bosh_cli 0.19.6 → 1.0.rc1

data/lib/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Cli
-    VERSION = "0.19.6"
+    VERSION = "1.0.rc1"
   end
 end

data/spec/assets/config/swift-hp/config/final.yml

@@ -0,0 +1,6 @@
+---
+blobstore:
+  provider: swift
+  options:
+    container_name: test
+    swift_provider: hp

data/spec/assets/config/swift-hp/config/private.yml

@@ -0,0 +1,7 @@
+---
+blobstore:
+  swift:
+    hp:
+      hp_account_id: foo
+      hp_secret_key: bar
+      hp_tenant_id: foo

data/spec/assets/config/swift-rackspace/config/final.yml

@@ -0,0 +1,6 @@
+---
+blobstore:
+  provider: swift
+  options:
+    container_name: test
+    swift_provider: rackspace

data/spec/assets/config/swift-rackspace/config/private.yml

@@ -0,0 +1,6 @@
+---
+blobstore:
+  swift:
+    rackspace:
+      rackspace_username: foo
+      rackspace_api_key: bar

data/spec/spec_helper.rb

@@ -9,11 +9,6 @@ def spec_asset(filename)
   File.expand_path(File.join(File.dirname(__FILE__), "assets", filename))
 end
 
-tmpdir = Dir.mktmpdir
-ENV["TMPDIR"] = tmpdir
-FileUtils.mkdir_p(tmpdir)
-at_exit { FileUtils.rm_rf(tmpdir) }
-
 RSpec.configure do |c|
   c.before(:each) do
     Bosh::Cli::Config.interactive = false

data/spec/unit/base_command_spec.rb

@@ -5,35 +5,38 @@ require "spec_helper"
 describe Bosh::Cli::Command::Base do
 
   before :each do
-    @config = File.join(Dir.mktmpdir, "bosh_config")
+    @runner = mock(Bosh::Cli::Runner)
+    @config_file = File.join(Dir.mktmpdir, "bosh_config")
     @cache_dir = Dir.mktmpdir
   end
 
   def add_config(object)
-    File.open(@config, "w") do |f|
+    File.open(@config_file, "w") do |f|
       f.write(YAML.dump(object))
     end
   end
 
-  def make_command(options = {})
-    Bosh::Cli::Command::Base.new({:config => @config,
-                                  :cache_dir => @cache_dir}.merge(options))
+  def make
+    cmd = Bosh::Cli::Command::Base.new(@runner)
+    cmd.add_option(:config, @config_file)
+    cmd
   end
 
   it "can access configuration and respects options" do
     add_config("target" => "localhost:8080", "deployment" => "test")
 
-    cmd = make_command(:verbose => true, :dry_run => true)
-    cmd.verbose?.should be_true
-    cmd.dry_run?.should be_true
+    cmd = make
+    cmd.config.should be_a(Bosh::Cli::Config)
+
     cmd.target.should == "http://localhost:8080"
     cmd.deployment.should == "test"
-    cmd.username.should == nil
-    cmd.password.should == nil
+    cmd.username.should be_nil
+    cmd.password.should be_nil
   end
 
-  it "looks up target, deployment and credentials in a right order" do
-    cmd = make_command
+  it "looks up target, deployment and credentials in the right order" do
+    cmd = make
+
     cmd.username.should be_nil
     cmd.password.should be_nil
     old_user = ENV["BOSH_USER"]
@@ -44,7 +47,10 @@ describe Bosh::Cli::Command::Base do
       ENV["BOSH_PASSWORD"] = "bar"
       cmd.username.should == "foo"
       cmd.password.should == "bar"
-      other_cmd = make_command(:username => "new", :password => "baz")
+      other_cmd = make
+      other_cmd.add_option(:username, "new")
+      other_cmd.add_option(:password, "baz")
+
       other_cmd.username.should == "new"
       other_cmd.password.should == "baz"
     ensure
@@ -53,7 +59,10 @@ describe Bosh::Cli::Command::Base do
     end
 
     add_config("target" => "localhost:8080", "deployment" => "test")
-    cmd2 = make_command(:target => "foo", :deployment => "bar")
+
+    cmd2 = make
+    cmd2.add_option(:target, "foo")
+    cmd2.add_option(:deployment, "bar")
     cmd2.target.should == "http://foo:25555"
     cmd2.deployment.should == "bar"
   end
@@ -61,32 +70,18 @@ describe Bosh::Cli::Command::Base do
   it "instantiates director when needed" do
     add_config("target" => "localhost:8080", "deployment" => "test")
 
-    cmd = make_command
+    cmd = make
+    cmd.director.should be_kind_of(Bosh::Cli::Director)
     cmd.director.director_uri.should == "http://localhost:8080"
   end
 
-  it "can evaluate other commands" do
-    cmd     = make_command
-    new_cmd = mock(Object)
-
-    Bosh::Cli::Command::Misc.should_receive(:new).and_return(new_cmd)
-    new_cmd.should_receive(:status).with(:arg1, :arg2)
-
-    cmd.run("misc", "status", :arg1, :arg2)
-  end
-
-  it "can redirect to other commands " +
-     "(effectively exiting after running them)" do
-    cmd = make_command
-    new_cmd = mock(Object)
-
-    Bosh::Cli::Command::Misc.should_receive(:new).and_return(new_cmd)
-    new_cmd.should_receive(:status).with(:arg1, :arg2)
-
-    lambda {
-      cmd.redirect("misc", "status", :arg1, :arg2)
-    }.should raise_error(Bosh::Cli::GracefulExit,
-                         "redirected to misc status arg1 arg2")
+  it "has logged_in? helper" do
+    cmd = make
+    cmd.logged_in?.should be_false
+    cmd.add_option(:username, "foo")
+    cmd.logged_in?.should be_false
+    cmd.add_option(:password, "bar")
+    cmd.logged_in?.should be_true
   end
 
 end

data/spec/unit/biff_spec.rb

@@ -19,7 +19,10 @@ describe Bosh::Cli::Command::Biff do
     @biff.stub!(:deployment).and_return(config_file)
     lambda {
       @biff.biff(template_file)
-    }.should raise_error(Bosh::Cli::CliExit, "IP range '2..9' is not within the bounds of network 'default', which only has 1 IPs.")
+    }.should raise_error(
+               Bosh::Cli::CliError,
+               "IP range '2..9' is not within " +
+               "the bounds of network 'default', which only has 1 IPs.")
   end
 
   it "throws an error when there is more than one subnet for default" do
@@ -28,7 +31,7 @@ describe Bosh::Cli::Command::Biff do
     @biff.stub!(:deployment).and_return(config_file)
     lambda {
       @biff.biff(template_file)
-    }.should raise_error(Bosh::Cli::CliExit, "Biff doesn't know how to deal " +
+    }.should raise_error(Bosh::Cli::CliError, "Biff doesn't know how to deal " +
         "with anything other than one subnet in default")
   end
 
@@ -38,7 +41,7 @@ describe Bosh::Cli::Command::Biff do
     @biff.stub!(:deployment).and_return(config_file)
     lambda {
       @biff.biff(template_file)
-    }.should raise_error(Bosh::Cli::CliExit, "Biff only supports " +
+    }.should raise_error(Bosh::Cli::CliError, "Biff only supports " +
         "configurations where the gateway is the first IP (e.g. 172.31.196.1).")
   end
 
@@ -48,7 +51,7 @@ describe Bosh::Cli::Command::Biff do
     @biff.stub!(:deployment).and_return(config_file)
     lambda {
       @biff.biff(template_file)
-    }.should raise_error(Bosh::Cli::CliExit, "Biff requires each network to " +
+    }.should raise_error(Bosh::Cli::CliError, "Biff requires each network to " +
         "have range and dns entries.")
   end
 
@@ -58,7 +61,7 @@ describe Bosh::Cli::Command::Biff do
     @biff.stub!(:deployment).and_return(config_file)
     lambda {
       @biff.biff(template_file)
-    }.should raise_error(Bosh::Cli::CliExit, "You must have subnets in default")
+    }.should raise_error(Bosh::Cli::CliError, "You must have subnets in default")
   end
 
   it "outputs the required yaml when the input does not contain it" do
@@ -76,11 +79,9 @@ describe Bosh::Cli::Command::Biff do
     # can come back in any order.
     @biff.should_receive(:say).with(/Add this to '':/).once
 
-    #@biff.should_receive(:say).once
-
-    @biff.should_receive(:say).with("There were 1 errors.").once
-
-    @biff.biff(template_file)
+    lambda {
+      @biff.biff(template_file)
+    }.should raise_error Bosh::Cli::CliError, "There were 1 errors."
   end
 
   it "correctly generates a file and reports when there are no differences" do

data/spec/unit/cli_commands_spec.rb

@@ -5,49 +5,46 @@ require "spec_helper"
 describe Bosh::Cli::Command::Base do
 
   before :each do
-    @config = File.join(Dir.mktmpdir, "bosh_config")
-    @cache = File.join(Dir.mktmpdir, "bosh_cache")
-    @opts = { :config => @config, :cache_dir => @cache }
+    tmpdir = Dir.mktmpdir
+    @config = File.join(tmpdir, "bosh_config")
+    @cache = File.join(tmpdir, "bosh_cache")
+    @director = mock(Bosh::Cli::Director)
+    Bosh::Cli::Director.stub!(:new).and_return(@director)
+    @director.stub!(:get_status).and_return("name" => "ZB")
   end
 
   describe Bosh::Cli::Command::Misc do
 
     before :each do
-      @cmd = Bosh::Cli::Command::Misc.new(@opts)
-      @cmd.stub!(:interactive?).and_return(false)
+      @cmd = Bosh::Cli::Command::Misc.new
+      @cmd.add_option(:config, @config)
+      @cmd.add_option(:cache_dir, @cache)
+      @cmd.add_option(:non_interactive, true)
     end
 
     it "sets the target" do
-      @cmd.target.should == nil
+      @cmd.target.should be_nil
       @cmd.set_target("http://example.com:232")
       @cmd.target.should == "http://example.com:232"
     end
 
     it "normalizes target" do
-      @cmd.target.should == nil
+      @cmd.target.should be_nil
       @cmd.set_target("test")
       @cmd.target.should == "http://test:25555"
     end
 
-    it "respects director checks option when setting target" do
-      @cmd.options[:director_checks] = true
+    it "handles director errors when setting target" do
+      @director.should_receive(:get_status).and_raise(Bosh::Cli::DirectorError)
 
       lambda {
-        mock_director = mock(Object)
-        mock_director.stub!(:get_status).and_raise(Bosh::Cli::DirectorError)
-        Bosh::Cli::Director.should_receive(:new).
-            with("http://test:25555").and_return(mock_director)
         @cmd.set_target("test")
-      }.should raise_error(Bosh::Cli::CliExit,
-                           "Cannot talk to director at `http://test:25555', " +
-                           "please set correct target")
+      }.should raise_error(Bosh::Cli::CliError, /cannot talk to director/i)
 
-      @cmd.target.should == nil
+      @cmd.target.should be_nil
+    end
 
-      mock_director = mock(Bosh::Cli::Director)
-      mock_director.stub!(:get_status).and_return("name" => "ZB")
-      Bosh::Cli::Director.should_receive(:new).
-          with("http://test:25555").and_return(mock_director)
+    it "sets target" do
       @cmd.set_target("test")
       @cmd.target.should == "http://test:25555"
     end
@@ -66,6 +63,9 @@ describe Bosh::Cli::Command::Base do
     end
 
     it "logs user in" do
+      @director.should_receive(:authenticated?).and_return(true)
+      @director.should_receive(:user=).with("user")
+      @director.should_receive(:password=).with("pass")
       @cmd.set_target("test")
       @cmd.login("user", "pass")
       @cmd.logged_in?.should be_true
@@ -75,26 +75,22 @@ describe Bosh::Cli::Command::Base do
 
     it "logs user out" do
       @cmd.set_target("test")
+      @director.should_receive(:authenticated?).and_return(true)
+      @director.should_receive(:user=).with("user")
+      @director.should_receive(:password=).with("pass")
       @cmd.login("user", "pass")
       @cmd.logout
       @cmd.logged_in?.should be_false
     end
 
     it "respects director checks option when logging in" do
-      @cmd.options[:director_checks] = true
-
-      mock_director = mock(Object)
-      mock_director.stub(:get_status).
-          and_return({ "user" => "user", "name" => "ZB" })
-      mock_director.stub(:authenticated?).and_return(true)
+      @director.stub!(:get_status).
+        and_return({ "user" => "user", "name" => "ZB" })
+      @director.stub(:authenticated?).and_return(true)
 
-      Bosh::Cli::Director.should_receive(:new).
-          with("http://test:25555").and_return(mock_director)
       @cmd.set_target("test")
-
-      Bosh::Cli::Director.should_receive(:new).
-          with("http://test:25555", "user", "pass").and_return(mock_director)
-
+      @director.should_receive(:user=).with("user")
+      @director.should_receive(:password=).with("pass")
       @cmd.login("user", "pass")
       @cmd.logged_in?.should be_true
       @cmd.username.should == "user"
@@ -104,37 +100,48 @@ describe Bosh::Cli::Command::Base do
 
   describe Bosh::Cli::Command::Stemcell do
     before :each do
-      @cmd = Bosh::Cli::Command::Stemcell.new(@opts)
-    end
+      @director = mock(Bosh::Cli::Director)
+      @director.stub(:list_stemcells).
+          and_return([{ "name" => "foo", "version" => "123" }])
+      @director.should_receive(:list_stemcells)
 
-    it "allows deleting the stemcell" do
-      mock_director = mock(Bosh::Cli::Director)
-      mock_director.should_receive(:delete_stemcell).with("foo", "123")
+      @cmd = Bosh::Cli::Command::Stemcell.new
+      @cmd.add_option(:non_interactive, true)
 
-      @cmd.stub!(:interactive?).and_return(false)
       @cmd.stub!(:target).and_return("test")
       @cmd.stub!(:username).and_return("user")
       @cmd.stub!(:password).and_return("pass")
-      @cmd.stub!(:director).and_return(mock_director)
+      @cmd.stub!(:director).and_return(@director)
+    end
+
+    it "allows deleting the stemcell" do
+      @director.should_receive(:delete_stemcell).with("foo", "123")
       @cmd.delete("foo", "123")
     end
 
     it "needs confirmation to delete stemcell" do
-      mock_director = mock(Bosh::Cli::Director)
-      mock_director.should_not_receive(:delete_stemcell)
+      @cmd.remove_option(:non_interactive)
+      @director.should_not_receive(:delete_stemcell)
 
-      @cmd.stub!(:target).and_return("test")
-      @cmd.stub!(:username).and_return("user")
-      @cmd.stub!(:password).and_return("pass")
-      @cmd.stub!(:director).and_return(mock_director)
       @cmd.stub!(:ask).and_return("")
       @cmd.delete("foo", "123")
     end
+
+    it "raises error when deleting if stemcell does not exist" do
+      @director.should_not_receive(:delete_stemcell)
+
+      @cmd.add_option(:non_interactive, true)
+      lambda {
+        @cmd.delete("foo", "111")
+      }.should raise_error(Bosh::Cli::CliError,
+                           "Stemcell `foo/111' does not exist")
+    end
   end
 
   describe Bosh::Cli::Command::Deployment do
     before :each do
-      @cmd = Bosh::Cli::Command::Deployment.new(@opts)
+      @cmd = Bosh::Cli::Command::Deployment.new
+      @cmd.add_option(:non_interactive, true)
     end
 
     it "allows deleting the deployment" do
@@ -154,6 +161,7 @@ describe Bosh::Cli::Command::Base do
       mock_director = mock(Bosh::Cli::Director)
       mock_director.should_not_receive(:delete_deployment)
 
+      @cmd.remove_option(:non_interactive)
       @cmd.stub!(:target).and_return("test")
       @cmd.stub!(:username).and_return("user")
       @cmd.stub!(:password).and_return("pass")
@@ -165,56 +173,51 @@ describe Bosh::Cli::Command::Base do
 
   describe Bosh::Cli::Command::Release do
     before :each do
-      @cmd = Bosh::Cli::Command::Release.new(@opts)
+      @director = mock(Bosh::Cli::Director)
+
+      @cmd = Bosh::Cli::Command::Release.new
+      @cmd.add_option(:non_interactive, true)
+
       @cmd.stub!(:target).and_return("test")
       @cmd.stub!(:username).and_return("user")
       @cmd.stub!(:password).and_return("pass")
+      @cmd.stub!(:director).and_return(@director)
     end
 
     it "allows deleting the release (non-force)" do
-      mock_director = mock(Bosh::Cli::Director)
-      mock_director.should_receive(:delete_release).
+      @director.should_receive(:delete_release).
           with("foo", :force => false, :version => nil)
 
-      @cmd.stub!(:interactive?).and_return(false)
-      @cmd.stub!(:director).and_return(mock_director)
       @cmd.delete("foo")
     end
 
-    it "allows deleting the release (non-force)" do
-      mock_director = mock(Bosh::Cli::Director)
-      mock_director.should_receive(:delete_release).
+    it "allows deleting the release (force)" do
+      @director.should_receive(:delete_release).
           with("foo", :force => true, :version => nil)
 
-      @cmd.stub!(:ask).and_return("yes")
-      @cmd.stub!(:director).and_return(mock_director)
-      @cmd.delete("foo", "--force")
+      @cmd.add_option(:force, true)
+      @cmd.delete("foo")
     end
 
     it "allows deleting a particular release version (non-force)" do
-      mock_director = mock(Bosh::Cli::Director)
-      mock_director.should_receive(:delete_release).
+      @director.should_receive(:delete_release).
           with("foo", :force => false, :version => "42")
 
-      @cmd.stub!(:ask).and_return("yes")
-      @cmd.stub!(:director).and_return(mock_director)
       @cmd.delete("foo", "42")
     end
 
-    it "allows deleting a particular release version (non-force)" do
-      mock_director = mock(Bosh::Cli::Director)
-      mock_director.should_receive(:delete_release).
+    it "allows deleting a particular release version (force)" do
+      @director.should_receive(:delete_release).
           with("foo", :force => true, :version => "42")
 
-      @cmd.stub!(:ask).and_return("yes")
-      @cmd.stub!(:director).and_return(mock_director)
-      @cmd.delete("foo", "42", "--force")
+      @cmd.add_option(:force, true)
+      @cmd.delete("foo", "42")
     end
 
     it "requires confirmation on deleting release" do
-      mock_director = mock(Bosh::Cli::Director)
-      mock_director.should_not_receive(:delete_release)
-      @cmd.stub!(:director).and_return(mock_director)
+      @director.should_not_receive(:delete_release)
+      @cmd.remove_option(:non_interactive)
+
       @cmd.stub!(:ask).and_return("")
       @cmd.delete("foo")
     end
@@ -225,10 +228,11 @@ describe Bosh::Cli::Command::Base do
     before :each do
       @manifest_path = spec_asset("deployment.MF")
       @manifest_yaml = YAML.dump({ "name" => "foo" })
-      @cmd = Bosh::Cli::Command::JobManagement.new(@opts)
+
+      @cmd = Bosh::Cli::Command::JobManagement.new
+      @cmd.add_option(:non_interactive, true)
       @cmd.stub!(:prepare_deployment_manifest).
-          with(:yaml => true).and_return(@manifest_yaml)
-      @cmd.stub!(:interactive?).and_return(false)
+        with(:yaml => true).and_return(@manifest_yaml)
       @cmd.stub!(:deployment).and_return(@manifest_path)
       @cmd.stub!(:target).and_return("test.com")
       @cmd.stub!(:target_name).and_return("dev2")
@@ -240,76 +244,80 @@ describe Bosh::Cli::Command::Base do
 
     it "allows starting jobs" do
       @director.should_receive(:change_job_state).
-          with("foo", @manifest_yaml, "dea", nil, "started")
+        with("foo", @manifest_yaml, "dea", nil, "started")
       @cmd.start_job("dea")
     end
 
     it "allows starting job instances" do
       @director.should_receive(:change_job_state).
-          with("foo", @manifest_yaml, "dea", 3, "started")
+        with("foo", @manifest_yaml, "dea", 3, "started")
       @cmd.start_job("dea", 3)
     end
 
     it "allows stopping jobs" do
       @director.should_receive(:change_job_state).
-          with("foo", @manifest_yaml, "dea", nil, "stopped")
+        with("foo", @manifest_yaml, "dea", nil, "stopped")
       @cmd.stop_job("dea")
     end
 
     it "allows stopping job instances" do
       @director.should_receive(:change_job_state).
-          with("foo", @manifest_yaml, "dea", 3, "stopped")
+        with("foo", @manifest_yaml, "dea", 3, "stopped")
       @cmd.stop_job("dea", 3)
     end
 
     it "allows restarting jobs" do
       @director.should_receive(:change_job_state).
-          with("foo", @manifest_yaml, "dea", nil, "restart")
+        with("foo", @manifest_yaml, "dea", nil, "restart")
       @cmd.restart_job("dea")
     end
 
     it "allows restart job instances" do
       @director.should_receive(:change_job_state).
-          with("foo", @manifest_yaml, "dea", 3, "restart")
+        with("foo", @manifest_yaml, "dea", 3, "restart")
       @cmd.restart_job("dea", 3)
     end
 
     it "allows recreating jobs" do
       @director.should_receive(:change_job_state).
-          with("foo", @manifest_yaml, "dea", nil, "recreate")
+        with("foo", @manifest_yaml, "dea", nil, "recreate")
       @cmd.recreate_job("dea")
     end
 
     it "allows recreating job instances" do
       @director.should_receive(:change_job_state).
-          with("foo", @manifest_yaml, "dea", 3, "recreate")
+        with("foo", @manifest_yaml, "dea", 3, "recreate")
       @cmd.recreate_job("dea", 3)
     end
 
     it "allows hard stop" do
       @director.should_receive(:change_job_state).
-          with("foo", @manifest_yaml, "dea", 3, "detached")
-      @cmd.stop_job("dea", 3, "--hard")
+        with("foo", @manifest_yaml, "dea", 3, "detached")
+      @cmd.add_option(:hard, true)
+      @cmd.stop_job("dea", 3)
     end
 
     it "allows soft stop (= regular stop)" do
       @director.should_receive(:change_job_state).
-          with("foo", @manifest_yaml, "dea", 3, "stopped")
-      @cmd.stop_job("dea", 3, "--soft")
+        with("foo", @manifest_yaml, "dea", 3, "stopped")
+      @cmd.add_option(:soft, true)
+      @cmd.stop_job("dea", 3)
     end
 
   end
 
   describe Bosh::Cli::Command::BlobManagement do
     before :each do
-      @cmd = Bosh::Cli::Command::BlobManagement.new(@opts)
+      @cmd = Bosh::Cli::Command::BlobManagement.new
+      @cmd.add_option(:non_interactive, true)
+
       @blob_manager = mock("blob manager")
       @release = mock("release")
 
       @cmd.should_receive(:check_if_release_dir)
       Bosh::Cli::Release.stub!(:new).and_return(@release)
       Bosh::Cli::BlobManager.stub!(:new).with(@release).
-          and_return(@blob_manager)
+        and_return(@blob_manager)
     end
 
     it "prints blobs status" do