chef 12.12.15 → 12.13.30

data/lib/chef/sandbox.rb

@@ -1,20 +1,20 @@
-class Chef
-  class Sandbox
-    # I DO NOTHING!!
-
-    # So, the reason we have a completely empty class here is so that
-    # Chef 11 clients do not choke when interacting with Chef 10
-    # servers.  The original Chef::Sandbox class (that actually did
-    # things) has been removed since its functionality is no longer
-    # needed for Chef 11.  However, since we still use the JSON gem
-    # and make use of its "auto-inflation" of classes (driven by the
-    # contents of the 'json_class' key in all of our JSON), any
-    # sandbox responses from a Chef 10 server to a Chef 11 client
-    # would cause knife to crash.  The JSON gem would attempt to
-    # auto-inflate based on a "json_class": "Chef::Sandbox" hash
-    # entry, but would not be able to find a Chef::Sandbox class!
-    #
-    # This is a workaround until such time as we can completely remove
-    # the reliance on the "json_class" field.
-  end
-end
+class Chef
+  class Sandbox
+    # I DO NOTHING!!
+
+    # So, the reason we have a completely empty class here is so that
+    # Chef 11 clients do not choke when interacting with Chef 10
+    # servers.  The original Chef::Sandbox class (that actually did
+    # things) has been removed since its functionality is no longer
+    # needed for Chef 11.  However, since we still use the JSON gem
+    # and make use of its "auto-inflation" of classes (driven by the
+    # contents of the 'json_class' key in all of our JSON), any
+    # sandbox responses from a Chef 10 server to a Chef 11 client
+    # would cause knife to crash.  The JSON gem would attempt to
+    # auto-inflate based on a "json_class": "Chef::Sandbox" hash
+    # entry, but would not be able to find a Chef::Sandbox class!
+    #
+    # This is a workaround until such time as we can completely remove
+    # the reliance on the "json_class" field.
+  end
+end

data/lib/chef/version.rb

@@ -21,7 +21,7 @@
 
 class Chef
   CHEF_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "12.12.15"
+  VERSION = "12.13.30"
 end
 
 #

data/lib/chef/version_class.rb

@@ -34,8 +34,13 @@ class Chef
 
     def <=>(v)
       [:major, :minor, :patch].each do |method|
-        ans = (self.send(method) <=> v.send(method))
-        return ans if ans != 0
+        version = self.send(method)
+        begin
+          ans = (version <=> v.send(method))
+        rescue NoMethodError # if the other thing isn't a version object, return nil
+          return nil
+        end
+        return ans unless ans == 0
       end
       0
     end

data/lib/chef/win32/file.rb

@@ -39,7 +39,7 @@ class Chef
       # returns nil as per MRI.
       #
       def self.link(old_name, new_name)
-        raise Errno::ENOENT, "(#{old_name}, #{new_name})" unless ::File.exist?(old_name)
+        raise Errno::ENOENT, "(#{old_name}, #{new_name})" unless ::File.exist?(old_name) || ::File.symlink?(old_name)
         # TODO do a check for CreateHardLinkW and
         # raise NotImplemented exception on older Windows
         old_name = encode_path(old_name)
@@ -56,7 +56,7 @@ class Chef
       # returns nil as per MRI.
       #
       def self.symlink(old_name, new_name)
-        # raise Errno::ENOENT, "(#{old_name}, #{new_name})" unless ::File.exist?(old_name)
+        # raise Errno::ENOENT, "(#{old_name}, #{new_name})" unless ::File.exist?(old_name) || ::File.symlink?(old_name)
         # TODO do a check for CreateSymbolicLinkW and
         # raise NotImplemented exception on older Windows
         flags = ::File.directory?(old_name) ? SYMBOLIC_LINK_FLAG_DIRECTORY : 0
@@ -75,7 +75,7 @@ class Chef
       def self.symlink?(file_name)
         is_symlink = false
         path = encode_path(file_name)
-        if ::File.exists?(file_name)
+        if ::File.exists?(file_name) || ::File.symlink?(file_name)
           if (GetFileAttributesW(path) & FILE_ATTRIBUTE_REPARSE_POINT) > 0
             file_search_handle(file_name) do |handle, find_data|
               if find_data[:dw_reserved_0] == IO_REPARSE_TAG_SYMLINK
@@ -93,7 +93,7 @@ class Chef
       # will raise a NotImplementedError, as per MRI.
       #
       def self.readlink(link_name)
-        raise Errno::ENOENT, link_name unless ::File.exists?(link_name)
+        raise Errno::ENOENT, link_name unless ::File.exists?(link_name) || ::File.symlink?(link_name)
         symlink_file_handle(link_name) do |handle|
           # Go to DeviceIoControl to get the symlink information
           # http://msdn.microsoft.com/en-us/library/windows/desktop/aa364571(v=vs.85).aspx

data/spec/data/apt/chef-integration-test-1.0/debian/changelog

@@ -1,5 +1,5 @@
-chef-integration-test (1.0-1) unstable; urgency=low
-
-  * Initial release (Closes: #CHEF-1718)
-
- -- Joshua Timberman <joshua@opscode.com>  Thu, 30 Sep 2010 09:53:45 -0600
+chef-integration-test (1.0-1) unstable; urgency=low
+
+  * Initial release (Closes: #CHEF-1718)
+
+ -- Joshua Timberman <joshua@opscode.com>  Thu, 30 Sep 2010 09:53:45 -0600

data/spec/data/apt/chef-integration-test-1.0/debian/compat

@@ -1 +1 @@
-7
+7

data/spec/data/apt/chef-integration-test-1.0/debian/control

@@ -1,13 +1,13 @@
-Source: chef-integration-test
-Section: ruby
-Priority: extra
-Maintainer: Joshua Timberman <Joshua Timberman <joshua@opscode.com>>
-Build-Depends: debhelper (>= 7.0.50~)
-Standards-Version: 3.8.4
-Homepage: http://tickets.opscode.com
-
-Package: chef-integration-test
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Chef integration tests for APT in Cucumber
- This package is used for cucumber integration testing in Chef.
+Source: chef-integration-test
+Section: ruby
+Priority: extra
+Maintainer: Joshua Timberman <Joshua Timberman <joshua@opscode.com>>
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.8.4
+Homepage: http://tickets.opscode.com
+
+Package: chef-integration-test
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Chef integration tests for APT in Cucumber
+ This package is used for cucumber integration testing in Chef.

data/spec/data/apt/chef-integration-test-1.0/debian/files

@@ -1 +1 @@
-chef-integration-test_1.0-1_amd64.deb ruby extra
+chef-integration-test_1.0-1_amd64.deb ruby extra

data/spec/data/apt/chef-integration-test-1.0/debian/rules

@@ -1,13 +1,13 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-%:
-	dh $@ 
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@ 

data/spec/data/apt/chef-integration-test-1.0/debian/source/format

@@ -1 +1 @@
-3.0 (quilt)
+3.0 (quilt)

data/spec/data/apt/chef-integration-test-1.1/debian/changelog

@@ -1,11 +1,11 @@
-chef-integration-test (1.1-1) unstable; urgency=low
-
-  * New upstream release (1.1)
-
- -- Joshua Timberman <joshua@opscode.com>  Thu, 30 Sep 2010 10:09:34 -0600
-
-chef-integration-test (1.0-1) unstable; urgency=low
-
-  * Initial release (Closes: #CHEF-1718)
-
- -- Joshua Timberman <joshua@opscode.com>  Thu, 30 Sep 2010 09:53:45 -0600
+chef-integration-test (1.1-1) unstable; urgency=low
+
+  * New upstream release (1.1)
+
+ -- Joshua Timberman <joshua@opscode.com>  Thu, 30 Sep 2010 10:09:34 -0600
+
+chef-integration-test (1.0-1) unstable; urgency=low
+
+  * Initial release (Closes: #CHEF-1718)
+
+ -- Joshua Timberman <joshua@opscode.com>  Thu, 30 Sep 2010 09:53:45 -0600

data/spec/data/apt/chef-integration-test-1.1/debian/compat

@@ -1 +1 @@
-7
+7

data/spec/data/apt/chef-integration-test-1.1/debian/control

@@ -1,13 +1,13 @@
-Source: chef-integration-test
-Section: ruby
-Priority: extra
-Maintainer: Joshua Timberman <Joshua Timberman <joshua@opscode.com>>
-Build-Depends: debhelper (>= 7.0.50~)
-Standards-Version: 3.8.4
-Homepage: http://tickets.opscode.com
-
-Package: chef-integration-test
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Chef integration tests for APT in Cucumber
- This package is used for cucumber integration testing in Chef.
+Source: chef-integration-test
+Section: ruby
+Priority: extra
+Maintainer: Joshua Timberman <Joshua Timberman <joshua@opscode.com>>
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.8.4
+Homepage: http://tickets.opscode.com
+
+Package: chef-integration-test
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Chef integration tests for APT in Cucumber
+ This package is used for cucumber integration testing in Chef.

data/spec/data/apt/chef-integration-test-1.1/debian/files

@@ -1 +1 @@
-chef-integration-test_1.1-1_amd64.deb ruby extra
+chef-integration-test_1.1-1_amd64.deb ruby extra

data/spec/data/apt/chef-integration-test-1.1/debian/rules

@@ -1,13 +1,13 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-%:
-	dh $@ 
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@ 

data/spec/data/apt/chef-integration-test-1.1/debian/source/format

@@ -1 +1 @@
-3.0 (quilt)
+3.0 (quilt)

data/spec/data/apt/chef-integration-test_1.0-1_amd64.changes

@@ -1,22 +1,22 @@
-Format: 1.8
-Date: Thu, 30 Sep 2010 09:53:45 -0600
-Source: chef-integration-test
-Binary: chef-integration-test
-Architecture: amd64
-Version: 1.0-1
-Distribution: unstable
-Urgency: low
-Maintainer: Joshua Timberman <Joshua Timberman <joshua@opscode.com>>
-Changed-By: Joshua Timberman <joshua@opscode.com>
-Description: 
- chef-integration-test - Chef integration tests for APT in Cucumber
-Changes: 
- chef-integration-test (1.0-1) unstable; urgency=low
- .
-   * Initial release (Closes: #CHEF-1718)
-Checksums-Sha1: 
- b44685ff59626bc94c67e60665f06c4643fe9767 1680 chef-integration-test_1.0-1_amd64.deb
-Checksums-Sha256: 
- da176f4405fa21fd7207d4785680c6996d395a1ca132f2d5565a61c5479b1116 1680 chef-integration-test_1.0-1_amd64.deb
-Files: 
- 713722480408ecc8e7220aea52bdd76e 1680 ruby extra chef-integration-test_1.0-1_amd64.deb
+Format: 1.8
+Date: Thu, 30 Sep 2010 09:53:45 -0600
+Source: chef-integration-test
+Binary: chef-integration-test
+Architecture: amd64
+Version: 1.0-1
+Distribution: unstable
+Urgency: low
+Maintainer: Joshua Timberman <Joshua Timberman <joshua@opscode.com>>
+Changed-By: Joshua Timberman <joshua@opscode.com>
+Description: 
+ chef-integration-test - Chef integration tests for APT in Cucumber
+Changes: 
+ chef-integration-test (1.0-1) unstable; urgency=low
+ .
+   * Initial release (Closes: #CHEF-1718)
+Checksums-Sha1: 
+ b44685ff59626bc94c67e60665f06c4643fe9767 1680 chef-integration-test_1.0-1_amd64.deb
+Checksums-Sha256: 
+ da176f4405fa21fd7207d4785680c6996d395a1ca132f2d5565a61c5479b1116 1680 chef-integration-test_1.0-1_amd64.deb
+Files: 
+ 713722480408ecc8e7220aea52bdd76e 1680 ruby extra chef-integration-test_1.0-1_amd64.deb

data/spec/data/apt/chef-integration-test_1.1-1_amd64.changes

@@ -1,22 +1,22 @@
-Format: 1.8
-Date: Thu, 30 Sep 2010 10:09:34 -0600
-Source: chef-integration-test
-Binary: chef-integration-test
-Architecture: amd64
-Version: 1.1-1
-Distribution: unstable
-Urgency: low
-Maintainer: Joshua Timberman <Joshua Timberman <joshua@opscode.com>>
-Changed-By: Joshua Timberman <joshua@opscode.com>
-Description: 
- chef-integration-test - Chef integration tests for APT in Cucumber
-Changes: 
- chef-integration-test (1.1-1) unstable; urgency=low
- .
-   * New upstream release (1.1)
-Checksums-Sha1: 
- 43c5653a9a5b9419849173a4ec3a9855cf0327a3 1722 chef-integration-test_1.1-1_amd64.deb
-Checksums-Sha256: 
- 84e2f087f7e11d1b73743007ecfc6b8b34e03f6917c0993b35c0758ee59702c1 1722 chef-integration-test_1.1-1_amd64.deb
-Files: 
- 4b05bace483dbca54efc21f97ee47e1d 1722 ruby extra chef-integration-test_1.1-1_amd64.deb
+Format: 1.8
+Date: Thu, 30 Sep 2010 10:09:34 -0600
+Source: chef-integration-test
+Binary: chef-integration-test
+Architecture: amd64
+Version: 1.1-1
+Distribution: unstable
+Urgency: low
+Maintainer: Joshua Timberman <Joshua Timberman <joshua@opscode.com>>
+Changed-By: Joshua Timberman <joshua@opscode.com>
+Description: 
+ chef-integration-test - Chef integration tests for APT in Cucumber
+Changes: 
+ chef-integration-test (1.1-1) unstable; urgency=low
+ .
+   * New upstream release (1.1)
+Checksums-Sha1: 
+ 43c5653a9a5b9419849173a4ec3a9855cf0327a3 1722 chef-integration-test_1.1-1_amd64.deb
+Checksums-Sha256: 
+ 84e2f087f7e11d1b73743007ecfc6b8b34e03f6917c0993b35c0758ee59702c1 1722 chef-integration-test_1.1-1_amd64.deb
+Files: 
+ 4b05bace483dbca54efc21f97ee47e1d 1722 ruby extra chef-integration-test_1.1-1_amd64.deb

data/spec/data/apt/var/www/apt/conf/distributions

@@ -1,7 +1,7 @@
-Origin: localhost
-Label: apt repository
-Codename: sid
-Architectures: amd64
-Components: main
-Description: Apt repository
-Pull: sid
+Origin: localhost
+Label: apt repository
+Codename: sid
+Architectures: amd64
+Components: main
+Description: Apt repository
+Pull: sid

data/spec/data/apt/var/www/apt/conf/incoming

@@ -1,4 +1,4 @@
-Name: default
-IncomingDir: /tmp/incoming
-TempDir: /tmp
-Allow: sid unstable>sid
+Name: default
+IncomingDir: /tmp/incoming
+TempDir: /tmp
+Allow: sid unstable>sid

data/spec/data/apt/var/www/apt/conf/pulls

@@ -1,3 +1,3 @@
-Name: sid
-From: sid
-Components: main
+Name: sid
+From: sid
+Components: main

data/spec/data/apt/var/www/apt/db/version

@@ -1,4 +1,4 @@
-4.2.0
-3.3.0
-bdb4.8.30
-bdb4.8.0
+4.2.0
+3.3.0
+bdb4.8.30
+bdb4.8.0

data/spec/data/apt/var/www/apt/dists/sid/Release

@@ -1,19 +1,19 @@
-Origin: localhost
-Label: apt repository
-Codename: sid
-Date: Thu, 30 Sep 2010 16:33:01 UTC
-Architectures: amd64
-Components: main
-Description: Apt repository
-MD5Sum:
- 92ed2cc14e37e9ab23466b27857d29ac 596 main/binary-amd64/Packages
- c7726773341137b71cc971d44ddec4f5 394 main/binary-amd64/Packages.gz
- 46cd71c965ce0813c94ef78c836cc7d3 104 main/binary-amd64/Release
-SHA1:
- cde25071c5fcee59cee8dcd773ca419dcb40d946 596 main/binary-amd64/Packages
- ce04daff75d4b27371d691d645282b198045544a 394 main/binary-amd64/Packages.gz
- 91ca9531e3afa7a540cabdc6030c6f75d315fec7 104 main/binary-amd64/Release
-SHA256:
- af601ce143f33405425746462973adc0fda3aceb381d1c739851b95ee0814ca3 596 main/binary-amd64/Packages
- 15e98119705a08018d4583caabc91d36ba12e6f1c8af0f799a3ec8ca5bfaa80d 394 main/binary-amd64/Packages.gz
- 098c599ac5b0a98785336afb2bc9c47002570ffa07dd62321c6f70b9fdb74325 104 main/binary-amd64/Release
+Origin: localhost
+Label: apt repository
+Codename: sid
+Date: Thu, 30 Sep 2010 16:33:01 UTC
+Architectures: amd64
+Components: main
+Description: Apt repository
+MD5Sum:
+ 92ed2cc14e37e9ab23466b27857d29ac 596 main/binary-amd64/Packages
+ c7726773341137b71cc971d44ddec4f5 394 main/binary-amd64/Packages.gz
+ 46cd71c965ce0813c94ef78c836cc7d3 104 main/binary-amd64/Release
+SHA1:
+ cde25071c5fcee59cee8dcd773ca419dcb40d946 596 main/binary-amd64/Packages
+ ce04daff75d4b27371d691d645282b198045544a 394 main/binary-amd64/Packages.gz
+ 91ca9531e3afa7a540cabdc6030c6f75d315fec7 104 main/binary-amd64/Release
+SHA256:
+ af601ce143f33405425746462973adc0fda3aceb381d1c739851b95ee0814ca3 596 main/binary-amd64/Packages
+ 15e98119705a08018d4583caabc91d36ba12e6f1c8af0f799a3ec8ca5bfaa80d 394 main/binary-amd64/Packages.gz
+ 098c599ac5b0a98785336afb2bc9c47002570ffa07dd62321c6f70b9fdb74325 104 main/binary-amd64/Release