bosh_cli 1.0.3 → 1.5.0.pre.1113

data/lib/cli/validation.rb

@@ -29,9 +29,11 @@ module Bosh::Cli
     private
 
     def step(name, error_message, kind = :non_fatal, &block)
+      say("%-60s " % [name], "")
+
       passed = yield
 
-      say("%-60s %s" % [name, passed ? "OK".green : "FAILED".red])
+      say("%s" % [passed ? "OK".make_green : "FAILED".make_red])
 
       unless passed
         errors << error_message

data/lib/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Cli
-    VERSION = "1.0.3"
+    VERSION = '1.5.0.pre.1113'
   end
 end

data/lib/cli/version_calc.rb

@@ -1,5 +1,7 @@
 # Copyright (c) 2009-2012 VMware, Inc.
 
+require 'common/version_number'
+
 module Bosh::Cli
   module VersionCalc
 
@@ -7,15 +9,7 @@ module Bosh::Cli
     # 1 if v1 > v2
     # -1 if v1 < v2
     def version_cmp(v1 = "0", v2 = "0")
-      vp1 = components(v1)
-      vp2 = components(v2)
-
-      [vp1.size, vp2.size].max.times do |i|
-        result = vp1[i].to_i <=> vp2[i].to_i
-        return result unless result == 0
-      end
-
-      0
+      Bosh::Common::VersionNumber.new(v1) <=> Bosh::Common::VersionNumber.new(v2)
     end
 
     def version_greater(v1, v2)
@@ -31,18 +25,11 @@ module Bosh::Cli
     end
 
     def major_version(v)
-      components(v)[0].to_i
+      Bosh::Common::VersionNumber.new(v).major
     end
 
     def minor_version(v)
-      components(v)[1].to_i
+      Bosh::Common::VersionNumber.new(v).minor
     end
-
-    private
-
-    def components(v)
-      v.to_s.split(".")
-    end
-
   end
 end

data/lib/cli/versions_index.rb

@@ -82,7 +82,7 @@ module Bosh::Cli
       end
 
       File.open(@index_file, "w") do |f|
-        f.write(YAML.dump(@data))
+        f.write(Psych.dump(@data))
       end
 
       File.expand_path(filename(version))

data/lib/cli/vm_state.rb

@@ -0,0 +1,43 @@
+module Bosh::Cli
+  class VmState
+    def initialize(command, force)
+      @command = command
+      @force = force
+    end
+
+    def change(job, index, new_state, operation_desc)
+      command.say("You are about to #{operation_desc.make_green}")
+      manifest = command.prepare_deployment_manifest
+      manifest_yaml = Psych.dump(manifest)
+
+      if command.interactive?
+        check_if_manifest_changed(manifest)
+
+        unless command.confirmed?("#{operation_desc.capitalize}?")
+          command.cancel_deployment
+        end
+      end
+
+      command.nl
+      command.say("Performing `#{operation_desc}'...")
+      command.director.change_job_state(manifest['name'], manifest_yaml, job, index, new_state)
+    end
+
+    private
+    attr_reader :command
+
+    def force?
+      !!@force
+    end
+
+    def check_if_manifest_changed(manifest)
+      other_changes_present = command.inspect_deployment_changes(
+          manifest, show_empty_changeset: false)
+
+      if other_changes_present && !force?
+        command.err('Cannot perform job management when other deployment changes ' +
+                        "are present. Please use `--force' to override.")
+      end
+    end
+  end
+end

data/lib/cli/yaml_helper.rb

@@ -6,56 +6,47 @@ module Bosh::Cli
       private
       def process_object(o)
         case o
-        when @syck_class::Map
-          process_map(o)
-        when @syck_class::Seq
-          process_seq(o)
-        when @syck_class::Scalar
-        else
-          err("Unhandled class #{o.class}, fix yaml duplicate check")
+          when Psych::Nodes::Mapping
+            process_mapping(o)
+          when Psych::Nodes::Sequence
+            process_sequence(o)
+          when Psych::Nodes::Scalar
+            # noop
+          when Psych::Nodes::Alias
+            # noop
+          else
+            err("Unhandled class #{o.class}, fix yaml duplicate check")
         end
       end
 
-      def process_seq(s)
-        s.value.each do |v|
+      def process_sequence(s)
+        s.children.each do |v|
           process_object(v)
         end
       end
 
-      def process_map(m)
-        return if m.class != @syck_class::Map
+      def process_mapping(m)
+        return unless m.children
         s = Set.new
-        m.value.each_key do  |k|
-          raise "Found dup key #{k.value}" if s.include?(k.value)
-          s.add(k.value)
+
+        m.children.each_with_index do |key_or_value, index|
+          next if index.odd? # skip the values
+          key = key_or_value.value # Sorry this is confusing, Psych mappings don't behave nicely like maps
+          raise "Found duplicate key '#{key}'" if s.include?(key)
+          s.add(key)
         end
 
-        m.value.each_value do |v|
-          process_object(v)
+        m.children.each_with_index do |key_or_value, index|
+          next if index.even? # skip the keys
+          process_object(key_or_value)
         end
       end
 
       public
-      def check_duplicate_keys(path)
-        # Some Ruby builds on Ubuntu seem to expose a bug
-        # with the opposite order of Syck check, so we first
-        # check for Syck and then for YAML::Syck
-        if defined?(Syck)
-          @syck_class = Syck
-        elsif defined?(YAML::Syck)
-          @syck_class = YAML::Syck
-        else
-          raise "Cannot find Syck parser for YAML, " +
-                    "please check your Ruby installation"
-        end
 
-        File.open(path) do |f|
-          begin
-            process_map(YAML.parse(f))
-          rescue => e
-            raise "Bad yaml file #{path}, " + e.message
-          end
-        end
+      def check_duplicate_keys(yaml_str)
+        document = Psych.parse(yaml_str)
+        process_mapping(document.root) if document
       end
     end
   end

metadata

@@ -1,32 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease: 
+  version: 1.5.0.pre.1113
+  prerelease: 6
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2013-10-16 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
+        version: 1.5.0.pre.1113
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 1.5.0.pre.1113
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -80,10 +80,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.2.4
-    - - <=
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.2.4
   type: :runtime
@@ -91,10 +88,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.2.4
-    - - <=
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.2.4
 - !ruby/object:Gem::Dependency
@@ -104,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -112,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: blobstore_client
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.5.0.pre.1113
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -128,13 +122,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 1.5.0.pre.1113
 - !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
@@ -142,7 +136,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.2.1
 - !ruby/object:Gem::Dependency
@@ -168,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -176,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: netaddr
   requirement: !ruby/object:Gem::Requirement
@@ -193,8 +187,42 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.0
-description: BOSH command-line tool for release engineering and deployment
-email: support@vmware.com
+- !ruby/object:Gem::Dependency
+  name: minitar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.4
+- !ruby/object:Gem::Dependency
+  name: rspec-fire
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! 'BOSH CLI
+
+  cfd471'
+email: support@cloudfoundry.com
 executables:
 - bosh
 extensions: []
@@ -202,12 +230,15 @@ extra_rdoc_files: []
 files:
 - bin/bosh
 - lib/cli.rb
+- lib/cli/backup_destination_path.rb
 - lib/cli/base_command.rb
 - lib/cli/blob_manager.rb
 - lib/cli/cache.rb
 - lib/cli/changeset_helper.rb
+- lib/cli/client/director.rb
 - lib/cli/command_discovery.rb
 - lib/cli/command_handler.rb
+- lib/cli/commands/backup.rb
 - lib/cli/commands/biff.rb
 - lib/cli/commands/blob_management.rb
 - lib/cli/commands/cloudcheck.rb
@@ -223,23 +254,29 @@ files:
 - lib/cli/commands/package.rb
 - lib/cli/commands/property_management.rb
 - lib/cli/commands/release.rb
+- lib/cli/commands/snapshot.rb
 - lib/cli/commands/ssh.rb
 - lib/cli/commands/stemcell.rb
 - lib/cli/commands/task.rb
 - lib/cli/commands/user.rb
+- lib/cli/commands/vm.rb
 - lib/cli/commands/vms.rb
 - lib/cli/config.rb
 - lib/cli/core_ext.rb
 - lib/cli/dependency_helper.rb
 - lib/cli/deployment_helper.rb
+- lib/cli/deployment_manifest.rb
 - lib/cli/deployment_manifest_compiler.rb
-- lib/cli/director.rb
 - lib/cli/director_task.rb
 - lib/cli/errors.rb
 - lib/cli/event_log_renderer.rb
+- lib/cli/file_with_progress_bar.rb
 - lib/cli/job_builder.rb
+- lib/cli/job_command_args.rb
 - lib/cli/job_property_collection.rb
 - lib/cli/job_property_validator.rb
+- lib/cli/job_state.rb
+- lib/cli/line_wrap.rb
 - lib/cli/null_renderer.rb
 - lib/cli/package_builder.rb
 - lib/cli/packaging_helper.rb
@@ -247,6 +284,7 @@ files:
 - lib/cli/release_builder.rb
 - lib/cli/release_compiler.rb
 - lib/cli/release_tarball.rb
+- lib/cli/resurrection.rb
 - lib/cli/runner.rb
 - lib/cli/stemcell.rb
 - lib/cli/task_log_renderer.rb
@@ -255,94 +293,12 @@ files:
 - lib/cli/version.rb
 - lib/cli/version_calc.rb
 - lib/cli/versions_index.rb
+- lib/cli/vm_state.rb
 - lib/cli/yaml_helper.rb
 - README
-- Rakefile
-- spec/assets/biff/bad_gateway_config.yml
-- spec/assets/biff/good_simple_config.yml
-- spec/assets/biff/good_simple_golden_config.yml
-- spec/assets/biff/good_simple_template.erb
-- spec/assets/biff/ip_out_of_range.yml
-- spec/assets/biff/multiple_subnets_config.yml
-- spec/assets/biff/network_only_template.erb
-- spec/assets/biff/no_cc_config.yml
-- spec/assets/biff/no_range_config.yml
-- spec/assets/biff/no_subnet_config.yml
-- spec/assets/biff/ok_network_config.yml
-- 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
-- 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
-- spec/assets/release/jobs/cacher.tgz
-- spec/assets/release/jobs/cacher/config/file1.conf
-- spec/assets/release/jobs/cacher/config/file2.conf
-- spec/assets/release/jobs/cacher/job.MF
-- spec/assets/release/jobs/cacher/monit
-- spec/assets/release/jobs/cleaner.tgz
-- spec/assets/release/jobs/cleaner/job.MF
-- spec/assets/release/jobs/cleaner/monit
-- spec/assets/release/jobs/sweeper.tgz
-- spec/assets/release/jobs/sweeper/config/test.conf
-- spec/assets/release/jobs/sweeper/job.MF
-- spec/assets/release/jobs/sweeper/monit
-- spec/assets/release/packages/mutator.tar.gz
-- spec/assets/release/packages/stuff.tgz
-- spec/assets/release/release.MF
-- spec/assets/release_invalid_checksum.tgz
-- spec/assets/release_invalid_jobs.tgz
-- spec/assets/release_no_name.tgz
-- spec/assets/release_no_version.tgz
-- spec/assets/stemcell/image
-- spec/assets/stemcell/stemcell.MF
-- spec/assets/stemcell_invalid_mf.tgz
-- spec/assets/stemcell_no_image.tgz
-- spec/assets/valid_release.tgz
-- spec/assets/valid_stemcell.tgz
-- 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
-- spec/unit/core_ext_spec.rb
-- spec/unit/dependency_helper_spec.rb
-- spec/unit/deployment_manifest_compiler_spec.rb
-- spec/unit/deployment_manifest_spec.rb
-- spec/unit/director_spec.rb
-- spec/unit/director_task_spec.rb
-- 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
-- spec/unit/release_spec.rb
-- spec/unit/release_tarball_spec.rb
-- 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
-licenses: []
+homepage: https://github.com/cloudfoundry/bosh
+licenses:
+- Apache 2.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -352,106 +308,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 3581265501078885115
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 3581265501078885115
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: BOSH CLI
-test_files:
-- spec/assets/biff/bad_gateway_config.yml
-- spec/assets/biff/good_simple_config.yml
-- spec/assets/biff/good_simple_golden_config.yml
-- spec/assets/biff/good_simple_template.erb
-- spec/assets/biff/ip_out_of_range.yml
-- spec/assets/biff/multiple_subnets_config.yml
-- spec/assets/biff/network_only_template.erb
-- spec/assets/biff/no_cc_config.yml
-- spec/assets/biff/no_range_config.yml
-- spec/assets/biff/no_subnet_config.yml
-- spec/assets/biff/ok_network_config.yml
-- 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
-- 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
-- spec/assets/release/jobs/cacher.tgz
-- spec/assets/release/jobs/cacher/config/file1.conf
-- spec/assets/release/jobs/cacher/config/file2.conf
-- spec/assets/release/jobs/cacher/job.MF
-- spec/assets/release/jobs/cacher/monit
-- spec/assets/release/jobs/cleaner.tgz
-- spec/assets/release/jobs/cleaner/job.MF
-- spec/assets/release/jobs/cleaner/monit
-- spec/assets/release/jobs/sweeper.tgz
-- spec/assets/release/jobs/sweeper/config/test.conf
-- spec/assets/release/jobs/sweeper/job.MF
-- spec/assets/release/jobs/sweeper/monit
-- spec/assets/release/packages/mutator.tar.gz
-- spec/assets/release/packages/stuff.tgz
-- spec/assets/release/release.MF
-- spec/assets/release_invalid_checksum.tgz
-- spec/assets/release_invalid_jobs.tgz
-- spec/assets/release_no_name.tgz
-- spec/assets/release_no_version.tgz
-- spec/assets/stemcell/image
-- spec/assets/stemcell/stemcell.MF
-- spec/assets/stemcell_invalid_mf.tgz
-- spec/assets/stemcell_no_image.tgz
-- spec/assets/valid_release.tgz
-- spec/assets/valid_stemcell.tgz
-- 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
-- spec/unit/core_ext_spec.rb
-- spec/unit/dependency_helper_spec.rb
-- spec/unit/deployment_manifest_compiler_spec.rb
-- spec/unit/deployment_manifest_spec.rb
-- spec/unit/director_spec.rb
-- spec/unit/director_task_spec.rb
-- 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
-- spec/unit/release_spec.rb
-- spec/unit/release_tarball_spec.rb
-- 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
+test_files: []