Change top level dirs to match gemnames, also add rake task to build …

…all gems

.gitignore

@@ -20,17 +20,8 @@ spec/assets/**/*.pid
 spec/assets/bosh_config.yml
 spec/assets/test_release
 bosh_agent/spec/tmp
-cli/pkg
-monit_api/pkg
-blobstore_client/pkg
-common/pkg
-cpi/pkg
-deployer/pkg
-vsphere_cpi/pkg
-aws_cpi/pkg
-aws_registry/pkg
-openstack_registry/pkg
-package_compiler/pkg
+pkg
+*/pkg
 aws_bootstrap/spec/assets/private.yml
 spec/assets/test_release/dev_releases
 spec/assets/test_release/.dev_builds

Gemfile

@@ -5,17 +5,17 @@ source :rubygems
 gem "agent_client", path: "agent_client"
 gem "blobstore_client", path: "blobstore_client"
 gem "bosh_agent", path: "bosh_agent"
-gem "bosh_aws_bootstrap", path: "aws_bootstrap"
-gem "bosh_aws_cpi", path: "aws_cpi"
-gem "bosh_aws_registry", path: "aws_registry"
-gem "bosh_common", path: "common"
-gem "bosh_cpi", path: "cpi"
-gem "bosh_cli", path: "cli"
-gem "bosh_deployer", path: "deployer"
-gem "bosh_encryption", path: "encryption"
-gem "bosh_openstack_registry", path: "openstack_registry"
-gem "bosh_vcloud_cpi", path: "vcloud_cpi"
-gem "bosh_vsphere_cpi", path: "vsphere_cpi"
+gem "bosh_aws_bootstrap", path: "bosh_aws_bootstrap"
+gem "bosh_aws_cpi", path: "bosh_aws_cpi"
+gem "bosh_aws_registry", path: "bosh_aws_registry"
+gem "bosh_common", path: "bosh_common"
+gem "bosh_cpi", path: "bosh_cpi"
+gem "bosh_cli", path: "bosh_cli"
+gem "bosh_deployer", path: "bosh_deployer"
+gem "bosh_encryption", path: "bosh_encryption"
+gem "bosh_openstack_registry", path: "bosh_openstack_registry"
+gem "bosh_vcloud_cpi", path: "bosh_vcloud_cpi"
+gem "bosh_vsphere_cpi", path: "bosh_vsphere_cpi"
 gem "director", path: "director"
 gem "health_monitor", path: "health_monitor"
 gem "monit_api", path: "monit_api"

Gemfile.lock

@@ -5,35 +5,6 @@ PATH
       httpclient (= 2.2.4)
       yajl-ruby (~> 1.1.0)
 
-PATH
-  remote: aws_bootstrap
-  specs:
-    bosh_aws_bootstrap (1.5.0.pre)
-      aws-sdk (~> 1.8.0)
-      bosh_cli (~> 1.5.0.pre)
-      uuidtools (~> 2.1.3)
-
-PATH
-  remote: aws_cpi
-  specs:
-    bosh_aws_cpi (1.5.0.pre)
-      aws-sdk (~> 1.8.0)
-      bosh_common (~> 1.5.0.pre)
-      bosh_cpi (~> 1.5.0.pre)
-      httpclient (= 2.2.4)
-      uuidtools (~> 2.1.3)
-      yajl-ruby (>= 0.8.2)
-
-PATH
-  remote: aws_registry
-  specs:
-    bosh_aws_registry (1.5.0.pre)
-      aws-sdk (~> 1.8.0)
-      sequel (~> 3.43.0)
-      sinatra (~> 1.2.8)
-      thin (~> 1.5.0)
-      yajl-ruby (~> 1.1.0)
-
 PATH
   remote: blobstore_client
   specs:
@@ -66,7 +37,36 @@ PATH
       yajl-ruby (~> 1.1.0)
 
 PATH
-  remote: cli
+  remote: bosh_aws_bootstrap
+  specs:
+    bosh_aws_bootstrap (1.5.0.pre)
+      aws-sdk (~> 1.8.0)
+      bosh_cli (~> 1.5.0.pre)
+      uuidtools (~> 2.1.3)
+
+PATH
+  remote: bosh_aws_cpi
+  specs:
+    bosh_aws_cpi (1.5.0.pre)
+      aws-sdk (~> 1.8.0)
+      bosh_common (~> 1.5.0.pre)
+      bosh_cpi (~> 1.5.0.pre)
+      httpclient (= 2.2.4)
+      uuidtools (~> 2.1.3)
+      yajl-ruby (>= 0.8.2)
+
+PATH
+  remote: bosh_aws_registry
+  specs:
+    bosh_aws_registry (1.5.0.pre)
+      aws-sdk (~> 1.8.0)
+      sequel (~> 3.43.0)
+      sinatra (~> 1.2.8)
+      thin (~> 1.5.0)
+      yajl-ruby (~> 1.1.0)
+
+PATH
+  remote: bosh_cli
   specs:
     bosh_cli (1.5.0.pre)
       blobstore_client (~> 1.5.0.pre)
@@ -82,18 +82,18 @@ PATH
       terminal-table (~> 1.4.3)
 
 PATH
-  remote: common
+  remote: bosh_common
   specs:
     bosh_common (1.5.0.pre)
 
 PATH
-  remote: cpi
+  remote: bosh_cpi
   specs:
     bosh_cpi (1.5.0.pre)
       bosh_common (~> 1.5.0.pre)
 
 PATH
-  remote: deployer
+  remote: bosh_deployer
   specs:
     bosh_deployer (1.5.0.pre)
       agent_client (~> 1.5.0.pre)
@@ -107,6 +107,45 @@ PATH
       bosh_vsphere_cpi (~> 1.5.0.pre)
       sqlite3 (~> 1.3.7)
 
+PATH
+  remote: bosh_encryption
+  specs:
+    bosh_encryption (1.5.0.pre)
+      gibberish (~> 1.2.0)
+      uuidtools (~> 2.1.3)
+      yajl-ruby (~> 1.1.0)
+
+PATH
+  remote: bosh_openstack_registry
+  specs:
+    bosh_openstack_registry (1.5.0.pre)
+      fog (~> 1.9.0)
+      sequel (~> 3.43.0)
+      sinatra (~> 1.2.8)
+      thin (~> 1.5.0)
+      yajl-ruby (~> 1.1.0)
+
+PATH
+  remote: bosh_vcloud_cpi
+  specs:
+    bosh_vcloud_cpi (1.5.0.pre)
+      bosh_common (~> 1.5.0.pre)
+      bosh_cpi (~> 1.5.0.pre)
+      ruby_vcloud_sdk (~> 1.5.0.pre)
+      uuidtools (~> 2.1)
+      yajl-ruby (>= 0.8.2)
+
+PATH
+  remote: bosh_vsphere_cpi
+  specs:
+    bosh_vsphere_cpi (1.5.0.pre)
+      bosh_common (~> 1.5.0.pre)
+      bosh_cpi (~> 1.5.0.pre)
+      membrane (~> 0.0.2)
+      ruby_vim_sdk (~> 1.5.0.pre)
+      sequel (~> 3.43.0)
+      uuidtools (~> 2.1.3)
+
 PATH
   remote: director
   specs:
@@ -134,14 +173,6 @@ PATH
       uuidtools (~> 2.1.3)
       yajl-ruby (~> 1.1.0)
 
-PATH
-  remote: encryption
-  specs:
-    bosh_encryption (1.5.0.pre)
-      gibberish (~> 1.2.0)
-      uuidtools (~> 2.1.3)
-      yajl-ruby (~> 1.1.0)
-
 PATH
   remote: health_monitor
   specs:
@@ -161,16 +192,6 @@ PATH
     monit_api (1.5.0.pre)
       crack (~> 0.3.2)
 
-PATH
-  remote: openstack_registry
-  specs:
-    bosh_openstack_registry (1.5.0.pre)
-      fog (~> 1.9.0)
-      sequel (~> 3.43.0)
-      sinatra (~> 1.2.8)
-      thin (~> 1.5.0)
-      yajl-ruby (~> 1.1.0)
-
 PATH
   remote: package_compiler
   specs:
@@ -206,27 +227,6 @@ PATH
       thin (~> 1.5.0)
       uuidtools (~> 2.1)
 
-PATH
-  remote: vcloud_cpi
-  specs:
-    bosh_vcloud_cpi (1.5.0.pre)
-      bosh_common (~> 1.5.0.pre)
-      bosh_cpi (~> 1.5.0.pre)
-      ruby_vcloud_sdk (~> 1.5.0.pre)
-      uuidtools (~> 2.1)
-      yajl-ruby (>= 0.8.2)
-
-PATH
-  remote: vsphere_cpi
-  specs:
-    bosh_vsphere_cpi (1.5.0.pre)
-      bosh_common (~> 1.5.0.pre)
-      bosh_cpi (~> 1.5.0.pre)
-      membrane (~> 0.0.2)
-      ruby_vim_sdk (~> 1.5.0.pre)
-      sequel (~> 3.43.0)
-      uuidtools (~> 2.1.3)
-
 GEM
   remote: http://rubygems.org/
   specs:

Rakefile

@@ -1,14 +1,10 @@
 task :default => :spec
 
-desc "build and install the bosh cli gem"
-task :build do
-  sh("cd cli && bundle exec rake install")
-end
-
 desc "run spec tests"
 task :spec do
   sh("./ci_build.rb")
 end
 
 import File.join("rake","stemcell.rake")
 import File.join("rake","bat.rake")
+import File.join("rake","gem.rake")

agent_client/lib/agent_client/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Agent
     class Client
-      VERSION = "0.1.1"
+      VERSION = '1.5.0.pre'
     end
   end
 end