chef 0.10.0.beta.2 → 0.10.0.beta.3

data/lib/chef/knife/data_bag_edit.rb

@@ -84,7 +84,7 @@ class Chef
         output = edit_item(item)
         rest.put_rest("data/#{@name_args[0]}/#{@name_args[1]}", output)
         stdout.puts("Saved data_bag_item[#{@name_args[1]}]")
-        output(format_for_display(object)) if config[:print_after]
+        output(format_for_display(object.raw_data)) if config[:print_after]
       end
     end
   end

data/lib/chef/knife/data_bag_show.rb

@@ -58,21 +58,21 @@ class Chef
 
       def run
         display = case @name_args.length
-                  when 2
-                    if use_encryption
-                      raw = Chef::EncryptedDataBagItem.load(@name_args[0],
-                                                            @name_args[1],
-                                                            read_secret)
-                      format_for_display(raw.to_hash)
-                    else
-                      format_for_display(Chef::DataBagItem.load(@name_args[0], @name_args[1]))
-                    end
-                  when 1
-                    format_list_for_display(Chef::DataBag.load(@name_args[0]))
-                  else
-                    stdout.puts opt_parser
-                    exit(1)
-                  end
+        when 2
+          if use_encryption
+            raw = Chef::EncryptedDataBagItem.load(@name_args[0],
+                                                  @name_args[1],
+                                                  read_secret)
+            format_for_display(raw.to_hash)
+          else
+            format_for_display(Chef::DataBagItem.load(@name_args[0], @name_args[1]).raw_data)
+          end
+        when 1
+          format_list_for_display(Chef::DataBag.load(@name_args[0]))
+        else
+          stdout.puts opt_parser
+          exit(1)
+        end
         output(display)
       end
     end

data/lib/chef/knife/ui.rb

@@ -114,9 +114,7 @@ class Chef
         config[:with_uri] ? list : list.keys.sort { |a,b| a <=> b }
       end
 
-      def format_for_display(item)
-        data = item.kind_of?(Chef::DataBagItem) ? item.raw_data : item
-
+      def format_for_display(data)
         if config[:attribute]
           config[:attribute].split(".").each do |attr|
             if data.respond_to?(:[])
@@ -127,12 +125,12 @@ class Chef
               data = data.send(attr.to_sym)
             end
           end
-          { config[:attribute] => data.kind_of?(Chef::Node::Attribute) ? data.to_hash : data }
+          { config[:attribute] => data.respond_to?(:to_hash) ? data.to_hash : data }
         elsif config[:run_list]
           data = data.run_list.run_list
           { "run_list" => data }
         elsif config[:environment]
-          if data.class == Chef::Node
+          if data.respond_to?(:chef_environment)
             {"chef_environment" => data.chef_environment}
           else
             # this is a place holder for now. Feel free to modify (i.e. add other cases). [nuo]

data/lib/chef/mixin/command.rb

@@ -118,6 +118,7 @@ class Chef
         args[:ignore_failure] ||= false
         args[:output_on_failure] ||= false
 
+        # TODO: This is the wrong place for this responsibility.
         if args.has_key?(:creates)
           if File.exists?(args[:creates])
             Chef::Log.debug("Skipping #{args[:command]} - creates #{args[:creates]} exists.")

data/lib/chef/mixin/command/windows.rb

@@ -18,7 +18,11 @@
 # limitations under the License.
 #
 
-require 'win32/open3'
+if RUBY_VERSION =~ /^1\.8/
+  require 'win32/open3'
+else
+  require 'open3'
+end
 
 class Chef
   module Mixin

data/lib/chef/mixin/shell_out.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,16 +20,18 @@ require 'chef/shell_out'
 class Chef
   module Mixin
     module ShellOut
-      
+
       def shell_out(*command_args)
         cmd = Chef::ShellOut.new(*command_args)
+        if STDOUT.tty? && !Chef::Config[:daemon] && Chef::Log.info?
+          cmd.live_stream ||= STDOUT
+        end
         cmd.run_command
         cmd
       end
-      
+
       def shell_out!(*command_args)
-        cmd = Chef::ShellOut.new(*command_args)
-        cmd.run_command
+        cmd= shell_out(*command_args)
         cmd.error!
         cmd
       end

data/lib/chef/provider/execute.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,43 +16,45 @@
 # limitations under the License.
 #
 
-require 'chef/mixin/command'
+require 'chef/mixin/shell_out'
 require 'chef/log'
 require 'chef/provider'
 
 class Chef
   class Provider
     class Execute < Chef::Provider
-      
-      include Chef::Mixin::Command
-      
+
+      include Chef::Mixin::ShellOut
+
       def load_current_resource
         true
       end
-      
+
       def action_run
-        command_args = {
-          :command => @new_resource.command,
-          :command_string => @new_resource.to_s,
-        }
-        command_args[:creates] = @new_resource.creates if @new_resource.creates
-        command_args[:only_if] = @new_resource.only_if if @new_resource.only_if
-        command_args[:not_if] = @new_resource.not_if if @new_resource.not_if
-        command_args[:timeout] = @new_resource.timeout if @new_resource.timeout
-        command_args[:returns] = @new_resource.returns if @new_resource.returns
-        command_args[:environment] = @new_resource.environment if @new_resource.environment
-        command_args[:user] = @new_resource.user if @new_resource.user
-        command_args[:group] = @new_resource.group if @new_resource.group
-        command_args[:cwd] = @new_resource.cwd if @new_resource.cwd
-        command_args[:umask] = @new_resource.umask if @new_resource.umask
-        
-        status = run_command(command_args)
-        if status
-          @new_resource.updated_by_last_action(true)
-          Chef::Log.info("Ran #{@new_resource} successfully")
+        opts = {}
+
+        if sentinel_file = @new_resource.creates
+          if File.exists?(sentinel_file)
+            Chef::Log.info("Skipping #{self} - sentinel file #{sentinel_file} exists.")
+            return false
+          end
         end
+
+        # original implementation did not specify a timeout, but ShellOut
+        # *always* times out. So, set a very long default timeout
+        opts[:timeout] = @new_resource.timeout || 3600
+        opts[:returns] = @new_resource.returns if @new_resource.returns
+        opts[:environment] = @new_resource.environment if @new_resource.environment
+        opts[:user] = @new_resource.user if @new_resource.user
+        opts[:group] = @new_resource.group if @new_resource.group
+        opts[:cwd] = @new_resource.cwd if @new_resource.cwd
+        opts[:umask] = @new_resource.umask if @new_resource.umask
+
+        result = shell_out!(@new_resource.command, opts)
+        @new_resource.updated_by_last_action(true)
+        Chef::Log.info("Ran #{@new_resource} successfully")
       end
-      
+
     end
   end
 end

data/lib/chef/provider/git.rb

@@ -19,14 +19,14 @@
 
 require 'chef/log'
 require 'chef/provider'
-require 'chef/mixin/command'
+require 'chef/mixin/shell_out'
 require 'fileutils'
 
 class Chef
   class Provider
     class Git < Chef::Provider
 
-      include Chef::Mixin::Command
+      include Chef::Mixin::ShellOut
 
       def load_current_resource
         @current_resource = Chef::Resource::Git.new(@new_resource.name)
@@ -91,12 +91,8 @@ class Chef
 
       def find_current_revision
         if ::File.exist?(::File.join(cwd, ".git"))
-          status, result, error_message = output_of_command("git rev-parse HEAD", run_options(:cwd=>cwd))
-
           # 128 is returned when we're not in a git repo. this is fine
-          unless [0,128].include?(status.exitstatus)
-            handle_command_failures(status, "STDOUT: #{result}\nSTDERR: #{error_message}")
-          end
+          result = shell_out!('git rev-parse HEAD', :cwd => cwd, :returns => [0,128]).stdout.strip
         end
         sha_hash?(result) ? result : nil
       end
@@ -111,21 +107,21 @@ class Chef
         Chef::Log.info "Cloning repo #{@new_resource.repository} to #{@new_resource.destination}"
 
         clone_cmd = "git clone #{args.join(' ')} #{@new_resource.repository} #{@new_resource.destination}"
-        run_command(run_options(:command => clone_cmd))
+        shell_out!(clone_cmd, run_options)
       end
 
       def checkout
         sha_ref = target_revision
         Chef::Log.info "Checking out branch: #{@new_resource.revision} reference: #{sha_ref}"
         # checkout into a local branch rather than a detached HEAD
-        run_command(run_options(:command => "git checkout -b deploy #{sha_ref}", :cwd => @new_resource.destination))
+        shell_out!("git checkout -b deploy #{sha_ref}", run_options(:cwd => @new_resource.destination))
       end
 
       def enable_submodules
         if @new_resource.enable_submodules
           Chef::Log.info "Enabling git submodules"
           command = "git submodule init && git submodule update"
-          run_command(run_options(:command => command, :cwd => @new_resource.destination))
+          shell_out!(command, run_options(:cwd => @new_resource.destination))
         end
       end
 
@@ -135,7 +131,7 @@ class Chef
         # since we're in a local branch already, just reset to specified revision rather than merge
         fetch_command = "git fetch #{@new_resource.remote} && git fetch #{@new_resource.remote} --tags && git reset --hard #{target_revision}"
         Chef::Log.debug "Fetching updates from #{new_resource.remote} and resetting to revison #{target_revision}"
-        run_command(run_options(:command => fetch_command, :cwd => @new_resource.destination))
+        shell_out!(fetch_command, run_options(:cwd => @new_resource.destination))
       end
 
       # Use git-config to setup a remote tracking branches. Could use
@@ -151,7 +147,7 @@ class Chef
                         "at remote #{@new_resource.remote}"
         command << "git config remote.#{@new_resource.remote}.url #{@new_resource.repository}"
         command << "git config remote.#{@new_resource.remote}.fetch +refs/heads/*:refs/remotes/#{@new_resource.remote}/*"
-        run_command(run_options(:command => command.join(" && "), :cwd => @new_resource.destination))
+        shell_out!(command.join(" && "), run_options(:cwd => @new_resource.destination))
       end
 
       def current_revision_matches_target_revision?
@@ -175,17 +171,7 @@ class Chef
 
       def remote_resolve_reference
         command = git('ls-remote', @new_resource.repository, @new_resource.revision)
-        Chef::Log.debug("Executing #{command}")
-        begin
-          status, result, error_message = output_of_command(command, run_options)
-          handle_command_failures(status, "STDOUT: #{result}\nSTDERR: #{error_message}")
-        rescue Chef::Exceptions::Exec => e
-          msg =  "Could not access the remote Git repository. If this is a private repository, "
-          msg << "verify that the deploy key for your application has been added to your remote Git account.\n"
-          msg << e.message
-          raise Chef::Exceptions::Exec, msg
-        end
-        result
+        shell_out!(command, run_options).stdout
       end
 
       private

data/lib/chef/resource/git.rb

@@ -31,6 +31,7 @@ class Chef
       alias :branch :revision
       alias :reference :revision
 
+      alias :repo :repository
     end
   end
 end

data/lib/chef/shell_out.rb

@@ -169,8 +169,7 @@ class Chef
     # * Chef::Exceptions::CommandTimeout  when the command does not complete
     #   within +timeout+ seconds (default: 60s)
     def run_command
-      # Implemented by unix/windows backend module, we just want to define it
-      # here for documentation purposes
+      Chef::Log.info("sh(#{@command})")
       super
     end
 

data/lib/chef/shell_out/unix.rb

@@ -14,7 +14,6 @@ class Chef
       # * Chef::Exceptions::CommandTimeout  when the command does not complete
       #   within +timeout+ seconds (default: 60s)
       def run_command
-        Chef::Log.debug("sh(#{@command})")
         @child_pid = fork_subprocess
 
         configure_parent_process_file_descriptors

data/lib/chef/shell_out/windows.rb

@@ -17,7 +17,11 @@
 #
 
 require 'timeout'
-require 'win32/open3'
+if RUBY_VERSION =~ /^1\.8/
+  require 'win32/open3'
+else
+  require 'open3'
+end
 
 class Chef
   class ShellOut
@@ -27,7 +31,6 @@ class Chef
       # Missing lots of features from the UNIX version, such as
       # environment, cwd, etc.
       def run_command
-        Chef::Log.debug("sh(#{@command})")
         # win32 open4 is really just open3.
         Open3.popen3(@command) do |stdin,stdout,stderr|
           @finished_stdout = false

data/lib/chef/version.rb

@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '0.10.0.beta.2'
+  VERSION = '0.10.0.beta.3'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

metadata

@@ -2,7 +2,7 @@
 name: chef
 version: !ruby/object:Gem::Version 
   prerelease: 7
-  version: 0.10.0.beta.2
+  version: 0.10.0.beta.3
 platform: ruby
 authors: 
 - Adam Jacob