knife-solo 0.0.4 → 0.0.5

data/lib/chef/knife/prepare.rb

@@ -30,12 +30,18 @@ class Chef
         @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_rpm_repos
+      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"
@@ -50,7 +56,7 @@ class Chef
         raise result.stderr unless result.success? || result.stdout.match(installed)
       end
 
-      def rpm_gem_install
+      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}")
@@ -73,7 +79,7 @@ class Chef
 
       def gem_install
         ui.msg "Installing rubygems from source..."
-        release = "rubygems-1.7.2"
+        release = "rubygems-1.8.10"
         file = "#{release}.tgz"
         url = "http://production.cf.rubygems.org/rubygems/#{file}"
         run_command("wget #{url}")
@@ -99,15 +105,17 @@ class Chef
           version = run_command("lsb_release -cs").stdout.strip
           {:type => "debian", :version => version}
         when %r{CentOS}
-          {:type => "rpm", :version => "CentOS"}
+          {:type => "yum", :version => "CentOS"}
         when %r{Red Hat Enterprise Linux}
-          {:type => "rpm", :version => "Red Hat"}
+          {:type => "yum", :version => "Red Hat"}
         when %r{Scientific Linux SL}
-          {:type => "rpm", :version => "Scientific Linux"}
+          {: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 "Contents of /etc/issue not recognized, please fork https://github.com/matschaffer/knife-solo and add support for your distro."
+          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

data/lib/knife-solo/info.rb

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

data/lib/knife-solo/ssh_command.rb

@@ -75,6 +75,7 @@ module KnifeSolo
       options = config_file_options
       options[:port] = config[:ssh_port] if config[:ssh_port]
       options[:password] = config[:ssh_password] if config[:ssh_password]
+      options[:keys] = [config[:ssh_identity]] if config[:ssh_identity]
       options
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-07 00:00:00.000000000Z
+date: 2011-10-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70138524107880 !ruby/object:Gem::Requirement
+  requirement: &70331323547300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70138524107880
+  version_requirements: *70331323547300
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70138524105520 !ruby/object:Gem::Requirement
+  requirement: &70331323543340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70138524105520
+  version_requirements: *70331323543340
 - !ruby/object:Gem::Dependency
   name: virtualbox
-  requirement: &70138524103420 !ruby/object:Gem::Requirement
+  requirement: &70331323532360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70138524103420
+  version_requirements: *70331323532360
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70138524099600 !ruby/object:Gem::Requirement
+  requirement: &70331323530880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70138524099600
+  version_requirements: *70331323530880
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70138524098780 !ruby/object:Gem::Requirement
+  requirement: &70331323528620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 2.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70138524098780
+  version_requirements: *70331323528620
 description: Handles bootstrapping, running chef solo, rsyncing cookbooks etc
 email: mat@schaffer.me
 executables: []