chef 0.9.18 → 0.10.0.beta.0
Sign up to get free protection for your applications and to get access to all the features.
- 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
@@ -0,0 +1,118 @@
|
|
1
|
+
#
|
2
|
+
# Author:: Adam Jacob (<adam@opscode.com>)
|
3
|
+
# Author:: Daniel DeLeo (<dan@opscode.com>)
|
4
|
+
# Copyright:: Copyright (c) 2009-2011 Opscode, Inc.
|
5
|
+
# License:: Apache License, Version 2.0
|
6
|
+
#
|
7
|
+
# Licensed under the Apache License, Version 2.0 (the "License");
|
8
|
+
# you may not use this file except in compliance with the License.
|
9
|
+
# You may obtain a copy of the License at
|
10
|
+
#
|
11
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
12
|
+
#
|
13
|
+
# Unless required by applicable law or agreed to in writing, software
|
14
|
+
# distributed under the License is distributed on an "AS IS" BASIS,
|
15
|
+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
16
|
+
# See the License for the specific language governing permissions and
|
17
|
+
# limitations under the License.
|
18
|
+
#
|
19
|
+
|
20
|
+
require 'net/http'
|
21
|
+
require 'uri'
|
22
|
+
require 'chef/json_compat'
|
23
|
+
require 'chef/config'
|
24
|
+
|
25
|
+
class Chef
|
26
|
+
class SolrQuery
|
27
|
+
class SolrHTTPRequest
|
28
|
+
CLASS_FOR_METHOD = {:GET => Net::HTTP::Get, :POST => Net::HTTP::Post}
|
29
|
+
|
30
|
+
UPDATE_URL = '/solr/update'
|
31
|
+
TEXT_XML = {"Content-Type" => "text/xml"}
|
32
|
+
|
33
|
+
def self.solr_url=(solr_url)
|
34
|
+
@solr_url = solr_url
|
35
|
+
@http_client = nil
|
36
|
+
end
|
37
|
+
|
38
|
+
def self.solr_url
|
39
|
+
@solr_url || Chef::Config[:solr_url]
|
40
|
+
end
|
41
|
+
|
42
|
+
def self.http_client
|
43
|
+
@http_client ||= begin
|
44
|
+
uri = URI.parse(solr_url)
|
45
|
+
Net::HTTP.new(uri.host, uri.port)
|
46
|
+
end
|
47
|
+
end
|
48
|
+
|
49
|
+
def self.select(params={})
|
50
|
+
url = "/solr/select?#{url_join(params)}"
|
51
|
+
Chef::Log.debug("Sending #{url} to Solr")
|
52
|
+
request = new(:GET, url)
|
53
|
+
json_response = request.run("Search Query to Solr '#{solr_url}#{url}'")
|
54
|
+
Chef::JSONCompat.from_json(json_response)
|
55
|
+
end
|
56
|
+
|
57
|
+
def self.update(doc)
|
58
|
+
Chef::Log.debug("POSTing document to SOLR:\n#{doc}")
|
59
|
+
request = new(:POST, UPDATE_URL, TEXT_XML) { |req| req.body = doc.to_s }
|
60
|
+
request.run("POST to Solr '#{UPDATE_URL}', data: #{doc}")
|
61
|
+
end
|
62
|
+
|
63
|
+
def self.url_join(params_hash={})
|
64
|
+
params = params_hash.inject("") do |param_str, params|
|
65
|
+
param_str << "#{params[0]}=#{escape(params[1])}&"
|
66
|
+
end
|
67
|
+
params.chop! # trailing &
|
68
|
+
params
|
69
|
+
end
|
70
|
+
|
71
|
+
def self.escape(s)
|
72
|
+
s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/n) {
|
73
|
+
'%'+$1.unpack('H2'*$1.size).join('%').upcase
|
74
|
+
}.tr(' ', '+')
|
75
|
+
end
|
76
|
+
|
77
|
+
def initialize(method, url, headers=nil)
|
78
|
+
args = headers ? [url, headers] : url
|
79
|
+
@request = CLASS_FOR_METHOD[method].new(*args)
|
80
|
+
yield @request if block_given?
|
81
|
+
end
|
82
|
+
|
83
|
+
def http_client
|
84
|
+
self.class.http_client
|
85
|
+
end
|
86
|
+
|
87
|
+
def solr_url
|
88
|
+
self.class.solr_url
|
89
|
+
end
|
90
|
+
|
91
|
+
def run(description="HTTP Request to Solr")
|
92
|
+
response = http_client.request(@request)
|
93
|
+
request_failed!(response, description) unless response.kind_of?(Net::HTTPSuccess)
|
94
|
+
response.body
|
95
|
+
rescue NoMethodError => e
|
96
|
+
# http://redmine.ruby-lang.org/issues/show/2708
|
97
|
+
# http://redmine.ruby-lang.org/issues/show/2758
|
98
|
+
if e.to_s =~ /#{Regexp.escape(%q|undefined method 'closed?' for nil:NilClass|)}/
|
99
|
+
Chef::Log.fatal("#{description} failed. Chef::Exceptions::SolrConnectionError exception: Errno::ECONNREFUSED (net/http undefined method closed?) attempting to contact #{solr_url}")
|
100
|
+
Chef::Log.debug("rescued error in http connect, treating it as Errno::ECONNREFUSED to hide bug in net/http")
|
101
|
+
Chef::Log.debug(e.backtrace.join("\n"))
|
102
|
+
raise Chef::Exceptions::SolrConnectionError, "Errno::ECONNREFUSED: Connection refused attempting to contact #{solr_url}"
|
103
|
+
else
|
104
|
+
raise
|
105
|
+
end
|
106
|
+
end
|
107
|
+
|
108
|
+
def request_failed!(response, description='HTTP call')
|
109
|
+
Chef::Log.fatal("#{description} failed (#{response.class} #{response.code} #{response.message})")
|
110
|
+
response.error!
|
111
|
+
rescue Timeout::Error, Errno::EINVAL, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEDOUT => e
|
112
|
+
Chef::Log.debug(e.backtrace.join("\n"))
|
113
|
+
raise Chef::Exceptions::SolrConnectionError, "#{e.class.name}: #{e.to_s}"
|
114
|
+
end
|
115
|
+
|
116
|
+
end
|
117
|
+
end
|
118
|
+
end
|
data/lib/chef/version.rb
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
#
|
2
2
|
# Author:: Daniel DeLeo (<dan@opscode.com>)
|
3
|
-
# Copyright:: Copyright (c) 2010 Opscode, Inc.
|
3
|
+
# Copyright:: Copyright (c) 2010-2011 Opscode, Inc.
|
4
4
|
# License:: Apache License, Version 2.0
|
5
5
|
#
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
@@ -17,5 +17,7 @@
|
|
17
17
|
|
18
18
|
class Chef
|
19
19
|
CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
|
20
|
-
VERSION = '0.
|
20
|
+
VERSION = '0.10.0.beta.0'
|
21
21
|
end
|
22
|
+
|
23
|
+
# NOTE: the Chef::Version class is defined in version_class.rb
|
@@ -0,0 +1,70 @@
|
|
1
|
+
# Author:: Seth Falcon (<seth@opscode.com>)
|
2
|
+
# Author:: Christopher Walters (<cw@opscode.com>)
|
3
|
+
# Copyright:: Copyright 2010-2011 Opscode, Inc.
|
4
|
+
# License:: Apache License, Version 2.0
|
5
|
+
#
|
6
|
+
# Licensed under the Apache License, Version 2.0 (the "License");
|
7
|
+
# you may not use this file except in compliance with the License.
|
8
|
+
# You may obtain a copy of the License at
|
9
|
+
#
|
10
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
11
|
+
#
|
12
|
+
# Unless required by applicable law or agreed to in writing, software
|
13
|
+
# distributed under the License is distributed on an "AS IS" BASIS,
|
14
|
+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
15
|
+
# See the License for the specific language governing permissions and
|
16
|
+
# limitations under the License.
|
17
|
+
|
18
|
+
class Chef
|
19
|
+
class Version
|
20
|
+
include Comparable
|
21
|
+
attr_reader :major, :minor, :patch
|
22
|
+
|
23
|
+
def initialize(str="")
|
24
|
+
@major, @minor, @patch = parse(str)
|
25
|
+
end
|
26
|
+
|
27
|
+
def inspect
|
28
|
+
"#{@major}.#{@minor}.#{@patch}"
|
29
|
+
end
|
30
|
+
|
31
|
+
def to_s
|
32
|
+
"#{@major}.#{@minor}.#{@patch}"
|
33
|
+
end
|
34
|
+
|
35
|
+
def <=>(v)
|
36
|
+
[:major, :minor, :patch].each do |method|
|
37
|
+
ans = (self.send(method) <=> v.send(method))
|
38
|
+
return ans if ans != 0
|
39
|
+
end
|
40
|
+
0
|
41
|
+
end
|
42
|
+
|
43
|
+
def hash
|
44
|
+
# Didn't put any thought or research into this, probably can be
|
45
|
+
# done better
|
46
|
+
to_s.hash
|
47
|
+
end
|
48
|
+
|
49
|
+
# For hash
|
50
|
+
def eql?(other)
|
51
|
+
other.is_a?(Version) && self == other
|
52
|
+
end
|
53
|
+
|
54
|
+
private
|
55
|
+
|
56
|
+
def parse(str="")
|
57
|
+
@major, @minor, @patch =
|
58
|
+
case str.to_s
|
59
|
+
when /^(\d+)\.(\d+)\.(\d+)$/
|
60
|
+
[ $1.to_i, $2.to_i, $3.to_i ]
|
61
|
+
when /^(\d+)\.(\d+)$/
|
62
|
+
[ $1.to_i, $2.to_i, 0 ]
|
63
|
+
else
|
64
|
+
msg = "'#{str.to_s}' does not match 'x.y.z' or 'x.y'"
|
65
|
+
raise Chef::Exceptions::InvalidCookbookVersion.new msg
|
66
|
+
end
|
67
|
+
end
|
68
|
+
|
69
|
+
end
|
70
|
+
end
|
@@ -0,0 +1,116 @@
|
|
1
|
+
# Author:: Seth Falcon (<seth@opscode.com>)
|
2
|
+
# Author:: Christopher Walters (<cw@opscode.com>)
|
3
|
+
# Copyright:: Copyright 2010-2011 Opscode, Inc.
|
4
|
+
# License:: Apache License, Version 2.0
|
5
|
+
#
|
6
|
+
# Licensed under the Apache License, Version 2.0 (the "License");
|
7
|
+
# you may not use this file except in compliance with the License.
|
8
|
+
# You may obtain a copy of the License at
|
9
|
+
#
|
10
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
11
|
+
#
|
12
|
+
# Unless required by applicable law or agreed to in writing, software
|
13
|
+
# distributed under the License is distributed on an "AS IS" BASIS,
|
14
|
+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
15
|
+
# See the License for the specific language governing permissions and
|
16
|
+
# limitations under the License.
|
17
|
+
require 'chef/version_class'
|
18
|
+
|
19
|
+
class Chef
|
20
|
+
class VersionConstraint
|
21
|
+
DEFAULT_CONSTRAINT = ">= 0.0.0"
|
22
|
+
STANDARD_OPS = %w(< > <= >=)
|
23
|
+
OPS = %w(< > = <= >= ~>)
|
24
|
+
PATTERN = /^(#{OPS.join('|')}) (.+)$/
|
25
|
+
|
26
|
+
attr_reader :op, :version
|
27
|
+
|
28
|
+
def initialize(constraint_spec=DEFAULT_CONSTRAINT)
|
29
|
+
case constraint_spec
|
30
|
+
when nil
|
31
|
+
parse(DEFAULT_CONSTRAINT)
|
32
|
+
when Array
|
33
|
+
parse_from_array(constraint_spec)
|
34
|
+
when String
|
35
|
+
parse(constraint_spec)
|
36
|
+
else
|
37
|
+
msg = "VersionConstraint should be created from a String. You gave: #{constraint_spec.inspect}"
|
38
|
+
raise Chef::Exceptions::InvalidVersionConstraint, msg
|
39
|
+
end
|
40
|
+
end
|
41
|
+
|
42
|
+
def include?(v)
|
43
|
+
version = if v.respond_to? :version # a CookbookVersion-like object
|
44
|
+
Chef::Version.new(v.version.to_s)
|
45
|
+
else
|
46
|
+
Chef::Version.new(v.to_s)
|
47
|
+
end
|
48
|
+
do_op(version)
|
49
|
+
end
|
50
|
+
|
51
|
+
def inspect
|
52
|
+
"(#{@op} #{@version})"
|
53
|
+
end
|
54
|
+
|
55
|
+
def to_s
|
56
|
+
"#{@op} #{@version}"
|
57
|
+
end
|
58
|
+
|
59
|
+
def eql?(o)
|
60
|
+
o.class == self.class && @op == o.op && @version == o.version
|
61
|
+
end
|
62
|
+
alias_method :==, :eql?
|
63
|
+
|
64
|
+
private
|
65
|
+
|
66
|
+
def do_op(other_version)
|
67
|
+
if STANDARD_OPS.include? @op
|
68
|
+
other_version.send(@op.to_sym, @version)
|
69
|
+
elsif @op == '='
|
70
|
+
other_version == @version
|
71
|
+
elsif @op == '~>'
|
72
|
+
if @missing_patch_level
|
73
|
+
(other_version.major == @version.major &&
|
74
|
+
other_version.minor >= @version.minor)
|
75
|
+
else
|
76
|
+
(other_version.major == @version.major &&
|
77
|
+
other_version.minor == @version.minor &&
|
78
|
+
other_version.patch >= @version.patch)
|
79
|
+
end
|
80
|
+
else # should never happen
|
81
|
+
raise "bad op #{@op}"
|
82
|
+
end
|
83
|
+
end
|
84
|
+
|
85
|
+
def parse_from_array(constraint_spec)
|
86
|
+
if constraint_spec.empty?
|
87
|
+
parse(DEFAULT_CONSTRAINT)
|
88
|
+
elsif constraint_spec.size == 1
|
89
|
+
parse(constraint_spec.first)
|
90
|
+
else
|
91
|
+
msg = "only one version constraint operation is supported, but you gave #{constraint_spec.size} "
|
92
|
+
msg << "['#{constraint_spec.join(', ')}']"
|
93
|
+
raise Chef::Exceptions::InvalidVersionConstraint, msg
|
94
|
+
end
|
95
|
+
end
|
96
|
+
|
97
|
+
def parse(str)
|
98
|
+
@missing_patch_level = false
|
99
|
+
if str.index(" ").nil? && str =~ /^[0-9]/
|
100
|
+
# try for lone version, implied '='
|
101
|
+
@version = Chef::Version.new(str)
|
102
|
+
@op = "="
|
103
|
+
elsif PATTERN.match str
|
104
|
+
@op = $1
|
105
|
+
raw_version = $2
|
106
|
+
@version = Chef::Version.new(raw_version)
|
107
|
+
if raw_version.split('.').size == 2
|
108
|
+
@missing_patch_level = true
|
109
|
+
end
|
110
|
+
else
|
111
|
+
raise Chef::Exceptions::InvalidVersionConstraint, "'#{str}'"
|
112
|
+
end
|
113
|
+
end
|
114
|
+
|
115
|
+
end
|
116
|
+
end
|
metadata
CHANGED
@@ -1,8 +1,8 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: chef
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
prerelease:
|
5
|
-
version: 0.
|
4
|
+
prerelease: 7
|
5
|
+
version: 0.10.0.beta.0
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
8
8
|
- Adam Jacob
|
@@ -10,7 +10,7 @@ autorequire:
|
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
12
|
|
13
|
-
date: 2011-
|
13
|
+
date: 2011-03-28 00:00:00 -07:00
|
14
14
|
default_executable:
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
@@ -43,7 +43,7 @@ dependencies:
|
|
43
43
|
requirements:
|
44
44
|
- - ">="
|
45
45
|
- !ruby/object:Gem::Version
|
46
|
-
version: 1.
|
46
|
+
version: 1.3.0
|
47
47
|
type: :runtime
|
48
48
|
version_requirements: *id003
|
49
49
|
- !ruby/object:Gem::Dependency
|
@@ -108,40 +108,40 @@ dependencies:
|
|
108
108
|
type: :runtime
|
109
109
|
version_requirements: *id008
|
110
110
|
- !ruby/object:Gem::Dependency
|
111
|
-
name:
|
111
|
+
name: treetop
|
112
112
|
prerelease: false
|
113
113
|
requirement: &id009 !ruby/object:Gem::Requirement
|
114
114
|
none: false
|
115
115
|
requirements:
|
116
|
-
- -
|
116
|
+
- - ~>
|
117
117
|
- !ruby/object:Gem::Version
|
118
|
-
version:
|
118
|
+
version: 1.4.9
|
119
119
|
type: :runtime
|
120
120
|
version_requirements: *id009
|
121
121
|
- !ruby/object:Gem::Dependency
|
122
|
-
name:
|
122
|
+
name: net-ssh
|
123
123
|
prerelease: false
|
124
124
|
requirement: &id010 !ruby/object:Gem::Requirement
|
125
125
|
none: false
|
126
126
|
requirements:
|
127
|
-
- -
|
127
|
+
- - ~>
|
128
128
|
- !ruby/object:Gem::Version
|
129
|
-
version:
|
129
|
+
version: 2.1.3
|
130
130
|
type: :runtime
|
131
131
|
version_requirements: *id010
|
132
132
|
- !ruby/object:Gem::Dependency
|
133
|
-
name:
|
133
|
+
name: net-ssh-multi
|
134
134
|
prerelease: false
|
135
135
|
requirement: &id011 !ruby/object:Gem::Requirement
|
136
136
|
none: false
|
137
137
|
requirements:
|
138
|
-
- -
|
138
|
+
- - ~>
|
139
139
|
- !ruby/object:Gem::Version
|
140
|
-
version:
|
140
|
+
version: 1.0.1
|
141
141
|
type: :runtime
|
142
142
|
version_requirements: *id011
|
143
143
|
- !ruby/object:Gem::Dependency
|
144
|
-
name:
|
144
|
+
name: erubis
|
145
145
|
prerelease: false
|
146
146
|
requirement: &id012 !ruby/object:Gem::Requirement
|
147
147
|
none: false
|
@@ -152,7 +152,7 @@ dependencies:
|
|
152
152
|
type: :runtime
|
153
153
|
version_requirements: *id012
|
154
154
|
- !ruby/object:Gem::Dependency
|
155
|
-
name:
|
155
|
+
name: moneta
|
156
156
|
prerelease: false
|
157
157
|
requirement: &id013 !ruby/object:Gem::Requirement
|
158
158
|
none: false
|
@@ -162,6 +162,28 @@ dependencies:
|
|
162
162
|
version: "0"
|
163
163
|
type: :runtime
|
164
164
|
version_requirements: *id013
|
165
|
+
- !ruby/object:Gem::Dependency
|
166
|
+
name: highline
|
167
|
+
prerelease: false
|
168
|
+
requirement: &id014 !ruby/object:Gem::Requirement
|
169
|
+
none: false
|
170
|
+
requirements:
|
171
|
+
- - ">="
|
172
|
+
- !ruby/object:Gem::Version
|
173
|
+
version: "0"
|
174
|
+
type: :runtime
|
175
|
+
version_requirements: *id014
|
176
|
+
- !ruby/object:Gem::Dependency
|
177
|
+
name: uuidtools
|
178
|
+
prerelease: false
|
179
|
+
requirement: &id015 !ruby/object:Gem::Requirement
|
180
|
+
none: false
|
181
|
+
requirements:
|
182
|
+
- - ">="
|
183
|
+
- !ruby/object:Gem::Version
|
184
|
+
version: "0"
|
185
|
+
type: :runtime
|
186
|
+
version_requirements: *id015
|
165
187
|
description: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure.
|
166
188
|
email: adam@opscode.com
|
167
189
|
executables:
|
@@ -242,10 +264,11 @@ files:
|
|
242
264
|
- lib/chef/checksum_cache.rb
|
243
265
|
- lib/chef/client.rb
|
244
266
|
- lib/chef/config.rb
|
267
|
+
- lib/chef/cookbook/chefignore.rb
|
245
268
|
- lib/chef/cookbook/cookbook_collection.rb
|
269
|
+
- lib/chef/cookbook/cookbook_version_loader.rb
|
246
270
|
- lib/chef/cookbook/file_system_file_vendor.rb
|
247
271
|
- lib/chef/cookbook/file_vendor.rb
|
248
|
-
- lib/chef/cookbook/metadata/version.rb
|
249
272
|
- lib/chef/cookbook/metadata.rb
|
250
273
|
- lib/chef/cookbook/remote_file_vendor.rb
|
251
274
|
- lib/chef/cookbook/syntax_check.rb
|
@@ -253,10 +276,13 @@ files:
|
|
253
276
|
- lib/chef/cookbook_site_streaming_uploader.rb
|
254
277
|
- lib/chef/cookbook_uploader.rb
|
255
278
|
- lib/chef/cookbook_version.rb
|
279
|
+
- lib/chef/cookbook_version_selector.rb
|
256
280
|
- lib/chef/couchdb.rb
|
257
281
|
- lib/chef/daemon.rb
|
258
282
|
- lib/chef/data_bag.rb
|
259
283
|
- lib/chef/data_bag_item.rb
|
284
|
+
- lib/chef/encrypted_data_bag_item.rb
|
285
|
+
- lib/chef/environment.rb
|
260
286
|
- lib/chef/exceptions.rb
|
261
287
|
- lib/chef/file_access_control.rb
|
262
288
|
- lib/chef/file_cache.rb
|
@@ -267,10 +293,6 @@ files:
|
|
267
293
|
- lib/chef/index_queue/indexable.rb
|
268
294
|
- lib/chef/index_queue.rb
|
269
295
|
- lib/chef/json_compat.rb
|
270
|
-
- lib/chef/knife/bluebox_images_list.rb
|
271
|
-
- lib/chef/knife/bluebox_server_create.rb
|
272
|
-
- lib/chef/knife/bluebox_server_delete.rb
|
273
|
-
- lib/chef/knife/bluebox_server_list.rb
|
274
296
|
- lib/chef/knife/bootstrap/archlinux-gems.erb
|
275
297
|
- lib/chef/knife/bootstrap/centos5-gems.erb
|
276
298
|
- lib/chef/knife/bootstrap/client-install.vbs
|
@@ -311,10 +333,12 @@ files:
|
|
311
333
|
- lib/chef/knife/data_bag_from_file.rb
|
312
334
|
- lib/chef/knife/data_bag_list.rb
|
313
335
|
- lib/chef/knife/data_bag_show.rb
|
314
|
-
- lib/chef/knife/
|
315
|
-
- lib/chef/knife/
|
316
|
-
- lib/chef/knife/
|
317
|
-
- lib/chef/knife/
|
336
|
+
- lib/chef/knife/environment_create.rb
|
337
|
+
- lib/chef/knife/environment_delete.rb
|
338
|
+
- lib/chef/knife/environment_edit.rb
|
339
|
+
- lib/chef/knife/environment_from_file.rb
|
340
|
+
- lib/chef/knife/environment_list.rb
|
341
|
+
- lib/chef/knife/environment_show.rb
|
318
342
|
- lib/chef/knife/exec.rb
|
319
343
|
- lib/chef/knife/index_rebuild.rb
|
320
344
|
- lib/chef/knife/node_bulk_delete.rb
|
@@ -326,9 +350,6 @@ files:
|
|
326
350
|
- lib/chef/knife/node_run_list_add.rb
|
327
351
|
- lib/chef/knife/node_run_list_remove.rb
|
328
352
|
- lib/chef/knife/node_show.rb
|
329
|
-
- lib/chef/knife/rackspace_server_create.rb
|
330
|
-
- lib/chef/knife/rackspace_server_delete.rb
|
331
|
-
- lib/chef/knife/rackspace_server_list.rb
|
332
353
|
- lib/chef/knife/recipe_list.rb
|
333
354
|
- lib/chef/knife/role_bulk_delete.rb
|
334
355
|
- lib/chef/knife/role_create.rb
|
@@ -338,18 +359,17 @@ files:
|
|
338
359
|
- lib/chef/knife/role_list.rb
|
339
360
|
- lib/chef/knife/role_show.rb
|
340
361
|
- lib/chef/knife/search.rb
|
341
|
-
- lib/chef/knife/slicehost_images_list.rb
|
342
|
-
- lib/chef/knife/slicehost_server_create.rb
|
343
|
-
- lib/chef/knife/slicehost_server_delete.rb
|
344
|
-
- lib/chef/knife/slicehost_server_list.rb
|
345
362
|
- lib/chef/knife/ssh.rb
|
346
363
|
- lib/chef/knife/status.rb
|
347
|
-
- lib/chef/knife/
|
348
|
-
- lib/chef/knife/
|
349
|
-
- lib/chef/knife/
|
364
|
+
- lib/chef/knife/subcommand_loader.rb
|
365
|
+
- lib/chef/knife/tag_create.rb
|
366
|
+
- lib/chef/knife/tag_delete.rb
|
367
|
+
- lib/chef/knife/tag_list.rb
|
368
|
+
- lib/chef/knife/ui.rb
|
350
369
|
- lib/chef/knife/windows_bootstrap.rb
|
351
370
|
- lib/chef/knife.rb
|
352
371
|
- lib/chef/log.rb
|
372
|
+
- lib/chef/mash.rb
|
353
373
|
- lib/chef/mixin/check_helper.rb
|
354
374
|
- lib/chef/mixin/checksum.rb
|
355
375
|
- lib/chef/mixin/command/unix.rb
|
@@ -359,7 +379,6 @@ files:
|
|
359
379
|
- lib/chef/mixin/create_path.rb
|
360
380
|
- lib/chef/mixin/deep_merge.rb
|
361
381
|
- lib/chef/mixin/deprecation.rb
|
362
|
-
- lib/chef/mixin/find_preferred_file.rb
|
363
382
|
- lib/chef/mixin/from_file.rb
|
364
383
|
- lib/chef/mixin/language.rb
|
365
384
|
- lib/chef/mixin/language_include_attribute.rb
|
@@ -375,6 +394,7 @@ files:
|
|
375
394
|
- lib/chef/monkey_patches/regexp.rb
|
376
395
|
- lib/chef/monkey_patches/string.rb
|
377
396
|
- lib/chef/monkey_patches/tempfile.rb
|
397
|
+
- lib/chef/nil_argument.rb
|
378
398
|
- lib/chef/node/attribute.rb
|
379
399
|
- lib/chef/node.rb
|
380
400
|
- lib/chef/openid_registration.rb
|
@@ -393,6 +413,7 @@ files:
|
|
393
413
|
- lib/chef/provider/execute.rb
|
394
414
|
- lib/chef/provider/file.rb
|
395
415
|
- lib/chef/provider/git.rb
|
416
|
+
- lib/chef/provider/group/aix.rb
|
396
417
|
- lib/chef/provider/group/dscl.rb
|
397
418
|
- lib/chef/provider/group/gpasswd.rb
|
398
419
|
- lib/chef/provider/group/groupadd.rb
|
@@ -511,6 +532,7 @@ files:
|
|
511
532
|
- lib/chef/run_context.rb
|
512
533
|
- lib/chef/run_list/run_list_expansion.rb
|
513
534
|
- lib/chef/run_list/run_list_item.rb
|
535
|
+
- lib/chef/run_list/versioned_recipe_list.rb
|
514
536
|
- lib/chef/run_list.rb
|
515
537
|
- lib/chef/run_status.rb
|
516
538
|
- lib/chef/runner.rb
|
@@ -521,7 +543,14 @@ files:
|
|
521
543
|
- lib/chef/shef/shef_rest.rb
|
522
544
|
- lib/chef/shef/shef_session.rb
|
523
545
|
- lib/chef/shef.rb
|
546
|
+
- lib/chef/shell_out/unix.rb
|
547
|
+
- lib/chef/shell_out/windows.rb
|
524
548
|
- lib/chef/shell_out.rb
|
549
|
+
- lib/chef/solr_query/lucene.treetop
|
550
|
+
- lib/chef/solr_query/lucene_nodes.rb
|
551
|
+
- lib/chef/solr_query/query_transform.rb
|
552
|
+
- lib/chef/solr_query/solr_http_request.rb
|
553
|
+
- lib/chef/solr_query.rb
|
525
554
|
- lib/chef/streaming_cookbook_uploader.rb
|
526
555
|
- lib/chef/tasks/chef_repo.rake
|
527
556
|
- lib/chef/util/file_edit.rb
|
@@ -531,6 +560,8 @@ files:
|
|
531
560
|
- lib/chef/util/windows/volume.rb
|
532
561
|
- lib/chef/util/windows.rb
|
533
562
|
- lib/chef/version.rb
|
563
|
+
- lib/chef/version_class.rb
|
564
|
+
- lib/chef/version_constraint.rb
|
534
565
|
- lib/chef/webui_user.rb
|
535
566
|
- lib/chef.rb
|
536
567
|
- bin/chef-client
|
@@ -555,9 +586,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
555
586
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
556
587
|
none: false
|
557
588
|
requirements:
|
558
|
-
- - "
|
589
|
+
- - ">"
|
559
590
|
- !ruby/object:Gem::Version
|
560
|
-
version:
|
591
|
+
version: 1.3.1
|
561
592
|
requirements: []
|
562
593
|
|
563
594
|
rubyforge_project:
|