cluster_chef 3.0.5 → 3.0.6

data/CHANGELOG.md

@@ -1,5 +1,8 @@
+## v3.0.6: schism of cookbooks and tools
 
-
+* cookbooks all now live in [their own repo](https://github.com/infochimps-labs/cluster_chef-homebase), organized according to opscode standard.
+* gem is now split into `cluster_chef` (the libraries) and `cluster_chef-knife` (the chef plugins)
+* private_key was passing its block to super, with bad results
 
 ## Changes from v2 => v3 [2011 October]
 

data/Gemfile

@@ -5,14 +5,21 @@ gem 'fog',           "~> 1.1.1"
 gem 'formatador',    "~> 0.2.1"
 gem 'gorillib',      "~> 0.1.7"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
 group :development do
   gem 'bundler',     "~> 1"
-  gem 'yard',        "~> 0.6.7"
-  gem 'jeweler',     "~> 1.6.4"
-  gem 'rspec',       "~> 2.7.0"
+  gem 'jeweler',     "~> 1.6"
+  gem 'rspec',       "~> 2.5"
+  gem 'yard',        "~> 0.6"
   gem 'configliere', "~> 0.4.8"
-  gem 'spork',       "~> 0.9.0.rc5"
+end
+
+group :test do
+  gem 'spork',       "~> 0.9.0.rc5", :platform => :mri
   gem 'watchr',      "~> 0.7"
+  gem 'rcov',        ">= 0.9.9"
+end
+
+group :support do
+  gem 'pry'
+  gem 'grit'
 end

data/Rakefile

@@ -33,7 +33,8 @@ require 'rspec/core/rake_task'
 require 'yard'
 
 # Load constants from rake config file.
-Dir[File.join(File.dirname(__FILE__), 'tasks', '*.rb')].sort.each{|f| p f ; require f }
+$LOAD_PATH.unshift('tasks')
+Dir[File.join('tasks', '*.rake')].sort.each{|f| load(f) }
 
 $jeweler_push_from_branch = 'version_3'
 
@@ -41,31 +42,38 @@ $jeweler_push_from_branch = 'version_3'
 #
 # Jeweler -- release cluster_chef as a gem
 #
-Jeweler::Tasks.new do |gem|
-  gem.name        = ENV['CLUSTER_CHEF_NAME'] || "cluster_chef-knife"
-  gem.homepage    = "http://infochimps.com/labs"
-  gem.license     = NEW_COOKBOOK_LICENSE.to_s
-  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.}
-  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.}
-  gem.email       = SSL_EMAIL_ADDRESS
-  gem.authors     = ["Infochimps"]
 
-  ignores = File.readlines(".gitignore").grep(/^[^#]\S+/).map{|s| s.chomp }
-  dotfiles = [".gemtest", ".gitignore", ".rspec", ".yardopts"]
-  gem.files = dotfiles + Dir["**/*"].
-    reject{|f| f =~ %r{^cookbooks/} }.
-    reject{|f| File.directory?(f) }.
-    reject{|f| ignores.any?{|i| File.fnmatch(i, f) || File.fnmatch(i+'/*', f) || File.fnmatch(i+'/**/*', f) } }
-  gem.test_files = gem.files.grep(/^spec\//)
-  gem.require_paths = ['lib']
+%w[ cluster_chef cluster_chef-knife ].each do |gem_name|
+  Jeweler::Tasks.new do |gem|
+    gem.name        = gem_name
+    gem.version     = File.read('VERSION')
+    gem.homepage    = "http://infochimps.com/labs"
+    gem.license     = NEW_COOKBOOK_LICENSE.to_s
+    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.}
+    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.}
+    gem.email       = SSL_EMAIL_ADDRESS
+    gem.authors     = ["Infochimps"]
 
-  if gem.name == 'cluster_chef'
-    gem.files.reject!{|f| f =~ %r{^(cluster_chef-knife.gemspec|lib/chef/knife/)} }
-  else
-    gem.files.reject!{|f| f =~ %r{^(cluster_chef.gemspec|lib/cluster_chef)} }
+    ignores = File.readlines(".gitignore").grep(/^[^#]\S+/).map{|s| s.chomp }
+    dotfiles = [".gemtest", ".gitignore", ".rspec", ".yardopts"]
+    gem.files = dotfiles + Dir["**/*"].
+      reject{|f| f =~ %r{^cookbooks/} }.
+      reject{|f| File.directory?(f) }.
+      reject{|f| ignores.any?{|i| File.fnmatch(i, f) || File.fnmatch(i+'/*', f) || File.fnmatch(i+'/**/*', f) } }
+    gem.test_files = gem.files.grep(/^spec\//)
+    gem.require_paths = ['lib']
+
+    if    gem.name == 'cluster_chef'
+      gem.files.reject!{|f| f =~ %r{^(cluster_chef-knife.gemspec|lib/chef/knife/)} }
+      gem.add_runtime_dependency 'cluster_chef-knife', "= #{gem.version}"
+    elsif gem.name == 'cluster_chef-knife'
+      gem.files.reject!{|f| f =~ %r{^(cluster_chef.gemspec|lib/cluster_chef)} }
+    else
+      raise "Don't know what to include for gem #{gem.name}"
+    end
   end
+  Jeweler::RubygemsDotOrgTasks.new
 end
-Jeweler::RubygemsDotOrgTasks.new
 
 # ---------------------------------------------------------------------------
 #

data/VERSION

@@ -1 +1 @@
-3.0.5
+3.0.6

data/cluster_chef.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cluster_chef"
-  s.version = "3.0.5"
+  s.version = "3.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2011-12-11"
+  s.date = "2011-12-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."
   s.email = "coders@infochimps.com"
   s.extra_rdoc_files = [
@@ -60,8 +60,8 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "spec/spec_helper/dummy_chef.rb",
     "spec/test_config.rb",
-    "tasks/chef_config.rb",
-    "tasks/jeweler_use_alt_branch.rb"
+    "tasks/chef_config.rake",
+    "tasks/jeweler_use_alt_branch.rake"
   ]
   s.homepage = "http://infochimps.com/labs"
   s.licenses = ["apachev2"]
@@ -79,24 +79,22 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<formatador>, ["~> 0.2.1"])
       s.add_runtime_dependency(%q<gorillib>, ["~> 0.1.7"])
       s.add_development_dependency(%q<bundler>, ["~> 1"])
-      s.add_development_dependency(%q<yard>, ["~> 0.6.7"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.7.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_development_dependency(%q<yard>, ["~> 0.6"])
       s.add_development_dependency(%q<configliere>, ["~> 0.4.8"])
-      s.add_development_dependency(%q<spork>, ["~> 0.9.0.rc5"])
-      s.add_development_dependency(%q<watchr>, ["~> 0.7"])
+      s.add_runtime_dependency(%q<cluster_chef-knife>, ["= 3.0.6"])
     else
       s.add_dependency(%q<chef>, ["~> 0.10.4"])
       s.add_dependency(%q<fog>, ["~> 1.1.1"])
       s.add_dependency(%q<formatador>, ["~> 0.2.1"])
       s.add_dependency(%q<gorillib>, ["~> 0.1.7"])
       s.add_dependency(%q<bundler>, ["~> 1"])
-      s.add_dependency(%q<yard>, ["~> 0.6.7"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rspec>, ["~> 2.7.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6"])
+      s.add_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_dependency(%q<yard>, ["~> 0.6"])
       s.add_dependency(%q<configliere>, ["~> 0.4.8"])
-      s.add_dependency(%q<spork>, ["~> 0.9.0.rc5"])
-      s.add_dependency(%q<watchr>, ["~> 0.7"])
+      s.add_dependency(%q<cluster_chef-knife>, ["= 3.0.6"])
     end
   else
     s.add_dependency(%q<chef>, ["~> 0.10.4"])
@@ -104,12 +102,11 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<formatador>, ["~> 0.2.1"])
     s.add_dependency(%q<gorillib>, ["~> 0.1.7"])
     s.add_dependency(%q<bundler>, ["~> 1"])
-    s.add_dependency(%q<yard>, ["~> 0.6.7"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rspec>, ["~> 2.7.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6"])
+    s.add_dependency(%q<rspec>, ["~> 2.5"])
+    s.add_dependency(%q<yard>, ["~> 0.6"])
     s.add_dependency(%q<configliere>, ["~> 0.4.8"])
-    s.add_dependency(%q<spork>, ["~> 0.9.0.rc5"])
-    s.add_dependency(%q<watchr>, ["~> 0.7"])
+    s.add_dependency(%q<cluster_chef-knife>, ["= 3.0.6"])
   end
 end
 

data/lib/cluster_chef/cookbook_munger/README.md.erb

@@ -6,24 +6,15 @@
 
 <%= long_description.present? ? long_description : description %>
 
-## Attributes
-
-<%- all_attributes.attrs.each do |attrib| %>
-* <%= "%-35s" % ('`'+attrib.bracketed_name+'`') %> - <%= attrib.display_name %><%- if attrib.default.is_a?(String) || attrib.default.is_a?(Symbol) %> (default: <%= attrib.default.inspect %>)<%- end %>
-<%- if attrib.description.present? && (attrib.description != attrib.display_name) %>
-  - <%= attrib.description.gsub(/\n/, "\n  ") %>
-<%- end %>
-<%- end %>
 <%- if components[:recipes].present? %>
-
 ## Recipes 
 
 <%- components[:recipes].each do |recipe| %>
 * <%= "%-26s" % ('`'+recipe.name+'`') %> - <%= recipe.desc %>
 <%- end %>
 <%- end %>
-<%- if all_resources.present? %>
 
+<%- if all_resources.present? %>
 ## Resources / Providers
 
 <%- end %>
@@ -37,6 +28,15 @@ Cookbook dependencies:
 * <%= dep.gsub(/"/, '') %>
 <%- end -%><%- end -%>
 
+## Attributes
+
+<%- all_attributes.attrs.each do |attrib| %>
+* <%= "%-35s" % ('`'+attrib.bracketed_name+'`') %> - <%= attrib.display_name %><%- if attrib.default.is_a?(String) || attrib.default.is_a?(Symbol) %> (default: <%= attrib.default.inspect %>)<%- end %>
+<%- if attrib.description.present? && (attrib.description != attrib.display_name) %>
+  - <%= attrib.description.gsub(/\n/, "\n  ") %>
+<%- end %>
+<%- end %>
+
 ## License and Author
 
 Author::                <%= maintainer %> (<<%= maintainer_email %>>)

data/lib/cluster_chef/dsl_object.rb

@@ -46,8 +46,9 @@ module ClusterChef
     class_attribute :keys
     self.keys = []
 
-    def initialize(attrs={})
-      @settings = attrs.to_mash || Mash.new
+    def initialize(attrs={}, &block)
+      @settings = Mash.new
+      configure(attrs, &block)
     end
 
     #

data/lib/cluster_chef/private_key.rb

@@ -16,7 +16,6 @@ module ClusterChef
     # @yield      a block, executed in caller's context, when the body is updated
     # @yieldparam the updated body
     def initialize(name, proxy=nil, &on_update)
-      super()
       @name      = name
       @proxy     = proxy
       @on_update = on_update

data/tasks/{jeweler_use_alt_branch.rb → jeweler_use_alt_branch.rake}

@@ -7,16 +7,19 @@
 module Jeweler::Commands
 
   PUSH_FROM_BRANCH = 'version_3' unless defined?(PUSH_FROM_BRANCH)
-  
+
   ReleaseToGit.class_eval do
     def run
+      branch = PUSH_FROM_BRANCH
+      remote = 'origin'
+
       unless clean_staging_area?
         system "git status"
         raise "Unclean staging area! Be sure to commit or .gitignore everything first. See `git status` above."
       end
 
-      repo.checkout(PUSH_FROM_BRANCH)
-      repo.push
+      repo.checkout(branch)
+      repo.push(remote, branch)
 
       if release_not_tagged?
         output.puts "Tagging #{release_tag}"
@@ -27,21 +30,24 @@ module Jeweler::Commands
       end
     end
   end
-  
+
   ReleaseGemspec.class_eval do
     def run
+      branch = PUSH_FROM_BRANCH
+      remote = 'origin'
+
       unless clean_staging_area?
         system "git status"
         raise "Unclean staging area! Be sure to commit or .gitignore everything first. See `git status` above."
       end
 
-      repo.checkout(PUSH_FROM_BRANCH)
+      repo.checkout(branch)
 
       regenerate_gemspec!
       commit_gemspec! if gemspec_changed?
 
-      output.puts "Pushing #{PUSH_FROM_BRANCH} to origin"
-      repo.push
+      output.puts "Pushing #{branch} to origin"
+      repo.push(remote, branch)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cluster_chef
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-11 00:00:00.000000000 Z
+date: 2011-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70325818912360 !ruby/object:Gem::Requirement
+  requirement: &70143371909080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.10.4
   type: :runtime
   prerelease: false
-  version_requirements: *70325818912360
+  version_requirements: *70143371909080
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70325818911800 !ruby/object:Gem::Requirement
+  requirement: &70143371907660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70325818911800
+  version_requirements: *70143371907660
 - !ruby/object:Gem::Dependency
   name: formatador
-  requirement: &70325819294520 !ruby/object:Gem::Requirement
+  requirement: &70143371907180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70325819294520
+  version_requirements: *70143371907180
 - !ruby/object:Gem::Dependency
   name: gorillib
-  requirement: &70325819294040 !ruby/object:Gem::Requirement
+  requirement: &70143371906580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *70325819294040
+  version_requirements: *70143371906580
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70325819293560 !ruby/object:Gem::Requirement
+  requirement: &70143371906080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,73 +65,62 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *70325819293560
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &70325819293060 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.7
-  type: :development
-  prerelease: false
-  version_requirements: *70325819293060
+  version_requirements: *70143371906080
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70325819292540 !ruby/object:Gem::Requirement
+  requirement: &70143371905600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *70325819292540
+  version_requirements: *70143371905600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70325819292060 !ruby/object:Gem::Requirement
+  requirement: &70143371905060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70325819292060
+  version_requirements: *70143371905060
 - !ruby/object:Gem::Dependency
-  name: configliere
-  requirement: &70325819291520 !ruby/object:Gem::Requirement
+  name: yard
+  requirement: &70143371904420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.8
+        version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70325819291520
+  version_requirements: *70143371904420
 - !ruby/object:Gem::Dependency
-  name: spork
-  requirement: &70325819291020 !ruby/object:Gem::Requirement
+  name: configliere
+  requirement: &70143371903880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0.rc5
+        version: 0.4.8
   type: :development
   prerelease: false
-  version_requirements: *70325819291020
+  version_requirements: *70143371903880
 - !ruby/object:Gem::Dependency
-  name: watchr
-  requirement: &70325819290540 !ruby/object:Gem::Requirement
+  name: cluster_chef-knife
+  requirement: &70143371903340 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :development
+        version: 3.0.6
+  type: :runtime
   prerelease: false
-  version_requirements: *70325819290540
+  version_requirements: *70143371903340
 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.
@@ -185,8 +174,8 @@ files:
 - spec/spec_helper.rb
 - spec/spec_helper/dummy_chef.rb
 - spec/test_config.rb
-- tasks/chef_config.rb
-- tasks/jeweler_use_alt_branch.rb
+- tasks/chef_config.rake
+- tasks/jeweler_use_alt_branch.rake
 homepage: http://infochimps.com/labs
 licenses:
 - apachev2
@@ -202,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3687247056688648988
+      hash: -3562653573573692445
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: