cluster_chef-knife 3.0.7 → 3.0.8

data/Rakefile

@@ -72,26 +72,26 @@ Dir[File.join('tasks', '*.rake')].sort.each{|f| load(f) }
   Jeweler::RubygemsDotOrgTasks.new
 end
 
-# # ---------------------------------------------------------------------------
-# #
-# # RSpec -- testing
-# #
-# RSpec::Core::RakeTask.new(:spec) do |spec|
-#   spec.pattern = FileList['spec/**/*_spec.rb']
-# end
+# ---------------------------------------------------------------------------
+#
+# RSpec -- testing
 #
-# RSpec::Core::RakeTask.new(:rcov) do |spec|
-#   spec.pattern = 'spec/**/*_spec.rb'
-#   spec.rcov = true
-#   spec.rcov_opts = %w[ --exclude .rvm --no-comments --text-summary]
-# end
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
+
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+  spec.rcov_opts = %w[ --exclude .rvm --no-comments --text-summary]
+end
 
-# # ---------------------------------------------------------------------------
-# #
-# # Yard -- documentation
-# #
-# YARD::Rake::YardocTask.new
+# ---------------------------------------------------------------------------
 #
-# # ---------------------------------------------------------------------------
+# Yard -- documentation
 #
-# task :default => :spec
+YARD::Rake::YardocTask.new
+
+# ---------------------------------------------------------------------------
+
+task :default => :spec

data/VERSION

@@ -1 +1 @@
-3.0.7
+3.0.8

data/cluster_chef-knife.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cluster_chef-knife"
-  s.version = "3.0.7"
+  s.version = "3.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2011-12-13"
+  s.date = "2011-12-14"
   s.description = "cluster_chef allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
   s.email = "coders@infochimps.com"
   s.extra_rdoc_files = [

data/lib/chef/knife/cluster_bootstrap.rb

@@ -43,9 +43,14 @@ class Chef
         :long        => "--sudo",
         :description => "Execute the bootstrap via sudo",
         :boolean     => true
+      option :host_key_verify,
+        :long => "--[no-]host-key-verify",
+        :description => "Verify host key, enabled by default.",
+        :boolean => true,
+        :default => true
 
       import_banner_and_options(Chef::Knife::Bootstrap,
-        :except => [:chef_node_name, :run_list, :ssh_user, :distro, :template_file])
+        :except => [:chef_node_name, :run_list, :ssh_user, :distro, :template_file, :no_host_key_verify, :host_key_verify])
       import_banner_and_options(ClusterChef::Script)
 
       deps do

data/lib/chef/knife/cluster_launch.rb

@@ -31,7 +31,7 @@ class Chef
       end
 
       banner "knife cluster launch CLUSTER_NAME [FACET_NAME [INDEXES]] (options)"
-      [ :ssh_port, :ssh_password, :identity_file, :use_sudo, :no_host_key_verify,
+      [ :ssh_port, :ssh_password, :identity_file, :use_sudo,
         :prerelease, :bootstrap_version, :template_file,
       ].each do |name|
         option name, Chef::Knife::Bootstrap.options[name]
@@ -58,6 +58,11 @@ class Chef
         :description => "If bootstrap is invoked, the bootstrap script causes an initial run of chef-client (default true).",
         :boolean     => true,
         :default     => true
+      option :host_key_verify,
+        :long => "--[no-]host-key-verify",
+        :description => "Verify host key, enabled by default.",
+        :boolean => true,
+        :default => true
 
       def run
         load_cluster_chef

data/lib/chef/knife/cluster_proxy.rb

@@ -61,22 +61,23 @@ class Chef
       end
 
       def command_for_target(svr)
-        config[:attribute]     ||= Chef::Config[:knife][:ssh_address_attribute] || "fqdn"
-        config[:ssh_user]      ||= Chef::Config[:knife][:ssh_user]
-        config[:identity_file] ||= svr.cloud.ssh_identity_file
+        config[:attribute]       ||= Chef::Config[:knife][:ssh_address_attribute] || "fqdn"
+        config[:ssh_user]        ||= Chef::Config[:knife][:ssh_user]
+        config[:identity_file]   ||= svr.cloud.ssh_identity_file
+        config[:host_key_verify] ||= Chef::Config[:knife][:host_key_verify] || (not config[:no_host_key_verify]) # pre-vs-post 0.10.4
 
         if (svr.cloud.public_ip)             then address = svr.cloud.public_ip ; end
         if (not address) && (svr.chef_node)  then address = format_for_display( svr.chef_node )[config[:attribute]] ; end
         if (not address) && (svr.fog_server) then address = svr.fog_server.public_ip_address ; end
 
         cmd  = [ 'ssh', '-N' ]
-        cmd += [ '-D', config[:socks_port].to_s  ]
-        cmd += [ '-i', config[:identity_file]    ] if config[:identity_file].present?
-        cmd += [ '-p', config[:port].to_s        ] if config[:port].present?
-        cmd << '-f'                                if config[:background]
-        cmd << "-#{'v' * config[:verbosity]}"      if (config[:verbosity] > 0)
-        cmd += %w[ -o StrictHostKeyChecking=no   ] if config[:no_host_key_verify]
+        cmd += [ '-D', config[:socks_port].to_s ]
+        cmd += [ '-p', config[:port].to_s       ]  if  config[:port].present?
+        cmd << '-f'                                if  config[:background]
+        cmd << "-#{'v' * config[:verbosity].to_i}" if (config[:verbosity].to_i > 0)
+        cmd += %w[ -o StrictHostKeyChecking=no  ]  if  config[:host_key_verify]
         cmd += %w[ -o ConnectTimeout=10 -o ServerAliveInterval=60 -o ControlPath=none ]
+        cmd += [ '-i', File.expand_path(config[:identity_file]) ] if  config[:identity_file].present?
         cmd << (config[:ssh_user] ? "#{config[:ssh_user]}@#{address}" : address)
 
         Chef::Log.debug("Cluster proxy config:  #{config.inspect}")
@@ -86,6 +87,7 @@ class Chef
             "for",        ui.color(svr.name,            :cyan),
             "(#{address})"
           ].join(" "))
+
         cmd
      end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cluster_chef-knife
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-13 00:00:00.000000000 Z
+date: 2011-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70278723207440 !ruby/object:Gem::Requirement
+  requirement: &70174880466240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.10.4
   type: :runtime
   prerelease: false
-  version_requirements: *70278723207440
+  version_requirements: *70174880466240
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70278723223240 !ruby/object:Gem::Requirement
+  requirement: &70174880464680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70278723223240
+  version_requirements: *70174880464680
 - !ruby/object:Gem::Dependency
   name: formatador
-  requirement: &70278723222620 !ruby/object:Gem::Requirement
+  requirement: &70174880479940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70278723222620
+  version_requirements: *70174880479940
 - !ruby/object:Gem::Dependency
   name: gorillib
-  requirement: &70278723222040 !ruby/object:Gem::Requirement
+  requirement: &70174880477380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *70278723222040
+  version_requirements: *70174880477380
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70278723221440 !ruby/object:Gem::Requirement
+  requirement: &70174880475480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *70278723221440
+  version_requirements: *70174880475480
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70278723219280 !ruby/object:Gem::Requirement
+  requirement: &70174880473820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *70278723219280
+  version_requirements: *70174880473820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70278723217920 !ruby/object:Gem::Requirement
+  requirement: &70174880472800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70278723217920
+  version_requirements: *70174880472800
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70278723216740 !ruby/object:Gem::Requirement
+  requirement: &70174880488500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70278723216740
+  version_requirements: *70174880488500
 - !ruby/object:Gem::Dependency
   name: configliere
-  requirement: &70278723215720 !ruby/object:Gem::Requirement
+  requirement: &70174880487740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 0.4.8
   type: :development
   prerelease: false
-  version_requirements: *70278723215720
+  version_requirements: *70174880487740
 description: cluster_chef allows you to orchestrate not just systems but clusters
   of machines. It includes a powerful layer on top of knife and a collection of cloud
   cookbooks.
@@ -176,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2985633027269319547
+      hash: -3376503058401634367
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: