bosh_cli 0.16 → 0.17

data/spec/unit/cli_commands_spec.rb

@@ -6,8 +6,8 @@ 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 }
+    @cache = File.join(Dir.mktmpdir, "bosh_cache")
+    @opts = { :config => @config, :cache_dir => @cache }
   end
 
   describe Bosh::Cli::Command::Misc do
@@ -300,181 +300,48 @@ describe Bosh::Cli::Command::Base do
 
   end
 
-  describe Bosh::Cli::Command::Blob do
+  describe Bosh::Cli::Command::BlobManagement do
     before :each do
-      @cmd = Bosh::Cli::Command::Blob.new(@opts)
-      @release_dir  = Dir.mktmpdir
-      @blob_dir = File.join(@release_dir, "blobs/")
-      @cmd.stub!(:work_dir).and_return(@release_dir)
-      @blobstore = mock("blobstore")
-      @cmd.stub!(:blobstore).and_return(@blobstore)
-      FileUtils.mkdir(@blob_dir)
+      @cmd = Bosh::Cli::Command::BlobManagement.new(@opts)
+      @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)
     end
 
-    after :each do
-      FileUtils.rm_rf(@release_dir)
+    it "prints blobs status" do
+      @blob_manager.should_receive(:print_status)
+      @cmd.status
     end
 
-    it "refuse to run outside of the release directory" do
-      lambda {
-        @cmd.upload_blob("foo")
-      }.should raise_error(Bosh::Cli::CliExit,
-                           "Sorry, your current directory doesn't " +
-                           "look like release directory".red)
+    it "adds blob under provided directory" do
+      @blob_manager.should_receive(:add_blob).with("foo/bar.tgz", "bar/bar.tgz")
+      @cmd.add("foo/bar.tgz", "bar")
+    end
 
-      lambda {
-        @cmd.sync_blobs
-      }.should raise_error(Bosh::Cli::CliExit,
-                           "Sorry, your current directory doesn't " +
-                           "look like release directory".red)
+    it "adds blob with no directory provided" do
+      @blob_manager.should_receive(:add_blob).with("foo/bar.tgz", "bar.tgz")
+      @cmd.add("foo/bar.tgz")
+    end
 
-      lambda {
-        @cmd.blobs_info
-      }.should raise_error(Bosh::Cli::CliExit,
-                           "Sorry, your current directory doesn't " +
-                           "look like release directory".red)
-    end
-
-    it "refuse to upload blob outside of release/blobs" do
-      Dir.chdir(@release_dir) do
-        FileUtils.touch("test.tgz")
-        @cmd.should_receive(:check_if_blobs_supported).and_return(true)
-        blob_path = Pathname.new(@release_dir).realpath.to_s
-        blobs_dir = Pathname.new(@blob_dir).realpath.to_s
-        lambda {
-          @cmd.upload_blob("test.tgz")
-        }.should raise_error(Bosh::Cli::CliExit,
-                             "#{File.join(blob_path, "test.tgz")} is " +
-                             "NOT under #{blobs_dir}/")
-      end
-    end
-
-    it "upload new blob to blobstore" do
-      Dir.chdir(@release_dir) do
-        FileUtils.mkdir("./blobs/test")
-        blob = FileUtils.touch("./blobs/test/test.tgz")
-        @cmd.should_receive(:get_blobs_index).and_return({})
-        @cmd.should_receive(:check_if_blobs_supported).and_return(true)
-        @blobstore.should_receive(:create).and_return(2)
-        @cmd.upload_blob("./blobs/test/test.tgz")
-        YAML.load_file("blob_index.yml").should == {
-          "test/test.tgz" => {
-            "object_id" => 2,
-            "sha" => Digest::SHA1.file(blob.first).hexdigest
-          }
-        }
-      end
-    end
-
-    it "should skip upload if blob already exists" do
-      Dir.chdir(@release_dir) do
-        FileUtils.mkdir("./blobs/test")
-        blob = FileUtils.touch("./blobs/test/test.tgz")
-        @cmd.should_receive(:check_if_blobs_supported).and_return(true)
-        @cmd.should_receive(:get_blobs_index).and_return('test/test.tgz' => {
-          "sha" => Digest::SHA1.file(blob.first).hexdigest,
-          "object_id" => 2
-        })
-        @blobstore.should_not_receive(:create)
-        @cmd.upload_blob("./blobs/test/test.tgz")
-      end
-    end
-
-    it "should ask user if blob was modified" do
-      Dir.chdir(@release_dir) do
-        FileUtils.mkdir("./blobs/test")
-        blob = FileUtils.touch("./blobs/test/test.tgz")
-        @cmd.should_receive(:check_if_blobs_supported).and_return(true)
-        @cmd.should_receive(:get_blobs_index).and_return('test/test.tgz' => {
-          "sha" => 1,
-          "object_id" => 2
-        })
-        @cmd.should_receive(:ask).and_return("no")
-        @blobstore.should_not_receive(:create)
-        @cmd.upload_blob("./blobs/test/test.tgz")
-      end
-    end
-
-    it "should sync if file is not present" do
-      Dir.chdir(@release_dir) do
-        @cmd.should_receive(:check_if_blobs_supported).and_return(true)
-        @cmd.should_receive(:get_blobs_index).and_return('test/test.tgz' => {
-          "sha" => 1,
-          "object_id" => 2
-        })
-        @cmd.should_receive(:fetch_blob).
-            with(File.join(@release_dir, "blobs", "test/test.tgz"),
-                 { "sha" => 1, "object_id" => 2 })
-        @cmd.sync_blobs
-      end
-    end
-
-    it "should not sync if the same file is present" do
-      Dir.chdir(@release_dir) do
-        FileUtils.mkdir("./blobs/test")
-        blob = FileUtils.touch("./blobs/test/test.tgz")
-        @cmd.should_receive(:check_if_blobs_supported).and_return(true)
-        @cmd.should_receive(:get_blobs_index).and_return('test/test.tgz' => {
-          "sha" => Digest::SHA1.file(blob.first).hexdigest,
-          "object_id" => 2
-        })
-        @cmd.should_not_receive(:fetch_blob)
-        @cmd.sync_blobs
-      end
-    end
-
-    it "should ask user if blob sha is different" do
-      Dir.chdir(@release_dir) do
-        FileUtils.mkdir("./blobs/test")
-        blob = FileUtils.touch("./blobs/test/test.tgz")
-        @cmd.should_receive(:check_if_blobs_supported).and_return(true)
-        @cmd.should_receive(:get_blobs_index).and_return('test/test.tgz' => {
-          "sha" => 1,
-          "object_id" => 2
-        })
-        @cmd.should_receive(:ask).and_return("")
-        @cmd.should_not_receive(:fetch_blob)
-        @cmd.sync_blobs
-      end
-    end
-
-    it "reports untracked blobs" do
-      Dir.chdir(@release_dir) do
-        FileUtils.mkdir("./blobs/test")
-        FileUtils.touch("./blobs/test/test.tgz")
-        @cmd.should_receive(:check_if_blobs_supported).and_return(true)
-        @cmd.should_receive(:get_blobs_index).and_return({})
-        @cmd.should_receive(:say).
-            with("\nNew blobs ('bosh upload blob' to add): ".green)
-        @cmd.should_receive(:say).with("test/test.tgz")
-        @cmd.blobs_info
-      end
-    end
-
-    it "reports modified blobs" do
-      Dir.chdir(@release_dir) do
-        FileUtils.mkdir("./blobs/test")
-        FileUtils.touch("./blobs/test/test.tgz")
-        @cmd.should_receive(:check_if_blobs_supported).and_return(true)
-        @cmd.should_receive(:get_blobs_index).
-            and_return({ "test/test.tgz" => { "sha" => 1, "object_id" => 2}})
-        @cmd.should_receive(:say).
-            with("\nModified blobs ('bosh upload blob' to update): ".green)
-        @cmd.should_receive(:say).with("test/test.tgz")
-        @cmd.blobs_info
-      end
-    end
-
-    it "reports unsynced blobs" do
-      Dir.chdir(@release_dir) do
-        @cmd.should_receive(:check_if_blobs_supported).and_return(true)
-        @cmd.should_receive(:get_blobs_index).
-            and_return({ "test/test.tgz" => { "sha" => 1, "object_id" => 2}})
-        @cmd.should_receive(:say).
-            with("\nMissing blobs ('bosh sync blobs' to fetch) : ".green)
-        @cmd.should_receive(:say).with("test/test.tgz")
-        @cmd.blobs_info
-      end
+    it "uploads blobs" do
+      @blob_manager.should_receive(:print_status)
+      @blob_manager.stub!(:blobs_to_upload).and_return(%w(foo bar baz))
+      @blob_manager.should_receive(:upload_blob).with("foo")
+      @blob_manager.should_receive(:upload_blob).with("bar")
+      @blob_manager.should_receive(:upload_blob).with("baz")
+
+      @cmd.should_receive(:confirmed?).exactly(3).times.and_return(true)
+      @cmd.upload
+    end
+
+    it "syncs blobs" do
+      @blob_manager.should_receive(:sync).ordered
+      @blob_manager.should_receive(:print_status).ordered
+      @cmd.sync
     end
   end
 

data/spec/unit/runner_spec.rb

@@ -93,6 +93,11 @@ describe Bosh::Cli::Runner do
     test_cmd(["tasks"], :task, :list_running)
     test_cmd(["tasks", "recent"], :task, :list_recent)
     test_cmd(["tasks", "recent", "42"], :task, :list_recent, ["42"])
+
+    test_cmd(%w(blobs), :blob_management, :status)
+    test_cmd(%w(add blob foo bar), :blob_management, :add, %w(foo bar))
+    test_cmd(%w(upload blobs), :blob_management, :upload)
+    test_cmd(%w(sync blobs), :blob_management, :sync)
   end
 
   it "cancels running task and quits when ctrl-c is issued " +

metadata

@@ -1,144 +1,207 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: bosh_cli
-version: !ruby/object:Gem::Version
-  version: '0.16'
+version: !ruby/object:Gem::Version 
+  hash: 41
   prerelease: 
+  segments: 
+  - 0
+  - 17
+  version: "0.17"
 platform: ruby
-authors:
+authors: 
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: json_pure
-  requirement: &70285282483660 !ruby/object:Gem::Requirement
+
+date: 2012-04-26 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 6
+        - 1
         version: 1.6.1
+  requirement: *id001
+  name: json_pure
   type: :runtime
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70285282483660
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: &70285282482820 !ruby/object:Gem::Requirement
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 6
+        - 2
         version: 1.6.2
+  requirement: *id002
+  name: highline
   type: :runtime
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70285282482820
-- !ruby/object:Gem::Dependency
-  name: progressbar
-  requirement: &70285282481940 !ruby/object:Gem::Requirement
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
         version: 0.9.0
+  requirement: *id003
+  name: progressbar
   type: :runtime
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70285282481940
-- !ruby/object:Gem::Dependency
-  name: httpclient
-  requirement: &70285282480760 !ruby/object:Gem::Requirement
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 2
+        - 4
         version: 2.2.4
     - - <=
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 2
+        - 4
         version: 2.2.4
+  requirement: *id004
+  name: httpclient
   type: :runtime
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70285282480760
-- !ruby/object:Gem::Dependency
-  name: terminal-table
-  requirement: &70285282477300 !ruby/object:Gem::Requirement
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 4
+        - 2
         version: 1.4.2
+  requirement: *id005
+  name: terminal-table
   type: :runtime
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70285282477300
-- !ruby/object:Gem::Dependency
-  name: blobstore_client
-  requirement: &70285282476580 !ruby/object:Gem::Requirement
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 3
+        - 13
         version: 0.3.13
+  requirement: *id006
+  name: blobstore_client
   type: :runtime
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70285282476580
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  requirement: &70285282475380 !ruby/object:Gem::Requirement
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 2
+        - 1
         version: 2.2.1
+  requirement: *id007
+  name: net-ssh
   type: :runtime
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70285282475380
-- !ruby/object:Gem::Dependency
-  name: net-ssh-gateway
-  requirement: &70285282474540 !ruby/object:Gem::Requirement
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
+  requirement: *id008
+  name: net-ssh-gateway
   type: :runtime
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70285282474540
-- !ruby/object:Gem::Dependency
-  name: net-scp
-  requirement: &70285282473460 !ruby/object:Gem::Requirement
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 0
+        - 4
         version: 1.0.4
+  requirement: *id009
+  name: net-scp
   type: :runtime
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *70285282473460
-- !ruby/object:Gem::Dependency
-  name: netaddr
-  requirement: &70285282472680 !ruby/object:Gem::Requirement
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 5
+        - 0
         version: 1.5.0
+  requirement: *id010
+  name: netaddr
   type: :runtime
-  prerelease: false
-  version_requirements: *70285282472680
 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
 - lib/cli/cache.rb
 - lib/cli/changeset_helper.rb
 - lib/cli/command_definition.rb
 - lib/cli/commands/base.rb
 - lib/cli/commands/biff.rb
-- lib/cli/commands/blob.rb
+- lib/cli/commands/blob_management.rb
 - lib/cli/commands/cloudcheck.rb
 - lib/cli/commands/deployment.rb
 - lib/cli/commands/job.rb
@@ -223,6 +286,7 @@ files:
 - spec/spec_helper.rb
 - spec/unit/base_command_spec.rb
 - spec/unit/biff_spec.rb
+- spec/unit/blob_manager_spec.rb
 - spec/unit/cache_spec.rb
 - spec/unit/cli_commands_spec.rb
 - spec/unit/config_spec.rb
@@ -245,35 +309,38 @@ 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
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -21086111877987397
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -21086111877987397
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.17
 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
@@ -316,6 +383,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/unit/base_command_spec.rb
 - spec/unit/biff_spec.rb
+- spec/unit/blob_manager_spec.rb
 - spec/unit/cache_spec.rb
 - spec/unit/cli_commands_spec.rb
 - spec/unit/config_spec.rb