silver_spurs 1.0.2 → 2.0.0.rc1

data/.gitignore

@@ -17,3 +17,19 @@ test/version_tmp
 tmp
 \#*#
 /silver_spurs_async
+### /Users/cblades/.gitignore-boilerplates/Global/Emacs.gitignore
+
+*~
+\#*\#
+/.emacs.desktop
+/.emacs.desktop.lock
+.elc
+auto-save-list
+tramp
+.\#*
+
+# Org-mode
+.org-id-locations
+*_archive
+
+

data/README.md

@@ -1,4 +1,4 @@
-# SilverSpurs [![Build Status](https://travis-ci.org/christian-blades-cb/silver_spurs.png?branch=master)](https://travis-ci.org/christian-blades-cb/silver_spurs)
+# SilverSpurs [![Build Status](https://travis-ci.org/christian-blades-cb/silver_spurs.png?branch=master)](https://travis-ci.org/christian-blades-cb/silver_spurs) [![Gem Version](https://badge.fury.io/rb/silver_spurs.png)](http://badge.fury.io/rb/silver_spurs)
 
 RESTful Chef bootstrapping
 

data/lib/silver_spurs/app.rb

@@ -2,12 +2,25 @@ require 'sinatra/base'
 require 'silver_spurs/knife_interface'
 require 'json'
 require 'silver_spurs/asyncifier'
+require 'silver_spurs/chef_interface'
+require 'silver_spurs/chef_exceptions'
+require 'ridley'
 
 module SilverSpurs
   class App < Sinatra::Base
     
     set :deployment_key, "/etc/chef/deployment_key.pem"
     set :deployment_user, "silverspurs"
+    set :chef_config, {
+      server_url: 'http://localhost:4000',
+      client_name: 'silver_spurs',
+      client_key: '/etc/chef/silver_spurs.pem',
+      ssh: {
+        user: settings.deployment_user,
+        keys: [ settings.deployment_key ],
+        paranoid: false
+      }
+    }
     # sane setting for AD subdomain
     set :node_name_filter, /^[-A-Za-z0-9]{3,15}$/
     
@@ -83,11 +96,20 @@ module SilverSpurs
         status 550
       end
     end
-    
+
+    post '/kick/:ip' do
+      run_list = params[:run] || []
+      chef = ChefInterface.new(settings.chef_config)
+      begin
+        chef.chef_run(params[:ip], run_list).to_json
+      rescue SilverSpurs::NodeNotFoundException
+        status 404
+      end
+    end
 
     def required_vars?(params, requirement_list)
       requirement_list.none? { |required_param| params[required_param].nil? }
     end
-        
+    
   end
 end

data/lib/silver_spurs/chef_exceptions.rb

@@ -0,0 +1,4 @@
+module SilverSpurs
+  class NodeNotFoundException < Exception
+  end
+end

data/lib/silver_spurs/chef_interface.rb

@@ -0,0 +1,36 @@
+require 'singleton'
+require 'forwardable'
+require 'ridley'
+require 'silver_spurs/chef_exceptions'
+
+module SilverSpurs
+  class ChefInterface
+
+    def initialize(options)
+      @chef_config = options
+    end
+
+    def chef_run(node_name, run_list = [])
+      node = find_node node_name
+      if run_list.size > 0
+        command = "sudo chef-client -o '#{run_list.join(',')}'"
+        ridley.node.execute_command node.public_hostname, command
+      else
+        node.chef_run
+      end
+    end
+
+    private
+
+    def ridley
+      @ridley ||= Ridley.new(@chef_config)
+    end
+
+    def find_node(node_name)
+      node = ridley.node.find(node_name)
+      raise NodeNotFoundException.new unless node
+      node
+    end
+
+  end
+end

data/lib/silver_spurs/client.rb

@@ -4,6 +4,7 @@ require 'json'
 require 'silver_spurs/knife_interface'
 require 'silver_spurs/client/exceptions'
 require 'silver_spurs/client/bootstrap_run'
+require 'silver_spurs/client/chef_run'
 
 module SilverSpurs
   class Client
@@ -24,6 +25,12 @@ module SilverSpurs
       BootstrapRun.new(response.headers[:location], :timeout => @timeout)
     end
 
+    def start_chef_run(host_name, runlist = [])
+      response = spur_host["kick/#{host_name}"].post :params => { :run => runlist }
+      raise ClientException.new("the host name was not found", response) if response.code == 404
+      ChefRun.new JSON.parse(response)
+    end
+
     private
     
     def parameterize_hash(param_hash)

data/lib/silver_spurs/client/chef_run.rb

@@ -0,0 +1,44 @@
+require 'rest-client'
+require 'silver_spurs/client/exceptions'
+require 'erb'
+
+module SilverSpurs
+  class ChefRun
+
+    attr_reader :log, :status
+
+    def initialize(response)
+      @status = convert_status response
+      @log = prettify_log response
+    end
+
+    private
+
+    def convert_status(response)
+      code = response[0]
+      case code
+      when 'ok'
+        :success
+      when 'error'
+        :failed
+      end
+    end
+
+    def prettify_log(response)
+      run_info = response[1]
+      stdout = run_info['stdout']
+      stderr = run_info['stderr']
+      exit_code = run_info['exit_code'] || run_info['exit_status']
+
+      template = ERB.new <<-END
+Exit Code: <%= exit_code %>
+--STDOUT-----------------
+<%= stdout %>
+--STDERR-----------------
+<%= stderr %>
+END
+      template.result binding
+    end
+
+  end
+end

data/lib/silver_spurs/version.rb

@@ -1,3 +1,3 @@
 module SilverSpurs
-  VERSION = "1.0.2"
+  VERSION = "2.0.0.rc1"
 end

data/silver_spurs.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'chef', '>= 10.18.2'
   gem.add_dependency 'rest-client', '~> 1.6.7'
   gem.add_dependency 'addressable', '~> 2.3.3'
+  gem.add_dependency "ridley", "~> 0.11.0.rc1"
 
   gem.add_development_dependency 'guard'
   gem.add_development_dependency 'guard-rspec'

data/spec/lib/silver_spurs/app_spec.rb

@@ -269,6 +269,29 @@ describe SilverSpurs::App do
     end
     
   end
+
+  describe '/kick/:ip' do
+    before :each do
+      @chef = double('chef')
+      SilverSpurs::ChefInterface.stub(:new).and_return @chef
+    end
+
+    it 'starts a chef run' do
+      @chef.should_receive :chef_run
+
+      post '/kick/node'
+    end
+
+    context 'when the node does not exist' do
+      it 'should return a 404' do
+        @chef.stub(:chef_run).and_raise(SilverSpurs::NodeNotFoundException.new)
+
+        post '/kick/node'
+        last_response.status.should eq 404
+      end
+    end
+
+  end
    
 end
 

data/spec/lib/silver_spurs/chef_interface_spec.rb

@@ -0,0 +1,135 @@
+require 'spec_helper'
+require 'ridley'
+
+describe SilverSpurs::ChefInterface do
+  
+  describe :chef_run do
+
+    before :each do
+      @chef_i = SilverSpurs::ChefInterface.new({})
+      @ridley = double('ridley')
+      @node_resource = double('node_resource')
+      @node_obj = double('node_obj')
+
+      @chef_i.stub(:ridley).and_return @ridley
+      @ridley.stub(:node).and_return @node_resource
+    end    
+    
+    it 'finds a node and then launches a chef run' do
+      @chef_i.should_receive(:find_node).and_return @node_obj
+      @node_obj.should_receive(:chef_run)
+
+      @chef_i.chef_run 'node'
+    end
+    
+    context 'with a run list' do
+      before :each do
+        @chef_i.stub(:find_node).and_return @node_obj
+      end
+      
+      after :each do
+        @chef_i.chef_run 'node_name', ['recipe[one]', 'recipe[two]']
+      end
+      
+      it 'should call execute off of the node resource' do
+        @node_obj.stub(:public_hostname).and_return 'hostname'
+        @node_resource.should_receive(:execute_command)
+      end
+
+      it 'should pass in the host name from the node object' do
+        @node_obj.should_receive(:public_hostname).and_return 'hostname'
+        @node_resource.should_receive(:execute_command).with('hostname', anything)
+      end
+
+      it 'should pass in the run list as a comma-seperated string' do
+        @node_obj.stub(:public_hostname).and_return 'hostname'
+        @node_resource.should_receive(:execute_command).with(anything, %r{'recipe\[one\],recipe\[two\]'})
+      end      
+    end
+
+    context 'without a run list' do
+      after :each do
+        @chef_i.chef_run 'node_name'
+      end
+      
+      before :each do
+        @chef_i.stub(:find_node).and_return @node_obj
+      end
+      
+      it 'should call chef_run off of the node object' do
+        @node_obj.should_receive :chef_run
+      end
+    end    
+      
+  end
+
+  describe :find_node do
+    
+    before :each do
+      @chef_i = SilverSpurs::ChefInterface.new({})
+      @ridley = double('ridley')
+      @node_resource = double('node_resource')
+
+      @chef_i.stub(:ridley).and_return @ridley
+      @ridley.stub(:node).and_return @node_resource
+    end
+
+    def call_find_node
+      @chef_i.send(:find_node, 'node_name')
+    end
+    
+    it 'asks ridley for the node' do
+      @node_resource.should_receive(:find).with('node_name').and_return double('node_obj')
+      call_find_node
+    end
+    
+    context 'when node exists' do
+      before :each do
+        @node_obj = double('node_obj')
+        @node_resource.stub(:find).and_return @node_obj
+      end
+      
+      it 'should return the node' do
+        call_find_node.should eq @node_obj
+      end              
+    end
+    
+    context 'when node does not exist' do
+      before :each do 
+        @node_resource.stub(:find).and_return nil
+      end
+      
+      it 'should throw an error' do
+        expect { call_find_node }.to raise_error
+      end      
+    end
+    
+  end
+
+  describe :ridley do
+    before :each do
+      @chef_i = SilverSpurs::ChefInterface.new({})
+    end
+    
+    def call_ridley
+      @chef_i.send :ridley
+    end
+    
+    context 'when @ridley has not been initialized' do
+      it 'creates a new Ridley instance' do
+        Ridley.should_receive(:new)
+        call_ridley
+      end
+    end
+
+    context 'when @ridley has been initialized' do
+      it 're-uses the old ridley' do
+        Ridley.should_receive(:new).once.and_return double('ridley')
+        call_ridley
+        call_ridley
+      end
+    end
+        
+  end
+       
+end

data/spec/lib/silver_spurs/client/chef_run_spec.rb

@@ -0,0 +1,84 @@
+require 'silver_spurs/client/chef_run'
+
+describe SilverSpurs::ChefRun do
+  describe :convert_status do
+    before :each do
+      @chef_run = SilverSpurs::ChefRun.new(["ok",{'stdout' => '', 'stderr' => '', 'exit_code' => 0, 'exit_status' => 0}])
+    end
+
+    def call_convert_status(response)
+      @chef_run.send(:convert_status, response)
+    end
+
+    context 'response is "ok"' do
+      before :each do
+        @response = ["ok", {}]
+      end
+
+      it "should return :success" do
+        call_convert_status(@response).should eq :success
+      end
+    end
+
+    context 'response is "error"' do
+      before :each do
+        @response = ["error", {}]
+      end
+
+      it "should return :failed" do
+        call_convert_status(@response).should eq :failed
+      end
+    end
+
+  end
+
+  describe :prettify_log do
+    before :each do
+      @chef_run = SilverSpurs::ChefRun.new(["ok",{'stdout' => '', 'stderr' => '', 'exit_code' => 0, 'exit_status' => 0}])
+    end
+
+    def call_prettify_log(response)
+      @chef_run.send :prettify_log, response
+    end
+
+    it 'should output stderr' do
+      response = ["ok",{'stdout' => '', 'stderr' => 'stdERR, son', 'exit_code' => 0, 'exit_status' => 0}]
+      call_prettify_log(response).should match(/stdERR, son/)
+    end
+
+    it 'should output stdout' do
+      response = ["ok",{'stdout' => 'stdOUT, son', 'stderr' => '', 'exit_code' => 0, 'exit_status' => 0}]
+      call_prettify_log(response).should match(/stdOUT, son/)
+    end
+
+    context 'when exit_code and exit_status are present' do
+      it 'should prefer exit_code' do
+        response = ["ok",{'stdout' => '', 'stderr' => '', 'exit_code' => 1, 'exit_status' => 2}]
+        call_prettify_log(response).should match(/Exit Code: 1/)
+      end
+    end
+
+    context 'when exit_code is not present' do
+      it 'should use exit_status' do
+        response = ["ok",{'stdout' => '', 'stderr' => '', 'exit_code' => nil, 'exit_status' => 2}]
+        call_prettify_log(response).should match(/Exit Code: 2/)
+      end
+    end
+
+    context 'when exit_status is not present' do
+      it 'should use exit_code' do
+        response = ["ok",{'stdout' => '', 'stderr' => '', 'exit_code' => 1, 'exit_status' => nil}]
+        call_prettify_log(response).should match(/Exit Code: 1/)
+      end
+    end
+
+    context 'when exit_code and exit_status are not present' do
+      it 'should use nil' do
+        response = ["ok",{'stdout' => '', 'stderr' => '', 'exit_code' => nil, 'exit_status' => nil}]
+        call_prettify_log(response).should match(/Exit Code: /)
+      end
+    end
+
+  end
+
+end

data/spec/lib/silver_spurs/client_spec.rb

@@ -109,5 +109,28 @@ describe SilverSpurs::Client do
     end
     
   end
+
+  describe :start_chef_run do
+    before :each do
+      @client = SilverSpurs::Client.new 'http://localhost'
+      @resource = double('rest-resource')
+      @resource.stub(:[]).and_return @resource
+      @client.stub(:spur_host).and_return @resource
+    end
+
+    it 'returns a ChefRun object' do
+      response_payload = ["ok", {'stderr' => '', 'stdout' => '', 'exit_code' => 0, 'exit_status' => 0}]
+      response = double('response')
+      response.stub(:to_str).and_return response_payload.to_json
+      response.stub(:code).and_return 200
+
+      @resource.stub(:post).and_return response
+
+      SilverSpurs::ChefRun.should_receive(:new).with(response_payload)
+
+      @client.start_chef_run('hostname')
+    end
+    
+  end
   
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: silver_spurs
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 2.0.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Christian Blades
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -75,6 +75,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.3
+- !ruby/object:Gem::Dependency
+  name: ridley
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.11.0.rc1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.11.0.rc1
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -207,15 +223,20 @@ files:
 - lib/silver_spurs.rb
 - lib/silver_spurs/app.rb
 - lib/silver_spurs/asyncifier.rb
+- lib/silver_spurs/chef_exceptions.rb
+- lib/silver_spurs/chef_interface.rb
 - lib/silver_spurs/client.rb
 - lib/silver_spurs/client/bootstrap_run.rb
+- lib/silver_spurs/client/chef_run.rb
 - lib/silver_spurs/client/exceptions.rb
 - lib/silver_spurs/knife_interface.rb
 - lib/silver_spurs/version.rb
 - silver_spurs.gemspec
 - spec/lib/silver_spurs/app_spec.rb
 - spec/lib/silver_spurs/asyncifier_spec.rb
+- spec/lib/silver_spurs/chef_interface_spec.rb
 - spec/lib/silver_spurs/client/bootstrap_run_spec.rb
+- spec/lib/silver_spurs/client/chef_run_spec.rb
 - spec/lib/silver_spurs/client_spec.rb
 - spec/lib/silver_spurs/knife_interface_spec.rb
 - spec/spec_helper.rb
@@ -231,28 +252,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1092412529978158920
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 1092412529978158920
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: RESTful service to kick off chef bootstraps
 test_files:
 - spec/lib/silver_spurs/app_spec.rb
 - spec/lib/silver_spurs/asyncifier_spec.rb
+- spec/lib/silver_spurs/chef_interface_spec.rb
 - spec/lib/silver_spurs/client/bootstrap_run_spec.rb
+- spec/lib/silver_spurs/client/chef_run_spec.rb
 - spec/lib/silver_spurs/client_spec.rb
 - spec/lib/silver_spurs/knife_interface_spec.rb
 - spec/spec_helper.rb