Skip to content

Commit

Permalink
[stager] remove vendor cache from stager
Browse files Browse the repository at this point in the history
  This change replaces vendor cache with git references.
  Bumped vcap-concurrency to 0.1.0 which has a valid gemspec.
  For this to deploy with BOSH the packaging scripts need to be changed,
c.f. Change I619c9a228b666dcd9e14b4bb6e24b89e5864f7d7.

  Test plan: create a release and pass BVT using Change I619c9a22 of
cf-release.

Change-Id: I849da047b37ac05220c6508869a34a94a8bf4f8c
  • Loading branch information
d committed May 24, 2012
1 parent d211123 commit 6cafe16
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 33 deletions.
12 changes: 6 additions & 6 deletions Gemfile
@@ -1,15 +1,15 @@
source :rubygems

gem 'eventmachine'
gem 'eventmachine', :git => 'git://github.com/cloudfoundry/eventmachine.git', :branch => 'release-0.12.11-cf'
gem 'nats'
gem 'rake'
gem 'yajl-ruby', '>= 0.7.9'

gem 'vcap_common', '~> 1.0.8'
gem 'vcap_logging', '>= 0.1.3'
gem 'vcap_staging', '~> 0.1.59'
gem 'vcap-concurrency', '~> 0.0.1'
gem 'stager-client', '~> 0.0.2'
gem 'vcap_common', '~> 1.0.8', :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'f6ffe9ad'
gem 'vcap_logging', '>= 0.1.3', :git => 'git://github.com/cloudfoundry/common.git'
gem 'vcap_staging', '~> 0.1.59', :git => 'git://github.com/cloudfoundry/vcap-staging.git', :ref => '251cb526'
gem 'vcap-concurrency', '~> 0.1.0', :git => 'git://github.com/cloudfoundry/vcap-concurrency.git'
gem 'stager-client', '~> 0.0.2', :git => 'git://github.com/cloudfoundry/stager-client.git'

group :test do
gem 'rspec'
Expand Down
87 changes: 60 additions & 27 deletions Gemfile.lock
@@ -1,3 +1,57 @@
GIT
remote: git://github.com/cloudfoundry/common.git
revision: b96ec1192d961925d91e17ca3831f8547489d918
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/stager-client.git
revision: fdaae720264e43cf7b1d068fcac27b005517d922
specs:
stager-client (0.0.2)
eventmachine
nats
yajl-ruby

GIT
remote: git://github.com/cloudfoundry/vcap-common.git
revision: f6ffe9add54b55eaf428556147d61f3d64508cd8
ref: f6ffe9ad
specs:
vcap_common (1.0.9)
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-concurrency.git
revision: be2bdb9f64a066f268d7537223ee24ae18e03cf7
specs:
vcap-concurrency (0.1.0)

GIT
remote: git://github.com/cloudfoundry/vcap-staging.git
revision: 251cb526ea26961bfc46efdea7f8268510e32e25
ref: 251cb526
specs:
vcap_staging (0.1.59)
nokogiri (>= 1.4.4)
rake
rspec
uuidtools (~> 2.1.2)
vcap_common (~> 1.0.8)
yajl-ruby (>= 0.7.9)

GEM
remote: http://rubygems.org/
specs:
Expand All @@ -8,7 +62,6 @@ GEM
crack (0.1.8)
daemons (1.1.8)
diff-lcs (1.1.3)
eventmachine (0.12.11.cloudfoundry.3)
json_pure (1.6.5)
nats (0.4.22)
daemons (>= 1.1.4)
Expand All @@ -30,32 +83,12 @@ GEM
sinatra (1.2.6)
rack (~> 1.1)
tilt (>= 1.2.2, < 2.0)
stager-client (0.0.2)
eventmachine
nats
yajl-ruby
thin (1.3.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
tilt (1.3.2)
uuidtools (2.1.2)
vcap-concurrency (0.0.1)
vcap_common (1.0.9)
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.1)
rake
vcap_staging (0.1.59)
nokogiri (>= 1.4.4)
rake
rspec
uuidtools (~> 2.1.2)
vcap_common (~> 1.0.8)
yajl-ruby (>= 0.7.9)
webmock (1.7.4)
addressable (~> 2.2, > 2.2.5)
crack (>= 0.1.7)
Expand All @@ -66,15 +99,15 @@ PLATFORMS

DEPENDENCIES
ci_reporter
eventmachine
eventmachine!
nats
rake
rspec
sinatra
stager-client (~> 0.0.2)
vcap-concurrency (~> 0.0.1)
vcap_common (~> 1.0.8)
vcap_logging (>= 0.1.3)
vcap_staging (~> 0.1.59)
stager-client (~> 0.0.2)!
vcap-concurrency (~> 0.1.0)!
vcap_common (~> 1.0.8)!
vcap_logging (>= 0.1.3)!
vcap_staging (~> 0.1.59)!
webmock
yajl-ruby (>= 0.7.9)

0 comments on commit 6cafe16

Please sign in to comment.