knife-solo 0.0.11 → 0.0.12

data/lib/chef/knife/prepare.rb

@@ -2,6 +2,7 @@ require 'chef/knife'
 require 'knife-solo/ssh_command'
 require 'knife-solo/kitchen_command'
 require 'knife-solo/bootstraps'
+require 'knife-solo/knife_solo_error'
 
 class Chef
   class Knife
@@ -11,6 +12,10 @@ class Chef
       include KnifeSolo::SshCommand
       include KnifeSolo::KitchenCommand
 
+      class WrongPrepareError < KnifeSolo::KnifeSoloError
+        alias :message :to_s
+      end
+      
       banner "knife prepare [user@]hostname (options)"
 
       option :omnibus_version,
@@ -18,6 +23,7 @@ class Chef
         :description => "The version of Omnibus to install"
 
       def run
+        validate_params!
         super
         bootstrap.bootstrap!
         generate_node_config
@@ -38,6 +44,12 @@ class Chef
       def operating_system
         @operating_system ||= run_command('uname -s').stdout.strip
       end
+
+      def validate_params!
+        unless @name_args.first =~ /\A.+\@.+\z/
+          raise WrongPrepareError.new "need to pass a [user@]hostname as the first argument"
+        end
+      end
     end
   end
 end

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

@@ -14,7 +14,7 @@ module KnifeSolo::Bootstraps
     end
 
     def http_client_get_url(url)
-      "wget #{url}"
+      "curl -LO #{url}"
     end
 
     def zypper_gem_install
@@ -91,6 +91,10 @@ module KnifeSolo::Bootstraps
         {:type => "omnibus", :version => "RHEL5"}
       when %r{Red Hat Enterprise.*? 6}
         {:type => "omnibus", :version => "RHEL6"}
+      when %r{Fedora release.*? 15}
+        {:type => "omnibus", :version => "FC15"}
+      when %r{Fedora release.*? 16}
+        {:type => "omnibus", :version => "FC16"}
       when %r{Scientific Linux.*? 5}
         {:type => "omnibus", :version => "RHEL5"}
       when %r{Scientific Linux.*? 6}

data/lib/knife-solo/info.rb

@@ -1,5 +1,5 @@
 module KnifeSolo
   def self.version
-    '0.0.11'
+    '0.0.12'
   end
 end

data/lib/knife-solo/kitchen_command.rb

@@ -1,6 +1,8 @@
+require 'knife-solo/knife_solo_error'
+
 module KnifeSolo
   module KitchenCommand
-    class OutOfKitchenError < StandardError
+    class OutOfKitchenError < KnifeSoloError
       def message
         "This command must be run inside a Chef solo kitchen."
       end
@@ -23,7 +25,11 @@ module KnifeSolo
     end
 
     def required_files_present?
-      KitchenCommand.all_requirements.inject(true) { |m, f| m && File.exists?(f) }
+      KitchenCommand.all_requirements.inject(true) do |m, f|
+        check = File.exists?(f)
+        Chef::Log.warn "#{f} is a required file/directory" unless check
+        m && check
+      end
     end
   end
 end

data/lib/knife-solo/knife_solo_error.rb

@@ -0,0 +1,3 @@
+module KnifeSolo
+  class KnifeSoloError < StandardError; end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -114,6 +114,7 @@ files:
 - lib/knife-solo/bootstraps.rb
 - lib/knife-solo/info.rb
 - lib/knife-solo/kitchen_command.rb
+- lib/knife-solo/knife_solo_error.rb
 - lib/knife-solo/ssh_command.rb
 - lib/knife-solo/tools.rb
 - lib/knife-solo.rb
@@ -131,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4055185627370622040
+      hash: -4402118030036500865
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -140,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4055185627370622040
+      hash: -4402118030036500865
 requirements: []
 rubyforge_project: nowarning
 rubygems_version: 1.8.24