bosh_cli 0.17 → 0.18

data/lib/cli/blob_manager.rb

@@ -247,7 +247,6 @@ module Bosh::Cli
         err("`#{blob_path}' is a symlink")
       end
 
-      object_id = rand(36**9).to_s(36)
       checksum = file_checksum(blob_path)
 
       progress(path, "uploading...")

data/lib/cli/commands/biff.rb

@@ -73,7 +73,19 @@ module Bosh::Cli::Command
         output = "No differences."
         @no_differences = true
       end
-      say(output)
+
+      output.each_line do |line|
+        added = line[0..0] == "+"
+        removed = line[0..0] == "-"
+
+        if added
+          say(line.chomp.green)
+        elsif removed
+          say(line.chomp.red)
+        else
+          say(line)
+        end
+      end
     end
 
     # Alias for find.  It is used to find within a given object, not the default

data/lib/cli/package_builder.rb

@@ -138,6 +138,7 @@ module Bosh::Cli
             ENV["RUBYOPT"] = ENV["RUBYOPT"].sub("-rbundler/setup", "")
           end
           ENV["BUILD_DIR"] = build_dir
+          ENV["RELEASE_DIR"] = @release_dir
           in_build_dir do
             pre_packaging_out = `bash -x pre_packaging 2>&1`
             pre_packaging_out.split("\n").each do |line|

data/lib/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Cli
-    VERSION = "0.17"
+    VERSION = "0.18"
   end
 end

data/spec/unit/director_spec.rb

@@ -493,7 +493,7 @@ describe Bosh::Cli::Director do
         with("/tasks/1").
         and_return([200, JSON.generate("state" => "error")])
 
-      @director.should_receive(:get).exactly(1).times
+      @director.should_receive(:get).exactly(2).times
 
       @director.poll_task(1, :poll_interval => 0, :max_polls => 10).
           should == :error

metadata

@@ -1,198 +1,189 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bosh_cli
-version: !ruby/object:Gem::Version 
-  hash: 41
+version: !ruby/object:Gem::Version
+  version: '0.18'
   prerelease: 
-  segments: 
-  - 0
-  - 17
-  version: "0.17"
 platform: ruby
-authors: 
+authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-05-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.6.1
-  requirement: *id001
-  name: json_pure
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 6
-        - 2
-        version: 1.6.2
-  requirement: *id002
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+- !ruby/object:Gem::Dependency
   name: highline
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.2
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 9
-        - 0
-        version: 0.9.0
-  requirement: *id003
+      - !ruby/object:Gem::Version
+        version: 1.6.2
+- !ruby/object:Gem::Dependency
   name: progressbar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 2
-        - 4
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.4
     - - <=
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 2
-        - 4
+      - !ruby/object:Gem::Version
         version: 2.2.4
-  requirement: *id004
-  name: httpclient
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.4
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 2.2.4
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 4
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.4.2
-  requirement: *id005
-  name: terminal-table
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 3
-        - 13
-        version: 0.3.13
-  requirement: *id006
+      - !ruby/object:Gem::Version
+        version: 1.4.2
+- !ruby/object:Gem::Dependency
   name: blobstore_client
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.13
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 2
-        - 1
-        version: 2.2.1
-  requirement: *id007
+      - !ruby/object:Gem::Version
+        version: 0.3.13
+- !ruby/object:Gem::Dependency
   name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.1
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
-        version: 1.1.0
-  requirement: *id008
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+- !ruby/object:Gem::Dependency
   name: net-ssh-gateway
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 0
-        - 4
-        version: 1.0.4
-  requirement: *id009
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
   name: net-scp
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.4
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
-        version: 1.5.0
-  requirement: *id010
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+- !ruby/object:Gem::Dependency
   name: netaddr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 description: BOSH command-line tool for release engineering and deployment
 email: support@vmware.com
-executables: 
+executables:
 - bosh
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/bosh
 - lib/cli.rb
 - lib/cli/blob_manager.rb
@@ -309,38 +300,35 @@ files:
 - spec/unit/versions_index_spec.rb
 homepage: http://www.vmware.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4379440498501370449
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 4379440498501370449
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: BOSH CLI
-test_files: 
+test_files:
 - spec/assets/biff/bad_gateway_config.yml
 - spec/assets/biff/good_simple_config.yml
 - spec/assets/biff/good_simple_golden_config.yml