bosh_cli 0.19.6 → 1.0.rc1

data/spec/unit/ssh_spec.rb

@@ -3,6 +3,7 @@
 require "spec_helper"
 
 describe Bosh::Cli::Command::Base do
+  # TODO: the whole spec needs to be rewritten
 
   before :all do
     @public_key = File.join(Dir.mktmpdir, "public_key")
@@ -14,7 +15,8 @@ describe Bosh::Cli::Command::Base do
   describe Bosh::Cli::Command::Ssh do
     it "should get the public key" do
       ssh = Bosh::Cli::Command::Ssh.new
-      public_key = ssh.get_public_key("public_key" => @public_key)
+      ssh.add_option(:public_key, @public_key)
+      public_key = ssh.send(:get_public_key)
       public_key.should == "PUBLIC_KEY"
     end
 
@@ -23,8 +25,8 @@ describe Bosh::Cli::Command::Base do
       ssh = Bosh::Cli::Command::Ssh.new
       public_key = nil
       begin
-        public_key = ssh.get_public_key({})
-      rescue Bosh::Cli::CliExit
+        public_key = ssh.send(:get_public_key)
+      rescue Bosh::Cli::CliError
         public_key = "SOMETHING"
       end
       public_key.should_not be_nil
@@ -32,15 +34,19 @@ describe Bosh::Cli::Command::Base do
 
     it "should contact director to setup ssh on the job" do
       mock_director = mock(Object)
-      mock_director.stub(:setup_ssh).and_return([{ "status" => "success",
-                                                   "ip" => "127.0.0.1" }])
+      mock_director.stub(:setup_ssh).and_return([:done, 42])
+
+      mock_director.stub(:get_task_result_log).with(42).
+        and_return(JSON.generate(
+                     [{ "status" => "success", "ip" => "127.0.0.1" }]))
       mock_director.stub(:cleanup_ssh)
       Bosh::Cli::Director.should_receive(:new).and_return(mock_director)
       ssh = Bosh::Cli::Command::Ssh.new
       ssh.stub(:prepare_deployment_manifest).and_return("test")
       ssh.stub(:cleanup_ssh)
-      ssh.setup_ssh("dea", 0, "temp_pass",
-                    { "public_key" => @public_key }) do |results, user|
+      ssh.stub(:get_public_key).and_return("PUBKEY")
+      ssh.send(
+        :setup_ssh, "dea", 0, "temp_pass") do |results, _, _|
         results.each do |result|
           result["status"].should == "success"
           result["ip"].should == "127.0.0.1"
@@ -62,7 +68,7 @@ describe Bosh::Cli::Command::Base do
       ssh = Bosh::Cli::Command::Ssh.new
       lambda {
         ssh.shell("dea")
-      }.should raise_error(Bosh::Cli::CliExit, "Please specify a job index")
+      }.should raise_error(Bosh::Cli::CliError)
     end
 
     it "should try to execute given command remotely" do
@@ -70,7 +76,7 @@ describe Bosh::Cli::Command::Base do
       @interactive_shell = false
       @execute_command = false
       ssh.stub(:setup_interactive_shell) { @interactive_shell = true }
-      ssh.stub(:execute_command) { @execute_command = true }
+      ssh.stub(:perform_operation) { @execute_command = true }
       ssh.shell("dea", "ls -l")
       @interactive_shell.should == false && @execute_command.should == true
     end

metadata

@@ -1,16 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 0.19.6
-  prerelease: 
+  version: 1.0.rc1
+  prerelease: 4
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
+date: 2012-10-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bosh_common
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
@@ -186,15 +202,18 @@ extra_rdoc_files: []
 files:
 - bin/bosh
 - lib/cli.rb
+- lib/cli/base_command.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/command_discovery.rb
+- lib/cli/command_handler.rb
 - lib/cli/commands/biff.rb
 - lib/cli/commands/blob_management.rb
 - lib/cli/commands/cloudcheck.rb
+- lib/cli/commands/complete.rb
 - lib/cli/commands/deployment.rb
+- lib/cli/commands/help.rb
 - lib/cli/commands/job.rb
 - lib/cli/commands/job_management.rb
 - lib/cli/commands/job_rename.rb
@@ -219,6 +238,8 @@ files:
 - lib/cli/errors.rb
 - lib/cli/event_log_renderer.rb
 - lib/cli/job_builder.rb
+- lib/cli/job_property_collection.rb
+- lib/cli/job_property_validator.rb
 - lib/cli/null_renderer.rb
 - lib/cli/package_builder.rb
 - lib/cli/packaging_helper.rb
@@ -230,7 +251,6 @@ files:
 - 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
 - lib/cli/version_calc.rb
@@ -256,6 +276,10 @@ files:
 - spec/assets/config/deprecation/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
+- spec/assets/config/swift-hp/config/private.yml
+- spec/assets/config/swift-rackspace/config/final.yml
+- spec/assets/config/swift-rackspace/config/private.yml
 - spec/assets/deployment.MF
 - spec/assets/plugins/bosh/cli/commands/echo.rb
 - spec/assets/plugins/bosh/cli/commands/ruby.rb
@@ -300,6 +324,8 @@ files:
 - spec/unit/event_log_renderer_spec.rb
 - spec/unit/hash_changeset_spec.rb
 - spec/unit/job_builder_spec.rb
+- spec/unit/job_property_collection_spec.rb
+- spec/unit/job_property_validator_spec.rb
 - spec/unit/job_rename_spec.rb
 - spec/unit/package_builder_spec.rb
 - spec/unit/release_builder_spec.rb
@@ -325,16 +351,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -389599683879577066
+      hash: -4439490482070871500
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -389599683879577066
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -360,6 +383,10 @@ test_files:
 - spec/assets/config/deprecation/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
+- spec/assets/config/swift-hp/config/private.yml
+- spec/assets/config/swift-rackspace/config/final.yml
+- spec/assets/config/swift-rackspace/config/private.yml
 - spec/assets/deployment.MF
 - spec/assets/plugins/bosh/cli/commands/echo.rb
 - spec/assets/plugins/bosh/cli/commands/ruby.rb
@@ -404,6 +431,8 @@ test_files:
 - spec/unit/event_log_renderer_spec.rb
 - spec/unit/hash_changeset_spec.rb
 - spec/unit/job_builder_spec.rb
+- spec/unit/job_property_collection_spec.rb
+- spec/unit/job_property_validator_spec.rb
 - spec/unit/job_rename_spec.rb
 - spec/unit/package_builder_spec.rb
 - spec/unit/release_builder_spec.rb

data/lib/cli/command_definition.rb

@@ -1,52 +0,0 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
-module Bosh::Cli
-  class CommandDefinition
-    attr_reader :options
-    attr_reader :power_options
-    attr_reader :keywords
-
-    def initialize
-      @options = []
-      @power_options = []
-      @hints = []
-      @keywords = []
-    end
-
-    def usage(str = nil)
-      if str
-        @usage = str.strip
-        @keywords = str.split(/\s+/).select do |word|
-          word.match(/^[a-z]/i)
-        end
-      else
-        @usage
-      end
-    end
-
-    def description(str = nil)
-      str ? (@description = str.to_s.strip) : @description
-    end
-
-    alias :desc :description
-
-    def option(name, value = "")
-      @options << [name, value]
-    end
-
-    def power_option(name, value = "")
-      @power_options << [name, value]
-    end
-
-    def route(*args, &block)
-      if args.size > 0
-        @route = args
-      elsif block_given?
-        @route = block
-      else
-        @route
-      end
-    end
-  end
-end
-

data/lib/cli/templates/help_message.erb

@@ -1,80 +0,0 @@
-<%= basic_usage %>
-Currently available bosh commands are:
-
-Deployment
-<%= command_usage(:deployment) %>
-<%= command_usage(:delete_deployment) %>
-<%= command_usage(:list_deployments) %>
-<%= command_usage(:deploy) %>
-<%= command_usage(:diff) %>
-
-Release management
-<%= command_usage(:create_release) %>
-<%= command_usage(:delete_release) %>
-<%= command_usage(:verify_release) %>
-<%= command_usage(:upload_release) %>
-<%= command_usage(:list_releases) %>
-<%= command_usage(:reset_release) %>
-
-<%= command_usage(:init_release) %>
-<%= command_usage(:generate_package) %>
-<%= command_usage(:generate_job) %>
-
-Stemcells
-<%= command_usage(:upload_stemcell) %>
-<%= command_usage(:verify_stemcell) %>
-<%= command_usage(:list_stemcells) %>
-<%= command_usage(:delete_stemcell) %>
-<%= command_usage(:list_public_stemcells) %>
-<%= command_usage(:download_public_stemcell) %>
-
-User management
-<%= command_usage(:create_user) %>
-
-Job management
-<%= command_usage(:start_job) %>
-<%= command_usage(:stop_job) %>
-<%= command_usage(:restart_job) %>
-<%= command_usage(:recreate_job) %>
-<%= command_usage(:rename_job) %>
-
-Log management
-<%= command_usage(:fetch_logs) %>
-
-Task management
-<%= command_usage(:list_running_tasks) %>
-<%= command_usage(:list_recent_tasks) %>
-<%= command_usage(:track_task) %>
-<%= command_usage(:cancel_task) %>
-
-Property management
-<%= command_usage(:set_property) %>
-<%= command_usage(:get_property) %>
-<%= command_usage(:unset_property) %>
-<%= command_usage(:list_properties) %>
-
-Maintenance
-<%= command_usage(:cleanup) %>
-<%= command_usage(:cloudcheck) %>
-
-Misc
-<%= command_usage(:status) %>
-<%= command_usage(:list_vms) %>
-<%= command_usage(:target) %>
-<%= command_usage(:list_targets) %>
-<%= command_usage(:login) %>
-<%= command_usage(:logout) %>
-<%= command_usage(:alias) %>
-<%= command_usage(:list_aliases) %>
-<%= command_usage(:purge) %>
-
-Remote access
-<%= command_usage(:ssh) %>
-<%= command_usage(:scp) %>
-<%= command_usage(:ssh_cleanup) %>
-
-Blob
-<%= command_usage(:add_blob) %>
-<%= command_usage(:upload_blobs) %>
-<%= command_usage(:sync_blobs) %>
-<%= command_usage(:blobs_status) %>