sous-chef 0.0.6 → 0.0.7

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    sous-chef (0.0.6)
+    sous-chef (0.0.7)
       knife-solo (~> 0.1.0)
-      rake (~> 10.0.3)
+      rake (~> 10.0.0)
 
 GEM
   remote: http://rubygems.org/
@@ -42,7 +42,7 @@ GEM
       chef (>= 0.10)
       highline
       thor (~> 0.15)
-    mime-types (1.19)
+    mime-types (1.20.1)
     mixlib-authentication (1.3.0)
       mixlib-log
     mixlib-cli (1.3.0)
@@ -77,7 +77,7 @@ GEM
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.1)
     systemu (2.5.2)
-    thor (0.16.0)
+    thor (0.17.0)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
@@ -89,6 +89,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.1)
-  rake (~> 10.0.3)
+  rake (~> 10.0.0)
   rspec (~> 2.12.0)
   sous-chef!

data/README.md

@@ -2,22 +2,31 @@
 
 Manage [knife-solo](http://matschaffer.github.com/knife-solo/) nodes.
 
-## Install
+## Usage
+
+Simply ensure the gem is installed using:
+
+    gem install sous-chef
+
+Or add this to your Gemfile if you use bundler:
+
+    gem 'sous-chef'
 
-Add the following to your `Rakefile`:
+And add the following to your `Rakefile`:
 
 ```ruby
   require 'sous-chef'
 ```
 
-You may run `rake sous_chef:init` to generate sample `nodes.yml` to
-`nodes/nodes.yml`
+Run `rake sous_chef:init` to place a sample `nodes.yml` under `nodes/nodes.yml`
+
+Run `rake -T` to display nodes and commands defined in `nodes/nodes.yml`
 
 ## Configure
 
-Create configuration in knife-solo nodes dir e.g. `nodes/nodes.yml`. Node
-configuration is used for sshconfig as well as nodename. You can namespace
-nodes however you want. Example `nodes.yml`:
+Node configuration is  done in `nodes/nodes.yml`. You can namespace your nodes
+however you want. You can run multiple tasks in parallel using the `:all:`
+namespace Example `nodes.yml`:
 
 ```yaml
 # Format:
@@ -62,10 +71,6 @@ vagrant:
     ForwardAgent: "yes"
 ```
 
-## Usage
-
-`rake -T` for a full list of tasks provided:
-
 ## Contributing
 
 1. Fork it

data/lib/helpers/node_helpers.rb

@@ -1,10 +1,11 @@
 module SousChef::NodeHelpers
 
+  module_function
+
   def node?(settings)
     settings.is_a? SousChef::Node or settings.has_key?('node_config') or
       settings.has_key?('ssh_config')
   end
 
-  module_function :node?
 end
 

data/lib/helpers/node_task_helpers.rb

@@ -0,0 +1,77 @@
+require 'rake'
+
+module SousChef::NodeTaskHelpers
+  include Rake::DSL
+
+  module_function
+
+  def build_node_task(node)
+    namespace node.name do
+      prepare_task(node)
+      cook_task(node)
+      bootstrap_task(node)
+      clean_task(node)
+    end
+  end
+
+  def clean_task(node)
+    desc "Run knife solo clean for #{node.name}"
+    task :clean do
+      run_knife 'clean', node
+    end
+  end
+
+  def cook_task(node)
+    desc "Run knife solo cook for #{node.name}"
+    task :cook do
+      run_knife 'cook', node
+    end
+  end
+
+  def bootstrap_task(node)
+    desc "Run knife solo bootstrap for #{node.name}"
+    task :bootstrap do
+      run_knife 'bootstrap', node
+    end
+  end
+
+  def prepare_task(node)
+    desc "Run knife solo prepare for #{node.name}"
+    task :prepare do
+      run_knife 'prepare', node
+    end
+  end
+
+  def batch_tasks(name, tasks)
+    task_names = tasks.map(&:name)
+
+    desc "Run knife solo prepare for all #{name} nodes"
+    multitask :prepare => filter_tasks(task_names, 'prepare')
+
+    desc "Run knife solo cook for all #{name} nodes"
+    multitask :cook => filter_tasks(task_names, 'cook')
+
+    desc "Run knife solo bootstrap for all #{name} nodes"
+    multitask :bootstrap => filter_tasks(task_names, 'bootstrap')
+
+    desc "Run knife solo clean for all #{name} nodes"
+    multitask :clean => filter_tasks(task_names, 'clean')
+  end
+
+  def filter_tasks(tasks_names, desired_task)
+    tasks_names.clone.keep_if { |task_name| task_name.include? desired_task }
+  end
+
+  def run(command)
+    puts "Running: #{command}"
+    system command
+    raise "Failure! #{$?}" if $? != 0
+  end
+
+  def run_knife(command, node)
+    options = "-F #{node.ssh_config_path} #{node.hostname}"
+    options = "#{options} -N #{node.name} #{node.config}" unless %w[clean].include? command
+    run "knife solo #{command} #{options}"
+  end
+end
+

data/lib/sous-chef/collection.rb

@@ -1,3 +1,5 @@
+require 'forwardable'
+
 class SousChef::Collection
   extend Forwardable
 

data/lib/sous-chef/task_builder.rb

@@ -1,5 +1,5 @@
 class SousChef::TaskBuilder
-  include SousChef::NodeTasks
+  include SousChef::NodeTaskHelpers
   include SousChef::NodeHelpers
 
   def initialize(nodes)
@@ -8,6 +8,19 @@ class SousChef::TaskBuilder
 
   def build_tasks
     build_namespace(@nodes)
+    build_batch_tasks(@nodes)
+  end
+
+  def build_batch_tasks(collection)
+    collection.each do |name, collection|
+      next if node?(collection)
+      namespace name do |ns|
+        namespace :all do
+          batch_tasks(name, ns.tasks)
+        end
+        build_batch_tasks(collection)
+      end
+    end
   end
 
   def build_namespace(collection)

data/lib/sous-chef.rb

@@ -3,6 +3,8 @@ module SousChef
   CONFIG_TEMPLATE = File.expand_path(File.join(File.dirname(__FILE__), 'templates', 'nodes.example.yml'))
   CONFIG_FILE = File.join(Dir.pwd, "nodes", "nodes.yml")
 
+  module_function
+
   def config_file_location
     CONFIG_FILE
   end
@@ -20,12 +22,11 @@ module SousChef
     end
   end
 
-  module_function :create_config, :config_file_location, :config_template_location
 end
 
 require 'helpers/node_helpers'
+require 'helpers/node_task_helpers'
 require 'sous-chef/parser'
-require 'sous-chef/node_tasks'
 require 'sous-chef/node'
 require 'sous-chef/collection'
 require 'sous-chef/task_builder'

data/sous-chef.gemspec

@@ -6,9 +6,9 @@ Gem::Specification.new do |s|
   s.email       = "shaun@substantail.com"
 
   s.name        = 'sous-chef'
-  s.version     = "0.0.6"
+  s.version     = "0.0.7"
   s.description = %q{Manage knife-solo nodes}
-  s.summary     = %q{Manage knife-solo nodes by environment. Run knife solo
+  s.summary     = %q{Rake tasks for managing knife-solo nodes by environment. Run knife solo
 commands on one or multiple nodes.}
   s.homepage    = %q{http://github.com/substantial/sous-chef}
   s.license     = "MIT"
@@ -20,11 +20,10 @@ commands on one or multiple nodes.}
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "rake", "~> 10.0.3"
+  s.add_runtime_dependency "rake", "~> 10.0.0"
   s.add_development_dependency "rspec", "~> 2.12.0"
-  s.add_development_dependency "rake", "~> 10.0.3"
+  s.add_development_dependency "rake", "~> 10.0.0"
   s.add_development_dependency "bundler", "~> 1.1"
   s.add_dependency "knife-solo", "~> 0.1.0"
-
 end
 

data/spec/helpers/node_task_helpers_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe SousChef::NodeTaskHelpers do
+  before do
+    SousChef::NodeTaskHelpers.stub(:run)
+  end
+
+  describe "#run_knife" do
+    let(:node) { double('node') }
+
+    before do
+      node.stub(name: 'foo')
+      node.stub(hostname: 'node_hostname')
+      node.stub(ssh_config_path: 'ssh_config_path')
+      node.stub(config: 'knife_solo_node_config')
+    end
+
+    it "should run knife solo command for given node" do
+      SousChef::NodeTaskHelpers.should_receive(:run).with("knife solo some_command -F ssh_config_path node_hostname -N foo knife_solo_node_config")
+      SousChef::NodeTaskHelpers.run_knife('some_command', node)
+    end
+
+    it "should not specify node config for #clean command" do
+      SousChef::NodeTaskHelpers.should_receive(:run).with("knife solo clean -F ssh_config_path node_hostname")
+      SousChef::NodeTaskHelpers.run_knife('clean', node)
+    end
+  end
+
+  describe "#filter_tasks" do
+    it "should filter for tasks that have the action" do
+      tasks = %w[foo:bar:action foo:bar:baz]
+      SousChef::NodeTaskHelpers.filter_tasks(tasks, 'action').should include "foo:bar:action"
+    end
+
+    it "shouldn't alter the input task list" do
+      tasks = %w[foo:bar:action foo:bar:baz]
+      tasks_clone = tasks.clone
+      SousChef::NodeTaskHelpers.filter_tasks(tasks, 'action').should include "foo:bar:action"
+      tasks.should == tasks_clone
+    end
+  end
+end
+

data/spec/sous-chef/tasks_spec.rb

@@ -1,5 +1,9 @@
 require 'spec_helper'
 
+def get_task(task_list, task_name)
+  task_list.select {|task| task.name == task_name}.first
+end
+
 describe "sous_chef.rake" do
   before(:all) do
     @rake = Rake::Application.new
@@ -37,5 +41,21 @@ describe "generated node tasks" do
   it "should namespace nodes tasks" do
     rake_tasks.should include "production:web:OtherAwesome:bootstrap"
   end
+
+  it "should have #all task for namespaces" do
+    rake_tasks.should include "production:all:cook"
+    rake_tasks.should include "production:web:all:prepare"
+  end
+
+  describe "generated namespace#all tasks" do
+    let(:multitasks) { multitasks = @rake.tasks.keep_if{ |task| task.is_a? Rake::MultiTask } }
+
+    %w[prepare cook clean bootstrap].each do |command|
+      it "should include all node tasks for #{command}" do
+        production_prepare_multitask = get_task(multitasks, "production:web:all:#{command}")
+        production_prepare_multitask.prerequisites.should =~ ["production:web:OtherAwesome:#{command}"]
+      end
+    end
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sous-chef
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -103,12 +103,12 @@ files:
 - README.md
 - Rakefile
 - lib/helpers/node_helpers.rb
+- lib/helpers/node_task_helpers.rb
 - lib/sous-chef.rb
 - lib/sous-chef/collection.rb
 - lib/sous-chef/node.rb
 - lib/sous-chef/node_builder.rb
 - lib/sous-chef/node_manager.rb
-- lib/sous-chef/node_tasks.rb
 - lib/sous-chef/parser.rb
 - lib/sous-chef/task_builder.rb
 - lib/sous-chef/tasks.rb
@@ -117,11 +117,11 @@ files:
 - lib/templates/nodes.example.yml
 - sous-chef.gemspec
 - spec/helpers/node_helpers_spec.rb
+- spec/helpers/node_task_helpers_spec.rb
 - spec/sous-chef/collection_spec.rb
 - spec/sous-chef/node_builder_spec.rb
 - spec/sous-chef/node_manager_spec.rb
 - spec/sous-chef/node_spec.rb
-- spec/sous-chef/node_tasks_spec.rb
 - spec/sous-chef/parser_spec.rb
 - spec/sous-chef/sous-chef_spec.rb
 - spec/sous-chef/task_builder_spec.rb
@@ -153,15 +153,15 @@ rubyforge_project: sous-chef
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Manage knife-solo nodes by environment. Run knife solo commands on one or
-  multiple nodes.
+summary: Rake tasks for managing knife-solo nodes by environment. Run knife solo commands
+  on one or multiple nodes.
 test_files:
 - spec/helpers/node_helpers_spec.rb
+- spec/helpers/node_task_helpers_spec.rb
 - spec/sous-chef/collection_spec.rb
 - spec/sous-chef/node_builder_spec.rb
 - spec/sous-chef/node_manager_spec.rb
 - spec/sous-chef/node_spec.rb
-- spec/sous-chef/node_tasks_spec.rb
 - spec/sous-chef/parser_spec.rb
 - spec/sous-chef/sous-chef_spec.rb
 - spec/sous-chef/task_builder_spec.rb

data/lib/sous-chef/node_tasks.rb

@@ -1,47 +0,0 @@
-require 'rake'
-
-module SousChef::NodeTasks
-  include Rake::DSL
-
-  def build_node_task(node)
-    namespace node.name do
-      prepare_task(node)
-      cook_task(node)
-      bootstrap_task(node)
-    end
-  end
-
-  def cook_task(node)
-    desc "Run knife solo cook for #{node.name}"
-    task :cook do
-      run_knife 'cook', node
-    end
-  end
-
-  def bootstrap_task(node)
-    desc "Run knife solo bootstrap for #{node.name}"
-    task :bootstrap do
-      run_knife 'bootstrap', node
-    end
-  end
-
-  def prepare_task(node)
-    desc "Run knife solo prepare for #{node.name}"
-    task :prepare do
-      run_knife 'prepare', node
-    end
-  end
-
-  def run(command)
-    puts "Running: #{command}"
-    system command
-    raise "Failure! #{$?}" if $? != 0
-  end
-
-  def run_knife(command, node)
-    run "knife solo #{command} -F #{node.ssh_config_path} #{node.hostname} -N #{node.name} #{node.config}"
-  end
-
-  module_function :build_node_task, :cook_task, :bootstrap_task, :prepare_task, :run, :run_knife
-end
-

data/spec/sous-chef/node_tasks_spec.rb

@@ -1,20 +0,0 @@
-require 'spec_helper'
-
-describe SousChef::NodeTasks do
-  before do
-    SousChef::NodeTasks.stub(:run)
-  end
-
-  describe "#run_knife" do
-    it "should run knife solo command for given node" do
-      node = double('node')
-      node.stub(name: 'foo')
-      node.stub(hostname: 'node_hostname')
-      node.stub(ssh_config_path: 'ssh_config_path')
-      node.stub(config: 'knife_solo_node_config')
-      SousChef::NodeTasks.should_receive(:run).with("knife solo some_command -F ssh_config_path node_hostname -N foo knife_solo_node_config")
-      SousChef::NodeTasks.run_knife('some_command', node)
-    end
-  end
-end
-