knife-solo 0.0.5 → 0.0.6

data/lib/chef/knife/cook.rb

@@ -14,7 +14,7 @@ class Chef
       include KnifeSolo::SshCommand
       include KnifeSolo::KitchenCommand
 
-      banner "knife prepare [user@]hostname [json] (options)"
+      banner "knife cook [user@]hostname [json] (options)"
 
       def run
         super
@@ -31,7 +31,7 @@ class Chef
 
         logging_arg = "-l debug" if config[:verbosity] > 0
         stream_command <<-BASH
-          sudo chef-solo -c #{chef_path}/solo.rb \
+          #{sudo} chef-solo -c #{chef_path}/solo.rb \
                          -j #{chef_path}/#{node_config} \
                          #{logging_arg}
         BASH

data/lib/chef/knife/prepare.rb

@@ -1,6 +1,7 @@
 require 'chef/knife'
 require 'knife-solo/ssh_command'
 require 'knife-solo/kitchen_command'
+require 'knife-solo/bootstraps'
 
 class Chef
   class Knife
@@ -14,10 +15,14 @@ class Chef
 
       def run
         super
-        send("#{distro[:type]}_gem_install")
+        bootstrap.bootstrap!
         generate_node_config
       end
 
+      def bootstrap
+        KnifeSolo::Bootstraps.class_for_operating_system(operating_system()).new(self)
+      end
+
       def generate_node_config
         File.open(node_config, 'w') do |f|
           f.print <<-JSON.gsub(/^\s+/, '')
@@ -26,98 +31,14 @@ class Chef
         end unless node_config.exist?
       end
 
-      def package_list
-        @packages.join(' ')
-      end
-
-      def zypper_gem_install
-        ui.msg("Installing required packages...")
-        run_command("sudo zypper --non-interactive install ruby-devel make gcc rsync")
-        gem_install
-      end
-
-      def emerge_gem_install
-        ui.msg("Installing required packages...")
-        run_command("sudo USE='-test' ACCEPT_KEYWORDS='~amd64' emerge -u chef")
-      end
-
-      def add_yum_repos
-        ui.message("Adding EPEL and ELFF...")
-        repo_url = "http://download.fedora.redhat.com"
-        repo_path = "/pub/epel/5/i386/epel-release-5-4.noarch.rpm"
-        result = run_command("sudo rpm -Uvh #{repo_url}#{repo_path}")
-        installed = "package epel-release-5-4.noarch is already installed"
-        raise result.stderr unless result.success? || result.stdout.match(installed)
-
-        repo_url = "http://download.elff.bravenet.com"
-        repo_path = "/5/i386/elff-release-5-3.noarch.rpm"
-        result = run_command("sudo rpm -Uvh #{repo_url}#{repo_path}")
-        installed = "package elff-release-5-3.noarch is already installed"
-        raise result.stderr unless result.success? || result.stdout.match(installed)
-      end
-
-      def yum_gem_install
-        ui.msg("Installing required packages...")
-        @packages = %w(ruby ruby-shadow gcc gcc-c++ ruby-devel wget rsync)
-        run_command("sudo yum -y install #{package_list}")
-        gem_install
-      end
-
-      def debian_gem_install
-        ui.msg "Updating apt caches..."
-        run_command("sudo apt-get update")
-
-        ui.msg "Installing required packages..."
-        @packages = %w(ruby ruby-dev libopenssl-ruby irb
-                       build-essential wget ssl-cert rsync)
-        run_command <<-BASH
-          sudo DEBIAN_FRONTEND=noninteractive apt-get --yes install #{package_list}
-        BASH
-
-        gem_install
-      end
-
-      def gem_install
-        ui.msg "Installing rubygems from source..."
-        release = "rubygems-1.8.10"
-        file = "#{release}.tgz"
-        url = "http://production.cf.rubygems.org/rubygems/#{file}"
-        run_command("wget #{url}")
-        run_command("tar zxf #{file}")
-        run_command("cd #{release} && sudo ruby setup.rb --no-format-executable")
-        run_command("sudo rm -rf #{release} #{file}")
-        run_command("sudo gem install --no-rdoc --no-ri chef")
+      def operating_system
+        @operating_system ||= begin
+                                run_command('uname -s').stdout.strip
+                              rescue
+                                ""
+                              end
       end
 
-      def issue
-        run_command("cat /etc/issue").stdout
-      end
-
-      def distro
-        @distro ||= case issue
-        when %r{Debian GNU/Linux 5}
-          {:type => "debian", :version => "lenny"}
-        when %r{Debian GNU/Linux 6}
-          {:type => "debian", :version => "squeeze"}
-        when %r{Debian GNU/Linux wheezy}
-          {:type => "debian", :version => "wheezy"}
-        when %r{Ubuntu}
-          version = run_command("lsb_release -cs").stdout.strip
-          {:type => "debian", :version => version}
-        when %r{CentOS}
-          {:type => "yum", :version => "CentOS"}
-        when %r{Red Hat Enterprise Linux}
-          {:type => "yum", :version => "Red Hat"}
-        when %r{Scientific Linux SL}
-          {:type => "yum", :version => "Scientific Linux"}
-        when %r{openSUSE 11.4}
-          {:type => "zypper", :version => "openSUSE"}
-        when %r{This is \\n\.\\O (\\s \\m \\r) \\t}
-          {:type => "gentoo", :version => "Gentoo"}
-        else
-          raise "Distro not recognized from looking at /etc/issue. Please fork https://github.com/matschaffer/knife-solo and add support for your distro."
-        end
-      end
     end
   end
 end

data/lib/knife-solo/bootstraps.rb

@@ -0,0 +1,90 @@
+class OperatingSystemNotSupportedError < StandardError ; end
+
+module KnifeSolo
+  module Bootstraps
+    class OperatingSystemNotImplementedError < StandardError 
+    end
+
+    def self.class_exists_for?(os_name)
+      begin
+        true if self.class_for_operating_system(os_name).class == Class
+      rescue => exception
+        false
+      end
+    end
+
+    def self.class_for_operating_system(os_name)
+      begin
+        os_class_name = os_name.gsub(/\s/,'')
+        eval("KnifeSolo::Bootstraps::#{os_class_name}")
+      rescue
+        raise OperatingSystemNotImplementedError.new("#{os_name} not implemented.  Feel free to add a bootstrap implementation in KnifeSolo::Bootstraps::#{os_class_name}")
+      end
+    end
+
+    module Delegates
+      def run_command(cmd)
+        prepare.run_command(cmd)
+      end
+
+      def ui
+        prepare.ui
+      end
+
+      def prepare
+        @prepare
+      end
+    end #Delegates
+
+    module InstallCommands
+
+      def bootstrap!
+        run_pre_bootstrap_checks()
+        send("#{distro[:type]}_install")
+      end
+
+      def distro
+        raise "implement distro detection for #{self.class.name}"
+      end
+
+      def gem_packages
+        raise "implement gem packages for #{self.class.name}"
+      end
+
+      def http_client_get_url(url)
+        "wget #{url}"
+      end
+
+      def gem_install
+        ui.msg "Installing rubygems from source..."
+        release = "rubygems-1.8.10"
+        file = "#{release}.tgz"
+        url = "http://production.cf.rubygems.org/rubygems/#{file}"
+        run_command(http_client_get_url(url))
+        run_command("tar zxf #{file}")
+        run_command("cd #{release} && sudo ruby setup.rb --no-format-executable")
+        run_command("sudo rm -rf #{release} #{file}")
+        run_command("sudo gem install --no-rdoc --no-ri #{gem_packages().join(' ')}")
+      end
+    end #InstallCommands
+
+    class Base
+      include KnifeSolo::Bootstraps::Delegates
+      include KnifeSolo::Bootstraps::InstallCommands
+
+      def initialize(prepare)
+        # instance of Chef::Knife::Prepare
+        @prepare = prepare
+      end
+
+      def run_pre_bootstrap_checks ; end
+      # run right before we run #{distro[:type]}_install method
+      # barf out here if need be
+    end
+    
+  end # Bootstraps
+end
+
+
+# bootstrap classes for different OSes
+Dir[File.dirname(__FILE__) + '/bootstraps/*.rb'].each {|p| require p}

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

@@ -0,0 +1,38 @@
+module KnifeSolo::Bootstraps
+  class Darwin < Base
+
+    def issue
+      run_command("sw_vers -productVersion").stdout.strip
+    end
+
+    def gem_packages
+      ['chef']
+    end
+    
+    def distro
+      case issue
+      when %r{10.5}
+          {:type => 'gem', :version => 'leopard'}
+      when %r{10.6}
+          {:type => 'gem', :version => 'snow_leopard'}
+      else
+          raise "OSX version #{issue} not supported"
+      end
+    end
+
+    def has_xcode_installed?
+      result = run_command("xcodebuild -version")
+      result.success?
+    end
+
+    def http_client_get_url(url)
+      filename = url.split("/").last
+      "curl '#{url}' >> #{filename}"
+    end
+
+    def run_pre_bootstrap_checks
+      raise 'xcode not installed, which is required to do anything.  please install and run again.' unless has_xcode_installed?
+    end
+
+  end
+end

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

@@ -0,0 +1,102 @@
+module KnifeSolo::Bootstraps
+  class Linux < Base
+
+    def issue
+      prepare.run_command("cat /etc/issue").stdout.strip
+    end
+
+    def package_list
+      @packages.join(' ')
+    end
+
+    def gem_packages
+      ['ruby-shadow','chef']
+    end
+
+    def http_client_get_url(url)
+      "wget #{url}"
+    end
+
+    def zypper_gem_install
+      ui.msg("Installing required packages...")
+      run_command("sudo zypper --non-interactive install ruby-devel make gcc rsync")
+      gem_install
+    end
+
+    def emerge_gem_install
+      ui.msg("Installing required packages...")
+      run_command("sudo USE='-test' ACCEPT_KEYWORDS='~amd64' emerge -u chef")
+    end
+
+    def add_yum_repos
+      repo_url = "http://rbel.co/"
+      if distro[:version] == "RHEL5"
+        repo_path = "/rbel5"
+      else
+        repo_path = "/rbel6"
+      end
+      installed = "is already installed"
+      result = run_command("#{sudo} rpm -Uvh #{repo_url}#{repo_path}")
+      raise result.stderr_or_stdout unless result.success? || result.stdout.match(installed)
+    end
+
+    def yum_install
+      ui.msg("Installing required packages...")
+      add_yum_repos
+      @packages = %w(rubygem-chef rsync)
+      run_command("#{sudo} yum -y install #{package_list}")
+    end
+
+    def debian_gem_install
+      ui.msg "Updating apt caches..."
+      run_command("sudo apt-get update")
+
+      ui.msg "Installing required packages..."
+      @packages = %w(ruby ruby-dev libopenssl-ruby irb
+                     build-essential wget ssl-cert rsync)
+      run_command <<-BASH
+        sudo DEBIAN_FRONTEND=noninteractive apt-get --yes install #{package_list}
+      BASH
+
+      gem_install
+    end
+
+    def distro
+      return @distro if @distro
+      @distro = case issue
+      when %r{Debian GNU/Linux 5}
+        {:type => "debian_gem", :version => "lenny"}
+      when %r{Debian GNU/Linux 6}
+        {:type => "debian_gem", :version => "squeeze"}
+      when %r{Debian GNU/Linux wheezy}
+        {:type => "debian_gem", :version => "wheezy"}
+      when %r{Ubuntu}
+        version = run_command("lsb_release -cs").stdout.strip
+        {:type => "debian_gem", :version => version}
+      when %r{CentOS.*? 5}
+        {:type => "yum", :version => "RHEL5"}
+      when %r{CentOS.*? 6}
+        {:type => "yum", :version => "RHEL6"}
+      when %r{Red Hat Enterprise.*? 5}
+        {:type => "yum", :version => "RHEL5"}
+      when %r{Red Hat Enterprise.*? 6}
+        {:type => "yum", :version => "RHEL6"}
+      when %r{Scientific Linux.*? 5}
+        {:type => "yum", :version => "RHEL5"}
+      when %r{Scientific Linux.*? 6}
+        {:type => "yum", :version => "RHEL6"}
+      when %r{SUSE Linux Enterprise Server 11 SP1}
+        {:type => "zypper_gem", :version => "SLES11"}
+      when %r{openSUSE 11.4}
+        {:type => "zypper_gem", :version => "openSUSE"}
+      when %r{This is \\n\.\\O (\\s \\m \\r) \\t}
+        {:type => "gentoo_gem", :version => "Gentoo"}
+      else
+        raise "Distro not recognized from looking at /etc/issue. Please fork https://github.com/matschaffer/knife-solo and add support for your distro."
+      end
+      Chef::Log.debug("Distro detection yielded: #{@distro}")
+      @distro
+    end #issue
+
+  end
+end

data/lib/knife-solo/info.rb

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

data/lib/knife-solo/kitchen_command.rb

@@ -11,8 +11,11 @@ module KnifeSolo
     end
 
     def run
-      all_present  = required_files.inject(true) { |m, f| m && File.exists?(f) }
-      raise OutOfKitchenError.new unless all_present
+      raise OutOfKitchenError.new unless required_files_present?
+    end
+
+    def required_files_present?
+      required_files.inject(true) { |m, f| m && File.exists?(f) }
     end
   end
 end

data/lib/knife-solo/ssh_command.rb

@@ -116,6 +116,23 @@ module KnifeSolo
       def success?
         exit_code == 0
       end
+
+      # Helper to use when raising exceptions since some operations
+      # (e.g., command not found) error on stdout
+      def stderr_or_stdout
+        return stderr unless stderr.empty?
+        stdout
+      end
+    end
+
+    def sudo
+      return @sudo if @sudo
+      if run_command("sudo -V").success?
+        @sudo = "sudo"
+      else
+        Chef::Log.debug("`sudo` not available on #{host}")
+        @sudo = ""
+      end
     end
 
     def stream_command(command)
@@ -125,6 +142,7 @@ module KnifeSolo
     def run_command(command, options={})
       detect_authentication_method
 
+      Chef::Log.debug("Running command #{command}")
       result = ExecResult.new
       command = command.sub(/^\s*sudo/, 'sudo -p \'knife sudo password: \'')
       Net::SSH.start(host, user, connection_options) do |ssh|
@@ -137,6 +155,7 @@ module KnifeSolo
               if data =~ /^knife sudo password: /
                 ch.send_data("#{password}\n")
               else
+                Chef::Log.debug("#{command} stdout: #{data}")
                 ui.stdout << data if options[:streaming]
                 result.stdout << data
               end
@@ -144,6 +163,7 @@ module KnifeSolo
 
             channel.on_extended_data do |ch, type, data|
               next unless type == 1
+              Chef::Log.debug("#{command} stderr: #{data}")
               ui.stderr << data if options[:streaming]
               result.stderr << data
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-31 00:00:00.000000000Z
+date: 2011-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70331323547300 !ruby/object:Gem::Requirement
+  requirement: &70322401955880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331323547300
+  version_requirements: *70322401955880
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70331323543340 !ruby/object:Gem::Requirement
+  requirement: &70322401955420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331323543340
+  version_requirements: *70322401955420
 - !ruby/object:Gem::Dependency
   name: virtualbox
-  requirement: &70331323532360 !ruby/object:Gem::Requirement
+  requirement: &70322401954980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331323532360
+  version_requirements: *70322401954980
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70331323530880 !ruby/object:Gem::Requirement
+  requirement: &70322401978760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70331323530880
+  version_requirements: *70322401978760
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70331323528620 !ruby/object:Gem::Requirement
+  requirement: &70322401978200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 2.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70331323528620
+  version_requirements: *70322401978200
 description: Handles bootstrapping, running chef solo, rsyncing cookbooks etc
 email: mat@schaffer.me
 executables: []
@@ -77,6 +77,9 @@ files:
 - lib/chef/knife/patches/parser.rb
 - lib/chef/knife/patches/search_patch.rb
 - lib/chef/knife/prepare.rb
+- lib/knife-solo/bootstraps/darwin.rb
+- lib/knife-solo/bootstraps/linux.rb
+- lib/knife-solo/bootstraps.rb
 - lib/knife-solo/info.rb
 - lib/knife-solo/kitchen_command.rb
 - lib/knife-solo/ssh_command.rb
@@ -101,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: nowarning
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A collection of knife plugins for dealing with chef solo