bosh_cli 0.19.4 → 0.19.5

data/spec/unit/biff_spec.rb

@@ -13,14 +13,23 @@ describe Bosh::Cli::Command::Biff do
     @biff.delete_temp_diff_files
   end
 
+  it "throws an error when there is an IP out of range" do
+    config_file = spec_asset("biff/ip_out_of_range.yml")
+    template_file = spec_asset("biff/good_simple_template.erb")
+    @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.")
+  end
+
   it "throws an error when there is more than one subnet for default" do
     config_file = spec_asset("biff/multiple_subnets_config.yml")
     template_file = spec_asset("biff/network_only_template.erb")
     @biff.stub!(:deployment).and_return(config_file)
     lambda {
       @biff.biff(template_file)
-    }.should raise_error(RuntimeError, "Biff doesn't know how to deal with " +
-        "anything other than one subnet in default")
+    }.should raise_error(Bosh::Cli::CliExit, "Biff doesn't know how to deal " +
+        "with anything other than one subnet in default")
   end
 
   it "throws an error when the gateway is anything other than the first ip" do
@@ -29,8 +38,8 @@ describe Bosh::Cli::Command::Biff do
     @biff.stub!(:deployment).and_return(config_file)
     lambda {
       @biff.biff(template_file)
-    }.should raise_error(RuntimeError, "Biff only supports configurations " +
-        "where the gateway is the first IP (e.g. 172.31.196.1).")
+    }.should raise_error(Bosh::Cli::CliExit, "Biff only supports " +
+        "configurations where the gateway is the first IP (e.g. 172.31.196.1).")
   end
 
   it "throws an error when the range is not specified in the config" do
@@ -39,8 +48,8 @@ describe Bosh::Cli::Command::Biff do
     @biff.stub!(:deployment).and_return(config_file)
     lambda {
       @biff.biff(template_file)
-    }.should raise_error(RuntimeError, "Biff requires each network to have " +
-        "range and dns entries.")
+    }.should raise_error(Bosh::Cli::CliExit, "Biff requires each network to " +
+        "have range and dns entries.")
   end
 
   it "throws an error if there are no subnets" do
@@ -49,7 +58,7 @@ describe Bosh::Cli::Command::Biff do
     @biff.stub!(:deployment).and_return(config_file)
     lambda {
       @biff.biff(template_file)
-    }.should raise_error(RuntimeError, "You must have subnets in default")
+    }.should raise_error(Bosh::Cli::CliExit, "You must have subnets in default")
   end
 
   it "outputs the required yaml when the input does not contain it" do

data/spec/unit/cli_commands_spec.rb

@@ -26,7 +26,7 @@ describe Bosh::Cli::Command::Base do
     it "normalizes target" do
       @cmd.target.should == nil
       @cmd.set_target("test")
-      @cmd.target.should == "http://test"
+      @cmd.target.should == "http://test:25555"
     end
 
     it "respects director checks option when setting target" do
@@ -36,33 +36,33 @@ describe Bosh::Cli::Command::Base do
         mock_director = mock(Object)
         mock_director.stub!(:get_status).and_raise(Bosh::Cli::DirectorError)
         Bosh::Cli::Director.should_receive(:new).
-            with("http://test").and_return(mock_director)
+            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', " +
+                           "Cannot talk to director at `http://test:25555', " +
                            "please set correct target")
 
       @cmd.target.should == nil
 
-      mock_director = mock(Object)
+      mock_director = mock(Bosh::Cli::Director)
       mock_director.stub!(:get_status).and_return("name" => "ZB")
       Bosh::Cli::Director.should_receive(:new).
-          with("http://test").and_return(mock_director)
+          with("http://test:25555").and_return(mock_director)
       @cmd.set_target("test")
-      @cmd.target.should == "http://test"
+      @cmd.target.should == "http://test:25555"
     end
 
     it "supports named targets" do
       @cmd.set_target("test", "mytarget")
-      @cmd.target.should == "http://test"
+      @cmd.target.should == "http://test:25555"
 
       @cmd.set_target("foo", "myfoo")
 
       @cmd.set_target("mytarget")
-      @cmd.target.should == "http://test"
+      @cmd.target.should == "http://test:25555"
 
       @cmd.set_target("myfoo")
-      @cmd.target.should == "http://foo"
+      @cmd.target.should == "http://foo:25555"
     end
 
     it "logs user in" do
@@ -89,11 +89,11 @@ describe Bosh::Cli::Command::Base do
       mock_director.stub(:authenticated?).and_return(true)
 
       Bosh::Cli::Director.should_receive(:new).
-          with("http://test").and_return(mock_director)
+          with("http://test:25555").and_return(mock_director)
       @cmd.set_target("test")
 
       Bosh::Cli::Director.should_receive(:new).
-          with("http://test", "user", "pass").and_return(mock_director)
+          with("http://test:25555", "user", "pass").and_return(mock_director)
 
       @cmd.login("user", "pass")
       @cmd.logged_in?.should be_true

data/spec/unit/config_spec.rb

@@ -18,10 +18,6 @@ describe Bosh::Cli::Config do
     Bosh::Cli::Config.new(@config)
   end
 
-  def logged_in?(cfg)
-    cfg.username && cfg.password
-  end
-
   it "should convert old deployment configs to the new config " +
      "when set_deployment is called" do
     add_config("target" => "localhost:8080", "deployment" => "test")
@@ -116,24 +112,14 @@ describe Bosh::Cli::Config do
     add_config(config)
     cfg = create_config
 
-    logged_in?(cfg).should be_true
-    cfg.username.should == "a"
-    cfg.password.should == "b"
+    cfg.username("localhost:8080").should == "a"
+    cfg.password("localhost:8080").should == "b"
 
-    config["target"] = "localhost:8081"
-    add_config(config)
+    cfg.username("localhost:8081").should == "c"
+    cfg.password("localhost:8081").should == "d"
 
-    cfg = create_config
-    logged_in?(cfg).should be_true
-    cfg.username.should == "c"
-    cfg.password.should == "d"
-
-    config["target"] = "localhost:8082"
-    add_config(config)
-    cfg = create_config
-    logged_in?(cfg).should be_false
-    cfg.username.should be_nil
-    cfg.password.should be_nil
+    cfg.username("localhost:8083").should be_nil
+    cfg.password("localhost:8083").should be_nil
   end
 
 end

data/spec/unit/deployment_manifest_spec.rb

@@ -0,0 +1,117 @@
+# Copyright (c) 2009-2012 VMware, Inc.
+
+require "spec_helper"
+
+describe Bosh::Cli::DeploymentHelper do
+
+  def make_cmd(options = {})
+    cmd = Bosh::Cli::Command::Base.new(options)
+    cmd.extend(Bosh::Cli::DeploymentHelper)
+    cmd
+  end
+
+  it "checks that actual director UUID matches the one in manifest" do
+    cmd = make_cmd
+    manifest = {
+      "name" => "mycloud",
+      "director_uuid" => "deadbeef"
+    }
+
+    manifest_file = Tempfile.new("manifest")
+    YAML.dump(manifest, manifest_file)
+    manifest_file.close
+    director = mock(Bosh::Cli::Director)
+
+    cmd.stub!(:deployment).and_return(manifest_file.path)
+    cmd.stub!(:director).and_return(director)
+
+    director.should_receive(:uuid).and_return("deadcafe")
+
+    expect {
+      cmd.prepare_deployment_manifest
+    }.to raise_error(/Target director UUID doesn't match/i)
+  end
+
+  it "resolves 'latest' release alias for multiple releases" do
+    cmd = make_cmd
+    manifest = {
+      "name" => "mycloud",
+      "director_uuid" => "deadbeef",
+      "releases" => [
+        {"name" => "foo", "version" => "latest"},
+        {"name" => "bar", "version" => "latest"},
+        {"name" => "baz", "version" => 3},
+      ]
+    }
+
+    manifest_file = Tempfile.new("manifest")
+    YAML.dump(manifest, manifest_file)
+    manifest_file.close
+    director = mock(Bosh::Cli::Director, :uuid => "deadbeef")
+
+    cmd.stub!(:deployment).and_return(manifest_file.path)
+    cmd.stub!(:director).and_return(director)
+
+    releases = [
+      {"name" => "foo", "versions" => %w(1 3.5.7-dev 2 3.5.2-dev)},
+      {"name" => "bar", "versions" => %w(4 2 3 1 1.1-dev 3.99-dev)},
+      {"name" => "baz", "versions" => %w(1 2 3 4 5 6 7)}
+    ]
+
+    director.should_receive(:list_releases).and_return(releases)
+
+    manifest = cmd.prepare_deployment_manifest
+    manifest["releases"][0]["version"].should == "3.5.7-dev"
+    manifest["releases"][1]["version"].should == 4 # cast to Integer!
+    manifest["releases"][2]["version"].should == 3
+  end
+
+  it "resolves 'latest' release alias for a single release" do
+    cmd = make_cmd
+    manifest = {
+      "name" => "mycloud",
+      "director_uuid" => "deadbeef",
+      "release" => {"name" => "foo", "version" => "latest"}
+    }
+
+    manifest_file = Tempfile.new("manifest")
+    YAML.dump(manifest, manifest_file)
+    manifest_file.close
+    director = mock(Bosh::Cli::Director, :uuid => "deadbeef")
+
+    cmd.stub!(:deployment).and_return(manifest_file.path)
+    cmd.stub!(:director).and_return(director)
+
+    releases = [
+      {"name" => "foo", "versions" => %w(1 3.5.7-dev 2 3.5.2-dev)},
+    ]
+
+    director.should_receive(:list_releases).and_return(releases)
+
+    manifest = cmd.prepare_deployment_manifest
+    manifest["release"]["version"].should == "3.5.7-dev"
+  end
+
+  it "treats having both 'releases' and 'release' as error" do
+    cmd = make_cmd
+    manifest = {
+      "name" => "mycloud",
+      "director_uuid" => "deadbeef",
+      "release" => {"name" => "foo", "version" => "latest"},
+      "releases" => []
+    }
+
+    manifest_file = Tempfile.new("manifest")
+    YAML.dump(manifest, manifest_file)
+    manifest_file.close
+    director = mock(Bosh::Cli::Director, :uuid => "deadbeef")
+
+    cmd.stub!(:deployment).and_return(manifest_file.path)
+    cmd.stub!(:director).and_return(director)
+
+    expect {
+      cmd.prepare_deployment_manifest
+    }.to raise_error(/manifest has both `release' and `releases'/i)
+  end
+
+end

data/spec/unit/package_builder_spec.rb

@@ -87,7 +87,7 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
     lambda {
       builder.build
     }.should raise_error(Bosh::Cli::InvalidPackage,
-                         "`foo' has a glob that resolves " +
+                         "Package `foo' has a glob that resolves " +
                          "to an empty file list: bar")
   end
 
@@ -520,17 +520,35 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
   it "supports alternative src directory" do
     add_file("src", "README.txt", "README contents")
     add_file("src", "lib/1.rb", "puts 'Hello world'")
+    add_file("src", "lib/2.rb", "puts 'Goodbye world'")
 
     builder = make_builder("A", %w(lib/*.rb README.*))
     s1 = builder.fingerprint
 
     add_file("src_alt", "README.txt", "README contents")
     add_file("src_alt", "lib/1.rb", "puts 'Hello world'")
+    add_file("src_alt", "lib/2.rb", "puts 'Goodbye world'")
 
-    remove_files("src", %w(README.txt lib/1.rb))
+    remove_files("src", %w(lib/1.rb))
     builder.reload.fingerprint.should == s1
   end
 
+  it "checks if glob top level dir is present in src_alt but doesn't match" do
+    add_file("src", "README.txt", "README contents")
+    add_file("src", "lib/1.rb", "puts 'Hello world'")
+    add_file("src", "lib/2.rb", "puts 'Goodbye world'")
+
+    builder = make_builder("A", %w(lib/*.rb README.*))
+
+    FileUtils.mkdir(File.join(@release_dir, "src_alt", "lib"))
+
+    lambda {
+      builder.fingerprint
+    }.should raise_error("Package `A' has a glob that doesn't match " +
+                         "in `src_alt' but matches in `src'. However " +
+                         "`src_alt/lib' exists, so this might be an error.")
+  end
+
   it "doesn't allow glob to match files under more than one source directory" do
     add_file("src", "README.txt", "README contents")
     add_file("src", "lib/1.rb", "puts 'Hello world'")
@@ -545,8 +563,8 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
 
     lambda {
       builder.reload.fingerprint
-    }.should raise_error("`A' has a glob that resolves to " +
-                           "an empty file list: lib/*.rb")
+    }.should raise_error("Package `A' has a glob that resolves to " +
+                         "an empty file list: lib/*.rb")
   end
 
   it "doesn't include the same path twice" do

data/spec/unit/runner_spec.rb

@@ -42,12 +42,29 @@ describe Bosh::Cli::Runner do
     runner.options[:non_interactive].should == true
   end
 
+  it "allows specifying target, deployment and credentials via command line" do
+    runner = Bosh::Cli::Runner.new([
+                                     "--target", "foo",
+                                     "--deployment", "bar",
+                                     "--user", "baz",
+                                     "--password", "deadbeef"
+                                   ])
+    runner.parse_options!
+    runner.options[:target].should == "foo"
+    runner.options[:deployment].should == "bar"
+    runner.options[:username].should == "baz"
+    runner.options[:password].should == "deadbeef"
+  end
+
   it "dispatches commands to appropriate methods (nu school)" do
     test_cmd(["version"], :misc, :version)
     test_cmd(["status"], :misc, :status)
+    test_cmd(["alias", "test", "alias"], :misc, :set_alias, ["test", "alias"])
+    test_cmd(["aliases"], :misc, :list_aliases)
     test_cmd(["target"], :misc, :show_target)
     test_cmd(["target", "test"], :misc, :set_target, ["test"])
     test_cmd(["target", "test", "alias"], :misc, :set_target, ["test", "alias"])
+    test_cmd(["targets"], :misc, :list_targets)
     test_cmd(["deploy"], :deployment, :perform)
     test_cmd(["deployment"], :deployment, :show_current)
     test_cmd(["deployment", "test"], :deployment, :set_current, ["test"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 0.19.4
+  version: 0.19.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -242,6 +242,7 @@ files:
 - spec/assets/biff/good_simple_config.yml
 - spec/assets/biff/good_simple_golden_config.yml
 - spec/assets/biff/good_simple_template.erb
+- spec/assets/biff/ip_out_of_range.yml
 - spec/assets/biff/multiple_subnets_config.yml
 - spec/assets/biff/network_only_template.erb
 - spec/assets/biff/no_cc_config.yml
@@ -287,6 +288,7 @@ files:
 - spec/unit/core_ext_spec.rb
 - spec/unit/dependency_helper_spec.rb
 - spec/unit/deployment_manifest_compiler_spec.rb
+- spec/unit/deployment_manifest_spec.rb
 - spec/unit/director_spec.rb
 - spec/unit/director_task_spec.rb
 - spec/unit/event_log_renderer_spec.rb
@@ -317,7 +319,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1823880374092927602
+      hash: 1133822301070881682
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -326,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1823880374092927602
+      hash: 1133822301070881682
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -338,6 +340,7 @@ test_files:
 - spec/assets/biff/good_simple_config.yml
 - spec/assets/biff/good_simple_golden_config.yml
 - spec/assets/biff/good_simple_template.erb
+- spec/assets/biff/ip_out_of_range.yml
 - spec/assets/biff/multiple_subnets_config.yml
 - spec/assets/biff/network_only_template.erb
 - spec/assets/biff/no_cc_config.yml
@@ -383,6 +386,7 @@ test_files:
 - spec/unit/core_ext_spec.rb
 - spec/unit/dependency_helper_spec.rb
 - spec/unit/deployment_manifest_compiler_spec.rb
+- spec/unit/deployment_manifest_spec.rb
 - spec/unit/director_spec.rb
 - spec/unit/director_task_spec.rb
 - spec/unit/event_log_renderer_spec.rb