Merge "Use git reference for cf gems in services"

Rakefile

@@ -6,21 +6,22 @@ task "tests" do |t|
 end
 
 namespace "bundler" do
-  desc "Update base gem"
-  task "update_base" do
-    system "cd base && rm -rf pkg && rake bundler:install"
+  def exec_in_svc_dir
     SERVICES_DIR.each do |dir|
       puts ">>>>>>>> enter #{dir}"
-      system "rm -f #{dir}/vendor/cache/vcap_services_base-*.gem && cp base/pkg/vcap_services_base-*.gem #{dir}/vendor/cache && cd #{dir} && bundle install --local"
+      Dir.chdir(dir) do
+        yield dir
+      end
     end
   end
 
-  desc "Update base gem and bump version using 'bundle update vcap_services_base'"
-  task "update_base!" do
-    system "cd base && rm -rf pkg && rake bundler:install"
-    SERVICES_DIR.each do |dir|
-      puts ">>>>>>>> enter #{dir}"
-      system "rm -f #{dir}/vendor/cache/vcap_services_base-*.gem && cp base/pkg/vcap_services_base-*.gem #{dir}/vendor/cache && cd #{dir} && bundle update vcap_services_base && bundle install --local"
-    end
+  desc "Update Gemfile"
+  task :update!, :oref, :nref do |t, args|
+    exec_in_svc_dir { |_| sh "sed -i \"s/#{args[:oref]}/#{args[:nref]}/g\" Gemfile && bundle install" }
+  end
+
+  desc "Dry run update Gemfile"
+  task :update, :oref, :nref do |t, args|
+    exec_in_svc_dir { |_| sh "sed \"s/#{args[:oref]}/#{args[:nref]}/g\" Gemfile" }
   end
 end

atmos/Gemfile

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'eventmachine'
+gem 'eventmachine', :git => 'git://github.com/cloudfoundry/eventmachine.git', :branch => 'release-0.12.11-cf'
 gem "em-http-request"
 gem "ruby-hmac"
 gem "uuidtools"
@@ -11,9 +11,9 @@ gem "sinatra"
 gem "thin"
 gem "xml-simple"
 
-gem 'vcap_common', '>= 1.0.8', :require => ['vcap/common', 'vcap/component']
-gem 'vcap_logging', '>=1.0.2', :require => ['vcap/logging']
-gem 'vcap_services_base'
+gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'a7779114db'
+gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '6bf11935c7'
 
 group :test do
   gem "rake"

atmos/Gemfile.lock

@@ -1,3 +1,53 @@
+GIT
+  remote: git://github.com/cloudfoundry/common.git
+  revision: b96ec1192d961925d91e17ca3831f8547489d918
+  ref: b96ec1192
+  specs:
+    vcap_logging (1.0.2)
+      rake
+
+GIT
+  remote: git://github.com/cloudfoundry/eventmachine.git
+  revision: 2806c630d8631d5dcf9fb2555f665b829052aabe
+  branch: release-0.12.11-cf
+  specs:
+    eventmachine (0.12.11.cloudfoundry.3)
+
+GIT
+  remote: git://github.com/cloudfoundry/vcap-common.git
+  revision: a7779114db666a1cf5eedf3fd1576c657ccafb6d
+  ref: a7779114db
+  specs:
+    vcap_common (1.0.13)
+      eventmachine (~> 0.12.11.cloudfoundry.3)
+      nats (~> 0.4.22.beta.8)
+      posix-spawn (~> 0.3.6)
+      thin (~> 1.3.1)
+      yajl-ruby (~> 0.8.3)
+
+GIT
+  remote: git://github.com/cloudfoundry/vcap-services-base.git
+  revision: 6bf11935c7ae88e30dc1c200161ca74e3babf3f9
+  ref: 6bf11935c7
+  specs:
+    vcap_services_base (0.1.11)
+      curb (~> 0.7.16)
+      datamapper (~> 1.1.0)
+      do_sqlite3 (~> 0.10.3)
+      em-http-request (~> 0.3.0)
+      eventmachine (~> 0.12.11.cloudfoundry.3)
+      eventmachine_httpserver (~> 0.2.1)
+      json (~> 1.4.6)
+      nats (~> 0.4.22.beta.8)
+      resque (~> 1.20)
+      resque-status (~> 0.3.2)
+      ruby-hmac (~> 0.4.0)
+      sinatra (~> 1.2.3)
+      thin (~> 1.3.1)
+      uuidtools (~> 2.1.2)
+      vcap_common (>= 1.0.8)
+      vcap_logging (>= 1.0.2)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -59,18 +109,17 @@ GEM
       escape_utils
       eventmachine (>= 0.12.9)
     escape_utils (0.2.4)
-    eventmachine (0.12.11.cloudfoundry.3)
     eventmachine_httpserver (0.2.1)
     fastercsv (1.5.5)
     json (1.4.6)
     json_pure (1.7.3)
-    macaddr (1.5.0)
-      systemu (>= 2.4.0)
+    macaddr (1.6.1)
+      systemu (~> 2.5.0)
     multi_json (1.0.4)
-    nats (0.4.22)
-      daemons (>= 1.1.4)
+    nats (0.4.24)
+      daemons (>= 1.1.5)
       eventmachine (>= 0.12.10)
-      json_pure (>= 1.6.1)
+      json_pure (>= 1.7.3)
       thin (>= 1.3.1)
     posix-spawn (0.3.6)
     rack (1.4.1)
@@ -110,7 +159,7 @@ GEM
       rack (~> 1.1)
       tilt (>= 1.2.2, < 2.0)
     stringex (1.2.2)
-    systemu (2.5.0)
+    systemu (2.5.1)
     thin (1.3.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
@@ -119,31 +168,6 @@ GEM
     uuid (2.3.5)
       macaddr (~> 1.0)
     uuidtools (2.1.2)
-    vcap_common (1.0.13)
-      eventmachine (~> 0.12.11.cloudfoundry.3)
-      nats (~> 0.4.22.beta.8)
-      posix-spawn (~> 0.3.6)
-      thin (~> 1.3.1)
-      yajl-ruby (~> 0.8.3)
-    vcap_logging (1.0.2)
-      rake
-    vcap_services_base (0.1.11)
-      curb (~> 0.7.16)
-      datamapper (~> 1.1.0)
-      do_sqlite3 (~> 0.10.3)
-      em-http-request (~> 0.3.0)
-      eventmachine (~> 0.12.11.cloudfoundry.3)
-      eventmachine_httpserver (~> 0.2.1)
-      json (~> 1.4.6)
-      nats (~> 0.4.22.beta.8)
-      resque (~> 1.20)
-      resque-status (~> 0.3.2)
-      ruby-hmac (~> 0.4.0)
-      sinatra (~> 1.2.3)
-      thin (~> 1.3.1)
-      uuidtools (~> 2.1.2)
-      vcap_common (>= 1.0.8)
-      vcap_logging (>= 1.0.2)
     vegas (0.1.11)
       rack (>= 1.0.0)
     xml-simple (1.0.15)
@@ -158,7 +182,7 @@ DEPENDENCIES
   dm-sqlite-adapter
   do_sqlite3
   em-http-request
-  eventmachine
+  eventmachine!
   rake
   rcov
   rspec
@@ -168,7 +192,7 @@ DEPENDENCIES
   sinatra
   thin
   uuidtools
-  vcap_common (>= 1.0.8)
-  vcap_logging (>= 1.0.2)
-  vcap_services_base
+  vcap_common!
+  vcap_logging!
+  vcap_services_base!
   xml-simple

atmos/Rakefile

@@ -1,13 +1,13 @@
 require 'rake'
 
 desc "Run specs"
-task "spec" => ["bundler:install:test", "test:spec"]
+task "spec" => ["test:spec"]
 
 desc "Run specs using SimpleCov"
-task "spec:rcov" => ["bundler:install:test", "test:spec:rcov"]
+task "spec:rcov" => ["test:spec:rcov"]
 
 desc "Run ci using SimpleCov"
-task "spec:ci" => ["bundler:install:test", "test:spec:ci"]
+task "spec:ci" => ["test:spec:ci"]
 
 namespace "bundler" do
   desc "Install gems"

filesystem/Gemfile

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'eventmachine'
+gem 'eventmachine', :git => 'git://github.com/cloudfoundry/eventmachine.git', :branch => 'release-0.12.11-cf'
 gem "em-http-request"
 gem "ruby-hmac"
 gem "uuidtools"
@@ -10,9 +10,9 @@ gem "do_sqlite3"
 gem "sinatra"
 gem "thin"
 
-gem 'vcap_common', '>= 1.0.8', :require => ['vcap/common', 'vcap/component']
-gem 'vcap_logging', '>=1.0.2', :require => ['vcap/logging']
-gem 'vcap_services_base'
+gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'a7779114db'
+gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '6bf11935c7'
 
 group :test do
   gem "rake"

filesystem/Gemfile.lock

@@ -1,3 +1,53 @@
+GIT
+  remote: git://github.com/cloudfoundry/common.git
+  revision: b96ec1192d961925d91e17ca3831f8547489d918
+  ref: b96ec1192
+  specs:
+    vcap_logging (1.0.2)
+      rake
+
+GIT
+  remote: git://github.com/cloudfoundry/eventmachine.git
+  revision: 2806c630d8631d5dcf9fb2555f665b829052aabe
+  branch: release-0.12.11-cf
+  specs:
+    eventmachine (0.12.11.cloudfoundry.3)
+
+GIT
+  remote: git://github.com/cloudfoundry/vcap-common.git
+  revision: a7779114db666a1cf5eedf3fd1576c657ccafb6d
+  ref: a7779114db
+  specs:
+    vcap_common (1.0.13)
+      eventmachine (~> 0.12.11.cloudfoundry.3)
+      nats (~> 0.4.22.beta.8)
+      posix-spawn (~> 0.3.6)
+      thin (~> 1.3.1)
+      yajl-ruby (~> 0.8.3)
+
+GIT
+  remote: git://github.com/cloudfoundry/vcap-services-base.git
+  revision: 6bf11935c7ae88e30dc1c200161ca74e3babf3f9
+  ref: 6bf11935c7
+  specs:
+    vcap_services_base (0.1.11)
+      curb (~> 0.7.16)
+      datamapper (~> 1.1.0)
+      do_sqlite3 (~> 0.10.3)
+      em-http-request (~> 0.3.0)
+      eventmachine (~> 0.12.11.cloudfoundry.3)
+      eventmachine_httpserver (~> 0.2.1)
+      json (~> 1.4.6)
+      nats (~> 0.4.22.beta.8)
+      resque (~> 1.20)
+      resque-status (~> 0.3.2)
+      ruby-hmac (~> 0.4.0)
+      sinatra (~> 1.2.3)
+      thin (~> 1.3.1)
+      uuidtools (~> 2.1.2)
+      vcap_common (>= 1.0.8)
+      vcap_logging (>= 1.0.2)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -59,18 +109,17 @@ GEM
       escape_utils
       eventmachine (>= 0.12.9)
     escape_utils (0.2.4)
-    eventmachine (0.12.11.cloudfoundry.3)
     eventmachine_httpserver (0.2.1)
     fastercsv (1.5.5)
     json (1.4.6)
     json_pure (1.7.3)
-    macaddr (1.5.0)
-      systemu (>= 2.4.0)
+    macaddr (1.6.1)
+      systemu (~> 2.5.0)
     multi_json (1.0.4)
-    nats (0.4.22)
-      daemons (>= 1.1.4)
+    nats (0.4.24)
+      daemons (>= 1.1.5)
       eventmachine (>= 0.12.10)
-      json_pure (>= 1.6.1)
+      json_pure (>= 1.7.3)
       thin (>= 1.3.1)
     posix-spawn (0.3.6)
     rack (1.4.1)
@@ -110,7 +159,7 @@ GEM
       rack (~> 1.1)
       tilt (>= 1.2.2, < 2.0)
     stringex (1.2.2)
-    systemu (2.5.0)
+    systemu (2.5.1)
     thin (1.3.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
@@ -119,31 +168,6 @@ GEM
     uuid (2.3.5)
       macaddr (~> 1.0)
     uuidtools (2.1.2)
-    vcap_common (1.0.13)
-      eventmachine (~> 0.12.11.cloudfoundry.3)
-      nats (~> 0.4.22.beta.8)
-      posix-spawn (~> 0.3.6)
-      thin (~> 1.3.1)
-      yajl-ruby (~> 0.8.3)
-    vcap_logging (1.0.2)
-      rake
-    vcap_services_base (0.1.11)
-      curb (~> 0.7.16)
-      datamapper (~> 1.1.0)
-      do_sqlite3 (~> 0.10.3)
-      em-http-request (~> 0.3.0)
-      eventmachine (~> 0.12.11.cloudfoundry.3)
-      eventmachine_httpserver (~> 0.2.1)
-      json (~> 1.4.6)
-      nats (~> 0.4.22.beta.8)
-      resque (~> 1.20)
-      resque-status (~> 0.3.2)
-      ruby-hmac (~> 0.4.0)
-      sinatra (~> 1.2.3)
-      thin (~> 1.3.1)
-      uuidtools (~> 2.1.2)
-      vcap_common (>= 1.0.8)
-      vcap_logging (>= 1.0.2)
     vegas (0.1.11)
       rack (>= 1.0.0)
     yajl-ruby (0.8.3)
@@ -157,7 +181,7 @@ DEPENDENCIES
   dm-sqlite-adapter
   do_sqlite3
   em-http-request
-  eventmachine
+  eventmachine!
   rake
   rcov
   rspec
@@ -167,6 +191,6 @@ DEPENDENCIES
   sinatra
   thin
   uuidtools
-  vcap_common (>= 1.0.8)
-  vcap_logging (>= 1.0.2)
-  vcap_services_base
+  vcap_common!
+  vcap_logging!
+  vcap_services_base!

filesystem/Rakefile

@@ -1,13 +1,13 @@
 require 'rake'
 
 desc "Run specs"
-task "spec" => ["bundler:install:test", "test:spec"]
+task "spec" => ["test:spec"]
 
 desc "Run specs using SimpleCov"
-task "spec:rcov" => ["bundler:install:test", "test:spec:rcov"]
+task "spec:rcov" => ["test:spec:rcov"]
 
 desc "Run ci using SimpleCov"
-task "spec:ci" => ["bundler:install:test", "test:spec:ci"]
+task "spec:ci" => ["test:spec:ci"]
 
 namespace "bundler" do
   desc "Install gems"