knife-solo 0.0.6 → 0.0.7

data/lib/chef/knife/cook.rb

@@ -18,26 +18,16 @@ class Chef
 
       def run
         super
-
         check_syntax
-
         Chef::Config.from_file('solo.rb')
-
+        check_chef_version
         rsync_kitchen
-
         add_patches
-
-        check_chef_version
-
-        logging_arg = "-l debug" if config[:verbosity] > 0
-        stream_command <<-BASH
-          #{sudo} chef-solo -c #{chef_path}/solo.rb \
-                         -j #{chef_path}/#{node_config} \
-                         #{logging_arg}
-        BASH
+        cook
       end
 
       def check_syntax
+        ui.msg('Checking cookbook syntax...')
         Dir["**/*.rb"].each do |recipe|
           ok = system "ruby -c #{recipe} >/dev/null 2>&1"
           raise "Syntax error in #{recipe}" if not ok
@@ -84,6 +74,15 @@ class Chef
         BASH
         raise "The chef gem on #{host} is out of date. Please run `#{$0} prepare #{ssh_args}` to upgrade Chef to #{constraint}." unless result.success?
       end
+
+      def cook
+        logging_arg = "-l debug" if config[:verbosity] > 0
+        stream_command <<-BASH
+          sudo chef-solo -c #{chef_path}/solo.rb \
+                         -j #{chef_path}/#{node_config} \
+                         #{logging_arg}
+        BASH
+      end
     end
   end
 end

data/lib/chef/knife/prepare.rb

@@ -32,13 +32,8 @@ class Chef
       end
 
       def operating_system
-        @operating_system ||= begin
-                                run_command('uname -s').stdout.strip
-                              rescue
-                                ""
-                              end
+        @operating_system ||= run_command('uname -s').stdout.strip
       end
-
     end
   end
 end

data/lib/knife-solo/bootstraps/linux.rb

@@ -36,7 +36,7 @@ module KnifeSolo::Bootstraps
         repo_path = "/rbel6"
       end
       installed = "is already installed"
-      result = run_command("#{sudo} rpm -Uvh #{repo_url}#{repo_path}")
+      result = run_command("sudo rpm -Uvh #{repo_url}#{repo_path}")
       raise result.stderr_or_stdout unless result.success? || result.stdout.match(installed)
     end
 
@@ -44,7 +44,7 @@ module KnifeSolo::Bootstraps
       ui.msg("Installing required packages...")
       add_yum_repos
       @packages = %w(rubygem-chef rsync)
-      run_command("#{sudo} yum -y install #{package_list}")
+      run_command("sudo yum -y install #{package_list}")
     end
 
     def debian_gem_install

data/lib/knife-solo/info.rb

@@ -1,5 +1,5 @@
 module KnifeSolo
   def self.version
-    '0.0.6'
+    '0.0.7'
   end
 end

data/lib/knife-solo/ssh_command.rb

@@ -125,14 +125,20 @@ module KnifeSolo
       end
     end
 
-    def sudo
-      return @sudo if @sudo
-      if run_command("sudo -V").success?
-        @sudo = "sudo"
+    def sudo_available?
+      return @sudo_available unless @sudo_available.nil?
+      @sudo_available = run_command('sudo -V', :process_sudo => false).success?
+      Chef::Log.debug("`sudo` not available on #{host}") unless @sudo_available
+      @sudo_available
+    end
+
+    def process_sudo(command)
+      if sudo_available?
+        replacement = 'sudo -p \'knife sudo password: \''
       else
-        Chef::Log.debug("`sudo` not available on #{host}")
-        @sudo = ""
+        replacement = ''
       end
+      command.sub(/^\s*sudo/, replacement)
     end
 
     def stream_command(command)
@@ -140,11 +146,14 @@ module KnifeSolo
     end
 
     def run_command(command, options={})
+      defaults = {:process_sudo => true}
+      options = defaults.merge(options)
+
       detect_authentication_method
 
       Chef::Log.debug("Running command #{command}")
       result = ExecResult.new
-      command = command.sub(/^\s*sudo/, 'sudo -p \'knife sudo password: \'')
+      command = process_sudo(command) if options[:process_sudo]
       Net::SSH.start(host, user, connection_options) do |ssh|
         ssh.open_channel do |channel|
           channel.request_pty

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-08 00:00:00.000000000 Z
+date: 2011-12-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70322401955880 !ruby/object:Gem::Requirement
+  requirement: &70125916232020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322401955880
+  version_requirements: *70125916232020
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70322401955420 !ruby/object:Gem::Requirement
+  requirement: &70125916231600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322401955420
+  version_requirements: *70125916231600
 - !ruby/object:Gem::Dependency
   name: virtualbox
-  requirement: &70322401954980 !ruby/object:Gem::Requirement
+  requirement: &70125916231180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322401954980
+  version_requirements: *70125916231180
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70322401978760 !ruby/object:Gem::Requirement
+  requirement: &70125916230640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70322401978760
+  version_requirements: *70125916230640
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70322401978200 !ruby/object:Gem::Requirement
+  requirement: &70125916230080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 2.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70322401978200
+  version_requirements: *70125916230080
 description: Handles bootstrapping, running chef solo, rsyncing cookbooks etc
 email: mat@schaffer.me
 executables: []
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: nowarning
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A collection of knife plugins for dealing with chef solo