capchef 0.0.3 → 0.0.4

data/README.md

@@ -35,6 +35,9 @@ Your Capfile might look something like the following:
     require 'capchef/chef_recipes'
     require 'capchef/utility_recipes'
 
+    # Uncomment the following if running scripts under sudo isn't allowed
+    #Capchef.use_sudo = false
+
     role :node, *Capchef.all_nodes
 
     # Define the path to the chef-solo executable if it's not in /usr/bin or /usr/local/bin

data/lib/capchef/chef_recipes.rb

@@ -60,7 +60,7 @@ Capistrano::Configuration.instance.load do
             Find.find('roles') do |role_file|
               # TODO: This does not work (how do I specify a role in JSON?
               if role_file.match(/\.yml$/)
-                data = YAML.load(ERB.new(File.read(role_file)).result(binding)).to_json
+                data = YAML.load(ERB.new(File.read(role_file), nil, '-').result(binding)).to_json
                 new_role_file = role_file.sub(/\.yml$/, '.json')
                 tar.add_file_simple(new_role_file, :size=>data.size, :mode=>0644, :mtime=>File.mtime(role_file)) { |f| f.write(data) }
               else
@@ -71,7 +71,14 @@ Capistrano::Configuration.instance.load do
           gzip.close
           put sio_roles_tgz.string, remote_roles_tgz, :hosts => valid_hosts
         end
-        Capchef.surun(self, "mkdir -p /etc/chef; cd /etc/chef; rm -rf cookbooks roles; tar zxf #{remote_cookbooks_tgz}; tar zxf #{remote_roles_tgz}; chef-solo -c #{remote_solo_file} -j #{remote_node_file}", :hosts => valid_hosts)
+        Capchef.surun(self, [
+            'mkdir -p /etc/chef',
+            'cd /etc/chef',
+            'rm -rf cookbooks roles',
+            "tar zxf #{remote_cookbooks_tgz}",
+            "tar zxf #{remote_roles_tgz}",
+            "chef-solo -c #{remote_solo_file} -j #{remote_node_file}"
+        ], :hosts => valid_hosts)
       ensure
         tmp_cookbooks_tgz.unlink
         run "rm -rf #{remote_tmpdir}"

data/lib/capchef.rb

@@ -27,36 +27,51 @@ module Capchef
     @path = "#{dir}:#{path}"
   end
 
-  # Runs +command+ as root invoking the command with su -c
-  # and handling the root password prompt.
+  def use_sudo=(val)
+    @use_sudo = val
+  end
+  
+  def use_sudo?
+    return true  if ENV['CAPCHEF_SUDO'] == 'true'
+    return false if ENV['CAPCHEF_SUDO'] == 'false'
+    # Default to true if unset
+    @use_sudo = true if @use_sudo.nil?
+    return @use_sudo
+  end
+
+  # Runs +command+ as root invoking the command with 'su -c' and handling the root password prompt.
   #
-  #   surun "/etc/init.d/apache reload"
+  #   surun cap, "/etc/init.d/apache reload"
   #   # Executes
   #   # su - -c '/etc/init.d/apache reload'
   #
-  def surun(cap, command, options={})
-    @root_password ||= cap.fetch(:root_password, Capistrano::CLI.password_prompt("root password: "))
-    cap.run("su -c 'cd; PATH=#{path}; #{command}'", options) do |channel, stream, output|
-      puts "[#{channel[:host]}] #{output}" if output
-      channel.send_data("#{@root_password}\n") if output && output =~ /^Password:/
-      yield channel, stream, output if block_given?
+  #   surun cap, 'my_install' do |channel, stream, output|
+  #     channel.send_data("\n") if output && output =~ /to continue/
+  #     channel.send_data("y\n") if output && output =~ /replace/
+  #   end
+  def surun(cap, command, options={}, &block)
+    if use_sudo?
+      if command.kind_of?(Array)
+        my_surun_script(cap, 'surun', command, nil, options, &block)
+      else
+        sucmd = "#{cap.sudo} PATH=#{path} #{command}"
+        cap.run(sucmd, options)
+      end
+    else
+      @root_password ||= cap.fetch(:root_password, Capistrano::CLI.password_prompt("root password: "))
+      command = command.join(';') if command.kind_of?(Array)
+      sucmd = "su -c 'cd; PATH=#{path}; #{command}'"
+      cap.run(sucmd, options) do |channel, stream, output|
+        puts "[#{channel[:host]}] #{output}" if output
+        channel.send_data("#{@root_password}\n") if !use_sudo? && output && output =~ /^Password:/
+        yield channel, stream, output if block_given?
+      end
     end
   end
 
-  def surun_script(cap, script, options={})
+  def surun_script(cap, script, args=nil, options={}, &block)
     raise "No such file: #{script}" unless File.exist?(script)
-    basename = File.basename(script)
-    script_dir = "#{tmpdir}/#{basename}.#$$"
-    remote_script = "#{script_dir}/#{basename}"
-    cap.run "mkdir #{script_dir}", options
-    cap.upload script, remote_script, options
-    cap.run "chmod 0755 #{remote_script}", options
-    if block_given?
-      yield remote_script
-    else
-      surun cap, remote_script, options
-    end
-    cap.run "rm -rf #{script_dir}", options
+    my_surun_script(cap, script, nil, args, options, &block)
   end
 
   def nodes_config
@@ -67,7 +82,7 @@ module Capchef
       nodes_file = ENV['NODES_FILE'] || 'nodes.yml'
       raise "No file #{nodes_file}" unless File.exist?(nodes_file)
       @config_pass += 1
-      config = YAML.load(ERB.new(File.read(nodes_file)).result(binding))
+      config = YAML.load(ERB.new(File.read(nodes_file), nil, '-').result(binding))
       @config_pass -= 1
       config
     end
@@ -77,4 +92,26 @@ module Capchef
     return [] if @config_pass && @config_pass > 1
     return nodes_config.keys
   end
+
+  private
+
+  # Hack way to allow either a script or a list of commands
+  def my_surun_script(cap, script, command_array, args, options, &block)
+    basename = File.basename(script)
+    script_dir = "#{tmpdir}/#{basename}.#$$"
+    remote_script = "#{script_dir}/#{basename}"
+    cap.run "mkdir #{script_dir}", options
+    if command_array
+      commands = command_array.join("\n")
+      script_text = "#!/bin/sh\n#{commands}\n"
+      cap.put script_text, remote_script, options
+    else
+      cap.upload script, remote_script, options
+    end
+    cap.run "chmod 0755 #{remote_script}", options
+    cmd = remote_script
+    cmd += ' ' + args if args
+    surun cap, cmd, options, &block
+    cap.run "rm -rf #{script_dir}", options
+  end
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: capchef
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 0
-    - 0
-    - 3
-  version: 0.0.3
+  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors: 
   - Brad Pardee
@@ -14,18 +10,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-08 00:00:00 -04:00
+date: 2011-09-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: capistrano
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
             version: "0"
     type: :runtime
     version_requirements: *id001
@@ -33,11 +28,10 @@ dependencies:
     name: json
     prerelease: false
     requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
             version: "0"
     type: :runtime
     version_requirements: *id002
@@ -45,11 +39,10 @@ dependencies:
     name: minitar
     prerelease: false
     requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
             version: "0"
     type: :runtime
     version_requirements: *id003
@@ -79,23 +72,21 @@ rdoc_options: []
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Chef capistrano recipes