sous-chef 0.0.3 → 0.0.4

data/.gitignore

@@ -2,4 +2,5 @@
 .rvmrc
 .ruby-version
 *.gem
+tmp
 

data/Gemfile.lock

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

data/README.md

@@ -1,8 +1,8 @@
-# SousChef
+# Sous Chef
 
 Note: This gem is a work in progress.
 
-Manage knife-solo nodes.
+Manage [knife-solo](http://matschaffer.github.com/knife-solo/) nodes.
 
 ## Install
 
@@ -12,20 +12,38 @@ Add the following to your `Rakefile`:
   require 'sous-chef'
 ```
 
+You may run `rake sous_chef` to generate sample `nodes.yml` to `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. Example `nodes.yml`:
 
 ```yaml
-SuperAwesomeNode:
-  HostName: 12.34.56.789
-  Port 1234
-  IdentityFile: ~/.ssh/other_id_rsa
+# 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
+#
 
+SuperAwesomeNode:
+  node_config: nodes/some_node.json
+  ssh_config:
+    HostName: 12.34.56.789
+    Port 1234
+    IdentityFile: ~/.ssh/other_id_rsa
 
 OtherAwesome:
-  HostName: localhost
+  node_config: nodes/some_node.json
+  ssh_config:
+    HostName: 12.34.56.789
 ```
 
 ## Usage

data/Rakefile

@@ -0,0 +1,16 @@
+#!/usr/bin/env rake
+
+require 'rubygems'
+require 'bundler/setup'
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+desc 'Default: run unit tests.'
+task :default => :spec
+
+desc "Run all specs"
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = 'spec/**/*_spec.rb'
+  t.rspec_opts = '--color'
+ end
+

data/lib/sous-chef/manager.rb

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

data/lib/sous-chef/node.rb

@@ -0,0 +1,54 @@
+class SousChef::Node
+  attr_reader :name
+
+  require 'tempfile'
+
+  def initialize(node, settings)
+    @settings = settings
+    @name = node
+  end
+
+  def config
+    @config ||= @settings['node_config'] || {}
+  end
+
+  def hostname
+    @hostname ||= ssh_hash['Host'] || @name
+  end
+
+  def ssh_config
+    @ssh_config ||= begin
+      config = "Host #{hostname}\n"
+       ssh_attrs.each do |key, value|
+         config << "  #{key} #{value}\n"
+       end
+       config
+     end
+  end
+
+  def ssh_config_path
+    @ssh_config_file ||= begin
+      config_file = Tempfile.new('agent_ssh_config')
+      config_file.write(ssh_config)
+      config_file.close
+      at_exit { config_file.delete }
+      config_file
+    end
+    @ssh_config_file.path
+  end
+
+  private
+
+  def ssh_hash
+    @ssh_hash ||= @settings['ssh_config'] || {}
+  end
+
+  def ssh_attrs
+    @ssh_attrs ||= begin
+      ssh_attrs = ssh_hash.clone
+      ssh_attrs.delete('Host')
+      ssh_attrs
+    end
+  end
+end
+

data/lib/sous-chef/parser.rb

@@ -0,0 +1,22 @@
+class SousChef::Parser
+  attr_reader :config_file
+
+  def initialize(config_file)
+    @config_file = config_file
+  end
+
+  def parse
+    parse_yaml(@config_file)
+  end
+
+  private
+
+  def parse_yaml(config_file)
+    if File.exists?(config_file)
+      YAML.load_file(config_file)
+    else
+      {}
+    end
+  end
+end
+

data/lib/sous-chef/tasks.rb

@@ -1,5 +1,4 @@
-require 'tempfile'
-require 'yaml'
+require 'rake'
 
 def run(command)
   puts "Running: #{command}"
@@ -8,97 +7,30 @@ def run(command)
 end
 
 def run_knife(command, node)
-  run "knife solo #{command} -F #{agents_ssh_config_path} #{node} -N #{node} nodes/buildAgent.json"
+  run "knife solo #{command} -F #{node.ssh_config_path} #{node.hostname} -N #{node.name} #{node.config}"
 end
 
-def agents
-  agents_path = File.join(Dir.pwd, "nodes", "nodes.yml")
-  unless File.exists? agents_path
-    puts "Can't find #{agents_path}"
-    exit 1
-  end
-  YAML.load_file(agents_path)
-end
-
-def agents_ssh_config_path
-  @agents_ssh_config_path ||= begin
-      ssh_config_file = Tempfile.new('agent_ssh_config')
-      agents.each do |node, attrs|
-        ssh_config_file.write("Host #{node}\n")
-        attrs.each do |key, value|
-          ssh_config_file.write("  #{key} #{value}\n")
-        end
-      end
-      ssh_config_file.close
-      at_exit { ssh_config_file.delete }
-      ssh_config_file.path
-    end
-end
-
-def agent_names
-  agents.map { |key, value| key }
-end
-
-agent_names.each do |node|
-  namespace node do
-    desc "Run knife solo prepare for #{node}"
+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
 
-    desc "Run knife solo cook for #{node}"
+    desc "Run knife solo cook for #{name}"
     task :cook do
       run_knife 'cook', node
     end
 
-    desc "Run knife solo bootstrap for #{node}"
+    desc "Run knife solo bootstrap for #{name}"
     task :bootstrap do
       run_knife 'bootstrap', node
     end
   end
 end
 
-namespace :vagrant do
-  def vagrant_ssh_config_path
-    @vagrant_ssh_config_paths ||= begin
-        ssh_config_file = Tempfile.new('vagrant-ssh-config')
-        ssh_config_file.write(`vagrant ssh-config`)
-        ssh_config_file.write('  LogLevel quiet')
-        ssh_config_file.close
-        ssh_config_file.path
-      end
-  end
-
-  def run_knife_vagrant(command)
-    run "knife solo #{command} -F #{vagrant_ssh_config_path} default nodes/buildAgent.json"
-  end
-
-  desc "Start the VM for the Vagrant Utility box"
-  task :up do
-    run "vagrant up"
-  end
-
-  desc "Prepare the Vagrant Utility box for provisioning"
-  task :prepare => [:up] do
-    run_knife_vagrant 'prepare'
-  end
-
-  desc "Provision the Vagrant Utility box"
-  task :cook do
-    run_knife_vagrant 'cook'
-  end
-
-  desc "Bootstrap (prepare & cook) the Vagrant Utility box"
-  task :bootstrap => [:up] do
-    run_knife_vagrant 'bootstrap'
-  end
-
-  desc "Destroy Vagrant Utility box"
-  task :destroy do
-    run "vagrant destroy -f"
-  end
-
-  desc "Cleans Vagrant Utility box, creating a fresh box"
-  task :clean => [:destroy, :up]
+desc "Generate nodes.yml example config"
+task :sous_chef do
+  SousChef.create_config
 end
 

data/lib/sous-chef.rb

@@ -1,10 +1,22 @@
-require 'rake'
-
-load 'sous-chef/tasks.rb'
 
 module SousChef
+  CONFIG_FILE = File.join(Dir.pwd, "nodes", "nodes.yml")
+
   class << self
-    attr_accessor :agents
+    def create_config
+      template = File.expand_path(File.join(File.dirname(__FILE__), 'templates', 'nodes.example.yml'))
+      if File.exists?(CONFIG_FILE)
+        puts "nodes.yml already exists"
+      else
+        puts "Coping example nodes.yml and placing in #{SousChef::CONFIG_FILE}"
+        FileUtils.cp(template, CONFIG_FILE)
+      end
+    end
   end
 end
 
+require 'sous-chef/parser.rb'
+require 'sous-chef/node.rb'
+require 'sous-chef/manager.rb'
+require 'sous-chef/tasks.rb'
+

data/lib/tasks/sous-chef.rake

@@ -0,0 +1,2 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'sous-chef', 'tasks'))
+

data/lib/templates/nodes.example.yml

@@ -0,0 +1,13 @@
+# 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
+#
+

data/sous-chef.gemspec

@@ -6,13 +6,13 @@ Gem::Specification.new do |s|
   s.email       = "shaun@substantail.com"
 
   s.name        = 'sous-chef'
-  s.version     = "0.0.3"
+  s.version     = "0.0.4"
   s.description = %q{Manage knife-solo nodes}
   s.summary     = %q{Manage knife-solo nodes}
-  s.homepage = %q{http://github.com/substantial/sous-chef}
-  s.rubyforge_project = "sous-chef"
+  s.homepage    = %q{http://github.com/substantial/sous-chef}
+  s.license     = "MIT"
 
-  s.license = "MIT"
+  s.rubyforge_project = "sous-chef"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/fixtures/single_node.yml

@@ -0,0 +1,7 @@
+SuperAwesomeNode:
+  node_config: some/path/to/node/config
+  ssh_config:
+    HostName: Some IP
+    Port: 1234
+    IdentityFile: ~/.ssh/other_id_rsa
+

data/spec/fixtures/some_nodes.yml

@@ -0,0 +1,12 @@
+SuperAwesomeNode:
+  node_config: some/path/to/node/config
+  ssh_config:
+    HostName: 12.34.56.789
+    Port: 1234
+    IdentityFile: ~/.ssh/other_id_rsa
+
+OtherAwesome:
+  node_config: some/path/to/node/config
+  ssh_config:
+    HostName: localhost
+

data/spec/sous-chef/manager_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe SousChef::Manager do
+  let(:manager) { SousChef::Manager.new(File.join(SPEC_ROOT, "fixtures", "some_nodes.yml")) }
+
+  describe "#initialize" do
+    it "instantiates a parser with the config file" 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]
+    end
+  end
+end
+

data/spec/sous-chef/node_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe SousChef::Node do
+  let(:node_hash) { {
+    "node_config" => "some/path/to/node/config",
+    "ssh_config" => { "HostName" => "Some IP" }
+  }}
+
+  subject { SousChef::Node.new('SuperAwesomeNode', node_hash) }
+
+  describe "#name" do
+    its(:name) { should == "SuperAwesomeNode" }
+  end
+
+  describe "#config" do
+    its(:config) { should == 'some/path/to/node/config' }
+  end
+
+  describe "#hostname" do
+    its(:hostname) { should == 'SuperAwesomeNode' }
+
+    context "with host in ssh_config" do
+      before { node_hash["ssh_config"]["Host"] = 'Some other name'}
+      its(:hostname) { should == 'Some other name'}
+    end
+  end
+
+  describe "#ssh_config" do
+    it "returns ssh_config" do
+      subject.ssh_config.should include "Host SuperAwesomeNode\n"
+      subject.ssh_config.should include "HostName Some IP\n"
+    end
+  end
+end
+

data/spec/sous-chef/parser_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe SousChef::Parser do
+  describe "#initialize" do
+    let(:parser) { SousChef::Parser.new('some config file') }
+
+    it 'sets config file' do
+      parser.config_file.should == 'some config file'
+    end
+  end
+
+  describe "#parse" do
+    subject { SousChef::Parser.new(File.join(SPEC_ROOT, "fixtures", "some_nodes.yml")).parse }
+
+    it "parses yaml" do
+      subject.keys.should =~ %w[SuperAwesomeNode OtherAwesome]
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+require 'bundler'
+Bundler.setup
+
+SPEC_ROOT = File.dirname(__FILE__)
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+end
+
+require File.join(SPEC_ROOT, '/../lib/sous-chef')
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sous-chef
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -101,10 +101,21 @@ files:
 - Gemfile
 - Gemfile.lock
 - README.md
+- Rakefile
 - lib/sous-chef.rb
+- lib/sous-chef/manager.rb
+- lib/sous-chef/node.rb
+- lib/sous-chef/parser.rb
 - lib/sous-chef/tasks.rb
-- lib/sous-chef/tasks/sous-chef.rake
+- lib/tasks/sous-chef.rake
+- lib/templates/nodes.example.yml
 - sous-chef.gemspec
+- spec/fixtures/single_node.yml
+- spec/fixtures/some_nodes.yml
+- spec/sous-chef/manager_spec.rb
+- spec/sous-chef/node_spec.rb
+- spec/sous-chef/parser_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/substantial/sous-chef
 licenses:
 - MIT
@@ -130,4 +141,10 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Manage knife-solo nodes
-test_files: []
+test_files:
+- spec/fixtures/single_node.yml
+- spec/fixtures/some_nodes.yml
+- spec/sous-chef/manager_spec.rb
+- spec/sous-chef/node_spec.rb
+- spec/sous-chef/parser_spec.rb
+- spec/spec_helper.rb

data/lib/sous-chef/tasks/sous-chef.rake

@@ -1,2 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../sous-chef', 'tasks'))
-