bosh_cli 1.0.rc1 → 1.0

data/lib/cli/commands/deployment.rb

@@ -195,9 +195,29 @@ module Bosh::Cli::Command
       err("No deployments") if deployments.empty?
 
       deployments_table = table do |t|
-        t.headings = %w(Name)
-        deployments.each do |r|
-          t << [r["name"]]
+        t.headings = %w(Name Release(s) Stemcell(s))
+        deployments.each do |d|
+          deployment = director.get_deployment(d["name"])
+
+          row = if (deployment["manifest"])
+            manifest = YAML.load(deployment["manifest"])
+
+            stemcells = manifest["resource_pools"].map { |rp|
+              rp["stemcell"].values_at("name", "version").join("/")
+            }.sort.uniq
+
+            releases = manifest["releases"] || [manifest["release"]]
+            releases = releases.map { |rl|
+              rl.values_at("name", "version").join("/")
+            }.sort
+
+            [manifest["name"], releases.join("\n"), stemcells.join("\n")]
+          else
+            [d["name"], "n/a", "n/a"]
+          end
+
+          t.add_row(row)
+          t.add_separator unless d == deployments.last
         end
       end
 

data/lib/cli/commands/release.rb

@@ -152,9 +152,9 @@ module Bosh::Cli::Command
       releases_table = table do |t|
         t.headings = "Name", "Versions"
         releases.each do |r|
-          versions = r["versions"].sort do |v1, v2|
+          versions = r["versions"].sort { |v1, v2|
             version_cmp(v1, v2)
-          end
+          }.map { |v| ((r["in_use"] || []).include?(v)) ? "#{v}*" : v }
 
           t << [r["name"], versions.join(", ")]
         end
@@ -162,6 +162,7 @@ module Bosh::Cli::Command
 
       nl
       say(releases_table)
+      say("(*) Currently deployed") if releases_table.to_s =~ /\*/
       nl
       say("Releases total: %d" % releases.size)
     end
@@ -521,4 +522,4 @@ module Bosh::Cli::Command
       exit(1) unless confirmed?
     end
   end
-end
+end

data/lib/cli/commands/task.rb

@@ -10,7 +10,7 @@ module Bosh::Cli::Command
     desc   "Show task status and start tracking its output"
     option "--no-cache", "Don't cache output locally"
     option "--event", "Track event log"
-    option "--soap", "Track CPI log"
+    option "--cpi", "Track CPI log"
     option "--debug", "Track debug log"
     option "--result", "Track result log"
     option "--raw", "Show raw log"
@@ -23,8 +23,8 @@ module Bosh::Cli::Command
 
       log_type = "event"
       n_types = 0
-      if options[:soap]
-        log_type = "soap"
+      if options[:cpi]
+        log_type = "cpi"
         n_types += 1
       end
 
@@ -137,4 +137,4 @@ module Bosh::Cli::Command
       use_filter ? 1 : 2
     end
   end
-end
+end

data/lib/cli/director.rb

@@ -18,7 +18,10 @@ module Bosh
       # @return [String]
       attr_accessor :password
 
-      def initialize(director_uri, user = nil, password = nil)
+      # Options can include:
+      # * :no_track => true - do not use +TaskTracker+ for long-running
+      #                       +request_and_track+ calls
+      def initialize(director_uri, user = nil, password = nil, options = {})
         if director_uri.nil? || director_uri =~ /^\s*$/
           raise DirectorMissing, "no director URI given"
         end
@@ -26,6 +29,7 @@ module Bosh
         @director_uri = director_uri
         @user = user
         @password = password
+        @track_tasks = !options.delete(:no_track)
       end
 
       def uuid
@@ -94,7 +98,6 @@ module Bosh
       end
 
       def list_recent_tasks(count = 30, verbose = 1)
-        count = [count.to_i, 100].min
         get_json("/tasks?limit=#{count}&verbose=#{verbose}")
       end
 
@@ -407,7 +410,13 @@ module Bosh
         else
           new_offset = nil
         end
-        [body, new_offset]
+
+        # backward compatible with renaming soap log to cpi log
+        if response_code == 204 && log_type == "cpi"
+          get_task_output(task_id, offset, "soap")
+        else
+          [body, new_offset]
+        end
       end
 
       def cancel_task(task_id)
@@ -443,8 +452,12 @@ module Bosh
         if redirected
           if location =~ /\/tasks\/(\d+)\/?$/ # Looks like we received task URI
             task_id = $1
-            tracker = Bosh::Cli::TaskTracker.new(self, task_id, track_opts)
-            status = tracker.track
+            if @track_tasks
+              tracker = Bosh::Cli::TaskTracker.new(self, task_id, track_opts)
+              status = tracker.track
+            else
+              status = :running
+            end
           else
             status = :non_trackable
           end

data/lib/cli/packaging_helper.rb

@@ -93,9 +93,13 @@ module Bosh::Cli
 
       if need_fetch
         say("Downloading `#{name} (#{version})'...".green)
-        payload = @blobstore.get(blobstore_id)
-        if Digest::SHA1.hexdigest(payload) == item["sha1"]
-          @tarball_path = @final_index.add_version(fingerprint, item, payload)
+        tmp_file = File.open(File.join(Dir.mktmpdir, name), "w")
+        @blobstore.get(blobstore_id, tmp_file)
+        tmp_file.close
+        if Digest::SHA1.file(tmp_file.path).hexdigest == item["sha1"]
+          @tarball_path = @final_index.add_version(fingerprint,
+                                                   item,
+                                                   tmp_file.path)
         else
           err("`#{name}' (#{version}) is corrupted in blobstore " +
                   "(id=#{blobstore_id}), " +
@@ -167,14 +171,12 @@ module Bosh::Cli
         end
       end
 
-      payload = tmp_file.read
-
       item = {
         "version" => version
       }
 
       unless dry_run?
-        @dev_index.add_version(fingerprint, item, payload)
+        @dev_index.add_version(fingerprint, item, tmp_file.path)
         @tarball_path = @dev_index.filename(version)
       end
 
@@ -189,16 +191,17 @@ module Bosh::Cli
 
       say("Uploading final version #{version}...")
 
-      if !item.nil?
-        version = item["version"]
+      if item
         say("This package has already been uploaded")
         return
       end
 
       version = @final_index.latest_version.to_i + 1
-      payload = File.read(path)
 
-      blobstore_id = @blobstore.create(payload)
+      blobstore_id = nil
+      File.open(path, "r") do |f|
+        blobstore_id = @blobstore.create(f)
+      end
 
       item = {
         "blobstore_id" => blobstore_id,
@@ -206,7 +209,7 @@ module Bosh::Cli
       }
 
       say("Uploaded, blobstore id #{blobstore_id}")
-      @final_index.add_version(fingerprint, item, payload)
+      @final_index.add_version(fingerprint, item, path)
       @tarball_path = @final_index.filename(version)
       @version = version
       @promoted = true

data/lib/cli/release.rb

@@ -135,7 +135,13 @@ module Bosh::Cli
     # and merges it into the blobstore options.
     def merge_private_data(provider, options)
       bs = @private_config["blobstore"]
-      options.merge(bs ? bs[provider] : {})
+      return options unless bs
+
+      if bs[provider].nil? && has_blobstore_secret?
+        err("blobstore private provider does not match final provider")
+      end
+
+      options.merge(bs[provider] ? bs[provider] : {})
     end
 
     # stores blobstore_secret as blobstore.atmos.secret

data/lib/cli/runner.rb

@@ -38,8 +38,8 @@ module Bosh::Cli
       Config.interactive = !@options[:non_interactive]
       Config.cache = Bosh::Cli::Cache.new(@options[:cache_dir])
 
-      build_parse_tree
       load_plugins
+      build_parse_tree
       add_shortcuts
 
       if @args.empty?
@@ -252,4 +252,4 @@ module Bosh::Cli
       search_parse_tree(@parse_tree)
     end
   end
-end
+end

data/lib/cli/version.rb

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

data/lib/cli/versions_index.rb

@@ -54,7 +54,7 @@ module Bosh::Cli
       File.exists?(filename(version))
     end
 
-    def add_version(fingerprint, item, payload = nil)
+    def add_version(fingerprint, item, tmp_file_path = nil)
       version = item["version"]
 
       if version.blank?
@@ -64,10 +64,8 @@ module Bosh::Cli
 
       create_directories
 
-      if payload
-        File.open(filename(version), "w") do |f|
-          f.write(payload)
-        end
+      if tmp_file_path
+        FileUtils.cp(tmp_file_path, filename(version), :preserve => true)
       end
 
       @data["builds"].each_pair do |fp, build|
@@ -78,8 +76,9 @@ module Bosh::Cli
       end
 
       @data["builds"][fingerprint] = item
-      if payload
-        @data["builds"][fingerprint]["sha1"] = Digest::SHA1.hexdigest(payload)
+      if tmp_file_path
+        file_sha1 = Digest::SHA1.file(tmp_file_path).hexdigest
+        @data["builds"][fingerprint]["sha1"] = file_sha1
       end
 
       File.open(@index_file, "w") do |f|

data/spec/assets/config/bad-providers/config/final.yml

@@ -0,0 +1,5 @@
+---
+blobstore:
+  provider: s3
+  options:
+    bucket_name: test

data/spec/assets/config/bad-providers/config/private.yml

@@ -0,0 +1,4 @@
+---
+blobstore:
+  atmos:
+    secret: bar

data/spec/assets/config/local/config/final.yml

@@ -0,0 +1,5 @@
+---
+blobstore:
+  provider: local
+  options:
+    blobstore_path: /tmp/blobstore

data/spec/assets/config/local/config/private.yml

@@ -0,0 +1 @@
+--- {}

data/spec/spec_helper.rb

@@ -18,3 +18,11 @@ RSpec.configure do |c|
 
   c.color_enabled = true
 end
+
+def get_tmp_file_path(content)
+  tmp_file = File.open(File.join(Dir.mktmpdir, "tmp"), "w")
+  tmp_file.write(content)
+  tmp_file.close
+
+  tmp_file.path
+end

data/spec/unit/director_spec.rb

@@ -112,7 +112,7 @@ describe Bosh::Cli::Director do
       @director.list_recent_tasks
 
       @director.should_receive(:get).
-        with("/tasks?limit=100&verbose=1", "application/json").
+        with("/tasks?limit=100000&verbose=1", "application/json").
         and_return([200, JSON.generate([]), {}])
       @director.list_recent_tasks(100000)
 
@@ -283,6 +283,31 @@ describe Bosh::Cli::Director do
         should == ["polling result", "502"]
     end
 
+    describe "not tracking trackable requests" do
+      it "returns without tracking/polling task if request responded with a redirect to task URL" do
+        options = { :arg1 => 1, :arg2 => 2 }
+
+        @director = Bosh::Cli::Director.new(DUMMY_TARGET, "user", "pass", :no_track => true)
+
+        @director.should_receive(:request).
+          with(:get, "/stuff", "text/plain", "abc").
+          and_return([302, "body", { :location => "/tasks/502" }])
+
+        tracker = mock("tracker", :track => "polling result", :output => "foo")
+
+        Bosh::Cli::TaskTracker.should_receive(:new).
+          with(@director, "502", options).
+          never
+
+        @director.request_and_track(:get, "/stuff",
+                                    {:content_type => "text/plain",
+                                     :payload => "abc",
+                                     :arg1 => 1, :arg2 => 2
+                                    }).
+          should == [:running, "502"]
+      end
+    end
+
     it "considers all responses but 302 a failure" do
       [200, 404, 403].each do |code|
         @director.should_receive(:request).

data/spec/unit/job_builder_spec.rb

@@ -321,10 +321,11 @@ describe Bosh::Cli::JobBuilder do
 
     final_versions.add_version(fingerprint,
                                { "version" => "4", "blobstore_id" => "12321" },
-                               "payload")
+                               get_tmp_file_path("payload"))
+
     dev_versions.add_version(fingerprint,
                              { "version" => "0.7-dev" },
-                             "dev_payload")
+                             get_tmp_file_path("dev_payload"))
 
     builder = new_builder("foo", [], ["bar", "baz"], [])
 

data/spec/unit/package_builder_spec.rb

@@ -226,10 +226,10 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
 
     final_versions.add_version(fingerprint,
                                { "version" => "4", "blobstore_id" => "12321" },
-                               "payload")
+                               get_tmp_file_path("payload"))
     dev_versions.add_version(fingerprint,
                              { "version" => "0.7-dev" },
-                             "dev_payload")
+                             get_tmp_file_path("dev_payload"))
 
     builder = make_builder("bar", globs)
     builder.fingerprint.should == fingerprint
@@ -371,13 +371,17 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
     builder.build
 
     final_index = Bosh::Cli::VersionsIndex.new(final_builds_dir)
-    final_index.add_version("deadbeef", { "version" => 34 }, "payload")
+    final_index.add_version("deadbeef",
+                            { "version" => 34 },
+                            get_tmp_file_path("payload"))
 
     add_file("src", "foo/foo14.rb")
     builder.reload.build
     builder.version.should == "34.1-dev"
 
-    final_index.add_version("deadbeef2", { "version" => 37 }, "payload")
+    final_index.add_version("deadbeef2",
+                            { "version" => 37 },
+                            get_tmp_file_path("payload"))
 
     add_file("src", "foo/foo15.rb")
     builder.reload.build
@@ -389,7 +393,9 @@ describe Bosh::Cli::PackageBuilder, "dev build" do
 
     FileUtils.rm_rf(final_builds_dir)
     final_index = Bosh::Cli::VersionsIndex.new(final_builds_dir)
-    final_index.add_version("deadbeef3", { "version" => 34 }, "payload")
+    final_index.add_version("deadbeef3",
+                            { "version" => 34 },
+                            get_tmp_file_path("payload"))
 
     add_file("src", "foo/foo17.rb")
     builder.reload.build

data/spec/unit/release_builder_spec.rb

@@ -69,13 +69,17 @@ describe Bosh::Cli::ReleaseBuilder do
     final_index = Bosh::Cli::VersionsIndex.new(File.join(@release_dir,
                                                          "releases"))
 
-    final_index.add_version("deadbeef", { "version" => 2 }, "payload")
+    final_index.add_version("deadbeef",
+                            { "version" => 2 },
+                            get_tmp_file_path("payload"))
 
     builder = new_builder
     builder.version.should == "2.1-dev"
     builder.build
 
-    final_index.add_version("deadbeef", { "version" => 7 }, "payload")
+    final_index.add_version("deadbeef",
+                            { "version" => 7 },
+                            get_tmp_file_path("payload"))
     builder = new_builder
     builder.version.should == "7.1-dev"
   end

data/spec/unit/release_spec.rb

@@ -151,5 +151,23 @@ describe Bosh::Cli::Release do
       r = Bosh::Cli::Release.new(spec_asset("config/swift-rackspace"))
       r.has_blobstore_secret?.should be_true
     end
+
+    it "should not throw an error when merging empty secrets into options" do
+      r = Bosh::Cli::Release.new(spec_asset("config/local"))
+      opts = {
+          :blobstore_path => "/tmp/blobstore"
+      }
+      Bosh::Blobstore::Client.should_receive(:create).with("local", opts)
+      r.blobstore
+    end
+
+    it "throws an error when blobstore providers does not match" do
+      r = Bosh::Cli::Release.new(spec_asset("config/bad-providers"))
+      expect {
+        r.blobstore
+      }.to raise_error(Bosh::Cli::CliError, "blobstore private provider " +
+          "does not match final provider")
+
+    end
   end
 end

data/spec/unit/versions_index_spec.rb

@@ -21,7 +21,9 @@ describe Bosh::Cli::VersionsIndex do
     @index.latest_version.should be_nil
     File.exists?(@index_file).should be_false
 
-    @index.add_version("deadcafe", { "version" => 2 }, "payload2")
+    @index.add_version("deadcafe",
+                       { "version" => 2 },
+                       get_tmp_file_path("payload2"))
     File.exists?(@index_file).should be_true
   end
 
@@ -44,8 +46,13 @@ describe Bosh::Cli::VersionsIndex do
   it "can be used to add versioned payloads to index" do
     item1 = { "a" => 1, "b" => 2, "version" => 1 }
     item2 = { "a" => 3, "b" => 4, "version" => 2 }
-    @index.add_version("deadbeef", item1, "payload1")
-    @index.add_version("deadcafe", item2, "payload2")
+
+    @index.add_version("deadbeef",
+                       item1,
+                       get_tmp_file_path("payload1"))
+    @index.add_version("deadcafe",
+                       item2,
+                       get_tmp_file_path("payload2"))
 
     @index.latest_version.should == 2
     @index["deadbeef"].should ==
@@ -73,12 +80,14 @@ describe Bosh::Cli::VersionsIndex do
     item2 = { "a" => 3, "b" => 4, "version" => 2 }
     item3 = { "a" => 3, "b" => 4, "version" => 3 }
 
-    @index.add_version("deadbeef", item1, "payload1")
-    @index.add_version("deadcafe", item2, "payload2")
+    @index.add_version("deadbeef", item1, get_tmp_file_path("payload1"))
+    @index.add_version("deadcafe", item2, get_tmp_file_path("payload2"))
     @index.latest_version.should == 2
-    @index.add_version("addedface", item3, "payload2")
+    @index.add_version("addedface", item3, get_tmp_file_path("payload2"))
     @index.latest_version.should == 3
-    @index.add_version("facedbeef", item1.merge("version" => "1.5"), "payload3")
+    @index.add_version("facedbeef",
+                       item1.merge("version" => "1.5"),
+                       get_tmp_file_path("payload3"))
     @index.latest_version.should == 3
   end
 
@@ -87,12 +96,14 @@ describe Bosh::Cli::VersionsIndex do
     item2 = { "a" => 3, "b" => 4, "version" => "1.8-dev" }
     item3 = { "a" => 3, "b" => 4, "version" => "1.10-dev" }
 
-    @index.add_version("deadbeef", item1, "payload1")
-    @index.add_version("deadcafe", item2, "payload2")
+    @index.add_version("deadbeef", item1, get_tmp_file_path("payload1"))
+    @index.add_version("deadcafe", item2, get_tmp_file_path("payload2"))
     @index.latest_version.should == "1.9-dev"
-    @index.add_version("facedead", item3, "payload2")
+    @index.add_version("facedead", item3, get_tmp_file_path("payload2"))
     @index.latest_version.should == "1.10-dev"
-    @index.add_version("badbed", item1.merge("version" => "2.15-dev"), "payload3")
+    @index.add_version("badbed",
+                       item1.merge("version" => "2.15-dev"),
+                       get_tmp_file_path("payload3"))
     @index.latest_version.should == "2.15-dev"
   end
 
@@ -100,10 +111,10 @@ describe Bosh::Cli::VersionsIndex do
     item1 = { "a" => 1, "b" => 2, "version" => "1.9-dev" }
     item2 = { "a" => 3, "b" => 4, "version" => "1.8-dev" }
 
-    @index.add_version("deadbeef", item1, "payload1")
+    @index.add_version("deadbeef", item1, get_tmp_file_path("payload1"))
 
     lambda {
-      @index.add_version("deadcafe", item1, "payload3")
+      @index.add_version("deadcafe", item1, get_tmp_file_path("payload3"))
     }.should raise_error("Trying to add duplicate version `1.9-dev' " +
                          "into index `#{File.join(@dir, "index.yml")}'")
   end
@@ -112,8 +123,8 @@ describe Bosh::Cli::VersionsIndex do
     item1 = { "a" => 1, "b" => 2, "version" => 1 }
     item2 = { "a" => 3, "b" => 4, "version" => 2 }
 
-    @index.add_version("deadbeef", item1, "payload1")
-    @index.add_version("deadcafe", item2, "payload2")
+    @index.add_version("deadbeef", item1, get_tmp_file_path("payload1"))
+    @index.add_version("deadcafe", item2, get_tmp_file_path("payload2"))
 
     checksum1 = Digest::SHA1.hexdigest("payload1")
     checksum2 = Digest::SHA1.hexdigest("payload2")
@@ -124,8 +135,9 @@ describe Bosh::Cli::VersionsIndex do
 
   it "supports name prefix" do
     item = { "a" => 1, "b" => 2, "version" => 1 }
+
     @index = Bosh::Cli::VersionsIndex.new(@dir, "foobar")
-    @index.add_version("deadbeef", item, "payload1")
+    @index.add_version("deadbeef", item, get_tmp_file_path("payload1"))
     @index.filename(1).should == File.join(@dir, "foobar-1.tgz")
   end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.0.rc1
-  prerelease: 4
+  version: '1.0'
+  prerelease: 
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-05 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -272,8 +272,12 @@ files:
 - spec/assets/biff/properties_template.erb
 - spec/assets/config/atmos/config/final.yml
 - spec/assets/config/atmos/config/private.yml
+- spec/assets/config/bad-providers/config/final.yml
+- spec/assets/config/bad-providers/config/private.yml
 - spec/assets/config/deprecation/config/final.yml
 - spec/assets/config/deprecation/config/private.yml
+- spec/assets/config/local/config/final.yml
+- spec/assets/config/local/config/private.yml
 - spec/assets/config/s3/config/final.yml
 - spec/assets/config/s3/config/private.yml
 - spec/assets/config/swift-hp/config/final.yml
@@ -351,13 +355,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4439490482070871500
+      hash: 418421310911129524
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 418421310911129524
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -379,8 +386,12 @@ test_files:
 - spec/assets/biff/properties_template.erb
 - spec/assets/config/atmos/config/final.yml
 - spec/assets/config/atmos/config/private.yml
+- spec/assets/config/bad-providers/config/final.yml
+- spec/assets/config/bad-providers/config/private.yml
 - spec/assets/config/deprecation/config/final.yml
 - spec/assets/config/deprecation/config/private.yml
+- spec/assets/config/local/config/final.yml
+- spec/assets/config/local/config/private.yml
 - spec/assets/config/s3/config/final.yml
 - spec/assets/config/s3/config/private.yml
 - spec/assets/config/swift-hp/config/final.yml