bosh-bootstrap 0.11.0 → 0.11.1

data/.travis.yml

@@ -2,8 +2,8 @@ language: ruby
 script: bundle exec rake spec:$SUITE
 rvm:
   - ruby-1.9.3
-  # - rbx-19mode
-  # - ruby-2.0.0 - generates "Cannot find Syck parser for YAML"
+  - rbx-19mode
+  - ruby-2.0.0
 notifications:
   email:
     recipients:
@@ -21,5 +21,7 @@ env:
     - secure: "OS3pnXOAVRP0QPDl/Nn/0iBPZbrnn9irFYwEbMJ2fGPsV00u4IYDwoIN5Gzb\nX+cXyiPZB0jdQlbiCMaQEYjYig3fgnDhiLj/MnxkVYtILm+0uPSrX2Zf7jvR\nmxCT5jfTSZoPXQeNi9h8rEqvaqKv4z930xp/Z0QNoZLPWdwY5wk="
 matrix:
   allow_failures:
+    # - rvm: rbx-19mode
+    # - rvm: ruby-2.0.0
     - env: SUITE=integration:aws:basic
         

data/ChangeLog.md

@@ -3,7 +3,7 @@
 `bosh-bootstrap` is a command line tool that you can run on your laptop and automatically get a microbosh (and an inception VM) deployed on AWS (with OpenStack & vSphere coming soon).
 
     gem install bosh-bootstrap
-    bosh bootstrap deploy
+    bosh-bootstrap deploy
 
 ## v0.11
 
@@ -17,6 +17,7 @@
 * 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)
 
 ## v0.10
 

data/README.md

@@ -13,7 +13,7 @@ Bosh Bootstrap currently supports AWS, with OpenStack and vSphere coming soon. T
 It also performs the task as fast as it is possible. On AWS, if a public AMI has been published for your requested region then it will use that (currently: us-east-1/Virginia).
 
 ```
-$ bosh bootstrap deploy
+$ bosh-bootstrap deploy
 Auto-detected infrastructure API credentials at ~/.fog (override with $FOG)
 1. AWS (default)
 2. AWS (bosh)
@@ -46,7 +46,7 @@ Confirming: Using address 107.21.194.123
 Generating ~/.bosh-bootstrap/universes/aws-us-east-1/micro_bosh.yml...
 Deploying micro bosh server...
 
-$ bosh bootstrap ssh
+$ bosh-bootstrap ssh
 SSH to micro bosh server...
 
 $ bosh-bootstrap delete
@@ -71,12 +71,14 @@ $ gem install bosh-bootstrap
 
 ## Usage
 
+Bosh Bootstrap is available primarily as a standalone CLI `bosh-bootstrap`. If you have the bosh CLI installed, then it is also available as a bosh plugin via `bosh bootstrap`. This readme assumes the former usage.
+
 ### First time usage
 
 The first time you use `bosh bootstrap` it will create everything necessary, including a public IP address, security groups, a private key, and the all-important micro bosh that you want. The example output below includes user prompts.
 
 ```
-$ bosh bootstrap deploy
+$ bosh-bootstrap deploy
 Auto-detected infrastructure API credentials at ~/.fog (override with $FOG)
 1. AWS (default)
 2. AWS (bosh)
@@ -161,22 +163,22 @@ The `deploy` command can be re-run and it will not prompt again for inputs. It a
 You can open an SSH shell to your micro bosh:
 
 ```
-$ bosh bootstrap ssh
+$ bosh-bootstrap ssh
 ```
 
 ## Deleting micro bosh
 
-The `bosh bootstrap delete`  command will delete the target micro-bosh.
+The `bosh-bootstrap delete` command will delete the target micro-bosh.
 
 ```
-$ bosh bootstrap delete
+$ bosh-bootstrap delete
 ```
 
 ## Deep dive into the Bosh Bootstrap deploy command
 
-What is actually happening when you run `bosh bootstrap deploy`?
+What is actually happening when you run `bosh-bootstrap deploy`?
 
-At the heart of `bosh bootstrap deploy` is the execution of the micro bosh deployer, a bosh plugin provided to bootstrap a single VM with all the parts of bosh running on it. If you ran this command yourself you would run:
+At the heart of `bosh-bootstrap deploy` is the execution of the micro bosh deployer, a bosh plugin provided to bootstrap a single VM with all the parts of bosh running on it. If you ran this command yourself you would run:
 
 ```
 $ gem install bosh_cli_plugin_micro -s https://s3.amazonaws.com/bosh-jenkins-gems/
@@ -190,7 +192,7 @@ Unfortunately for this simple scenario, there are many little prerequisite steps
 * publicly available stemcells
 * custom stemcells generated from the bosh repository.
 
-To understand exactly what the `bosh bootstrap deploy` command is doing, let's start with what the running parts of bosh are and how `bosh micro deploy` deploys them.
+To understand exactly what the `bosh-bootstrap deploy` command is doing, let's start with what the running parts of bosh are and how `bosh micro deploy` deploys them.
 
 ### What is in bosh?
 
@@ -268,7 +270,7 @@ One of the feature of the Bosh Bootstrap is that you can run it from your local
 
 ### When do I need an inception server?
 
-There are occasions when it is preferable or required to provision a initial server (called an [inception server](https://github.com/drnic/inception-server)) and to run Bosh Bootstrap (`bosh bootstrap deploy`) within that.
+There are occasions when it is preferable or required to provision a initial server (called an [inception server](https://github.com/drnic/inception-server)) and to run Bosh Bootstrap (`bosh-bootstrap deploy`) within that.
 
 * Using a AWS region other than us-east-1 (you need to be in that region to create an AMI)
 * You want much faster internet between your terminal (an ssh session into your inception server) and your micro bosh and deployed servers

data/TODO.md

@@ -6,6 +6,8 @@
   * bosh name (currently fixed at test-bosh)
   * ~/.microbosh folder is singular
 
+* specify an AZ to use in the region
+
 ### Display status
 
 ```

data/bin/bosh-bootstrap

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+$:.push File.dirname(__FILE__) + '/../lib'
+
+require "rubygems"
+require "bosh-bootstrap"
+require "bosh-bootstrap/thor_cli"
+
+Bosh::Bootstrap::ThorCli.start

data/bosh-bootstrap.gemspec

@@ -22,10 +22,11 @@ EOS
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "cyoi"
+  gem.add_dependency "cyoi", "~> 0.4"
+  gem.add_dependency "fog", "~> 1.11"
   gem.add_dependency "readwritesettings", "~> 3.0"
+  gem.add_dependency "thor", "~> 0.18"
   gem.add_dependency "redcard"
-  gem.add_dependency "bosh_cli"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "fakeweb"

data/lib/bosh-bootstrap/thor_cli.rb

@@ -0,0 +1,28 @@
+require "thor"
+require "bosh-bootstrap"
+
+module Bosh::Bootstrap
+  class ThorCli < Thor
+
+    desc "deploy", "Configure and bootstrap a micro bosh; or deploy/upgrade existing Micro Bosh"
+    def deploy
+      require "bosh-bootstrap/cli/commands/deploy"
+      deploy_cmd = Bosh::Bootstrap::Cli::Commands::Deploy.new
+      deploy_cmd.perform
+    end
+
+    desc "ssh", "SSH into micro bosh"
+    def ssh
+      require "bosh-bootstrap/cli/commands/ssh"
+      cmd = Bosh::Bootstrap::Cli::Commands::SSH.new
+      cmd.perform
+    end
+
+    desc "delete", "Delete existing Micro Bosh (does not delete any bosh deployments running)"
+    def delete
+      require "bosh-bootstrap/cli/commands/delete"
+      cmd = Bosh::Bootstrap::Cli::Commands::Delete.new
+      cmd.perform
+    end
+  end
+end

data/lib/bosh-bootstrap/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Bootstrap
-    VERSION = "0.11.0"
+    VERSION = "0.11.1"
   end
 end

data/spec/spec_helper.rb

@@ -9,8 +9,8 @@ Bundler.setup(:default, :test)
 $:.unshift(File.expand_path("../../lib", __FILE__))
 
 require "rspec/core"
-require "cli" # bosh CLI
-require "bosh/cli/commands/bootstrap" # "bosh bootstrap COMMAND" commands added to bosh CLI
+require "tmpdir"
+require "bosh-bootstrap"
 require "bosh-bootstrap/cli/helpers"
 
 # for the #sh helper
@@ -32,6 +32,12 @@ def files_match(filename, expected_filename)
   file.should == expected_file
 end
 
+def yaml_files_match(filename, expected_filename)
+  yaml = YAML.load_file(filename)
+  expected_yaml = YAML.load_file(expected_filename)
+  yaml.should == expected_yaml
+end
+
 def setup_home_dir
   home_dir = File.expand_path("../../tmp/home", __FILE__)
   FileUtils.rm_rf(home_dir)

data/spec/unit/cli/bootstrap_spec.rb

@@ -1,41 +1,49 @@
 # Copyright (c) 2012-2013 Stark & Wayne, LLC
 
-require "bosh-bootstrap/cli/commands/deploy"
-require "bosh-bootstrap/cli/commands/delete"
-require "bosh-bootstrap/cli/commands/ssh"
-describe Bosh::Cli::Command::Bootstrap do
-  include FileUtils
+# By default, this bosh plugin test does not run. To enable it, include the `bosh_cli` gem
+# in the Gemfile.
+begin
+  require "cli" # bosh CLI
+  require "bosh/cli/commands/bootstrap" # "bosh bootstrap COMMAND" commands added to bosh CLI
 
-  before do
-    FileUtils.mkdir_p(@stemcells_dir = File.join(Dir.mktmpdir, "stemcells"))
-    FileUtils.mkdir_p(@cache_dir = File.join(Dir.mktmpdir, "cache"))
-  end
+  require "bosh-bootstrap/cli/commands/deploy"
+  require "bosh-bootstrap/cli/commands/delete"
+  require "bosh-bootstrap/cli/commands/ssh"
+  describe Bosh::Cli::Command::Bootstrap do
+    include FileUtils
 
-  let(:cli) do
-    cli = Bosh::Cli::Command::Bootstrap.new(nil)
-    cli.add_option(:non_interactive, true)
-    cli.add_option(:cache_dir, @cache_dir)
-    cli
-  end
+    before do
+      FileUtils.mkdir_p(@stemcells_dir = File.join(Dir.mktmpdir, "stemcells"))
+      FileUtils.mkdir_p(@cache_dir = File.join(Dir.mktmpdir, "cache"))
+    end
 
-  it "runs deploy command" do
-    cmd = double(Bosh::Bootstrap::Cli::Commands::Deploy)
-    cmd.should_receive(:perform)
-    Bosh::Bootstrap::Cli::Commands::Deploy.stub(:new).and_return(cmd)
-    cli.deploy
-  end
+    let(:cli) do
+      cli = Bosh::Cli::Command::Bootstrap.new(nil)
+      cli.add_option(:non_interactive, true)
+      cli.add_option(:cache_dir, @cache_dir)
+      cli
+    end
 
-  it "runs delete command" do
-    cmd = double(Bosh::Bootstrap::Cli::Commands::Delete)
-    cmd.should_receive(:perform)
-    Bosh::Bootstrap::Cli::Commands::Delete.stub(:new).and_return(cmd)
-    cli.delete
-  end
+    it "runs deploy command" do
+      cmd = double(Bosh::Bootstrap::Cli::Commands::Deploy)
+      cmd.should_receive(:perform)
+      Bosh::Bootstrap::Cli::Commands::Deploy.stub(:new).and_return(cmd)
+      cli.deploy
+    end
+
+    it "runs delete command" do
+      cmd = double(Bosh::Bootstrap::Cli::Commands::Delete)
+      cmd.should_receive(:perform)
+      Bosh::Bootstrap::Cli::Commands::Delete.stub(:new).and_return(cmd)
+      cli.delete
+    end
 
-  it "runs ssh command" do
-    cmd = double(Bosh::Bootstrap::Cli::Commands::SSH)
-    cmd.should_receive(:perform)
-    Bosh::Bootstrap::Cli::Commands::SSH.stub(:new).and_return(cmd)
-    cli.ssh
+    it "runs ssh command" do
+      cmd = double(Bosh::Bootstrap::Cli::Commands::SSH)
+      cmd.should_receive(:perform)
+      Bosh::Bootstrap::Cli::Commands::SSH.stub(:new).and_return(cmd)
+      cli.ssh
+    end
   end
+rescue LoadError
 end

data/spec/unit/commands/deploy_spec.rb

@@ -58,7 +58,5 @@ describe Bosh::Bootstrap::Cli::Commands::Deploy do
 
       capture_stdout { cmd.perform }
     end
-    it "delete does nothing if not targetting a deployment"
-    it "delete runs 'bosh micro delete' & releases IP address; updates settings"
   end
 end

data/spec/unit/key_pair_spec.rb

@@ -1,3 +1,5 @@
+require "bosh-bootstrap/key_pair"
+
 describe Bosh::Bootstrap::KeyPair do
   include Bosh::Bootstrap::Cli::Helpers::Settings
 

data/spec/unit/microbosh_providers/aws_spec.rb

@@ -25,7 +25,7 @@ describe Bosh::Bootstrap::MicroboshProviders::AWS do
 
     subject.create_microbosh_yml(settings)
     File.should be_exists(microbosh_yml)
-    files_match(microbosh_yml, spec_asset("microbosh_yml/micro_bosh.aws_ec2.yml"))
+    yaml_files_match(microbosh_yml, spec_asset("microbosh_yml/micro_bosh.aws_ec2.yml"))
   end
 
   describe "stemcell" do

data/spec/unit/microbosh_providers/openstack_spec.rb

@@ -22,6 +22,6 @@ describe Bosh::Bootstrap::MicroboshProviders::OpenStack do
 
     subject.create_microbosh_yml(settings)
     File.should be_exists(microbosh_yml)
-    files_match(microbosh_yml, spec_asset("microbosh_yml/micro_bosh.openstack.yml"))
+    yaml_files_match(microbosh_yml, spec_asset("microbosh_yml/micro_bosh.openstack.yml"))
   end
 end

data/spec/unit/microbosh_providers/vsphere_spec.rb

@@ -37,6 +37,6 @@ describe Bosh::Bootstrap::MicroboshProviders::VSphere do
 
     subject.create_microbosh_yml(settings)
     File.should be_exists(microbosh_yml)
-    files_match(microbosh_yml, spec_asset("microbosh_yml/micro_bosh.vsphere.yml"))
+    yaml_files_match(microbosh_yml, spec_asset("microbosh_yml/micro_bosh.vsphere.yml"))
   end
 end

data/spec/unit/network_providers/aws_spec.rb

@@ -1,5 +1,6 @@
 require "readwritesettings"
 require "fakeweb"
+require "bosh-bootstrap/network_providers"
 require "bosh-bootstrap/network_providers/aws"
 
 describe Bosh::Bootstrap::NetworkProviders::AWS do

data/spec/unit/network_spec.rb

@@ -1,3 +1,5 @@
+require "bosh-bootstrap/network"
+
 describe Bosh::Bootstrap::Network do
   include Bosh::Bootstrap::Cli::Helpers::Settings
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cyoi
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: readwritesettings
   requirement: !ruby/object:Gem::Requirement
@@ -44,23 +60,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: redcard
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
-  name: bosh_cli
+  name: redcard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -126,7 +142,8 @@ dependencies:
 description: Bootstrap a micro bosh universe from one CLI
 email:
 - drnicwilliams@gmail.com
-executables: []
+executables:
+- bosh-bootstrap
 extensions: []
 extra_rdoc_files: []
 files:
@@ -140,6 +157,7 @@ files:
 - README.md
 - Rakefile
 - TODO.md
+- bin/bosh-bootstrap
 - bosh-bootstrap.gemspec
 - lib/bosh-bootstrap.rb
 - lib/bosh-bootstrap/cli/commands/delete.rb
@@ -161,6 +179,7 @@ files:
 - lib/bosh-bootstrap/network_providers/aws.rb
 - lib/bosh-bootstrap/network_providers/dummy.rb
 - lib/bosh-bootstrap/network_providers/openstack.rb
+- lib/bosh-bootstrap/thor_cli.rb
 - lib/bosh-bootstrap/version.rb
 - lib/bosh/cli/commands/bootstrap.rb
 - spec/assets/.gitkeep
@@ -206,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2107311079188106960
+      hash: -2381433706831646133
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25