Merge pull request #45 from No5251/master

updates, added pessimistic operators

Gemfile

@@ -1,16 +1,16 @@
 source "http://gems.github.com"
 source "http://rubygems.org"
 
-gem 'nanoc3'
+gem 'nanoc', '~> 3.7.5'
-gem 'builder'
+gem 'builder', '~> 3.2.2'
-gem 'guard-nanoc'
+gem 'guard-nanoc', '~> 1.0.3'
-gem 'systemu'
+gem 'systemu', '~> 2.6.5'
-gem 'adsf'
+gem 'adsf', '~> 1.2.0'
-gem 'sass'
+gem 'sass', '~> 3.4.21'
-gem 'rdiscount'
+gem 'rdiscount', '~> 2.1.8'
-gem 't'
+gem 't', '~> 2.10.0'
-gem 'nokogiri'
+gem 'nokogiri', '~> 1.6.4'
-gem 'feedjira'
+gem 'feedjira', '~> 2.0.0'
-gem 'ri_cal'
+gem 'ri_cal', '~> 0.8.8'
-gem 'rqrcode_png'
+gem 'rqrcode_png', '~> 0.1.5'
 

Gemfile.lock

@@ -2,125 +2,135 @@ GEM
   remote: http://gems.github.com/
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.6)
+    addressable (2.4.0)
     adsf (1.2.0)
       rack (>= 1.0.0)
     buftok (0.2.0)
     builder (3.2.2)
-    celluloid (0.16.0)
+    chunky_png (1.3.5)
-      timers (~> 4.0.0)
-    chunky_png (1.3.3)
     coderay (1.1.0)
     colored (1.2)
-    cri (2.6.1)
+    cri (2.7.0)
       colored (~> 1.2)
-    curb (0.8.6)
+    domain_name (0.5.20160128)
-    equalizer (0.0.9)
+      unf (>= 0.0.5, < 1.0.0)
-    faraday (0.9.0)
+    equalizer (0.0.10)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    feedjira (1.5.0)
+    faraday_middleware (0.10.0)
-      curb (~> 0.8)
+      faraday (>= 0.7.4, < 0.10)
+    feedjira (2.0.0)
+      faraday (~> 0.9)
+      faraday_middleware (~> 0.9)
       loofah (~> 2.0)
       sax-machine (~> 1.0)
-    ffi (1.9.6)
+    ffi (1.9.10)
     formatador (0.2.5)
-    geokit (1.9.0)
+    geokit (1.10.0)
-      multi_json (>= 1.3.2)
+    guard (2.13.0)
-    guard (2.8.2)
       formatador (>= 0.2.4)
-      listen (~> 2.7)
+      listen (>= 2.7, <= 4.0)
       lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
       pry (>= 0.9.12)
+      shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-nanoc (1.0.3)
       guard (~> 2.8)
       nanoc (~> 3.6)
-    hitimes (1.2.2)
+    htmlentities (4.3.4)
-    htmlentities (4.3.2)
+    http (1.0.2)
-    http (0.6.3)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (~> 1.0.1)
       http_parser.rb (~> 0.6.0)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    http-form_data (1.0.1)
     http_parser.rb (0.6.0)
-    json (1.8.1)
+    json (1.8.3)
     launchy (2.4.3)
       addressable (~> 2.3)
-    listen (2.8.0)
+    listen (3.0.6)
-      celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
+      rb-inotify (>= 0.9.7)
-    loofah (2.0.1)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    lumberjack (1.0.9)
+    lumberjack (1.0.10)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     method_source (0.8.2)
-    mini_portile (0.6.1)
-    multi_json (1.10.1)
     multipart-post (2.0.0)
-    nanoc (3.7.3)
+    nanoc (3.7.5)
       cri (~> 2.3)
-    nanoc3 (3.3.0)
+    naught (1.1.0)
-      nanoc (>= 3.3.0)
+    nenv (0.3.0)
-    naught (1.0.0)
+    nokogiri (1.6.7.2)
-    nokogiri (1.6.4.1)
+    notiffany (0.0.8)
-      mini_portile (~> 0.6.0)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
     oauth (0.4.7)
-    pry (0.10.1)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.5.2)
+    rack (1.6.4)
-    rb-fsevent (0.9.4)
+    rb-fsevent (0.9.7)
-    rb-inotify (0.9.5)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    rdiscount (2.1.7.1)
+    rdiscount (2.1.8)
-    retryable (1.3.6)
+    retryable (2.0.3)
     ri_cal (0.8.8)
-    rqrcode (0.4.2)
+    rqrcode (0.10.1)
+      chunky_png (~> 1.0)
     rqrcode_png (0.1.5)
       chunky_png
       rqrcode
-    sass (3.4.8)
+    sass (3.4.21)
-    sax-machine (1.1.1)
+    sax-machine (1.3.2)
-    simple_oauth (0.3.0)
+    shellany (0.0.1)
+    simple_oauth (0.3.1)
     slop (3.6.0)
-    systemu (2.6.4)
+    systemu (2.6.5)
-    t (2.8.0)
+    t (2.10.0)
-      geokit (>= 1.8.3, < 2)
+      geokit (~> 1.9)
       htmlentities (~> 4.3)
       launchy (~> 2.4)
       oauth (~> 0.4.7)
-      retryable (~> 1.3)
+      retryable (~> 2.0)
       thor (>= 0.19.1, < 2)
-      twitter (~> 5.12)
+      twitter (~> 5.16)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
-    timers (4.0.1)
+    twitter (5.16.0)
-      hitimes
-    twitter (5.13.0)
       addressable (~> 2.3)
       buftok (~> 0.2.0)
-      equalizer (~> 0.0.9)
+      equalizer (= 0.0.10)
       faraday (~> 0.9.0)
-      http (~> 0.6.0)
+      http (~> 1.0)
       http_parser.rb (~> 0.6.0)
       json (~> 1.8)
       memoizable (~> 0.4.0)
       naught (~> 1.0)
       simple_oauth (~> 0.3.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  adsf
+  adsf (~> 1.2.0)
-  builder
+  builder (~> 3.2.2)
-  feedjira
+  feedjira (~> 2.0.0)
-  guard-nanoc
+  guard-nanoc (~> 1.0.3)
-  nanoc3
+  nanoc (~> 3.7.5)
-  nokogiri
+  nokogiri (~> 1.6.4)
-  rdiscount
+  rdiscount (~> 2.1.8)
-  ri_cal
+  ri_cal (~> 0.8.8)
-  rqrcode_png
+  rqrcode_png (~> 0.1.5)
-  sass
+  sass (~> 3.4.21)
-  systemu
+  systemu (~> 2.6.5)
-  t
+  t (~> 2.10.0)