knife-solo 0.0.7 → 0.0.8

data/lib/chef/knife/cook.rb

@@ -16,11 +16,16 @@ class Chef
 
       banner "knife cook [user@]hostname [json] (options)"
 
+      option :skip_chef_check,
+        :long => '--skip-chef-check',
+        :boolean => true,
+        :description => "Skip the version check on the Chef gem"
+
       def run
         super
         check_syntax
         Chef::Config.from_file('solo.rb')
-        check_chef_version
+        check_chef_version unless config[:skip_chef_check]
         rsync_kitchen
         add_patches
         cook

data/lib/chef/knife/kitchen.rb

@@ -10,11 +10,10 @@ class Chef
       def run
         name = @name_args.first
         mkdir name
-        mkdir name + "/nodes"
-        mkdir name + "/roles"
-        mkdir name + "/data_bags"
-        mkdir name + "/site-cookbooks"
-        mkdir name + "/cookbooks"
+        %w(nodes roles data_bags site-cookbooks cookbooks).each do |dir|
+          mkdir name + "/#{dir}"
+          touch name + "/#{dir}/.gitkeep"
+        end
         File.open(name + "/solo.rb", 'w') do |f|
           f << <<-RUBY.gsub(/^ {12}/, '')
             file_cache_path "/tmp/chef-solo"

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

@@ -28,23 +28,29 @@ module KnifeSolo::Bootstraps
       run_command("sudo USE='-test' ACCEPT_KEYWORDS='~amd64' emerge -u chef")
     end
 
-    def add_yum_repos
+    def add_yum_repos(repo_path)
       repo_url = "http://rbel.co/"
-      if distro[:version] == "RHEL5"
-        repo_path = "/rbel5"
-      else
-        repo_path = "/rbel6"
-      end
+
+      tmp_file = "/tmp/rbel"
       installed = "is already installed"
-      result = run_command("sudo rpm -Uvh #{repo_url}#{repo_path}")
+      run_command("sudo yum -y install curl")
+      run_command("curl #{repo_url}#{repo_path} -o #{tmp_file}")
+      result = run_command("sudo rpm -Uvh #{tmp_file} && rm #{tmp_file}")
       raise result.stderr_or_stdout unless result.success? || result.stdout.match(installed)
     end
 
     def yum_install
       ui.msg("Installing required packages...")
-      add_yum_repos
+
+      if distro[:version] == "RHEL5"
+        repo_path = "rbel5"
+      else
+        repo_path = "rbel6"
+      end
+
+      add_yum_repos(repo_path)
       @packages = %w(rubygem-chef rsync)
-      run_command("sudo yum -y install #{package_list}")
+      run_command("sudo yum -y --disablerepo=* --enablerepo=#{repo_path} 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.7'
+    '0.0.8'
   end
 end

data/lib/knife-solo/kitchen_command.rb

@@ -6,8 +6,16 @@ module KnifeSolo
       end
     end
 
-    def required_files
-      %w(nodes roles cookbooks data_bags solo.rb)
+    def self.required_directories
+      %w(nodes roles cookbooks data_bags site-cookbooks)
+    end
+
+    def self.required_files
+      %w(solo.rb)
+    end
+
+    def self.all_requirements
+      required_files + required_directories
     end
 
     def run
@@ -15,7 +23,7 @@ module KnifeSolo
     end
 
     def required_files_present?
-      required_files.inject(true) { |m, f| m && File.exists?(f) }
+      KitchenCommand.all_requirements.inject(true) { |m, f| m && File.exists?(f) }
     end
   end
 end

data/lib/knife-solo/ssh_command.rb

@@ -27,6 +27,11 @@ module KnifeSolo
           :short => "-p FILE",
           :long => "--ssh-port FILE",
           :description => "The ssh port"
+
+        option :startup_script,
+          :short => "-s FILE",
+          :long => "--startup-script FILE",
+          :description => "The startup script on the remote server containing variable definitions"
       end
     end
 
@@ -105,6 +110,10 @@ module KnifeSolo
       [host_arg, config_arg, ident_arg, port_arg].compact.join(' ')
     end
 
+    def startup_script
+      config[:startup_script]
+    end
+
     class ExecResult
       attr_accessor :stdout, :stderr, :exit_code
 
@@ -141,19 +150,32 @@ module KnifeSolo
       command.sub(/^\s*sudo/, replacement)
     end
 
+    def process_startup_file(command)
+      command.insert(0, "source #{startup_script} && ")
+    end
+
     def stream_command(command)
       run_command(command, :streaming => true)
     end
 
+    def processed_command(command, options = {})
+      command = process_sudo(command) if options[:process_sudo]
+      command = process_startup_file(command) if startup_script
+      command
+    end
+
     def run_command(command, options={})
       defaults = {:process_sudo => true}
       options = defaults.merge(options)
 
       detect_authentication_method
 
-      Chef::Log.debug("Running command #{command}")
+      Chef::Log.debug("Initial command #{command}")
       result = ExecResult.new
-      command = process_sudo(command) if options[:process_sudo]
+
+      command = processed_command(command, options)
+      Chef::Log.debug("Running processed command #{command}")
+
       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.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-09 00:00:00.000000000Z
+date: 2012-02-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70125916232020 !ruby/object:Gem::Requirement
+  requirement: &70146380288440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70125916232020
+  version_requirements: *70146380288440
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70125916231600 !ruby/object:Gem::Requirement
+  requirement: &70146380288020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70125916231600
+  version_requirements: *70146380288020
 - !ruby/object:Gem::Dependency
   name: virtualbox
-  requirement: &70125916231180 !ruby/object:Gem::Requirement
+  requirement: &70146380287600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70125916231180
+  version_requirements: *70146380287600
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70125916230640 !ruby/object:Gem::Requirement
+  requirement: &70146380287100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70125916230640
+  version_requirements: *70146380287100
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70125916230080 !ruby/object:Gem::Requirement
+  requirement: &70146380286600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 2.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70125916230080
+  version_requirements: *70146380286600
 description: Handles bootstrapping, running chef solo, rsyncing cookbooks etc
 email: mat@schaffer.me
 executables: []
@@ -104,8 +104,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: nowarning
-rubygems_version: 1.8.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A collection of knife plugins for dealing with chef solo
 test_files: []
+has_rdoc: