bosh_cli 0.18 → 0.19

data/spec/unit/release_builder_spec.rb

@@ -14,8 +14,8 @@ describe Bosh::Cli::ReleaseBuilder do
     Bosh::Cli::ReleaseBuilder.new(@release, [], [])
   end
 
-  it "uses version 1 if no previous releases have been created" do
-    new_builder.version.should == 1
+  it "uses version 0.1-dev if no previous releases have been created" do
+    new_builder.version.should == "0.1-dev"
   end
 
   it "builds a release" do
@@ -23,7 +23,8 @@ describe Bosh::Cli::ReleaseBuilder do
     builder.build
 
     expected_tarball_path = File.join(@release_dir,
-                                      "dev_releases", "bosh_release-1.tgz")
+                                      "dev_releases",
+                                      "bosh_release-0.1-dev.tgz")
 
     builder.tarball_path.should == expected_tarball_path
     File.file?(expected_tarball_path).should be_true
@@ -34,21 +35,23 @@ describe Bosh::Cli::ReleaseBuilder do
     builder.build
     builder.build
 
-    File.file?(File.join(@release_dir, "dev_releases", "bosh_release-1.tgz")).
+    File.file?(File.join(@release_dir, "dev_releases",
+                         "bosh_release-0.1-dev.tgz")).
         should be_true
-    File.file?(File.join(@release_dir, "dev_releases", "bosh_release-2.tgz")).
+    File.file?(File.join(@release_dir, "dev_releases",
+                         "bosh_release-0.2-dev.tgz")).
         should be_false
   end
 
   it "has a list of jobs affected by building this release" do
     job1 = mock(:job, :new_version? => true,
-                :packages => ["bar", "baz"], :name => "job1")
+                :packages => %w(bar baz), :name => "job1")
     job2 = mock(:job, :new_version? => false,
-                :packages => ["foo", "baz"], :name => "job2")
+                :packages => %w(foo baz), :name => "job2")
     job3 = mock(:job, :new_version? => false,
-                :packages => ["baz", "zb"], :name => "job3")
+                :packages => %w(baz zb), :name => "job3")
     job4 = mock(:job, :new_version? => false,
-                :packages => ["bar", "baz"], :name => "job4")
+                :packages => %w(bar baz), :name => "job4")
 
     package1 = mock(:package, :name => "foo", :new_version? => true)
     package2 = mock(:package, :name => "bar", :new_version? => false)
@@ -62,4 +65,19 @@ describe Bosh::Cli::ReleaseBuilder do
     builder.affected_jobs.should =~ [job1, job2, job3]
   end
 
+  it "bumps dev version in sync with final version" do
+    final_index = Bosh::Cli::VersionsIndex.new(File.join(@release_dir,
+                                                         "releases"))
+
+    final_index.add_version("deadbeef", { "version" => 2 }, "payload")
+
+    builder = new_builder
+    builder.version.should == "2.1-dev"
+    builder.build
+
+    final_index.add_version("deadbeef", { "version" => 7 }, "payload")
+    builder = new_builder
+    builder.version.should == "7.1-dev"
+  end
+
 end

data/spec/unit/runner_spec.rb

@@ -100,31 +100,6 @@ describe Bosh::Cli::Runner do
     test_cmd(%w(sync blobs), :blob_management, :sync)
   end
 
-  it "cancels running task and quits when ctrl-c is issued " +
-     "and user agrees to quit" do
-    runner = Bosh::Cli::Runner.new(["any", "command"])
-    runner.runner = {}
-    runner.runner.stub(:task_running?).and_return(true)
-    runner.stub(:kill_current_task?).and_return(true)
-    runner.runner.should_receive(:cancel_current_task).once
-    lambda { runner.handle_ctrl_c }.should raise_error SystemExit
-  end
-
-  it "quits when ctrl-c is issued and there is no task running" do
-    runner = Bosh::Cli::Runner.new(["any", "command"])
-    runner.runner = {}
-    runner.runner.stub(:task_running?).and_return(false)
-    lambda { runner.handle_ctrl_c }.should raise_error SystemExit
-  end
-
-  it "doesn't quit when user issues ctrl-c but does not want to quit" do
-    runner = Bosh::Cli::Runner.new(["any", "command"])
-    runner.runner = {}
-    runner.runner.stub(:task_running?).and_return(true)
-    runner.stub(:kill_current_task?).and_return(false)
-    lambda { runner.handle_ctrl_c }.should_not raise_error SystemExit
-  end
-
   it "loads custom plugins" do
     plugin_path = spec_asset("plugins")
     $:.unshift(plugin_path)

data/spec/unit/task_tracker_spec.rb

@@ -0,0 +1,154 @@
+# Copyright (c) 2009-2012 VMware, Inc.
+
+require "spec_helper"
+
+describe Bosh::Cli::TaskTracker do
+
+  before(:each) do
+    @cache = mock("cache")
+    @director = mock("director", :uuid => "deadbeef",
+                     :get_time_difference => 0.5)
+    Bosh::Cli::Config.cache = @cache
+  end
+
+  def make_tracker(task_id, options)
+    tracker = Bosh::Cli::TaskTracker.new(@director, task_id, options)
+    tracker.stub!(:sleep)
+    tracker
+  end
+
+  it "tracks director task event log" do
+    tracker = make_tracker("42", {})
+    @director.should_receive(:get_time_difference).and_return(0.5)
+
+    @cache.should_receive(:read).with("task/deadbeef/42/event").and_return(nil)
+
+    @director.should_receive(:get_task_state).with("42").
+      and_return("queued", "queued", "processing", "processing", "done")
+
+    @director.should_receive(:get_task_output).with("42", 0, "event").
+      and_return(["", nil], ["", nil], ["foo\nbar", 8])
+
+    @director.should_receive(:get_task_output).with("42", 8, "event").
+      and_return(["\nba", 12])
+
+    @director.should_receive(:get_task_output).with("42", 12, "event").
+      and_return(["z", 13])
+
+    @cache.should_receive(:write).
+      with("task/deadbeef/42/event", "foo\nbar\nbaz\n")
+
+    tracker.should_receive(:sleep).with(1).exactly(4).times
+
+    tracker.track.should == :done
+  end
+
+  it "used cached task result if available" do
+    tracker = make_tracker("42", { :log_type => "debug" })
+
+    @cache.should_receive(:read).with("task/deadbeef/42/debug").
+      and_return("foo\nbar\nbaz\n")
+
+    @director.should_receive(:get_task_state).with("42").and_return("cancelled")
+
+    tracker.track.should == :cancelled
+  end
+
+  it "uses appropriate renderer" do
+    renderer = mock("renderer", :duration_known? => false)
+    Bosh::Cli::TaskLogRenderer.should_receive(:create_for_log_type).
+      with("foobar").and_return(renderer)
+
+    tracker = make_tracker("42", { :log_type => "foobar" })
+
+    @cache.should_receive(:read).with("task/deadbeef/42/foobar").and_return(nil)
+
+    @director.should_receive(:get_task_state).with("42").
+      and_return("queued", "processing", "done")
+
+    @director.should_receive(:get_task_output).with("42", 0, "foobar").
+      and_return(["", nil], ["foo\nbar", 8])
+
+    @director.should_receive(:get_task_output).with("42", 8, "foobar").
+      and_return(["\nbaz", 12])
+
+    renderer.should_receive(:time_adjustment=).with(0.5)
+    renderer.should_receive(:add_output).with("foo\n").ordered
+    renderer.should_receive(:add_output).with("bar\n").ordered
+    renderer.should_receive(:add_output).with("baz\n").ordered
+    renderer.should_receive(:refresh).exactly(3).times
+    renderer.should_receive(:finish).with(:done)
+
+    tracker.should_receive(:sleep).with(1).exactly(2).times
+
+    @cache.should_receive(:write).
+      with("task/deadbeef/42/foobar", "foo\nbar\nbaz\n")
+
+    tracker.track.should == :done
+  end
+
+  it "treats error and cancelled states as finished states" do
+    %w(error cancelled).each do |state|
+      tracker = make_tracker("42", { :log_type => "foobar",
+                                     :use_cache => false })
+
+      @director.should_receive(:get_task_state).with("42").
+        and_return("queued", "processing", state)
+
+      @director.should_receive(:get_task_output).with("42", 0, "foobar").
+        and_return(["", nil], ["foo\nbar", 8])
+
+      @director.should_receive(:get_task_output).with("42", 8, "foobar").
+        and_return(["\nbaz", 12])
+
+      tracker.should_receive(:sleep).with(1).exactly(2).times
+
+      tracker.track.should == state.to_sym
+    end
+  end
+
+  it "prompts for task cancel on interrupt (if in interactive mode)" do
+    tracker = make_tracker("42", { :log_type => "foobar",
+                                   :use_cache => false })
+
+    tracker.stub!(:interactive?).and_return(true)
+
+    @director.should_receive(:get_task_state).with("42").and_raise(Interrupt)
+    @director.should_receive(:get_task_state).with("42").and_return("cancelled")
+    @director.should_receive(:get_task_output).with("42", 0, "foobar").
+      and_return(["", nil])
+
+    tracker.should_receive(:ask).and_return("yes")
+    @director.should_receive(:cancel_task).with("42")
+
+    tracker.track.should == :cancelled
+  end
+
+  it "prompts for task error log on error (if in interactive mode)" do
+    tracker = make_tracker("42", { :log_type => "event",
+                                   :use_cache => false })
+
+    tracker.stub!(:interactive?).and_return(true)
+
+    @director.should_receive(:get_task_state).with("42").
+      and_return("processing", "error")
+
+    @director.should_receive(:get_task_output).with("42", 0, "event").
+      and_return(["", nil])
+
+    @director.should_receive(:get_task_output).with("42", 0, "event").
+      and_return(["foo", 4])
+
+    tracker.should_receive(:ask).and_return("yes")
+
+    new_tracker = mock("tracker")
+    Bosh::Cli::TaskTracker.should_receive(:new).
+      with(@director, "42", { :log_type => "debug", :use_cache => false }).
+      and_return(new_tracker)
+
+    new_tracker.should_receive(:track).and_return(:foo)
+
+    tracker.track.should == :error
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: '0.18'
+  version: '0.19'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2012-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -197,6 +197,7 @@ files:
 - lib/cli/commands/deployment.rb
 - lib/cli/commands/job.rb
 - lib/cli/commands/job_management.rb
+- lib/cli/commands/job_rename.rb
 - lib/cli/commands/log_management.rb
 - lib/cli/commands/maintenance.rb
 - lib/cli/commands/misc.rb
@@ -218,6 +219,7 @@ files:
 - lib/cli/errors.rb
 - lib/cli/event_log_renderer.rb
 - lib/cli/job_builder.rb
+- lib/cli/null_renderer.rb
 - lib/cli/package_builder.rb
 - lib/cli/packaging_helper.rb
 - lib/cli/release.rb
@@ -227,6 +229,7 @@ files:
 - lib/cli/runner.rb
 - lib/cli/stemcell.rb
 - lib/cli/task_log_renderer.rb
+- lib/cli/task_tracker.rb
 - lib/cli/templates/help_message.erb
 - lib/cli/validation.rb
 - lib/cli/version.rb
@@ -289,6 +292,7 @@ files:
 - spec/unit/event_log_renderer_spec.rb
 - spec/unit/hash_changeset_spec.rb
 - spec/unit/job_builder_spec.rb
+- spec/unit/job_rename_spec.rb
 - spec/unit/package_builder_spec.rb
 - spec/unit/release_builder_spec.rb
 - spec/unit/release_spec.rb
@@ -296,6 +300,7 @@ files:
 - spec/unit/runner_spec.rb
 - spec/unit/ssh_spec.rb
 - spec/unit/stemcell_spec.rb
+- spec/unit/task_tracker_spec.rb
 - spec/unit/version_calc_spec.rb
 - spec/unit/versions_index_spec.rb
 homepage: http://www.vmware.com
@@ -312,7 +317,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4379440498501370449
+      hash: -2317006899427919460
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -321,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4379440498501370449
+      hash: -2317006899427919460
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -383,6 +388,7 @@ test_files:
 - spec/unit/event_log_renderer_spec.rb
 - spec/unit/hash_changeset_spec.rb
 - spec/unit/job_builder_spec.rb
+- spec/unit/job_rename_spec.rb
 - spec/unit/package_builder_spec.rb
 - spec/unit/release_builder_spec.rb
 - spec/unit/release_spec.rb
@@ -390,5 +396,6 @@ test_files:
 - spec/unit/runner_spec.rb
 - spec/unit/ssh_spec.rb
 - spec/unit/stemcell_spec.rb
+- spec/unit/task_tracker_spec.rb
 - spec/unit/version_calc_spec.rb
 - spec/unit/versions_index_spec.rb