silver_spurs 2.0.0.rc3 → 2.0.0.rc4

data/lib/silver_spurs/app.rb

@@ -11,18 +11,21 @@ module SilverSpurs
     
     set :deployment_key, "/etc/chef/deployment_key.pem"
     set :deployment_user, "silverspurs"
-    set :chef_config, {
+
+    default_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
+        paranoid: false,
+        sudo: false
       }
     }
-    # sane setting for AD subdomain
-    set :node_name_filter, /^[-A-Za-z0-9]{3,15}$/
+
+    set :chef_config, default_chef_config
+    set :node_name_filter, /^[-A-Za-z0-9]{3,15}$/ # sane setting for AD subdomain
     
     get '/' do
       %q| Ride 'em, cowboy |
@@ -55,8 +58,7 @@ module SilverSpurs
                                    [arg, params[arg]]
                                  end]
       
-        command = KnifeInterface.bootstrap_command(
-                                                   params[:ip],
+        command = KnifeInterface.bootstrap_command(params[:ip],
                                                    node_name,
                                                    settings.deployment_user,
                                                    settings.deployment_key,
@@ -96,7 +98,7 @@ module SilverSpurs
 
     post '/kick/:ip' do
       run_list = params[:run] || []
-      chef = ChefInterface.new(settings.chef_config)
+      chef     = ChefInterface.new(settings.chef_config)
       begin
         chef.chef_run(params[:ip], run_list).to_json
       rescue SilverSpurs::NodeNotFoundException

data/lib/silver_spurs/chef_interface.rb

@@ -1,5 +1,3 @@
-require 'singleton'
-require 'forwardable'
 require 'ridley'
 require 'silver_spurs/chef_exceptions'
 
@@ -12,9 +10,9 @@ module SilverSpurs
 
     def chef_run(node_name, run_list = [])
       node = find_node node_name
+      hostname = find_hostname(node_name, node)
       if run_list.size > 0
-        command = "sudo chef-client -o '#{run_list.join(',')}'"
-        ridley.node.execute_command find_hostname(node_name, node), command
+        ridley.node.run hostname, "chef-client -o '#{run_list.join(',')}'"
       else
         node.chef_run
       end
@@ -22,9 +20,7 @@ module SilverSpurs
 
     def update_node_attributes(node_name, attributes)
       node = find_node node_name
-      attributes.each do |attribute_name, value|
-        node.set_chef_attribute attribute_name, value
-      end
+      attributes.each { |attr_name, value| node.set_chef_attribute(attr_name, value) }
       node.save
     end
 
@@ -44,7 +40,7 @@ module SilverSpurs
     def find_hostname(node_name, node)
       return node.public_hostname if node.public_hostname
       return node.public_ipv4 if node.public_ipv4
-      return node_name
+      node_name
     end
     
   end

data/lib/silver_spurs/client/chef_output.rb

@@ -15,20 +15,14 @@ module SilverSpurs
     private
 
     def convert_status(response)
-      code = response[0]
-      case code
-      when 'ok'
-        :success
-      when 'error'
-        :failed
-      end
+      failure = (response['exit_code'] == 1) || (response['exit_status'] == 1)
+      failure ? :failed : :success
     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']
+      stdout = response['stdout']
+      stderr = response['stderr']
+      exit_code = response['exit_code'] || response['exit_status']
 
       template = ERB.new <<-END
 Exit Code: <%= exit_code %>

data/lib/silver_spurs/client.rb

@@ -29,7 +29,7 @@ module SilverSpurs
 
     def start_chef_run(host_name, runlist = [])
       response = gracefully_handle_rest_call do
-        spur_host["kick/#{host_name}"].post :params => { :run => runlist }
+        spur_host["kick/#{host_name}"].post({ :run => runlist })
       end
       ChefOutput.new JSON.parse(response)
     end
@@ -46,10 +46,10 @@ module SilverSpurs
     def gracefully_handle_rest_call(&rest_call)
       begin
         response = rest_call.call
-      rescue RestClient::ResourceNotFound
-        raise ClientException.new("the host name was not found", response)
-      rescue Exception
-        raise ClientException.new("an unanticipated error occured", response)
+      rescue RestClient::ResourceNotFound => ex
+        raise ClientException.new("the host name was not found", ex.response)
+      rescue Exception => ex
+        raise ClientException.new("an unanticipated error occured", ex.message)
       end
 
       response

data/lib/silver_spurs/version.rb

@@ -1,3 +1,3 @@
 module SilverSpurs
-  VERSION = "2.0.0.rc3"
+  VERSION = '2.0.0.rc4'
 end

data/silver_spurs.gemspec

@@ -19,7 +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_dependency 'ridley', '~> 1.1.1'
 
   gem.add_development_dependency 'guard'
   gem.add_development_dependency 'guard-rspec'

data/spec/lib/silver_spurs/chef_interface_spec.rb

@@ -10,6 +10,7 @@ describe SilverSpurs::ChefInterface do
       @ridley = double('ridley')
       @node_resource = double('node_resource')
       @node_obj = double('node_obj')
+      @node_obj.stub(:public_hostname).and_return 'node_name'
 
       @chef_i.stub(:ridley).and_return @ridley
       @ridley.stub(:node).and_return @node_resource
@@ -17,7 +18,7 @@ describe SilverSpurs::ChefInterface do
     
     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)
+      @node_obj.should_receive :chef_run
 
       @chef_i.chef_run 'node'
     end
@@ -25,25 +26,28 @@ describe SilverSpurs::ChefInterface do
     context 'with a run list' do
       before :each do
         @chef_i.stub(:find_node).and_return @node_obj
+        @node_obj.stub(:merge_data)
+        @node_resource.stub(:run)
+        @run_list = ['recipe[one]', 'recipe[two]']
       end
       
       after :each do
-        @chef_i.chef_run 'node_name', ['recipe[one]', 'recipe[two]']
+        @chef_i.chef_run 'node_name', @run_list
       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)
+      it 'should call run off of the node resource' do
+        @node_resource.should_receive(:run)
       end
 
+
       it 'should pass in the host name from the node object' do
         @chef_i.should_receive(:find_hostname).and_return 'hostname'
-        @node_resource.should_receive(:execute_command).with('hostname', anything)
+        @node_resource.should_receive(:run).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\]'})
+      it 'should pass in the run list to ridley if provided' do
+        @node_resource.should_receive(:run)
+          .with(kind_of(String), /^(.+)'recipe\[one],recipe\[two]'$/)
       end      
     end
 
@@ -56,7 +60,7 @@ describe SilverSpurs::ChefInterface do
         @chef_i.stub(:find_node).and_return @node_obj
       end
       
-      it 'should call chef_run off of the node object' do
+      it 'should call #run off of the node object' do
         @node_obj.should_receive :chef_run
       end
     end    

data/spec/lib/silver_spurs/client/{chef_run_spec.rb → chef_output_spec.rb}

@@ -3,16 +3,16 @@ require 'silver_spurs/client/chef_output'
 describe SilverSpurs::ChefOutput do
   describe :convert_status do
     before :each do
-      @chef_run = SilverSpurs::ChefOutput.new(["ok",{'stdout' => '', 'stderr' => '', 'exit_code' => 0, 'exit_status' => 0}])
+      @chef_run = SilverSpurs::ChefOutput.new({'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
+    context 'exit code and status = 0' do
       before :each do
-        @response = ["ok", {}]
+        @response = { 'exit_code' => 0, 'exit_status' => 0}
       end
 
       it "should return :success" do
@@ -20,12 +20,14 @@ describe SilverSpurs::ChefOutput do
       end
     end
 
-    context 'response is "error"' do
-      before :each do
-        @response = ["error", {}]
+    context 'exit code or status = 1' do
+      it "should return :failed" do
+        @response = { 'exit_code' => 0, 'exit_status' => 1}
+        call_convert_status(@response).should eq :failed
       end
 
       it "should return :failed" do
+        @response = { 'exit_code' => 1, 'exit_status' => 0}
         call_convert_status(@response).should eq :failed
       end
     end
@@ -34,7 +36,7 @@ describe SilverSpurs::ChefOutput do
 
   describe :prettify_log do
     before :each do
-      @chef_run = SilverSpurs::ChefOutput.new(["ok",{'stdout' => '', 'stderr' => '', 'exit_code' => 0, 'exit_status' => 0}])
+      @chef_run = SilverSpurs::ChefOutput.new({'stdout' => '', 'stderr' => '', 'exit_code' => 0, 'exit_status' => 0})
     end
 
     def call_prettify_log(response)
@@ -42,39 +44,39 @@ describe SilverSpurs::ChefOutput do
     end
 
     it 'should output stderr' do
-      response = ["ok",{'stdout' => '', 'stderr' => 'stdERR, son', 'exit_code' => 0, 'exit_status' => 0}]
+      response = {'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}]
+      response = {'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}]
+        response = {'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}]
+        response = {'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}]
+        response = {'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}]
+        response = {'stdout' => '', 'stderr' => '', 'exit_code' => nil, 'exit_status' => nil}
         call_prettify_log(response).should match(/Exit Code: /)
       end
     end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: silver_spurs
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc3
+  version: 2.0.0.rc4
+  prerelease: 6
 platform: ruby
 authors:
 - Christian Blades
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,20 +78,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ridley
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.0.rc1
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.0.rc1
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: growl
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -153,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +182,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -167,6 +190,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,6 +198,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -211,39 +236,41 @@ files:
 - 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/chef_output_spec.rb
 - spec/lib/silver_spurs/client_spec.rb
 - spec/lib/silver_spurs/knife_interface_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/christian-blades-cb/silver_spurs
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+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/chef_output_spec.rb
 - spec/lib/silver_spurs/client_spec.rb
 - spec/lib/silver_spurs/knife_interface_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Yjc1NDE4ZTRiM2U0OWZiZjIxYzFhMWYwZGQxYzg3ZjdjMmQ2NzE0NQ==
-  data.tar.gz: !binary |-
-    NWJhMjM4ZmMyMzNmMjMwOTViM2E2NjdkZGJjYjk0YzZiYjk1M2Y3ZQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MDExZmYwMzJiZjQ0Y2ZlZjRlNWJlZTA1NDg5YzgyOThjY2NhMGI3YzYyNGM0
-    YWE5YzMzZmRhMmMzM2UzY2QyODAwMDYzYzQ4YmNiMWFlODk0MDRkOWMwNzM3
-    YmY2YWVkY2NiY2Y3NDBlZGY1NzFhYTNkYzdjZjNmNjQ5NDI2NWE=
-  data.tar.gz: !binary |-
-    YWJkMzQxMjQ4MzdiN2ZhMDI1OTM5NzFhOWJmN2JjNzMyNDM0YzcyNGZjNTNh
-    NmE4NWI2NDMyNWNlZDBkMmU1ZDg0NmRhMDc2ZTFjN2E0ZGZkMTJhNDI3Mzkw
-    OGExMDE2ZDM5OGRmNjc0ZmU0MmU3ZjU5ZWZhZjc4ZTFhZTE4Y2I=