RubyGems - chef - Versions diffs - 0.9.18 → 0.10.0.beta.0 - Mend

chef 0.9.18 → 0.10.0.beta.0

Files changed (177) hide show

data/README.rdoc +0 -3
data/distro/arch/etc/rc.d/chef-server +0 -4
data/distro/arch/etc/rc.d/chef-server-webui +0 -4
data/distro/arch/etc/rc.d/chef-solr +0 -4
data/distro/arch/etc/rc.d/chef-solr-indexer +0 -4
data/lib/chef.rb +3 -3
data/lib/chef/api_client.rb +1 -1
data/lib/chef/application.rb +11 -1
data/lib/chef/application/client.rb +18 -22
data/lib/chef/application/knife.rb +28 -29
data/lib/chef/application/solo.rb +14 -12
data/lib/chef/client.rb +112 -54
data/lib/chef/config.rb +4 -0
data/lib/chef/cookbook/chefignore.rb +66 -0
data/lib/chef/cookbook/cookbook_collection.rb +6 -5
data/lib/chef/cookbook/cookbook_version_loader.rb +151 -0
data/lib/chef/cookbook/file_system_file_vendor.rb +10 -8
data/lib/chef/cookbook/metadata.rb +200 -108
data/lib/chef/cookbook_loader.rb +39 -163
data/lib/chef/cookbook_uploader.rb +100 -78
data/lib/chef/cookbook_version.rb +92 -47
data/lib/chef/cookbook_version_selector.rb +163 -0
data/lib/chef/couchdb.rb +9 -1
data/lib/chef/data_bag.rb +1 -1
data/lib/chef/data_bag_item.rb +1 -1
data/lib/chef/encrypted_data_bag_item.rb +126 -0
data/lib/chef/environment.rb +386 -0
data/lib/chef/exceptions.rb +82 -1
data/lib/chef/index_queue/amqp_client.rb +15 -12
data/lib/chef/index_queue/indexable.rb +38 -4
data/lib/chef/json_compat.rb +3 -3
data/lib/chef/knife.rb +97 -202
data/lib/chef/knife/bootstrap.rb +27 -61
data/lib/chef/knife/bootstrap/archlinux-gems.erb +4 -2
data/lib/chef/knife/bootstrap/centos5-gems.erb +6 -15
data/lib/chef/knife/bootstrap/fedora13-gems.erb +3 -4
data/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb +2 -2
data/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb +6 -5
data/lib/chef/knife/client_bulk_delete.rb +6 -3
data/lib/chef/knife/client_create.rb +13 -10
data/lib/chef/knife/client_delete.rb +10 -7
data/lib/chef/knife/client_edit.rb +9 -6
data/lib/chef/knife/client_list.rb +8 -5
data/lib/chef/knife/client_reregister.rb +9 -6
data/lib/chef/knife/client_show.rb +9 -6
data/lib/chef/knife/configure.rb +15 -19
data/lib/chef/knife/configure_client.rb +4 -4
data/lib/chef/knife/cookbook_bulk_delete.rb +11 -8
data/lib/chef/knife/cookbook_create.rb +120 -55
data/lib/chef/knife/cookbook_delete.rb +18 -12
data/lib/chef/knife/cookbook_download.rb +10 -6
data/lib/chef/knife/cookbook_list.rb +15 -6
data/lib/chef/knife/cookbook_metadata.rb +41 -21
data/lib/chef/knife/cookbook_metadata_from_file.rb +4 -0
data/lib/chef/knife/cookbook_show.rb +16 -5
data/lib/chef/knife/cookbook_site_download.rb +2 -2
data/lib/chef/knife/cookbook_site_share.rb +18 -13
data/lib/chef/knife/cookbook_site_unshare.rb +7 -4
data/lib/chef/knife/cookbook_site_vendor.rb +21 -18
data/lib/chef/knife/cookbook_test.rb +14 -14
data/lib/chef/knife/cookbook_upload.rb +91 -40
data/lib/chef/knife/data_bag_create.rb +41 -6
data/lib/chef/knife/data_bag_delete.rb +5 -3
data/lib/chef/knife/data_bag_edit.rb +55 -11
data/lib/chef/knife/data_bag_from_file.rb +47 -7
data/lib/chef/knife/data_bag_list.rb +4 -1
data/lib/chef/knife/data_bag_show.rb +44 -4
data/lib/chef/knife/environment_create.rb +53 -0
data/lib/chef/knife/environment_delete.rb +45 -0
data/lib/chef/knife/environment_edit.rb +45 -0
data/lib/chef/knife/environment_from_file.rb +39 -0
data/lib/chef/knife/environment_list.rb +42 -0
data/lib/chef/knife/environment_show.rb +46 -0
data/lib/chef/knife/exec.rb +1 -1
data/lib/chef/knife/index_rebuild.rb +8 -9
data/lib/chef/knife/node_bulk_delete.rb +9 -6
data/lib/chef/knife/node_create.rb +9 -6
data/lib/chef/knife/node_delete.rb +10 -7
data/lib/chef/knife/node_edit.rb +129 -10
data/lib/chef/knife/node_from_file.rb +10 -7
data/lib/chef/knife/node_list.rb +11 -6
data/lib/chef/knife/node_run_list_add.rb +10 -7
data/lib/chef/knife/node_run_list_remove.rb +9 -6
data/lib/chef/knife/node_show.rb +15 -7
data/lib/chef/knife/recipe_list.rb +4 -3
data/lib/chef/knife/role_bulk_delete.rb +9 -6
data/lib/chef/knife/role_create.rb +9 -6
data/lib/chef/knife/role_delete.rb +10 -7
data/lib/chef/knife/role_edit.rb +11 -8
data/lib/chef/knife/role_from_file.rb +10 -7
data/lib/chef/knife/role_list.rb +8 -5
data/lib/chef/knife/role_show.rb +11 -8
data/lib/chef/knife/search.rb +33 -10
data/lib/chef/knife/ssh.rb +33 -61
data/lib/chef/knife/status.rb +7 -4
data/lib/chef/knife/subcommand_loader.rb +101 -0
data/lib/chef/knife/tag_create.rb +31 -0
data/lib/chef/knife/tag_delete.rb +31 -0
data/lib/chef/knife/tag_list.rb +29 -0
data/lib/chef/knife/ui.rb +229 -0
data/lib/chef/knife/windows_bootstrap.rb +8 -5
data/lib/chef/log.rb +5 -59
data/lib/chef/mash.rb +211 -0
data/lib/chef/mixins.rb +1 -2
data/lib/chef/nil_argument.rb +3 -0
data/lib/chef/node.rb +96 -34
data/lib/chef/platform.rb +27 -0
data/lib/chef/provider/cookbook_file.rb +21 -20
data/lib/chef/provider/deploy/revision.rb +3 -0
data/lib/chef/provider/file.rb +20 -11
data/lib/chef/provider/git.rb +26 -26
data/lib/chef/provider/group/aix.rb +70 -0
data/lib/chef/provider/group/groupadd.rb +7 -4
data/lib/chef/provider/group/usermod.rb +1 -1
data/lib/chef/provider/package.rb +28 -28
data/lib/chef/provider/package/dpkg.rb +1 -1
data/lib/chef/provider/package/portage.rb +50 -39
data/lib/chef/provider/package/rubygems.rb +1 -1
data/lib/chef/provider/package/zypper.rb +3 -20
data/lib/chef/provider/remote_directory.rb +0 -2
data/lib/chef/provider/remote_file.rb +2 -3
data/lib/chef/provider/service/arch.rb +28 -35
data/lib/chef/provider/service/simple.rb +1 -1
data/lib/chef/provider/subversion.rb +22 -22
data/lib/chef/providers.rb +1 -0
data/lib/chef/recipe.rb +10 -12
data/lib/chef/resource.rb +49 -42
data/lib/chef/resource/gem_package.rb +7 -3
data/lib/chef/resource/git.rb +5 -5
data/lib/chef/resource/package.rb +7 -7
data/lib/chef/resource/scm.rb +2 -1
data/lib/chef/resource/solaris_package.rb +0 -1
data/lib/chef/resource/yum_package.rb +0 -1
data/lib/chef/rest.rb +7 -16
data/lib/chef/rest/rest_request.rb +0 -16
data/lib/chef/role.rb +67 -13
data/lib/chef/run_context.rb +37 -21
data/lib/chef/run_list.rb +30 -15
data/lib/chef/run_list/run_list_expansion.rb +41 -20
data/lib/chef/run_list/run_list_item.rb +20 -6
data/lib/chef/run_list/versioned_recipe_list.rb +68 -0
data/lib/chef/runner.rb +7 -15
data/lib/chef/search/query.rb +12 -7
data/lib/chef/shef.rb +6 -7
data/lib/chef/shef/shef_session.rb +40 -35
data/lib/chef/shell_out.rb +22 -201
data/lib/chef/shell_out/unix.rb +224 -0
data/lib/chef/shell_out/windows.rb +95 -0
data/lib/chef/solr_query.rb +187 -0
data/lib/chef/solr_query/lucene.treetop +145 -0
data/lib/chef/solr_query/lucene_nodes.rb +285 -0
data/lib/chef/solr_query/query_transform.rb +65 -0
data/lib/chef/solr_query/solr_http_request.rb +118 -0
data/lib/chef/version.rb +4 -2
data/lib/chef/version_class.rb +70 -0
data/lib/chef/version_constraint.rb +116 -0
metadata +68 -37
data/lib/chef/cookbook/metadata/version.rb +0 -87
data/lib/chef/knife/bluebox_images_list.rb +0 -54
data/lib/chef/knife/bluebox_server_create.rb +0 -157
data/lib/chef/knife/bluebox_server_delete.rb +0 -63
data/lib/chef/knife/bluebox_server_list.rb +0 -59
data/lib/chef/knife/ec2_instance_data.rb +0 -46
data/lib/chef/knife/ec2_server_create.rb +0 -218
data/lib/chef/knife/ec2_server_delete.rb +0 -87
data/lib/chef/knife/ec2_server_list.rb +0 -89
data/lib/chef/knife/rackspace_server_create.rb +0 -184
data/lib/chef/knife/rackspace_server_delete.rb +0 -57
data/lib/chef/knife/rackspace_server_list.rb +0 -59
data/lib/chef/knife/slicehost_images_list.rb +0 -53
data/lib/chef/knife/slicehost_server_create.rb +0 -103
data/lib/chef/knife/slicehost_server_delete.rb +0 -61
data/lib/chef/knife/slicehost_server_list.rb +0 -64
data/lib/chef/knife/terremark_server_create.rb +0 -152
data/lib/chef/knife/terremark_server_delete.rb +0 -87
data/lib/chef/knife/terremark_server_list.rb +0 -77
data/lib/chef/mixin/find_preferred_file.rb +0 -92

data/lib/chef/solr_query/lucene.treetop ADDED

@@ -0,0 +1,145 @@
+#
+# Author:: Seth Falcon (<seth@opscode.com>)
+# Copyright:: Copyright (c) 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.
+#
+grammar Lucene
+  rule body
+    (expression / space)* <Body>
+  end
+  rule expression
+    operation / group / field / field_range / term / string
+  end
+  rule term
+    keyword valid_letter+ <Term> / !keyword valid_letter+ <Term>
+  end
+  rule field
+    field_name ":" (term/string/group) <Field>
+  end
+  rule field_range
+    field_name ":" "[" range_value " TO " range_value "]" <InclFieldRange>
+    /
+    field_name ":" "{" range_value " TO " range_value "}" <ExclFieldRange>
+  end
+  rule field_name
+    !keyword valid_letter+ <FieldName>
+  end
+  rule range_value
+    valid_letter+ <RangeValue>
+  end
+  rule group
+    space? '(' body ')' space? <Group>
+  end
+  rule operation
+    binary_op / unary_op / fuzzy_op / boost_op
+  end
+  rule unary_op
+    not_op / required_op / prohibited_op
+  end
+  rule binary_op
+    (group / field / field_range / term) space? boolean_operator space+ body <BinaryOp>
+  end
+  rule boolean_operator
+    and_operator / or_operator
+  end
+  rule and_operator
+    'AND' <AndOperator> / '&&' <AndOperator>
+  end
+  rule or_operator
+    'OR' <OrOperator> / '||' <OrOperator>
+  end
+  rule not_op
+    not_operator space (group / field / field_range / term / string) <UnaryOp>
+    /
+    bang_operator space? (group / field / field_range / term / string) <UnaryOp>
+  end
+  rule not_operator
+    'NOT' <NotOperator>
+  end
+  rule bang_operator
+    '!' <NotOperator>
+  end
+  rule required_op
+    !valid_letter required_operator (term/string) <UnaryOp>
+    /
+    required_operator (term/string) <UnaryOp>
+  end
+  rule required_operator
+    '+' <RequiredOperator>
+  end
+  rule prohibited_op
+    !valid_letter prohibited_operator (field/field_range/term/string) <UnaryOp>
+    /
+    prohibited_operator (field/field_range/term/string) <UnaryOp>
+  end
+  rule prohibited_operator
+    '-' <ProhibitedOperator>
+  end
+  rule boost_op
+    (term/string) '^' fuzzy_param <BoostOp>
+  end
+  rule fuzzy_op
+    (term/string) '~' fuzzy_param? <FuzzyOp>
+  end
+  rule fuzzy_param
+    [0-9] '.'? [0-9] <FuzzyParam> / [0-9]+ <FuzzyParam>
+  end
+  rule string
+    #'"' (!'"' . / '\"')* '"' <Phrase>
+    '"' term (space term)* '"' <Phrase>
+  end
+  rule keyword
+    'AND' / 'OR' / 'NOT'
+  end
+  rule valid_letter
+    [a-zA-Z0-9*_+.-] / '\\' special_char
+  end
+  rule special_char
+    [!(){}\[\]^"~*?:\\]
+  end
+  rule space
+    [\s]+
+  end
+end

data/lib/chef/solr_query/lucene_nodes.rb ADDED

@@ -0,0 +1,285 @@
+#
+# Author:: Seth Falcon (<seth@opscode.com>)
+# Copyright:: Copyright (c) 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 'treetop'
+module Lucene
+  SEP = "__=__"
+  class Term < Treetop::Runtime::SyntaxNode
+    def to_array
+      "T:#{self.text_value}"
+    end
+    def transform
+      self.text_value
+    end
+  end
+  class Field < Treetop::Runtime::SyntaxNode
+    def to_array
+      field = self.elements[0].text_value
+      term = self.elements[1].to_array
+      "(F:#{field} #{term})"
+    end
+    def transform
+      field = self.elements[0].text_value
+      term = self.elements[1]
+      if term.is_a? Phrase
+        str = term.transform
+        # remove quotes
+        str = str[1 ... (str.length - 1)]
+        "content:\"#{field}#{SEP}#{str}\""
+      else
+        "content:#{field}#{SEP}#{term.transform}"
+      end
+    end
+  end
+  class FieldRange < Treetop::Runtime::SyntaxNode
+    def to_array
+      field = self.elements[0].text_value
+      range_start = self.elements[1].to_array
+      range_end = self.elements[2].to_array
+      "(FR:#{field} #{left}#{range_start}#{right} #{left}#{range_end}#{right})"
+    end
+    def transform
+      field = self.elements[0].text_value
+      range_start = self.elements[1].transform
+      range_end = self.elements[2].transform
+      # FIXME: handle special cases for missing start/end
+      if ("*" == range_start && "*" == range_end)
+        "content:#{field}#{SEP}*"
+      elsif "*" == range_end
+        "content:#{left}#{field}#{SEP}#{range_start} TO #{field}#{SEP}\\ufff0#{right}"
+      elsif "*" == range_start
+        "content:#{left}#{field}#{SEP} TO #{field}#{SEP}#{range_end}#{right}"
+      else
+        "content:#{left}#{field}#{SEP}#{range_start} TO #{field}#{SEP}#{range_end}#{right}"
+      end
+    end
+  end
+  class InclFieldRange < FieldRange
+    def left
+      "["
+    end
+    def right
+      "]"
+    end
+  end
+  class ExclFieldRange < FieldRange
+    def left
+      "{"
+    end
+    def right
+      "}"
+    end
+  end
+  class RangeValue < Treetop::Runtime::SyntaxNode
+    def to_array
+      self.text_value
+    end
+    def transform
+      to_array
+    end
+  end
+  class FieldName < Treetop::Runtime::SyntaxNode
+    def to_array
+      self.text_value
+    end
+    def transform
+      to_array
+    end
+  end
+  class Body < Treetop::Runtime::SyntaxNode
+    def to_array
+      self.elements.map { |x| x.to_array }.join(" ")
+    end
+    def transform
+      self.elements.map { |x| x.transform }.join(" ")
+    end
+  end
+  class Group < Treetop::Runtime::SyntaxNode
+    def to_array
+      "(" + self.elements[0].to_array + ")"
+    end
+    def transform
+      "(" + self.elements[0].transform + ")"
+    end
+  end
+  class BinaryOp < Treetop::Runtime::SyntaxNode
+    def to_array
+      op = self.elements[1].to_array
+      a = self.elements[0].to_array
+      b = self.elements[2].to_array
+      "(#{op} #{a} #{b})"
+    end
+    def transform
+      op = self.elements[1].transform
+      a = self.elements[0].transform
+      b = self.elements[2].transform
+      "#{a} #{op} #{b}"
+    end
+  end
+  class AndOperator < Treetop::Runtime::SyntaxNode
+    def to_array
+      "OP:AND"
+    end
+    def transform
+      "AND"
+    end
+  end
+    class OrOperator < Treetop::Runtime::SyntaxNode
+    def to_array
+      "OP:OR"
+    end
+    def transform
+      "OR"
+    end
+  end
+  class FuzzyOp < Treetop::Runtime::SyntaxNode
+    def to_array
+      a = self.elements[0].to_array
+      param = self.elements[1]
+      if param
+        "(OP:~ #{a} #{param.to_array})"
+      else
+        "(OP:~ #{a})"
+      end
+    end
+    def transform
+      a = self.elements[0].transform
+      param = self.elements[1]
+      if param
+        "#{a}~#{param.transform}"
+      else
+        "#{a}~"
+      end
+    end
+  end
+  class BoostOp < Treetop::Runtime::SyntaxNode
+    def to_array
+      a = self.elements[0].to_array
+      param = self.elements[1]
+      "(OP:^ #{a} #{param.to_array})"
+    end
+    def transform
+      a = self.elements[0].transform
+      param = self.elements[1]
+      "#{a}^#{param.transform}"
+    end
+  end
+  class FuzzyParam < Treetop::Runtime::SyntaxNode
+    def to_array
+      self.text_value
+    end
+    def transform
+      self.text_value
+    end
+  end
+  class UnaryOp < Treetop::Runtime::SyntaxNode
+    def to_array
+      op = self.elements[0].to_array
+      a = self.elements[1].to_array
+      "(#{op} #{a})"
+    end
+    def transform
+      op = self.elements[0].transform
+      a = self.elements[1].transform
+      spc = case op
+            when "+", "-"
+              ""
+            else
+              " "
+            end
+      "#{op}#{spc}#{a}"
+    end
+  end
+  class NotOperator < Treetop::Runtime::SyntaxNode
+    def to_array
+      "OP:NOT"
+    end
+    def transform
+      "NOT"
+    end
+  end
+  class RequiredOperator < Treetop::Runtime::SyntaxNode
+    def to_array
+      "OP:+"
+    end
+    def transform
+      "+"
+    end
+  end
+  class ProhibitedOperator < Treetop::Runtime::SyntaxNode
+    def to_array
+      "OP:-"
+    end
+    def transform
+      "-"
+    end
+  end
+  class Phrase < Treetop::Runtime::SyntaxNode
+    def to_array
+      "STR:#{self.text_value}"
+    end
+    def transform
+      "#{self.text_value}"
+    end
+  end
+end

data/lib/chef/solr_query/query_transform.rb ADDED

@@ -0,0 +1,65 @@
+#
+# Author:: Seth Falcon (<seth@opscode.com>)
+# Copyright:: Copyright (c) 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 'treetop'
+require 'chef/solr_query/lucene_nodes'
+class Chef
+  class Exceptions
+    class QueryParseError < StandardError
+    end
+  end
+end
+class Chef
+  class SolrQuery
+    class QueryTransform
+      @@base_path = File.expand_path(File.dirname(__FILE__))
+      Treetop.load(File.join(@@base_path, 'lucene.treetop'))
+      @@parser = LuceneParser.new
+      def self.parse(data)
+        tree = @@parser.parse(data)
+        msg = "Parse error at offset: #{@@parser.index}\n"
+        msg += "Reason: #{@@parser.failure_reason}"
+        raise Chef::Exceptions::QueryParseError, msg if tree.nil?
+        self.clean_tree(tree)
+        tree.to_array
+      end
+      def self.transform(data)
+        return "*:*" if data == "*:*"
+        tree = @@parser.parse(data)
+        msg = "Parse error at offset: #{@@parser.index}\n"
+        msg += "Reason: #{@@parser.failure_reason}"
+        raise Chef::Exceptions::QueryParseError, msg if tree.nil?
+        self.clean_tree(tree)
+        tree.transform
+      end
+      private
+      def self.clean_tree(root_node)
+        return if root_node.elements.nil?
+        root_node.elements.delete_if do |node|
+          node.class.name == "Treetop::Runtime::SyntaxNode"
+        end
+        root_node.elements.each { |node| self.clean_tree(node) }
+      end
+    end
+  end
+end