silver_spurs 2.0.0.rc1 → 2.0.0.rc3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!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=

data/.gitignore

@@ -32,4 +32,5 @@ tramp
 .org-id-locations
 *_archive
 
+.idea
 

data/.travis.yml

@@ -3,4 +3,7 @@ rvm:
   - 2.0.0
   - 1.9.3
   - 1.9.2
-  - ruby-head
+  - ruby-head
+notifications:
+  campfire:
+      secure: "e/rh1fwGlXvclgG7ql+WEHVm1TwdbJ/iSpbjzYvdvud9ZtWPHEI8/qvUMeqR\n4PZDqLfCt9N2Eliky4VGo49yu4OGYEy9bY0I/oRLi8DQw4eFohwTII14oXM2\nDh1qT/5p1DeIfm0BgHwbS0YwsbaIWpYoYdh3C93FNwsNXI0lMoQ="

data/lib/silver_spurs/app.rb

@@ -40,10 +40,7 @@ module SilverSpurs
     end
 
     put '/bootstrap/:ip' do
-      required_params = [:node_name]
-      unless required_vars? params, required_params
-        return 406, {:required_params => required_params}.to_json
-      end
+      ensure_required_params :node_name
 
       node_name = params[:node_name].strip
       return 406, {:bad_params => :node_name}.to_json unless node_name =~ settings.node_name_filter
@@ -107,8 +104,38 @@ module SilverSpurs
       end
     end
 
-    def required_vars?(params, requirement_list)
-      requirement_list.none? { |required_param| params[required_param].nil? }
+    # JSON endpoint - set Content-Type request header to 'application/json'
+    # This should be PUT'd to with a JSON payload that looks like:
+    # {
+    #   "attributes": {
+    #     "somenew.node.attribute": "bananas",
+    #     "another.node.attribute": true
+    #   }
+    # }
+    put '/attributes/:ip' do
+      ensure_required_params :attributes
+
+      chef = ChefInterface.new(settings.chef_config)
+      begin
+        chef.update_node_attributes(params[:ip], params[:attributes])
+      rescue SilverSpurs::NodeNotFoundException
+        status 404
+      end
+    end
+
+    def ensure_required_params(*required_params)
+      merge_json_body_params
+      all_present = required_params.none? { |required_param| params[required_param].nil? }
+      unless all_present
+        halt 406, {:required_params => required_params}.to_json
+      end
+    end
+
+    def merge_json_body_params
+      if request.content_type.include?('application/json') and request.content_length.to_i > 0
+        request.body.rewind
+        params.merge! JSON.parse(request.body.read.strip)
+      end
     end
     
   end

data/lib/silver_spurs/asyncifier.rb

@@ -38,7 +38,12 @@ module SilverSpurs
       return false unless File.exists? pid_file_path(process_name)
       
       pid = File.read(pid_file_path(process_name)).to_i
-      IO.popen("ps -o command -p #{pid}").read.split("\n").count == 2
+      
+      ps_handle = IO.popen("ps -o command -p #{pid}")
+      process_is_running = ps_handle.read.split("\n").count == 2
+      ps_handle.close
+      
+      process_is_running
     end
 
     def success?(process_name)

data/lib/silver_spurs/chef_interface.rb

@@ -14,12 +14,20 @@ module SilverSpurs
       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
+        ridley.node.execute_command find_hostname(node_name, node), command
       else
         node.chef_run
       end
     end
 
+    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
+      node.save
+    end
+
     private
 
     def ridley
@@ -32,5 +40,12 @@ module SilverSpurs
       node
     end
 
+    # Waterfall through the options, use the node name as a last resort
+    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
+    end
+    
   end
 end

data/lib/silver_spurs/client.rb

@@ -4,7 +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'
+require 'silver_spurs/client/chef_output'
 
 module SilverSpurs
   class Client
@@ -18,7 +18,9 @@ module SilverSpurs
       payload = parameterize_hash params
       headers = {:accept => :json, :content_type=> 'application/x-www-form-urlencoded'}
 
-      response = spur_host["bootstrap/#{ip}"].put(payload, headers, &method(:dont_redirect_for_303))
+      response = gracefully_handle_rest_call do
+        spur_host["bootstrap/#{ip}"].put(payload, headers, &method(:dont_redirect_for_303))
+      end
       
       throw ClientException.new("unexpected response", response) unless response.code == 303
 
@@ -26,12 +28,32 @@ module SilverSpurs
     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)
+      response = gracefully_handle_rest_call do
+        spur_host["kick/#{host_name}"].post :params => { :run => runlist }
+      end
+      ChefOutput.new JSON.parse(response)
+    end
+
+    def set_node_attributes(host_name, attributes = {})
+      headers = { :accept => :json, :content_type => 'application/json' }
+      gracefully_handle_rest_call do
+        spur_host["attributes/#{host_name}"].put({ :attributes => attributes }.to_json, headers)
+      end
     end
 
     private
+
+    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)
+      end
+
+      response
+    end
     
     def parameterize_hash(param_hash)
       uri = Addressable::URI.new

data/lib/silver_spurs/client/{chef_run.rb → chef_output.rb}

@@ -3,7 +3,7 @@ require 'silver_spurs/client/exceptions'
 require 'erb'
 
 module SilverSpurs
-  class ChefRun
+  class ChefOutput
 
     attr_reader :log, :status
 

data/lib/silver_spurs/version.rb

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

data/spec/lib/silver_spurs/app_spec.rb

@@ -292,6 +292,61 @@ describe SilverSpurs::App do
     end
 
   end
+
+  describe '/attributes/:ip' do
+    before :each do
+      @chef = double('chef')
+      SilverSpurs::ChefInterface.stub(:new).and_return @chef
+    end
+
+    context 'when attributes are supplied' do
+
+      before :each do
+        @attributes = {
+          :attributes => {
+            :thing => 'sloth',
+            :things => 'more_sloths'
+          }
+        }.to_json
+
+        header 'Content-Type', 'application/json'
+      end
+
+      it 'updates the attributes on the target node' do
+        @chef.should_receive(:update_node_attributes)
+
+        put '/attributes/node', @attributes
+        last_response.status.should eq 200
+      end
+
+      context 'and the node does not exist' do
+        it 'should return a 404' do
+          @chef.stub(:update_node_attributes).and_raise(SilverSpurs::NodeNotFoundException.new)
+
+          put '/attributes/node', @attributes
+          last_response.status.should eq 404
+        end
+      end
+
+    end
+
+    context 'when attributes are not supplied' do
+
+      it 'returns a 406 since attributes (required) were not present' do
+        put '/attributes/node'
+        last_response.status.should eq 406
+      end
+
+      context 'and the node does not exist' do
+        it 'should still return a 406 due to the missing attributes' do
+          put '/attributes/node'
+          last_response.status.should eq 406
+        end
+      end
+
+    end
+
+  end
    
 end
 

data/spec/lib/silver_spurs/chef_interface_spec.rb

@@ -37,7 +37,7 @@ describe SilverSpurs::ChefInterface do
       end
 
       it 'should pass in the host name from the node object' do
-        @node_obj.should_receive(:public_hostname).and_return 'hostname'
+        @chef_i.should_receive(:find_hostname).and_return 'hostname'
         @node_resource.should_receive(:execute_command).with('hostname', anything)
       end
 
@@ -131,5 +131,115 @@ describe SilverSpurs::ChefInterface do
     end
         
   end
-       
+
+  describe :find_hostname do
+    before :each do
+      @chef_i = SilverSpurs::ChefInterface.new({})
+      @node_resource = double('node_resource')
+      @node_name = 'node_name'
+      @hostname = 'hostname.domain.tld'
+      @ipv4 = '1.1.1.1'
+    end
+    
+    def call_find_hostname(node_name, node)
+      @chef_i.send :find_hostname, node_name, node
+    end
+
+    context 'when node knows about public_hostname' do
+      before :each do
+        @node_resource.stub(:public_hostname).and_return @hostname
+      end
+
+      context 'and also public_ipv4' do
+        before :each do
+          @node_resource.stub(:public_ipv4).and_return @ipv4
+        end
+
+        it 'returns the public hostname' do
+          call_find_hostname(@node_name, @node_resource).should eq @hostname
+        end
+      end
+
+      context 'but not public_ipv4' do
+        before :each do
+          @node_resource.stub(:public_ipv4).and_return nil
+        end
+
+        it 'returns the public hostname' do
+          call_find_hostname(@node_name, @node_resource).should eq @hostname
+        end
+      end
+    end
+
+    context 'when node does not know about public_hostname' do
+      before :each do
+        @node_resource.stub(:public_hostname).and_return nil
+      end
+
+      context 'but does know public_ipv4' do
+        before :each do
+          @node_resource.stub(:public_ipv4).and_return @ipv4
+        end
+
+        it 'returns the public_ipv4' do
+          call_find_hostname(@node_name, @node_resource).should eq @ipv4
+        end
+      end
+
+      context 'and is also ignorant of the public_ipv4' do
+        before :each do
+          @node_resource.stub(:public_ipv4).and_return nil
+        end
+
+        it 'returns the node name' do
+          call_find_hostname(@node_name, @node_resource).should eq @node_name
+        end
+      end
+    end
+    
+  end
+
+  describe :update_node_attributes do
+
+    before :each do
+      @chef_i = SilverSpurs::ChefInterface.new({})
+      @node_obj = double('node_obj')
+    end
+
+    context 'when the target node is found' do
+      it 'finds a node then updates its attributes' do
+        @chef_i.should_receive(:find_node).and_return @node_obj
+        @node_obj.should_receive(:set_chef_attribute).with(kind_of(String), kind_of(String))
+        @node_obj.should_receive(:save)
+
+        @chef_i.update_node_attributes 'node', { 'app.program.config' => 'bananas' }
+      end
+    end
+
+    context 'when the target node is not found' do
+      before :each do
+        @ridley = double('ridley')
+        Ridley.stub(:new).and_return @ridley
+        @node_resource = double('node_res')
+        @ridley.stub(:node).and_return @node_resource
+        @node_resource.stub(:find).and_return nil
+      end
+
+      it 'throws an exception when trying to find the target node' do
+        expect {
+          @chef_i.update_node_attributes('node', { 'app.program.config' => 'bananas' })
+        }.to raise_exception SilverSpurs::NodeNotFoundException
+      end
+
+      it 'does not try to set or save any node attributes' do
+        @node_obj.should_not_receive(:set_chef_attribute).with any_args
+        @node_obj.should_not_receive(:save).with any_args
+
+        expect {
+          @chef_i.update_node_attributes('node', { 'app.program.config' => 'bananas' })
+        }.to raise_exception SilverSpurs::NodeNotFoundException
+      end
+    end
+
+  end
 end

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

@@ -1,9 +1,9 @@
-require 'silver_spurs/client/chef_run'
+require 'silver_spurs/client/chef_output'
 
-describe SilverSpurs::ChefRun do
+describe SilverSpurs::ChefOutput do
   describe :convert_status do
     before :each do
-      @chef_run = SilverSpurs::ChefRun.new(["ok",{'stdout' => '', 'stderr' => '', 'exit_code' => 0, 'exit_status' => 0}])
+      @chef_run = SilverSpurs::ChefOutput.new(["ok",{'stdout' => '', 'stderr' => '', 'exit_code' => 0, 'exit_status' => 0}])
     end
 
     def call_convert_status(response)
@@ -34,7 +34,7 @@ describe SilverSpurs::ChefRun do
 
   describe :prettify_log do
     before :each do
-      @chef_run = SilverSpurs::ChefRun.new(["ok",{'stdout' => '', 'stderr' => '', 'exit_code' => 0, 'exit_status' => 0}])
+      @chef_run = SilverSpurs::ChefOutput.new(["ok",{'stdout' => '', 'stderr' => '', 'exit_code' => 0, 'exit_status' => 0}])
     end
 
     def call_prettify_log(response)

data/spec/lib/silver_spurs/client_spec.rb

@@ -118,7 +118,7 @@ describe SilverSpurs::Client do
       @client.stub(:spur_host).and_return @resource
     end
 
-    it 'returns a ChefRun object' do
+    it 'returns a ChefOutput 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
@@ -126,11 +126,51 @@ describe SilverSpurs::Client do
 
       @resource.stub(:post).and_return response
 
-      SilverSpurs::ChefRun.should_receive(:new).with(response_payload)
+      SilverSpurs::ChefOutput.should_receive(:new).with(response_payload)
 
       @client.start_chef_run('hostname')
     end
     
   end
-  
+
+  describe :set_node_attributes 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 String indicating success' do
+      response = 'true'
+      response.stub(:to_str).and_return 'true'
+      response.stub(:code).and_return 200
+      @resource.stub(:put).and_return response
+
+      @client.set_node_attributes('hostname', { 'this.attribute.right.here' => true })
+        .should be_a String
+    end
+
+    it 'raises an exception if a 404 is encountered' do
+      response = 'explosions'
+      response.stub(:to_str).and_return 'explosions'
+      response.stub(:code).and_return 404
+      @resource.stub(:put).and_raise RestClient::ResourceNotFound
+
+      expect {
+        @client.set_node_attributes('hostname', { 'this.attribute.right.here' => true })
+      }.to raise_exception SilverSpurs::ClientException
+    end
+
+    it 'raises a rather generic ClientException when any exception is caught' do
+      response = 'explosions'
+      response.stub(:to_str).and_return 'explosions'
+      @resource.stub(:put).and_raise 'uh ohes!'
+
+      expect {
+        @client.set_node_attributes('hostname', { 'this.attribute.right.here' => true })
+      }.to raise_exception SilverSpurs::ClientException
+    end
+  end
+
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: silver_spurs
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
-  prerelease: 6
+  version: 2.0.0.rc3
 platform: ruby
 authors:
 - Christian Blades
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ridley
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: growl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -174,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -190,7 +167,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -198,7 +174,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -227,7 +202,7 @@ files:
 - 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/chef_output.rb
 - lib/silver_spurs/client/exceptions.rb
 - lib/silver_spurs/knife_interface.rb
 - lib/silver_spurs/version.rb
@@ -242,27 +217,26 @@ files:
 - 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: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: RESTful service to kick off chef bootstraps
 test_files:
 - spec/lib/silver_spurs/app_spec.rb