Eliminate Gemfile duplicate gem declarations

* Pull in bosh gems as dependencies rather than part of the Gemfile * Remove development dependencies for gems that are not themselves development dependencies. Signed-off-by: Rob Day-Reynolds <[email protected]>
drich10 · May 16, 2014 · 3aaad0a · 3aaad0a
1 parent e68d066
commit 3aaad0a
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 51 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,25 +2,29 @@
 
 source 'https://rubygems.org'
 
-gemspec path: 'agent_client'
-gemspec path: 'blobstore_client'
-gemspec path: 'bosh_agent'
-gemspec path: 'bosh_aws_cpi'
-gemspec path: 'bosh_common'
-gemspec path: 'bosh-core'
-gemspec path: 'bosh_cpi'
-gemspec path: 'bosh_cli'
-gemspec path: 'bosh_cli_plugin_aws'
-gemspec path: 'bosh_cli_plugin_micro'
-gemspec path: 'bosh_openstack_cpi'
-gemspec path: 'bosh-registry'
-gemspec path: 'bosh_vsphere_cpi'
-gemspec path: 'bosh_warden_cpi'
-gemspec path: 'bosh-director'
-gemspec path: 'bosh-director-core'
-gemspec path: 'bosh-monitor'
-gemspec path: 'bosh-release'
-gemspec path: 'simple_blobstore_server'
+%w(
+  agent_client
+  blobstore_client
+  bosh_agent
+  bosh_aws_cpi
+  bosh_common
+  bosh-core
+  bosh_cpi
+  bosh_cli
+  bosh_cli_plugin_aws
+  bosh_cli_plugin_micro
+  bosh_openstack_cpi
+  bosh-registry
+  bosh_vsphere_cpi
+  bosh_warden_cpi
+  bosh-director
+  bosh-director-core
+  bosh-monitor
+  bosh-release
+  simple_blobstore_server
+).each do |gem_name|
+  gem gem_name, path: gem_name
+end
 
 gem 'rake', '~>10.0'
 

diff --git a/agent_client/agent_client.gemspec b/agent_client/agent_client.gemspec
@@ -21,6 +21,4 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'httpclient', '=2.2.4'
   s.add_dependency 'yajl-ruby', '~>1.1.0'
-
-  s.add_development_dependency 'rspec'
 end
diff --git a/blobstore_client/blobstore_client.gemspec b/blobstore_client/blobstore_client.gemspec
@@ -26,6 +26,4 @@ Gem::Specification.new do |s|
   s.add_dependency 'multi_json',      '~> 1.1'
   s.add_dependency 'ruby-atmos-pure', '~> 1.0.5'
   s.add_dependency 'bosh_common',     "~>#{version}"
-
-  s.add_development_dependency 'rspec'
 end
diff --git a/bosh-core/bosh-core.gemspec b/bosh-core/bosh-core.gemspec
@@ -20,7 +20,4 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'gibberish', '~>1.2.0'
   spec.add_dependency 'yajl-ruby', '~>1.1.0'
-
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
 end
diff --git a/bosh-director-core/bosh-director-core.gemspec b/bosh-director-core/bosh-director-core.gemspec
@@ -21,8 +21,4 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib]
 
   spec.add_dependency 'bosh_common', "~>#{version}"
-
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'fakefs'
 end
diff --git a/bosh-director/bosh-director.gemspec b/bosh-director/bosh-director.gemspec
@@ -47,11 +47,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'yajl-ruby',        '~>1.1.0'
   s.add_dependency 'membrane',         '~>0.0.2'
 
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rspec-its'
-  s.add_development_dependency 'fakefs'
-  s.add_development_dependency 'machinist', '~>1.0'
-
   s.bindir      = 'bin'
   s.executables << 'bosh-director'
   s.executables << 'bosh-director-console'

diff --git a/bosh_agent/bosh_agent.gemspec b/bosh_agent/bosh_agent.gemspec
@@ -29,9 +29,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'bosh_common',      "~>#{version}"
   s.add_dependency 'blobstore_client', "~>#{version}"
 
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'fakefs'
-
   s.files         = `git ls-files -- lib/*`.split("\n") + %w(CHANGELOG)
   s.require_paths = %w(lib)
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})

diff --git a/bosh_cli/bosh_cli.gemspec b/bosh_cli/bosh_cli.gemspec
@@ -32,9 +32,4 @@ Gem::Specification.new do |s|
   s.add_dependency 'net-scp', '~>1.1.0'
   s.add_dependency 'netaddr', '~>1.5.0'
   s.add_dependency 'minitar', '~>0.5.4'
-
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rspec-its'
-  s.add_development_dependency 'fakefs'
-  s.add_development_dependency 'webmock'
 end
diff --git a/bosh_cli_plugin_aws/bosh_cli_plugin_aws.gemspec b/bosh_cli_plugin_aws/bosh_cli_plugin_aws.gemspec
@@ -22,7 +22,4 @@ Gem::Specification.new do |s|
   s.add_dependency 'bosh_aws_cpi',          "~>#{version}"
   s.add_dependency 'bosh_cli_plugin_micro', "~>#{version}"
   s.add_dependency 'bosh-stemcell',         "~>#{version}"
-
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rspec-its'
 end
diff --git a/bosh_cli_plugin_micro/bosh_cli_plugin_micro.gemspec b/bosh_cli_plugin_micro/bosh_cli_plugin_micro.gemspec
@@ -32,7 +32,4 @@ Gem::Specification.new do |s|
   s.add_dependency 'bosh_vsphere_cpi',   "~>#{version}"
   s.add_dependency 'bosh-director-core', "~>#{version}"
   s.add_dependency 'blobstore_client',   "~>#{version}"
-
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'fakefs'
 end
diff --git a/bosh_vsphere_cpi/bosh_vsphere_cpi.gemspec b/bosh_vsphere_cpi/bosh_vsphere_cpi.gemspec
@@ -30,6 +30,4 @@ Gem::Specification.new do |s|
   s.add_dependency 'builder',     '~>3.1.4'
   s.add_dependency 'nokogiri',    '~>1.5.10'
   s.add_dependency 'httpclient',  '~>2.2.4'
-
-  s.add_development_dependency 'rspec'
 end