chef 0.10.0.qs.0 → 0.10.0.qs.1

data/distro/common/html/knife-node.1.html

@@ -247,11 +247,11 @@ run list, the correct syntax is "role[ROLE_NAME]"</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#x6d;&#97;&#105;&#x6c;&#x74;&#x6f;&#58;&#97;&#100;&#x61;&#x6d;&#64;&#x6f;&#112;&#x73;&#99;&#111;&#x64;&#101;&#x2e;&#99;&#111;&#109;" data-bare-link="true">&#97;&#100;&#x61;&#x6d;&#x40;&#x6f;&#112;&#x73;&#99;&#111;&#x64;&#101;&#x2e;&#x63;&#111;&#x6d;</a> with many contributions from the community.</p>
+<p>   Chef was written by Adam Jacob <a href="&#x6d;&#97;&#105;&#x6c;&#x74;&#x6f;&#x3a;&#x61;&#100;&#x61;&#109;&#x40;&#x6f;&#112;&#115;&#x63;&#x6f;&#100;&#101;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#x64;&#x61;&#x6d;&#x40;&#111;&#112;&#115;&#99;&#111;&#100;&#x65;&#x2e;&#x63;&#111;&#x6d;</a> with many contributions from the community.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#105;&#108;&#116;&#x6f;&#x3a;&#x6a;&#x6f;&#115;&#x68;&#117;&#97;&#x40;&#x6f;&#112;&#x73;&#99;&#111;&#100;&#x65;&#46;&#99;&#111;&#109;" data-bare-link="true">&#x6a;&#111;&#x73;&#104;&#117;&#97;&#64;&#111;&#x70;&#115;&#99;&#111;&#x64;&#x65;&#x2e;&#99;&#x6f;&#x6d;</a>.
+<p>   This manual page was written by Joshua Timberman <a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#x3a;&#106;&#x6f;&#x73;&#104;&#117;&#x61;&#x40;&#x6f;&#112;&#x73;&#99;&#x6f;&#100;&#x65;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#106;&#111;&#x73;&#x68;&#x75;&#97;&#x40;&#111;&#x70;&#115;&#x63;&#x6f;&#100;&#x65;&#46;&#x63;&#111;&#109;</a>.
    Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
 
 <h2 id="CHEF">CHEF</h2>
@@ -261,7 +261,7 @@ run list, the correct syntax is "role[ROLE_NAME]"</p>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'>Chef 0.10.0</li>
-    <li class='tc'>June 2011</li>
+    <li class='tc'>April 2011</li>
     <li class='tr'>knife-node(1)</li>
   </ol>
 

data/distro/common/man/man1/knife-node.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-NODE" "1" "June 2011" "Chef 0.10.0" "Chef Manual"
+.TH "KNIFE\-NODE" "1" "April 2011" "Chef 0.10.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-node\fR \- Manage the hosts in your infrastructure

data/lib/chef/provider/git.rb

@@ -108,7 +108,9 @@ class Chef
         Chef::Log.info "#{@new_resource} cloning repo #{@new_resource.repository} to #{@new_resource.destination}"
 
         clone_cmd = "git clone #{args.join(' ')} #{@new_resource.repository} #{@new_resource.destination}"
-        shell_out!(clone_cmd, run_options(:command_log_level => :info))
+        retry_git(3) do
+          shell_out!(clone_cmd, run_options(:command_log_level => :info))
+        end
       end
 
       def checkout
@@ -132,7 +134,9 @@ 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}"
-        shell_out!(fetch_command, run_options(:cwd => @new_resource.destination))
+        retry_git(3) do
+          shell_out!(fetch_command, run_options(:cwd => @new_resource.destination))
+        end
       end
 
       # Use git-config to setup a remote tracking branches. Could use
@@ -173,7 +177,9 @@ class Chef
       def remote_resolve_reference
         Chef::Log.debug("#{@new_resource} resolving remote reference")
         command = git('ls-remote', @new_resource.repository, @new_resource.revision)
-        shell_out!(command, run_options).stdout
+        retry_git(3) do
+          shell_out!(command, run_options).stdout
+        end
       end
 
       private
@@ -225,6 +231,23 @@ class Chef
         $1
       end
 
+      def retry_git(max_retries)
+        attempts = 0
+        begin
+          yield()
+        rescue Chef::Exceptions::ShellCommandFailed => e
+          attempts += 1
+          if attempts > max_retries
+            raise e
+          else
+            wait_for = 2 ** attempts
+            Chef::Log.warn("#{e.class.name}: #{new_resource} had an error: #{e.message}: retrying #{attempts}/#{max_retries}, waiting #{wait_for} seconds")
+            sleep wait_for
+            retry
+          end
+        end
+      end
+
     end
   end
 end

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: chef
 version: !ruby/object:Gem::Version 
+  hash: 15288919
   prerelease: 7
-  version: 0.10.0.qs.0
+  segments: 
+  - 0
+  - 10
+  - 0
+  - qs
+  - 1
+  version: 0.10.0.qs.1
 platform: ruby
 authors: 
 - Adam Jacob
@@ -10,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-12 00:00:00 -07:00
+date: 2011-06-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +28,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 1
+        - 2
         version: 1.1.2
   type: :runtime
   version_requirements: *id001
@@ -32,6 +44,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
   type: :runtime
   version_requirements: *id002
@@ -43,6 +60,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
   type: :runtime
   version_requirements: *id003
@@ -54,6 +76,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
   type: :runtime
   version_requirements: *id004
@@ -65,6 +92,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
   type: :runtime
   version_requirements: *id005
@@ -76,9 +108,19 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 0
+        - 4
         version: 1.0.4
     - - <
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 7
+        - 0
         version: 1.7.0
   type: :runtime
   version_requirements: *id006
@@ -90,6 +132,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
   type: :runtime
   version_requirements: *id007
@@ -101,9 +148,19 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 4
+        - 4
         version: 1.4.4
     - - <=
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 5
+        - 2
         version: 1.5.2
   type: :runtime
   version_requirements: *id008
@@ -115,6 +172,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 4
+        - 9
         version: 1.4.9
   type: :runtime
   version_requirements: *id009
@@ -126,6 +188,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 2
+        - 1
+        - 3
         version: 2.1.3
   type: :runtime
   version_requirements: *id010
@@ -137,6 +204,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
         version: 1.0.1
   type: :runtime
   version_requirements: *id011
@@ -148,6 +220,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id012
@@ -159,6 +234,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id013
@@ -170,6 +248,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id014
@@ -181,6 +262,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id015
@@ -652,12 +736,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []