bosh-bootstrap 0.14.5 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adb4ce189053f551910a65c3696e327991235275
-  data.tar.gz: e6e6f0ef6d6ee0e5c0f336b92a6c17715a7bf064
+  metadata.gz: ec9bfaa86ff0d6489f4032bf510a20e2631a8f0e
+  data.tar.gz: e162324692a5a37959e5274fd32bf9fb2b89b600
 SHA512:
-  metadata.gz: b323094bce6d018e9693ee0c0a0b841fd20824a4674d9bd46a704577afa1c6834a1609b585be389fb2dde1033742fd960dd330ed1f98a862b6034408ba60f9ed
-  data.tar.gz: 00977695a6ed8a4cbdca9de8854152070bb8498bc66e0457d2a1ef9fc761ab74d84be3d03525ff7fbafa59deb3e0e4c52dd6e133d157af16dc22378e832090bb
+  metadata.gz: 0d7c876a236c07499f60a72efc788a9c9919c9a6be160d4075dca94091a420a8fc982fda17a9dfb5b530930a99662fd52b1b502614ce45b41b81b44c0fae1f2b
+  data.tar.gz: 77b888965fbce1a2e65a84e9cdb61c38fedec828ddccf9b6132039983530ee6385babe959b85d3b8d8a6b1a904eefb0f142650be5b18ccc57380ccee76f1d981

data/ChangeLog.md

@@ -8,6 +8,12 @@ gem install bosh-bootstrap
 bosh-bootstrap deploy
 ```
 
+v0.15
+-----
+
+-	No more separate Gemfile and ugly `bundle install` step; thanks to BOSH CLI upgrading its dependencies sufficiently so as not to clash with bosh-bootstrap
+-	This allows inclusion in the [traveling-bosh](https://github.com/cloudfoundry-community/traveling-bosh) project
+
 v0.14
 -----
 
@@ -18,8 +24,8 @@ v0.14
 -	[aws] reuse existing bosh stemcell AMIs - automatically detects if a stemcell has been uploaded/converted into an AMI [v0.14.2]
 -	[openstack] reuse existing bosh stemcell images - automatically detects if a stemcell has been uploaded/converted into an OpenStack image [v0.14.3]
 -	[aws vpc] security groups are uniquely named per VPC [v0.14.4]
-- [aws vpc] added dns recursor to vpc [v0.14.5]
-- added ability to set dns recursor [v0.14.5]
+-	[aws vpc] added dns recursor to vpc [v0.14.5]
+-	added ability to set dns recursor [v0.14.5]
 
 v0.13
 -----
@@ -47,7 +53,7 @@ v0.11
 -	Accessing settings is much cleaner; functionality moved into fork of settingslogic called [readwritesettings](https://github.com/drnic/readwritesettings)
 -	Inception VM/server is now provisioned via separate CLI project [inception-server](https://github.com/drnic/inception-server)
 -	AWS/us-east-1 uses public AMIs; other regions & other CPIs use stemcells
--	CLI via bosh plugin (`bosh bootstrap`) rather than a stand alone CLI (`bosh-bootstrap`)
+-	CLI via bosh plugin (`bosh bootstrap`) rather than a stand alone CLI (`bosh-bootstrap`\)
 -	Added `ssh` action to ssh into the microbosh
 -	Added `delete` actions to delete the microbosh (but not the IP address and security groups)
 -	Add back `bosh-bootstrap` CLI & remove bosh_cli dependency (v0.11.1)

data/bosh-bootstrap.gemspec

@@ -22,6 +22,7 @@ EOS
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  gem.add_dependency "bosh_cli_plugin_micro"
   gem.add_dependency "cyoi", "~> 0.11"
   gem.add_dependency "fog", "~> 1.11"
   gem.add_dependency "readwritesettings", "~> 3.0"

data/lib/bosh-bootstrap/cli/commands/delete.rb

@@ -10,8 +10,8 @@ class Bosh::Bootstrap::Cli::Commands::Delete
 
   def perform
     chdir(deployment_dir) do
-      bundle "exec bosh -n micro deployment #{bosh_name}"
-      bundle "exec bosh -n micro delete"
+      run "bosh", "-n", "micro", "deployment", bosh_name
+      run "bosh", "-n", "micro", "delete"
     end
   end
 
@@ -23,4 +23,4 @@ class Bosh::Bootstrap::Cli::Commands::Delete
   def deployment_dir
     File.join(settings_dir, "deployments")
   end
-end
+end

data/lib/bosh-bootstrap/cli/helpers/bundle.rb

@@ -11,4 +11,11 @@ module Bosh::Bootstrap::Cli::Helpers::Bundle
       sh "bundle #{args.join(' ')}"
     }
   end
-end
+
+  def run(*args)
+    Bundler.with_clean_env {
+      ENV.delete 'RUBYOPT'
+      sh *args
+    }
+  end
+end

data/lib/bosh-bootstrap/microbosh.rb

@@ -38,35 +38,20 @@ class Bosh::Bootstrap::Microbosh
     @manifest_yml = File.join(deployments_dir, bosh_name, "micro_bosh.yml")
     mkdir_p(File.dirname(manifest_yml))
     chdir(base_path) do
-      setup_gems
       create_microbosh_yml(settings)
       deploy_or_update(settings.bosh.name, settings.bosh.stemcell_path)
     end
   end
 
   protected
-  def setup_gems
-    gempath = File.expand_path("../../..", __FILE__)
-    pwd = File.expand_path(".")
-    File.open("Gemfile", "w") do |f|
-      f << <<-RUBY
-source 'https://rubygems.org'
-
-gem "bosh_cli_plugin_micro"
-      RUBY
-    end
-    rm_rf "Gemfile.lock"
-    bundle "install"
-  end
-
   def create_microbosh_yml(settings)
     provider.create_microbosh_yml(settings)
   end
 
   def deploy_or_update(bosh_name, stemcell)
     chdir("deployments") do
-      bundle "exec bosh micro deployment", bosh_name
-      bundle "exec bosh -n micro deploy --update-if-exists", stemcell
+      run "bosh", "micro", "deployment", bosh_name
+      run "bosh", "-n", "micro", "deploy", "--update-if-exists", stemcell
     end
   end
 end

data/lib/bosh-bootstrap/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Bootstrap
-    VERSION = "0.14.5"
+    VERSION = "0.15.0"
   end
 end

data/spec/unit/commands/delete_spec.rb

@@ -11,8 +11,8 @@ describe Bosh::Bootstrap::Cli::Commands::Delete do
   it "deletes microbosh VM" do
     setting "bosh.name", "test-bosh"
     mkdir_p(File.join(settings_dir, "deployments"))
-    expect(subject).to receive(:sh).with("bundle exec bosh -n micro deployment test-bosh")
-    expect(subject).to receive(:sh).with("bundle exec bosh -n micro delete")
+    expect(subject).to receive(:sh).with("bosh", "-n", "micro", "deployment", "test-bosh")
+    expect(subject).to receive(:sh).with("bosh", "-n", "micro", "delete")
     subject.perform
   end
 end

data/spec/unit/microbosh_spec.rb

@@ -12,9 +12,8 @@ describe Bosh::Bootstrap::Microbosh do
   it "deploys new microbosh" do
     setting "bosh.name", "test-bosh"
     setting "bosh.stemcell_path", stemcell_path
-    expect(subject).to receive(:sh).with("bundle install")
-    expect(subject).to receive(:sh).with("bundle exec bosh micro deployment test-bosh")
-    expect(subject).to receive(:sh).with("bundle exec bosh -n micro deploy --update-if-exists #{stemcell_path}")
+    expect(subject).to receive(:sh).with("bosh", "micro", "deployment", "test-bosh")
+    expect(subject).to receive(:sh).with("bosh", "-n", "micro", "deploy", "--update-if-exists", stemcell_path)
     subject.deploy(settings)
   end
 

metadata

@@ -1,69 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: bosh-bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.14.5
+  version: 0.15.0
 platform: ruby
 authors:
 - Dr Nic Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bosh_cli_plugin_micro
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cyoi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
   name: readwritesettings
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
 - !ruby/object:Gem::Dependency
@@ -84,70 +98,70 @@ dependencies:
   name: redcard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Bootstrap a micro bosh universe from one CLI
@@ -158,9 +172,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - ChangeLog.md
 - Gemfile
 - Guardfile
@@ -237,17 +251,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: bosh-bootstrap configures and deploys a microbosh deployed on either AWS