chef 0.9.18 → 0.10.0.beta.0

data/lib/chef/solr_query/solr_http_request.rb

@@ -0,0 +1,118 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2009-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 'net/http'
+require 'uri'
+require 'chef/json_compat'
+require 'chef/config'
+
+class Chef
+  class SolrQuery
+    class SolrHTTPRequest
+      CLASS_FOR_METHOD = {:GET => Net::HTTP::Get, :POST => Net::HTTP::Post}
+
+      UPDATE_URL = '/solr/update'
+      TEXT_XML = {"Content-Type" => "text/xml"}
+
+      def self.solr_url=(solr_url)
+        @solr_url = solr_url
+        @http_client = nil
+      end
+
+      def self.solr_url
+        @solr_url || Chef::Config[:solr_url]
+      end
+
+      def self.http_client
+        @http_client ||= begin
+          uri = URI.parse(solr_url)
+          Net::HTTP.new(uri.host, uri.port)
+        end
+      end
+
+      def self.select(params={})
+        url = "/solr/select?#{url_join(params)}"
+        Chef::Log.debug("Sending #{url} to Solr")
+        request = new(:GET, url)
+        json_response = request.run("Search Query to Solr '#{solr_url}#{url}'")
+        Chef::JSONCompat.from_json(json_response)
+      end
+
+      def self.update(doc)
+        Chef::Log.debug("POSTing document to SOLR:\n#{doc}")
+        request = new(:POST, UPDATE_URL, TEXT_XML) { |req| req.body = doc.to_s }
+        request.run("POST to Solr '#{UPDATE_URL}', data: #{doc}")
+      end
+
+      def self.url_join(params_hash={})
+        params = params_hash.inject("") do |param_str, params|
+          param_str << "#{params[0]}=#{escape(params[1])}&"
+        end
+        params.chop! # trailing &
+        params
+      end
+
+      def self.escape(s)
+        s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/n) {
+          '%'+$1.unpack('H2'*$1.size).join('%').upcase
+        }.tr(' ', '+')
+      end
+
+      def initialize(method, url, headers=nil)
+        args = headers ? [url, headers] : url
+        @request = CLASS_FOR_METHOD[method].new(*args)
+        yield @request if block_given?
+      end
+
+      def http_client
+        self.class.http_client
+      end
+
+      def solr_url
+        self.class.solr_url
+      end
+
+      def run(description="HTTP Request to Solr")
+        response = http_client.request(@request)
+        request_failed!(response, description) unless response.kind_of?(Net::HTTPSuccess)
+        response.body
+      rescue NoMethodError => e
+        # http://redmine.ruby-lang.org/issues/show/2708
+        # http://redmine.ruby-lang.org/issues/show/2758
+        if e.to_s =~ /#{Regexp.escape(%q|undefined method 'closed?' for nil:NilClass|)}/
+          Chef::Log.fatal("#{description} failed.  Chef::Exceptions::SolrConnectionError exception: Errno::ECONNREFUSED (net/http undefined method closed?) attempting to contact #{solr_url}")
+          Chef::Log.debug("rescued error in http connect, treating it as Errno::ECONNREFUSED to hide bug in net/http")
+          Chef::Log.debug(e.backtrace.join("\n"))
+          raise Chef::Exceptions::SolrConnectionError, "Errno::ECONNREFUSED: Connection refused attempting to contact #{solr_url}"
+        else
+          raise
+        end
+      end
+
+      def request_failed!(response, description='HTTP call')
+        Chef::Log.fatal("#{description} failed (#{response.class} #{response.code} #{response.message})")
+        response.error!
+      rescue Timeout::Error, Errno::EINVAL, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEDOUT => e
+        Chef::Log.debug(e.backtrace.join("\n"))
+        raise Chef::Exceptions::SolrConnectionError, "#{e.class.name}: #{e.to_s}"
+      end
+
+    end
+  end
+end

data/lib/chef/version.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Daniel DeLeo (<dan@opscode.com>)
-# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# Copyright:: Copyright (c) 2010-2011 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,5 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '0.9.18'
+  VERSION = '0.10.0.beta.0'
 end
+
+# NOTE: the Chef::Version class is defined in version_class.rb

data/lib/chef/version_class.rb

@@ -0,0 +1,70 @@
+# Author:: Seth Falcon (<seth@opscode.com>)
+# Author:: Christopher Walters (<cw@opscode.com>)
+# Copyright:: Copyright 2010-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.
+
+class Chef
+  class Version
+    include Comparable
+    attr_reader :major, :minor, :patch
+
+    def initialize(str="")
+      @major, @minor, @patch = parse(str)
+    end
+
+    def inspect
+      "#{@major}.#{@minor}.#{@patch}"
+    end
+
+    def to_s
+      "#{@major}.#{@minor}.#{@patch}"
+    end
+
+    def <=>(v)
+      [:major, :minor, :patch].each do |method|
+        ans = (self.send(method) <=> v.send(method))
+        return ans if ans != 0
+      end
+      0
+    end
+
+    def hash
+      # Didn't put any thought or research into this, probably can be
+      # done better
+      to_s.hash
+    end
+
+    # For hash
+    def eql?(other)
+      other.is_a?(Version) && self == other
+    end
+    
+    private
+
+    def parse(str="")
+      @major, @minor, @patch =
+        case str.to_s
+        when /^(\d+)\.(\d+)\.(\d+)$/
+          [ $1.to_i, $2.to_i, $3.to_i ]
+        when /^(\d+)\.(\d+)$/
+          [ $1.to_i, $2.to_i, 0 ]
+        else
+          msg = "'#{str.to_s}' does not match 'x.y.z' or 'x.y'"
+          raise Chef::Exceptions::InvalidCookbookVersion.new msg
+        end
+    end
+
+  end
+end

data/lib/chef/version_constraint.rb

@@ -0,0 +1,116 @@
+# Author:: Seth Falcon (<seth@opscode.com>)
+# Author:: Christopher Walters (<cw@opscode.com>)
+# Copyright:: Copyright 2010-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/version_class'
+
+class Chef
+  class VersionConstraint
+    DEFAULT_CONSTRAINT = ">= 0.0.0"
+    STANDARD_OPS = %w(< > <= >=)
+    OPS = %w(< > = <= >= ~>)
+    PATTERN = /^(#{OPS.join('|')}) (.+)$/
+
+    attr_reader :op, :version
+
+    def initialize(constraint_spec=DEFAULT_CONSTRAINT)
+      case constraint_spec
+      when nil
+        parse(DEFAULT_CONSTRAINT)
+      when Array
+        parse_from_array(constraint_spec)
+      when String
+        parse(constraint_spec)
+      else
+        msg = "VersionConstraint should be created from a String. You gave: #{constraint_spec.inspect}"
+        raise Chef::Exceptions::InvalidVersionConstraint, msg
+      end
+    end
+
+    def include?(v)
+      version = if v.respond_to? :version # a CookbookVersion-like object
+                  Chef::Version.new(v.version.to_s)
+                else
+                  Chef::Version.new(v.to_s)
+                end
+     do_op(version)
+    end
+
+    def inspect
+      "(#{@op} #{@version})"
+    end
+
+    def to_s
+      "#{@op} #{@version}"
+    end
+
+    def eql?(o)
+      o.class == self.class && @op == o.op && @version == o.version
+    end
+    alias_method :==, :eql?
+
+    private
+
+    def do_op(other_version)
+      if STANDARD_OPS.include? @op
+        other_version.send(@op.to_sym, @version)
+      elsif @op == '='
+        other_version == @version
+      elsif @op == '~>'
+        if @missing_patch_level
+          (other_version.major == @version.major &&
+           other_version.minor >= @version.minor)
+        else
+          (other_version.major == @version.major &&
+           other_version.minor == @version.minor &&
+           other_version.patch >= @version.patch)
+        end
+      else                      # should never happen
+        raise "bad op #{@op}"
+      end
+    end
+
+    def parse_from_array(constraint_spec)
+      if constraint_spec.empty?
+        parse(DEFAULT_CONSTRAINT)
+      elsif constraint_spec.size == 1
+        parse(constraint_spec.first)
+      else
+        msg = "only one version constraint operation is supported, but you gave #{constraint_spec.size} "
+        msg << "['#{constraint_spec.join(', ')}']"
+        raise Chef::Exceptions::InvalidVersionConstraint, msg
+      end
+    end
+
+    def parse(str)
+      @missing_patch_level = false
+      if str.index(" ").nil? && str =~ /^[0-9]/
+        # try for lone version, implied '='
+        @version = Chef::Version.new(str)
+        @op = "="
+      elsif PATTERN.match str
+        @op = $1
+        raw_version = $2
+        @version = Chef::Version.new(raw_version)
+        if raw_version.split('.').size == 2
+          @missing_patch_level = true
+        end
+      else
+        raise Chef::Exceptions::InvalidVersionConstraint, "'#{str}'"
+      end
+    end
+
+  end
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: chef
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.9.18
+  prerelease: 7
+  version: 0.10.0.beta.0
 platform: ruby
 authors: 
 - Adam Jacob
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-29 00:00:00 -07:00
+date: 2011-03-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -108,40 +108,40 @@ dependencies:
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: erubis
+  name: treetop
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.4.9
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: extlib
+  name: net-ssh
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.1.3
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: moneta
+  name: net-ssh-multi
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.0.1
   type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: highline
+  name: erubis
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
@@ -152,7 +152,7 @@ dependencies:
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: uuidtools
+  name: moneta
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
@@ -162,6 +162,28 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: highline
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: uuidtools
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id015
 description: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure.
 email: adam@opscode.com
 executables: 
@@ -242,10 +264,11 @@ files:
 - lib/chef/checksum_cache.rb
 - lib/chef/client.rb
 - lib/chef/config.rb
+- lib/chef/cookbook/chefignore.rb
 - lib/chef/cookbook/cookbook_collection.rb
+- lib/chef/cookbook/cookbook_version_loader.rb
 - lib/chef/cookbook/file_system_file_vendor.rb
 - lib/chef/cookbook/file_vendor.rb
-- lib/chef/cookbook/metadata/version.rb
 - lib/chef/cookbook/metadata.rb
 - lib/chef/cookbook/remote_file_vendor.rb
 - lib/chef/cookbook/syntax_check.rb
@@ -253,10 +276,13 @@ files:
 - lib/chef/cookbook_site_streaming_uploader.rb
 - lib/chef/cookbook_uploader.rb
 - lib/chef/cookbook_version.rb
+- lib/chef/cookbook_version_selector.rb
 - lib/chef/couchdb.rb
 - lib/chef/daemon.rb
 - lib/chef/data_bag.rb
 - lib/chef/data_bag_item.rb
+- lib/chef/encrypted_data_bag_item.rb
+- lib/chef/environment.rb
 - lib/chef/exceptions.rb
 - lib/chef/file_access_control.rb
 - lib/chef/file_cache.rb
@@ -267,10 +293,6 @@ files:
 - lib/chef/index_queue/indexable.rb
 - lib/chef/index_queue.rb
 - lib/chef/json_compat.rb
-- lib/chef/knife/bluebox_images_list.rb
-- lib/chef/knife/bluebox_server_create.rb
-- lib/chef/knife/bluebox_server_delete.rb
-- lib/chef/knife/bluebox_server_list.rb
 - lib/chef/knife/bootstrap/archlinux-gems.erb
 - lib/chef/knife/bootstrap/centos5-gems.erb
 - lib/chef/knife/bootstrap/client-install.vbs
@@ -311,10 +333,12 @@ files:
 - lib/chef/knife/data_bag_from_file.rb
 - lib/chef/knife/data_bag_list.rb
 - lib/chef/knife/data_bag_show.rb
-- lib/chef/knife/ec2_instance_data.rb
-- lib/chef/knife/ec2_server_create.rb
-- lib/chef/knife/ec2_server_delete.rb
-- lib/chef/knife/ec2_server_list.rb
+- lib/chef/knife/environment_create.rb
+- lib/chef/knife/environment_delete.rb
+- lib/chef/knife/environment_edit.rb
+- lib/chef/knife/environment_from_file.rb
+- lib/chef/knife/environment_list.rb
+- lib/chef/knife/environment_show.rb
 - lib/chef/knife/exec.rb
 - lib/chef/knife/index_rebuild.rb
 - lib/chef/knife/node_bulk_delete.rb
@@ -326,9 +350,6 @@ files:
 - lib/chef/knife/node_run_list_add.rb
 - lib/chef/knife/node_run_list_remove.rb
 - lib/chef/knife/node_show.rb
-- lib/chef/knife/rackspace_server_create.rb
-- lib/chef/knife/rackspace_server_delete.rb
-- lib/chef/knife/rackspace_server_list.rb
 - lib/chef/knife/recipe_list.rb
 - lib/chef/knife/role_bulk_delete.rb
 - lib/chef/knife/role_create.rb
@@ -338,18 +359,17 @@ files:
 - lib/chef/knife/role_list.rb
 - lib/chef/knife/role_show.rb
 - lib/chef/knife/search.rb
-- lib/chef/knife/slicehost_images_list.rb
-- lib/chef/knife/slicehost_server_create.rb
-- lib/chef/knife/slicehost_server_delete.rb
-- lib/chef/knife/slicehost_server_list.rb
 - lib/chef/knife/ssh.rb
 - lib/chef/knife/status.rb
-- lib/chef/knife/terremark_server_create.rb
-- lib/chef/knife/terremark_server_delete.rb
-- lib/chef/knife/terremark_server_list.rb
+- lib/chef/knife/subcommand_loader.rb
+- lib/chef/knife/tag_create.rb
+- lib/chef/knife/tag_delete.rb
+- lib/chef/knife/tag_list.rb
+- lib/chef/knife/ui.rb
 - lib/chef/knife/windows_bootstrap.rb
 - lib/chef/knife.rb
 - lib/chef/log.rb
+- lib/chef/mash.rb
 - lib/chef/mixin/check_helper.rb
 - lib/chef/mixin/checksum.rb
 - lib/chef/mixin/command/unix.rb
@@ -359,7 +379,6 @@ files:
 - lib/chef/mixin/create_path.rb
 - lib/chef/mixin/deep_merge.rb
 - lib/chef/mixin/deprecation.rb
-- lib/chef/mixin/find_preferred_file.rb
 - lib/chef/mixin/from_file.rb
 - lib/chef/mixin/language.rb
 - lib/chef/mixin/language_include_attribute.rb
@@ -375,6 +394,7 @@ files:
 - lib/chef/monkey_patches/regexp.rb
 - lib/chef/monkey_patches/string.rb
 - lib/chef/monkey_patches/tempfile.rb
+- lib/chef/nil_argument.rb
 - lib/chef/node/attribute.rb
 - lib/chef/node.rb
 - lib/chef/openid_registration.rb
@@ -393,6 +413,7 @@ files:
 - lib/chef/provider/execute.rb
 - lib/chef/provider/file.rb
 - lib/chef/provider/git.rb
+- lib/chef/provider/group/aix.rb
 - lib/chef/provider/group/dscl.rb
 - lib/chef/provider/group/gpasswd.rb
 - lib/chef/provider/group/groupadd.rb
@@ -511,6 +532,7 @@ files:
 - lib/chef/run_context.rb
 - lib/chef/run_list/run_list_expansion.rb
 - lib/chef/run_list/run_list_item.rb
+- lib/chef/run_list/versioned_recipe_list.rb
 - lib/chef/run_list.rb
 - lib/chef/run_status.rb
 - lib/chef/runner.rb
@@ -521,7 +543,14 @@ files:
 - lib/chef/shef/shef_rest.rb
 - lib/chef/shef/shef_session.rb
 - lib/chef/shef.rb
+- lib/chef/shell_out/unix.rb
+- lib/chef/shell_out/windows.rb
 - lib/chef/shell_out.rb
+- lib/chef/solr_query/lucene.treetop
+- lib/chef/solr_query/lucene_nodes.rb
+- lib/chef/solr_query/query_transform.rb
+- lib/chef/solr_query/solr_http_request.rb
+- lib/chef/solr_query.rb
 - lib/chef/streaming_cookbook_uploader.rb
 - lib/chef/tasks/chef_repo.rake
 - lib/chef/util/file_edit.rb
@@ -531,6 +560,8 @@ files:
 - lib/chef/util/windows/volume.rb
 - lib/chef/util/windows.rb
 - lib/chef/version.rb
+- lib/chef/version_class.rb
+- lib/chef/version_constraint.rb
 - lib/chef/webui_user.rb
 - lib/chef.rb
 - bin/chef-client
@@ -555,9 +586,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: