chef 0.10.6.beta.2 → 0.10.6.beta.3

data/lib/chef/resource/conditional.rb

@@ -0,0 +1,90 @@
+#
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/mixin/shell_out'
+
+class Chef
+  class Resource
+    class Conditional
+      include Chef::Mixin::ShellOut
+
+      # We only create these via the `not_if` or `only_if` constructors, and
+      # not the default constructor
+      class << self
+        private :new
+      end
+
+      def self.not_if(command=nil, command_opts={}, &block)
+        new(:not_if, command, command_opts, &block)
+      end
+
+      def self.only_if(command=nil, command_opts={}, &block)
+        new(:only_if, command, command_opts, &block)
+      end
+
+      attr_reader :positivity
+      attr_reader :command
+      attr_reader :command_opts
+      attr_reader :block
+
+      def initialize(positivity, command=nil, command_opts={}, &block)
+        @positivity = positivity
+        case command
+        when String
+          @command, @command_opts = command, command_opts
+          @block = nil
+        when nil
+          raise ArgumentError, "only_if/not_if requires either a command or a block" unless block_given?
+          @command, @command_opts = nil, nil
+          @block = block
+        else
+          raise ArgumentError, "Invalid only_if/not_if command: #{command.inspect} (#{command.class})"
+        end
+      end
+
+      def continue?
+        case @positivity
+        when :only_if
+          evaluate
+        when :not_if
+          !evaluate
+        else
+          raise "Cannot evaluate resource conditional of type #{@positivity}"
+        end
+      end
+
+      def evaluate
+        @command ? evaluate_command : evaluate_block
+      end
+
+      def evaluate_command
+        shell_out(@command, @command_opts).status.success?
+      end
+
+      def evaluate_block
+        @block.call
+      end
+
+      def description
+        cmd_or_block = @command ? "command `#{@command}`" : "ruby block"
+        "#{@positivity} #{cmd_or_block}"
+      end
+
+    end
+  end
+end

data/lib/chef/rest.rb

@@ -167,6 +167,10 @@ class Chef
     # Will return the body of the response on success.
     def run_request(method, url, headers={}, data=false, limit=nil, raw=false)
       json_body = data ? Chef::JSONCompat.to_json(data) : nil
+      # Force encoding to binary to fix SSL related EOFErrors
+      # cf. http://tickets.opscode.com/browse/CHEF-2363
+      # http://redmine.ruby-lang.org/issues/5233
+      json_body.force_encoding(Encoding::BINARY) if json_body.respond_to?(:force_encoding)
       headers = build_headers(method, url, headers, json_body, raw)
 
       tf = nil
@@ -213,6 +217,10 @@ class Chef
     # Runs an HTTP request to a JSON API. File Download not supported.
     def api_request(method, url, headers={}, data=false)
       json_body = data ? Chef::JSONCompat.to_json(data) : nil
+      # Force encoding to binary to fix SSL related EOFErrors
+      # cf. http://tickets.opscode.com/browse/CHEF-2363
+      # http://redmine.ruby-lang.org/issues/5233
+      json_body.force_encoding(Encoding::BINARY) if json_body.respond_to?(:force_encoding)
       headers = build_headers(method, url, headers, json_body)
 
       retriable_rest_request(method, url, json_body, headers) do |rest_request|

data/lib/chef/version.rb

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

data/lib/chef/version_class.rb

@@ -21,7 +21,7 @@ class Chef
     attr_reader :major, :minor, :patch
 
     def initialize(str="")
-      @major, @minor, @patch = parse(str)
+      parse(str)
     end
 
     def inspect

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 0.10.6.beta.2
+  version: 0.10.6.beta.3
   prerelease: 7
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-01 00:00:00.000000000 Z
+date: 2011-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-config
-  requirement: &70340395936060 !ruby/object:Gem::Requirement
+  requirement: &70321173274180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70340395936060
+  version_requirements: *70321173274180
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
-  requirement: &70340395935520 !ruby/object:Gem::Requirement
+  requirement: &70321173273600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70340395935520
+  version_requirements: *70321173273600
 - !ruby/object:Gem::Dependency
   name: mixlib-log
-  requirement: &70340395935040 !ruby/object:Gem::Requirement
+  requirement: &70321173272540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70340395935040
+  version_requirements: *70321173272540
 - !ruby/object:Gem::Dependency
   name: mixlib-authentication
-  requirement: &70340395934560 !ruby/object:Gem::Requirement
+  requirement: &70321173271420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70340395934560
+  version_requirements: *70321173271420
 - !ruby/object:Gem::Dependency
   name: ohai
-  requirement: &70340395934080 !ruby/object:Gem::Requirement
+  requirement: &70321173270620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70340395934080
+  version_requirements: *70321173270620
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70340395933520 !ruby/object:Gem::Requirement
+  requirement: &70321173269660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70340395933520
+  version_requirements: *70321173269660
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &70340395932760 !ruby/object:Gem::Requirement
+  requirement: &70321173268900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70340395932760
+  version_requirements: *70321173268900
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70340395932240 !ruby/object:Gem::Requirement
+  requirement: &70321173268400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -104,10 +104,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70340395932240
+  version_requirements: *70321173268400
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &70340395931520 !ruby/object:Gem::Requirement
+  requirement: &70321173267660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -115,10 +115,10 @@ dependencies:
         version: 1.4.9
   type: :runtime
   prerelease: false
-  version_requirements: *70340395931520
+  version_requirements: *70321173267660
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70340395931060 !ruby/object:Gem::Requirement
+  requirement: &70321173267200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -126,10 +126,10 @@ dependencies:
         version: 2.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70340395931060
+  version_requirements: *70321173267200
 - !ruby/object:Gem::Dependency
   name: net-ssh-multi
-  requirement: &70340395930600 !ruby/object:Gem::Requirement
+  requirement: &70321173266740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -137,10 +137,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70340395930600
+  version_requirements: *70321173266740
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &70340395930100 !ruby/object:Gem::Requirement
+  requirement: &70321173266280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -148,10 +148,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70340395930100
+  version_requirements: *70321173266280
 - !ruby/object:Gem::Dependency
   name: moneta
-  requirement: &70340395929660 !ruby/object:Gem::Requirement
+  requirement: &70321173265840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -159,10 +159,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70340395929660
+  version_requirements: *70321173265840
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70340395929260 !ruby/object:Gem::Requirement
+  requirement: &70321173265400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -170,10 +170,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70340395929260
+  version_requirements: *70321173265400
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70340395928780 !ruby/object:Gem::Requirement
+  requirement: &70321173265000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -181,10 +181,54 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70340395928780
+  version_requirements: *70321173265000
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70321173264400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70321173264400
+- !ruby/object:Gem::Dependency
+  name: sdoc
+  requirement: &70321173264000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70321173264000
+- !ruby/object:Gem::Dependency
+  name: ronn
+  requirement: &70321173263600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70321173263600
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70321173263180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70321173263180
 - !ruby/object:Gem::Dependency
   name: dep_selector
-  requirement: &70340395928220 !ruby/object:Gem::Requirement
+  requirement: &70321173262780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -192,10 +236,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70340395928220
+  version_requirements: *70321173262780
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &70340395927800 !ruby/object:Gem::Requirement
+  requirement: &70321173262380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -203,10 +247,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70340395927800
+  version_requirements: *70321173262380
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &70340395927400 !ruby/object:Gem::Requirement
+  requirement: &70321173261980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -214,10 +258,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70340395927400
+  version_requirements: *70321173261980
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
-  requirement: &70340395927000 !ruby/object:Gem::Requirement
+  requirement: &70321173261580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -225,7 +269,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70340395927000
+  version_requirements: *70321173261580
 description: A systems integration framework, built to bring the benefits of configuration
   management to your entire infrastructure.
 email: adam@opscode.com
@@ -593,6 +637,7 @@ files:
 - lib/chef/resource/apt_package.rb
 - lib/chef/resource/bash.rb
 - lib/chef/resource/breakpoint.rb
+- lib/chef/resource/conditional.rb
 - lib/chef/resource/cookbook_file.rb
 - lib/chef/resource/cron.rb
 - lib/chef/resource/csh.rb