bump gems for mysql gw and node

including: * vcap_common 1.0.3 * nats 0.4.22.beta.4 * thin 1.3.1 Also reorder the Gemfile to a similar order as mysql/Gemfile, otherwise, bundler can't resolve the gem versions to use. (This seems like a bundler bug) Change-Id: I520c4cc8c0385ce9c44aca1b98183af16f9ae8c6
leto · Jan 4, 2012 · 728b3c4 · 728b3c4
1 parent 1a8ce44
commit 728b3c4
Show file tree

Hide file tree

Showing 22 changed files with 28 additions and 27 deletions.
diff --git a/mongodb/Gemfile b/mongodb/Gemfile
@@ -1,19 +1,19 @@
 source :rubygems
 
-gem "eventmachine"
-gem "em-http-request"
-gem "nats", '>= 0.4.10'
-gem "ruby-hmac"
-gem "uuidtools"
+gem "nats"
 gem "datamapper", ">= 0.10.2"
 gem "do_sqlite3"
 gem "dm-sqlite-adapter"
-gem "sinatra"
-gem "thin"
+gem "eventmachine"
+gem "em-http-request"
+gem "uuidtools"
+gem "ruby-hmac"
 gem "mongo"
 gem "bson_ext"
+gem "thin"
+gem "sinatra"
 
-gem 'vcap_common', :require => ['vcap/common', 'vcap/component']
+gem 'vcap_common', '~> 1.0.3', :require => ['vcap/common', 'vcap/component']
 gem 'vcap_logging', '>=0.1.3', :require => ['vcap/logging']
 
 group :test do

diff --git a/mongodb/Gemfile.lock b/mongodb/Gemfile.lock
@@ -8,7 +8,7 @@ GEM
     builder (3.0.0)
     ci_reporter (1.6.4)
       builder (>= 2.1.2)
-    daemons (1.1.2)
+    daemons (1.1.5)
     data_objects (0.10.3)
       addressable (~> 2.1)
     datamapper (1.1.0)
@@ -60,21 +60,22 @@ GEM
       escape_utils
       eventmachine (>= 0.12.9)
     escape_utils (0.2.3)
-    eventmachine (0.12.10)
+    eventmachine (0.12.11.cloudfoundry.3)
     fastercsv (1.5.4)
     json (1.4.6)
-    json_pure (1.5.1)
-    little-plugger (1.1.2)
-    logging (1.5.0)
+    json_pure (1.6.4)
+    little-plugger (1.1.3)
+    logging (1.6.1)
       little-plugger (>= 1.1.2)
     mongo (1.2.4)
       bson (>= 1.2.4)
-    nats (0.4.10)
-      daemons (>= 1.1.0)
+    nats (0.4.22.beta.4)
+      daemons (>= 1.1.4)
       eventmachine (>= 0.12.10)
-      json_pure (>= 1.5.1)
+      json_pure (>= 1.6.1)
+      thin (>= 1.3.1)
     posix-spawn (0.3.6)
-    rack (1.2.2)
+    rack (1.4.0)
     rake (0.8.7)
     rcov (0.9.9)
     rspec (2.5.0)
@@ -90,21 +91,21 @@ GEM
       rack (~> 1.1)
       tilt (>= 1.2.2, < 2.0)
     stringex (1.2.1)
-    thin (1.2.11)
+    thin (1.3.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     tilt (1.2.2)
     uuidtools (2.1.2)
-    vcap_common (0.99)
-      eventmachine (~> 0.12.10)
+    vcap_common (1.0.3)
+      eventmachine (~> 0.12.11.cloudfoundry.3)
       logging (>= 1.5.0)
-      nats
-      posix-spawn
-      thin
-      yajl-ruby
+      nats (~> 0.4.22.beta.4)
+      posix-spawn (~> 0.3.6)
+      thin (~> 1.3.1)
+      yajl-ruby (~> 0.8.3)
     vcap_logging (0.1.3)
-    yajl-ruby (0.8.2)
+    yajl-ruby (0.8.3)
 
 PLATFORMS
   ruby
@@ -118,13 +119,13 @@ DEPENDENCIES
   em-http-request
   eventmachine
   mongo
-  nats (>= 0.4.10)
+  nats
   rake
   rcov
   rspec
   ruby-hmac
   sinatra
   thin
   uuidtools
-  vcap_common
+  vcap_common (~> 1.0.3)
   vcap_logging (>= 0.1.3)
diff --git a/mongodb/vendor/cache/daemons-1.1.2.gem b/mongodb/vendor/cache/daemons-1.1.2.gem
diff --git a/mongodb/vendor/cache/daemons-1.1.5.gem b/mongodb/vendor/cache/daemons-1.1.5.gem
diff --git a/mongodb/vendor/cache/eventmachine-0.12.10.gem b/mongodb/vendor/cache/eventmachine-0.12.10.gem
diff --git a/mongodb/vendor/cache/eventmachine-0.12.11.cloudfoundry.3.gem b/mongodb/vendor/cache/eventmachine-0.12.11.cloudfoundry.3.gem
diff --git a/mongodb/vendor/cache/json_pure-1.5.1.gem b/mongodb/vendor/cache/json_pure-1.5.1.gem
diff --git a/mongodb/vendor/cache/json_pure-1.6.4.gem b/mongodb/vendor/cache/json_pure-1.6.4.gem
diff --git a/mongodb/vendor/cache/little-plugger-1.1.2.gem b/mongodb/vendor/cache/little-plugger-1.1.2.gem
diff --git a/mongodb/vendor/cache/little-plugger-1.1.3.gem b/mongodb/vendor/cache/little-plugger-1.1.3.gem
diff --git a/mongodb/vendor/cache/logging-1.5.0.gem b/mongodb/vendor/cache/logging-1.5.0.gem
diff --git a/mongodb/vendor/cache/logging-1.6.1.gem b/mongodb/vendor/cache/logging-1.6.1.gem
diff --git a/mongodb/vendor/cache/nats-0.4.10.gem b/mongodb/vendor/cache/nats-0.4.10.gem
diff --git a/mongodb/vendor/cache/nats-0.4.22.beta.4.gem b/mongodb/vendor/cache/nats-0.4.22.beta.4.gem
diff --git a/mongodb/vendor/cache/rack-1.2.2.gem b/mongodb/vendor/cache/rack-1.2.2.gem
diff --git a/mongodb/vendor/cache/rack-1.4.0.gem b/mongodb/vendor/cache/rack-1.4.0.gem
diff --git a/mongodb/vendor/cache/thin-1.2.11.gem b/mongodb/vendor/cache/thin-1.2.11.gem
diff --git a/mongodb/vendor/cache/thin-1.3.1.gem b/mongodb/vendor/cache/thin-1.3.1.gem
diff --git a/mongodb/vendor/cache/vcap_common-0.99.gem b/mongodb/vendor/cache/vcap_common-0.99.gem
diff --git a/mongodb/vendor/cache/vcap_common-1.0.3.gem b/mongodb/vendor/cache/vcap_common-1.0.3.gem
diff --git a/mongodb/vendor/cache/yajl-ruby-0.8.2.gem b/mongodb/vendor/cache/yajl-ruby-0.8.2.gem
diff --git a/mongodb/vendor/cache/yajl-ruby-0.8.3.gem b/mongodb/vendor/cache/yajl-ruby-0.8.3.gem