sous-chef 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sous-chef (0.0.3)
+    sous-chef (0.0.4)
       knife-solo (~> 0.1.0)
       rake (~> 10.0.3)
 

data/README.md

@@ -1,7 +1,5 @@
 # Sous Chef
 
-Note: This gem is a work in progress.
-
 Manage [knife-solo](http://matschaffer.github.com/knife-solo/) nodes.
 
 ## Install
@@ -12,7 +10,8 @@ Add the following to your `Rakefile`:
   require 'sous-chef'
 ```
 
-You may run `rake sous_chef` to generate sample `nodes.yml` to `nodes/nodes.yml`
+You may run `rake sous_chef:init` to generate sample `nodes.yml` to
+`nodes/nodes.yml`
 
 ## Configure
 
@@ -22,31 +21,49 @@ configuration is used for sshconfig as well as nodename. Example `nodes.yml`:
 ```yaml
 # Format:
 #
-# <node name>:
-#   node_config: <knife-solo node config e.g. nodes/someNode.json>
-#   ssh_config:
-#     <ssh config options>
-#     e.g.
-#     Host: <host alias. defaults to node name>
-#     HostName: 12.34.56.789
-#     Port: 1234
-#     IdentityFile: ~/.ssh/other_id_rsa
-#
+# <environment>:
+#   <node name>:
+#     node_config: <knife-solo node config e.g. nodes/someNode.json>
+#     ssh_config:
+#       <ssh config options>
+#       e.g.
+#       Host: <host alias. defaults to node name>
+#       HostName: 12.34.56.789
+#       Port: 1234
+#       IdentityFile: ~/.ssh/other_id_rsa
+
+production:
+  SuperAwesomeNode:
+    node_config: nodes/some_node.json
+    ssh_config:
+      HostName: 12.34.56.789
+      Port 1234
+      IdentityFile: ~/.ssh/other_id_rsa
 
-SuperAwesomeNode:
-  node_config: nodes/some_node.json
-  ssh_config:
-    HostName: 12.34.56.789
-    Port 1234
-    IdentityFile: ~/.ssh/other_id_rsa
-
-OtherAwesome:
-  node_config: nodes/some_node.json
-  ssh_config:
-    HostName: 12.34.56.789
+  CoolWorld:
+    node_config: nodes/some_node.json
+    ssh_config:
+      HostName: localhost
+
+vagrant:
+  default:
+    node_config: nodes/buildAgent.json
+    ssh_config:
+      HostName: 127.0.0.1
+      User: vagrant
+      Port: 2222
+      UserKnownHostsFile: /dev/null
+      StrictHostKeyChecking: "no"
+      PasswordAuthentication: "no"
+      IdentityFile: "~/.vagrant.d/insecure_private_key"
+      IdentitiesOnly: "yes"
+      ForwardAgent: "yes"
 ```
 
 ## Usage
 
 `rake -T` for a full list of tasks provided:
 
+`rake <environment>:all:<knife solo task>` will run on all nodes for a given
+environment.
+

data/lib/sous-chef/environment.rb

@@ -0,0 +1,20 @@
+module SousChef
+  class Environment
+    attr_reader :nodes, :name
+
+    def initialize(name, nodes)
+      @nodes = {}
+      @name = name
+      initialize_nodes(nodes)
+    end
+
+    private
+
+    def initialize_nodes(nodes)
+      nodes.each do |name, settings|
+        @nodes[name] = Node.new(name, settings)
+      end
+    end
+  end
+end
+

data/lib/sous-chef/manager.rb

@@ -1,25 +1,20 @@
 module SousChef
   class Manager
-    attr_accessor :nodes
-    attr_reader :parser
+    attr_reader :envs, :parser
 
     def initialize(config_file)
       @parser = Parser.new(config_file)
-      @nodes = {}
-      initialize_nodes
-    end
-
-    def all
-      @nodes.keys
+      @envs = {}
+      initialize_environments
     end
 
     private
 
-    def initialize_nodes
-      @parser.parse.each do |node, settings|
-        @nodes[node] = Node.new(node, settings)
+    def initialize_environments
+      @parser.parse.each do |name, nodes|
+        @envs[name] = Environment.new(name, nodes)
       end
     end
-
   end
 end
+

data/lib/sous-chef/node.rb

@@ -3,9 +3,9 @@ class SousChef::Node
 
   require 'tempfile'
 
-  def initialize(node, settings)
+  def initialize(name, settings)
     @settings = settings
-    @name = node
+    @name = name
   end
 
   def config

data/lib/sous-chef/tasks.rb

@@ -10,27 +10,48 @@ def run_knife(command, node)
   run "knife solo #{command} -F #{node.ssh_config_path} #{node.hostname} -N #{node.name} #{node.config}"
 end
 
-SousChef::Manager.new(SousChef::CONFIG_FILE).nodes.each do |name, node|
-  namespace name do
-    desc "Run knife solo prepare for #{name}"
-    task :prepare do
-      run_knife 'prepare', node
-    end
+def build_task_list(environment_name, names, task)
+  names.map { |name| "#{environment_name}:#{name}:#{task}" }
+end
+
+SousChef::Manager.new(SousChef::CONFIG_FILE).envs.each do |environment_name, env|
+  namespace environment_name do
+    namespace :all do
+      desc "Run knife solo prepare for all #{environment_name} nodes"
+      multitask :prepare => build_task_list(environment_name, env.nodes.keys, "prepare")
+
+      desc "Run knife solo cook for all #{environment_name} nodes"
+      multitask :cook => build_task_list(environment_name, env.nodes.keys, "cook")
 
-    desc "Run knife solo cook for #{name}"
-    task :cook do
-      run_knife 'cook', node
+      desc "Run knife solo bootstrap for all #{environment_name} nodes"
+      multitask :bootstrap => build_task_list(environment_name, env.nodes.keys, "bootstrap")
     end
 
-    desc "Run knife solo bootstrap for #{name}"
-    task :bootstrap do
-      run_knife 'bootstrap', node
+    env.nodes.each do |node_name, node|
+      namespace node_name do
+        desc "Run knife solo prepare for #{node_name}"
+        task :prepare do
+          run_knife 'prepare', node 
+        end
+
+        desc "Run knife solo cook for #{node_name}"
+        task :cook do
+          run_knife 'cook', node
+        end
+
+        desc "Run knife solo bootstrap for #{node_name}"
+        task :bootstrap do
+          run_knife 'bootstrap', node
+        end
+      end
     end
   end
 end
 
-desc "Generate nodes.yml example config"
-task :sous_chef do
-  SousChef.create_config
+namespace :sous_chef do
+  desc "Generate nodes.yml example config"
+  task :init do
+    SousChef.create_config
+  end
 end
 

data/lib/sous-chef.rb

@@ -17,6 +17,7 @@ end
 
 require 'sous-chef/parser.rb'
 require 'sous-chef/node.rb'
+require 'sous-chef/environment.rb'
 require 'sous-chef/manager.rb'
 require 'sous-chef/tasks.rb'
 

data/lib/templates/nodes.example.yml

@@ -1,13 +1,27 @@
 # Format:
 #
-# <node name>:
-#   node_config: <knife-solo node config e.g. nodes/someNode.json>
-#   ssh_config:
-#     <ssh config options>
-#     e.g.
-#     Host: <host alias. defaults to node name>
-#     HostName: 12.34.56.789
-#     Port: 1234
-#     IdentityFile: ~/.ssh/other_id_rsa
+# <environment>:
+#   <node name>:
+#     node_config: <knife-solo node config e.g. nodes/someNode.json>
+#     ssh_config:
+#       <ssh config options>
+#       e.g.
+#       Host: <host alias. defaults to node name>
+#       HostName: 12.34.56.789
+#       Port: 1234
+#       IdentityFile: ~/.ssh/other_id_rsa
 #
+# vagrant:
+#   default:
+#     node_config: nodes/buildAgent.json
+#     ssh_config:
+#       HostName: 127.0.0.1
+#       User: vagrant
+#       Port: 2222
+#       UserKnownHostsFile: /dev/null
+#       StrictHostKeyChecking: "no"
+#       PasswordAuthentication: "no"
+#       IdentityFile: "~/.vagrant.d/insecure_private_key"
+#       IdentitiesOnly: "yes"
+#       ForwardAgent: "yes"
 

data/sous-chef.gemspec

@@ -6,9 +6,10 @@ Gem::Specification.new do |s|
   s.email       = "shaun@substantail.com"
 
   s.name        = 'sous-chef'
-  s.version     = "0.0.4"
+  s.version     = "0.0.5"
   s.description = %q{Manage knife-solo nodes}
-  s.summary     = %q{Manage knife-solo nodes}
+  s.summary     = %q{Manage 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"
 

data/spec/fixtures/some_nodes.yml

@@ -1,12 +1,19 @@
-SuperAwesomeNode:
-  node_config: some/path/to/node/config
-  ssh_config:
-    HostName: 12.34.56.789
-    Port: 1234
-    IdentityFile: ~/.ssh/other_id_rsa
+production:
+  OtherAwesome:
+    node_config: some/path/to/node/config
+    ssh_config:
+      HostName: localhost
 
-OtherAwesome:
-  node_config: some/path/to/node/config
-  ssh_config:
-    HostName: localhost
+  CoolWorld:
+    node_config: some/path/to/node/config
+    ssh_config:
+      HostName: Some Ip
+
+staging:
+  AwesomeDBServer:
+    node_config: some/path/to/node/config
+    ssh_config:
+      HostName: 12.34.56.789
+      Port: 1234
+      IdentityFile: ~/.ssh/other_id_rsa
 

data/spec/sous-chef/environment_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe SousChef::Environment do
+  let(:nodes) { {} }
+  let(:environment) { SousChef::Environment.new('some environment', nodes) }
+
+  describe "#initialize" do
+    it "sets the name" do
+      environment.name.should == 'some environment'
+    end
+
+    it "has nodes" do
+      environment.nodes.should be_a Hash
+    end
+  end
+end
+

data/spec/sous-chef/manager_spec.rb

@@ -8,14 +8,8 @@ describe SousChef::Manager do
       manager.parser.should be_a SousChef::Parser
     end
 
-    it "instantiates nodes" do
-      manager.nodes.should be_a Hash
-    end
-  end
-
-  describe "#all" do
-    it "returns node names" do
-      manager.all.should =~ %w[SuperAwesomeNode OtherAwesome]
+    it "has environments" do
+      manager.envs.should be_a Hash
     end
   end
 end

data/spec/sous-chef/parser_spec.rb

@@ -13,7 +13,7 @@ describe SousChef::Parser do
     subject { SousChef::Parser.new(File.join(SPEC_ROOT, "fixtures", "some_nodes.yml")).parse }
 
     it "parses yaml" do
-      subject.keys.should =~ %w[SuperAwesomeNode OtherAwesome]
+      subject.keys.should =~ %w[production staging]
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sous-chef
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -103,6 +103,7 @@ files:
 - README.md
 - Rakefile
 - lib/sous-chef.rb
+- lib/sous-chef/environment.rb
 - lib/sous-chef/manager.rb
 - lib/sous-chef/node.rb
 - lib/sous-chef/parser.rb
@@ -112,6 +113,7 @@ files:
 - sous-chef.gemspec
 - spec/fixtures/single_node.yml
 - spec/fixtures/some_nodes.yml
+- spec/sous-chef/environment_spec.rb
 - spec/sous-chef/manager_spec.rb
 - spec/sous-chef/node_spec.rb
 - spec/sous-chef/parser_spec.rb
@@ -140,10 +142,12 @@ rubyforge_project: sous-chef
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Manage knife-solo nodes
+summary: Manage knife-solo nodes by environment. Run knife solo commands on one or
+  multiple nodes.
 test_files:
 - spec/fixtures/single_node.yml
 - spec/fixtures/some_nodes.yml
+- spec/sous-chef/environment_spec.rb
 - spec/sous-chef/manager_spec.rb
 - spec/sous-chef/node_spec.rb
 - spec/sous-chef/parser_spec.rb