chef 0.9.10.rc.0 → 0.9.10.rc.1

data/lib/chef/application/client.rb

@@ -89,6 +89,11 @@ class Chef::Application::Client < Chef::Application
     :description => "Run chef-client periodically, in seconds",
     :proc => lambda { |s| s.to_i }
 
+  option :once,
+    :long => "--short",
+    :description => "Cancel any interval or splay options, run chef once and exit",
+    :boolean => true
+
   option :json_attribs,
     :short => "-j JSON_ATTRIBS",
     :long => "--json-attributes JSON_ATTRIBS",
@@ -149,7 +154,9 @@ class Chef::Application::Client < Chef::Application
    
     if Chef::Config[:daemonize]
       Chef::Config[:interval] ||= 1800
-    else
+    end
+
+    if Chef::Config[:once]
       Chef::Config[:interval] = nil
       Chef::Config[:splay] = nil
     end

data/lib/chef/client.rb

@@ -220,6 +220,7 @@ class Chef
 
 
       @node.consume_external_attrs(ohai.data, @json_attribs)
+      @node.expand!
       @node.save unless Chef::Config[:solo]
       @node.reset_defaults_and_overrides
 

data/lib/chef/knife.rb

@@ -418,7 +418,20 @@ class Chef
       object = klass.load(name)
 
       output = edit_data(object)
-      if output.to_s != object.to_s
+
+      # Only make the save if the user changed the object.
+      #
+      # Output JSON for the original (object) and edited (output), then parse 
+      # them without reconstituting the objects into real classes
+      # (create_additions=false). Then, compare the resulting simple objects,
+      # which will be Array/Hash/String/etc. 
+      #
+      # We wouldn't have to do these shenanigans if all the editable objects 
+      # implemented to_hash, or if to_json against a hash returned a string 
+      # with stable key order.
+      object_parsed_again = JSON.parse(object.to_json, :create_additions => false)
+      output_parsed_again = JSON.parse(output.to_json, :create_additions => false)
+      if object_parsed_again != output_parsed_again
         output.save
         self.msg("Saved #{output}")
       else

data/lib/chef/provider/cookbook_file.rb

@@ -33,7 +33,7 @@ class Chef
 
 
       def action_create
-         if file_cache_location
+         if file_cache_location && content_stale?
            Chef::Log.debug("content of file #{@new_resource.path} requires update")
            backup_new_resource
            Tempfile.open(::File.basename(@new_resource.name)) do |staging_file|
@@ -46,7 +46,7 @@ class Chef
          else
            set_all_access_controls(@new_resource.path)
          end
-         @new_resource.updated_by_last_action(true)
+         @new_resource.updated_by_last_action?
        end
 
       def action_create_if_missing
@@ -91,6 +91,10 @@ class Chef
         end
       end
 
+      def content_stale?
+        ( ! ::File.exist?(@new_resource.path)) || ( ! compare_content)
+      end
+
     end
   end
 end

data/lib/chef/version.rb

@@ -17,5 +17,5 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '0.9.10.rc.0'
+  VERSION = '0.9.10.rc.1'
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 9
   - 10
   - rc
-  - 0
-  version: 0.9.10.rc.0
+  - 1
+  version: 0.9.10.rc.1
 platform: ruby
 authors: 
 - Adam Jacob