cluster_chef-knife 3.0.5 → 3.0.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/CHANGELOG.md +4 -1
- data/Gemfile +13 -6
- data/Rakefile +30 -22
- data/VERSION +1 -1
- data/cluster_chef-knife.gemspec +13 -19
- data/tasks/{chef_config.rb → chef_config.rake} +0 -0
- data/tasks/{jeweler_use_alt_branch.rb → jeweler_use_alt_branch.rake} +13 -7
- metadata +29 -51
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,8 @@
|
|
1
|
+
## v3.0.6: schism of cookbooks and tools
|
1
2
|
|
2
|
-
|
3
|
+
* cookbooks all now live in [their own repo](https://github.com/infochimps-labs/cluster_chef-homebase), organized according to opscode standard.
|
4
|
+
* gem is now split into `cluster_chef` (the libraries) and `cluster_chef-knife` (the chef plugins)
|
5
|
+
* private_key was passing its block to super, with bad results
|
3
6
|
|
4
7
|
## Changes from v2 => v3 [2011 October]
|
5
8
|
|
data/Gemfile
CHANGED
@@ -5,14 +5,21 @@ gem 'fog', "~> 1.1.1"
|
|
5
5
|
gem 'formatador', "~> 0.2.1"
|
6
6
|
gem 'gorillib', "~> 0.1.7"
|
7
7
|
|
8
|
-
# Add dependencies to develop your gem here.
|
9
|
-
# Include everything needed to run rake, tests, features, etc.
|
10
8
|
group :development do
|
11
9
|
gem 'bundler', "~> 1"
|
12
|
-
gem '
|
13
|
-
gem '
|
14
|
-
gem '
|
10
|
+
gem 'jeweler', "~> 1.6"
|
11
|
+
gem 'rspec', "~> 2.5"
|
12
|
+
gem 'yard', "~> 0.6"
|
15
13
|
gem 'configliere', "~> 0.4.8"
|
16
|
-
|
14
|
+
end
|
15
|
+
|
16
|
+
group :test do
|
17
|
+
gem 'spork', "~> 0.9.0.rc5", :platform => :mri
|
17
18
|
gem 'watchr', "~> 0.7"
|
19
|
+
gem 'rcov', ">= 0.9.9"
|
20
|
+
end
|
21
|
+
|
22
|
+
group :support do
|
23
|
+
gem 'pry'
|
24
|
+
gem 'grit'
|
18
25
|
end
|
data/Rakefile
CHANGED
@@ -33,7 +33,8 @@ require 'rspec/core/rake_task'
|
|
33
33
|
require 'yard'
|
34
34
|
|
35
35
|
# Load constants from rake config file.
|
36
|
-
|
36
|
+
$LOAD_PATH.unshift('tasks')
|
37
|
+
Dir[File.join('tasks', '*.rake')].sort.each{|f| load(f) }
|
37
38
|
|
38
39
|
$jeweler_push_from_branch = 'version_3'
|
39
40
|
|
@@ -41,31 +42,38 @@ $jeweler_push_from_branch = 'version_3'
|
|
41
42
|
#
|
42
43
|
# Jeweler -- release cluster_chef as a gem
|
43
44
|
#
|
44
|
-
Jeweler::Tasks.new do |gem|
|
45
|
-
gem.name = ENV['CLUSTER_CHEF_NAME'] || "cluster_chef-knife"
|
46
|
-
gem.homepage = "http://infochimps.com/labs"
|
47
|
-
gem.license = NEW_COOKBOOK_LICENSE.to_s
|
48
|
-
gem.summary = %Q{cluster_chef allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks.}
|
49
|
-
gem.description = %Q{cluster_chef allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks.}
|
50
|
-
gem.email = SSL_EMAIL_ADDRESS
|
51
|
-
gem.authors = ["Infochimps"]
|
52
45
|
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
46
|
+
%w[ cluster_chef cluster_chef-knife ].each do |gem_name|
|
47
|
+
Jeweler::Tasks.new do |gem|
|
48
|
+
gem.name = gem_name
|
49
|
+
gem.version = File.read('VERSION')
|
50
|
+
gem.homepage = "http://infochimps.com/labs"
|
51
|
+
gem.license = NEW_COOKBOOK_LICENSE.to_s
|
52
|
+
gem.summary = %Q{cluster_chef allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks.}
|
53
|
+
gem.description = %Q{cluster_chef allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks.}
|
54
|
+
gem.email = SSL_EMAIL_ADDRESS
|
55
|
+
gem.authors = ["Infochimps"]
|
61
56
|
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
57
|
+
ignores = File.readlines(".gitignore").grep(/^[^#]\S+/).map{|s| s.chomp }
|
58
|
+
dotfiles = [".gemtest", ".gitignore", ".rspec", ".yardopts"]
|
59
|
+
gem.files = dotfiles + Dir["**/*"].
|
60
|
+
reject{|f| f =~ %r{^cookbooks/} }.
|
61
|
+
reject{|f| File.directory?(f) }.
|
62
|
+
reject{|f| ignores.any?{|i| File.fnmatch(i, f) || File.fnmatch(i+'/*', f) || File.fnmatch(i+'/**/*', f) } }
|
63
|
+
gem.test_files = gem.files.grep(/^spec\//)
|
64
|
+
gem.require_paths = ['lib']
|
65
|
+
|
66
|
+
if gem.name == 'cluster_chef'
|
67
|
+
gem.files.reject!{|f| f =~ %r{^(cluster_chef-knife.gemspec|lib/chef/knife/)} }
|
68
|
+
gem.add_runtime_dependency 'cluster_chef-knife', "= #{gem.version}"
|
69
|
+
elsif gem.name == 'cluster_chef-knife'
|
70
|
+
gem.files.reject!{|f| f =~ %r{^(cluster_chef.gemspec|lib/cluster_chef)} }
|
71
|
+
else
|
72
|
+
raise "Don't know what to include for gem #{gem.name}"
|
73
|
+
end
|
66
74
|
end
|
75
|
+
Jeweler::RubygemsDotOrgTasks.new
|
67
76
|
end
|
68
|
-
Jeweler::RubygemsDotOrgTasks.new
|
69
77
|
|
70
78
|
# ---------------------------------------------------------------------------
|
71
79
|
#
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
3.0.
|
1
|
+
3.0.6
|
data/cluster_chef-knife.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = "cluster_chef-knife"
|
8
|
-
s.version = "3.0.
|
8
|
+
s.version = "3.0.6"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Infochimps"]
|
12
|
-
s.date = "2011-12-
|
12
|
+
s.date = "2011-12-13"
|
13
13
|
s.description = "cluster_chef allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
|
14
14
|
s.email = "coders@infochimps.com"
|
15
15
|
s.extra_rdoc_files = [
|
@@ -56,8 +56,8 @@ Gem::Specification.new do |s|
|
|
56
56
|
"spec/spec_helper.rb",
|
57
57
|
"spec/spec_helper/dummy_chef.rb",
|
58
58
|
"spec/test_config.rb",
|
59
|
-
"tasks/chef_config.
|
60
|
-
"tasks/jeweler_use_alt_branch.
|
59
|
+
"tasks/chef_config.rake",
|
60
|
+
"tasks/jeweler_use_alt_branch.rake"
|
61
61
|
]
|
62
62
|
s.homepage = "http://infochimps.com/labs"
|
63
63
|
s.licenses = ["apachev2"]
|
@@ -75,24 +75,20 @@ Gem::Specification.new do |s|
|
|
75
75
|
s.add_runtime_dependency(%q<formatador>, ["~> 0.2.1"])
|
76
76
|
s.add_runtime_dependency(%q<gorillib>, ["~> 0.1.7"])
|
77
77
|
s.add_development_dependency(%q<bundler>, ["~> 1"])
|
78
|
-
s.add_development_dependency(%q<
|
79
|
-
s.add_development_dependency(%q<
|
80
|
-
s.add_development_dependency(%q<
|
78
|
+
s.add_development_dependency(%q<jeweler>, ["~> 1.6"])
|
79
|
+
s.add_development_dependency(%q<rspec>, ["~> 2.5"])
|
80
|
+
s.add_development_dependency(%q<yard>, ["~> 0.6"])
|
81
81
|
s.add_development_dependency(%q<configliere>, ["~> 0.4.8"])
|
82
|
-
s.add_development_dependency(%q<spork>, ["~> 0.9.0.rc5"])
|
83
|
-
s.add_development_dependency(%q<watchr>, ["~> 0.7"])
|
84
82
|
else
|
85
83
|
s.add_dependency(%q<chef>, ["~> 0.10.4"])
|
86
84
|
s.add_dependency(%q<fog>, ["~> 1.1.1"])
|
87
85
|
s.add_dependency(%q<formatador>, ["~> 0.2.1"])
|
88
86
|
s.add_dependency(%q<gorillib>, ["~> 0.1.7"])
|
89
87
|
s.add_dependency(%q<bundler>, ["~> 1"])
|
90
|
-
s.add_dependency(%q<
|
91
|
-
s.add_dependency(%q<
|
92
|
-
s.add_dependency(%q<
|
88
|
+
s.add_dependency(%q<jeweler>, ["~> 1.6"])
|
89
|
+
s.add_dependency(%q<rspec>, ["~> 2.5"])
|
90
|
+
s.add_dependency(%q<yard>, ["~> 0.6"])
|
93
91
|
s.add_dependency(%q<configliere>, ["~> 0.4.8"])
|
94
|
-
s.add_dependency(%q<spork>, ["~> 0.9.0.rc5"])
|
95
|
-
s.add_dependency(%q<watchr>, ["~> 0.7"])
|
96
92
|
end
|
97
93
|
else
|
98
94
|
s.add_dependency(%q<chef>, ["~> 0.10.4"])
|
@@ -100,12 +96,10 @@ Gem::Specification.new do |s|
|
|
100
96
|
s.add_dependency(%q<formatador>, ["~> 0.2.1"])
|
101
97
|
s.add_dependency(%q<gorillib>, ["~> 0.1.7"])
|
102
98
|
s.add_dependency(%q<bundler>, ["~> 1"])
|
103
|
-
s.add_dependency(%q<
|
104
|
-
s.add_dependency(%q<
|
105
|
-
s.add_dependency(%q<
|
99
|
+
s.add_dependency(%q<jeweler>, ["~> 1.6"])
|
100
|
+
s.add_dependency(%q<rspec>, ["~> 2.5"])
|
101
|
+
s.add_dependency(%q<yard>, ["~> 0.6"])
|
106
102
|
s.add_dependency(%q<configliere>, ["~> 0.4.8"])
|
107
|
-
s.add_dependency(%q<spork>, ["~> 0.9.0.rc5"])
|
108
|
-
s.add_dependency(%q<watchr>, ["~> 0.7"])
|
109
103
|
end
|
110
104
|
end
|
111
105
|
|
File without changes
|
@@ -7,16 +7,19 @@
|
|
7
7
|
module Jeweler::Commands
|
8
8
|
|
9
9
|
PUSH_FROM_BRANCH = 'version_3' unless defined?(PUSH_FROM_BRANCH)
|
10
|
-
|
10
|
+
|
11
11
|
ReleaseToGit.class_eval do
|
12
12
|
def run
|
13
|
+
branch = PUSH_FROM_BRANCH
|
14
|
+
remote = 'origin'
|
15
|
+
|
13
16
|
unless clean_staging_area?
|
14
17
|
system "git status"
|
15
18
|
raise "Unclean staging area! Be sure to commit or .gitignore everything first. See `git status` above."
|
16
19
|
end
|
17
20
|
|
18
|
-
repo.checkout(
|
19
|
-
repo.push
|
21
|
+
repo.checkout(branch)
|
22
|
+
repo.push(remote, branch)
|
20
23
|
|
21
24
|
if release_not_tagged?
|
22
25
|
output.puts "Tagging #{release_tag}"
|
@@ -27,21 +30,24 @@ module Jeweler::Commands
|
|
27
30
|
end
|
28
31
|
end
|
29
32
|
end
|
30
|
-
|
33
|
+
|
31
34
|
ReleaseGemspec.class_eval do
|
32
35
|
def run
|
36
|
+
branch = PUSH_FROM_BRANCH
|
37
|
+
remote = 'origin'
|
38
|
+
|
33
39
|
unless clean_staging_area?
|
34
40
|
system "git status"
|
35
41
|
raise "Unclean staging area! Be sure to commit or .gitignore everything first. See `git status` above."
|
36
42
|
end
|
37
43
|
|
38
|
-
repo.checkout(
|
44
|
+
repo.checkout(branch)
|
39
45
|
|
40
46
|
regenerate_gemspec!
|
41
47
|
commit_gemspec! if gemspec_changed?
|
42
48
|
|
43
|
-
output.puts "Pushing #{
|
44
|
-
repo.push
|
49
|
+
output.puts "Pushing #{branch} to origin"
|
50
|
+
repo.push(remote, branch)
|
45
51
|
end
|
46
52
|
end
|
47
53
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cluster_chef-knife
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.0.
|
4
|
+
version: 3.0.6
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2011-12-
|
12
|
+
date: 2011-12-13 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: chef
|
16
|
-
requirement: &
|
16
|
+
requirement: &70143360220620 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ~>
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: 0.10.4
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *70143360220620
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: fog
|
27
|
-
requirement: &
|
27
|
+
requirement: &70143360219880 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ~>
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: 1.1.1
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *70143360219880
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: formatador
|
38
|
-
requirement: &
|
38
|
+
requirement: &70143360219220 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ~>
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: 0.2.1
|
44
44
|
type: :runtime
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *70143360219220
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: gorillib
|
49
|
-
requirement: &
|
49
|
+
requirement: &70143360218120 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ~>
|
@@ -54,10 +54,10 @@ dependencies:
|
|
54
54
|
version: 0.1.7
|
55
55
|
type: :runtime
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *70143360218120
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: bundler
|
60
|
-
requirement: &
|
60
|
+
requirement: &70143360217060 !ruby/object:Gem::Requirement
|
61
61
|
none: false
|
62
62
|
requirements:
|
63
63
|
- - ~>
|
@@ -65,73 +65,51 @@ dependencies:
|
|
65
65
|
version: '1'
|
66
66
|
type: :development
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
69
|
-
- !ruby/object:Gem::Dependency
|
70
|
-
name: yard
|
71
|
-
requirement: &70272996262020 !ruby/object:Gem::Requirement
|
72
|
-
none: false
|
73
|
-
requirements:
|
74
|
-
- - ~>
|
75
|
-
- !ruby/object:Gem::Version
|
76
|
-
version: 0.6.7
|
77
|
-
type: :development
|
78
|
-
prerelease: false
|
79
|
-
version_requirements: *70272996262020
|
68
|
+
version_requirements: *70143360217060
|
80
69
|
- !ruby/object:Gem::Dependency
|
81
70
|
name: jeweler
|
82
|
-
requirement: &
|
71
|
+
requirement: &70143360216400 !ruby/object:Gem::Requirement
|
83
72
|
none: false
|
84
73
|
requirements:
|
85
74
|
- - ~>
|
86
75
|
- !ruby/object:Gem::Version
|
87
|
-
version: 1.6
|
76
|
+
version: '1.6'
|
88
77
|
type: :development
|
89
78
|
prerelease: false
|
90
|
-
version_requirements: *
|
79
|
+
version_requirements: *70143360216400
|
91
80
|
- !ruby/object:Gem::Dependency
|
92
81
|
name: rspec
|
93
|
-
requirement: &
|
94
|
-
none: false
|
95
|
-
requirements:
|
96
|
-
- - ~>
|
97
|
-
- !ruby/object:Gem::Version
|
98
|
-
version: 2.7.0
|
99
|
-
type: :development
|
100
|
-
prerelease: false
|
101
|
-
version_requirements: *70272996261000
|
102
|
-
- !ruby/object:Gem::Dependency
|
103
|
-
name: configliere
|
104
|
-
requirement: &70272996513940 !ruby/object:Gem::Requirement
|
82
|
+
requirement: &70143360215780 !ruby/object:Gem::Requirement
|
105
83
|
none: false
|
106
84
|
requirements:
|
107
85
|
- - ~>
|
108
86
|
- !ruby/object:Gem::Version
|
109
|
-
version:
|
87
|
+
version: '2.5'
|
110
88
|
type: :development
|
111
89
|
prerelease: false
|
112
|
-
version_requirements: *
|
90
|
+
version_requirements: *70143360215780
|
113
91
|
- !ruby/object:Gem::Dependency
|
114
|
-
name:
|
115
|
-
requirement: &
|
92
|
+
name: yard
|
93
|
+
requirement: &70143360215060 !ruby/object:Gem::Requirement
|
116
94
|
none: false
|
117
95
|
requirements:
|
118
96
|
- - ~>
|
119
97
|
- !ruby/object:Gem::Version
|
120
|
-
version: 0.
|
98
|
+
version: '0.6'
|
121
99
|
type: :development
|
122
100
|
prerelease: false
|
123
|
-
version_requirements: *
|
101
|
+
version_requirements: *70143360215060
|
124
102
|
- !ruby/object:Gem::Dependency
|
125
|
-
name:
|
126
|
-
requirement: &
|
103
|
+
name: configliere
|
104
|
+
requirement: &70143360214320 !ruby/object:Gem::Requirement
|
127
105
|
none: false
|
128
106
|
requirements:
|
129
107
|
- - ~>
|
130
108
|
- !ruby/object:Gem::Version
|
131
|
-
version:
|
109
|
+
version: 0.4.8
|
132
110
|
type: :development
|
133
111
|
prerelease: false
|
134
|
-
version_requirements: *
|
112
|
+
version_requirements: *70143360214320
|
135
113
|
description: cluster_chef allows you to orchestrate not just systems but clusters
|
136
114
|
of machines. It includes a powerful layer on top of knife and a collection of cloud
|
137
115
|
cookbooks.
|
@@ -181,8 +159,8 @@ files:
|
|
181
159
|
- spec/spec_helper.rb
|
182
160
|
- spec/spec_helper/dummy_chef.rb
|
183
161
|
- spec/test_config.rb
|
184
|
-
- tasks/chef_config.
|
185
|
-
- tasks/jeweler_use_alt_branch.
|
162
|
+
- tasks/chef_config.rake
|
163
|
+
- tasks/jeweler_use_alt_branch.rake
|
186
164
|
homepage: http://infochimps.com/labs
|
187
165
|
licenses:
|
188
166
|
- apachev2
|
@@ -198,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
198
176
|
version: '0'
|
199
177
|
segments:
|
200
178
|
- 0
|
201
|
-
hash:
|
179
|
+
hash: -3562653573573692445
|
202
180
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
203
181
|
none: false
|
204
182
|
requirements:
|