ridley 1.0.3 → 1.1.0

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p392
+1.9.3-p429

data/lib/ridley/chef/cookbook/syntax_check.rb

@@ -1,4 +1,5 @@
 require 'shellwords'
+require 'buff/shell_out'
 
 module Ridley::Chef
   class Cookbook
@@ -67,8 +68,8 @@ module Ridley::Chef
           end
       end
 
+      include Buff::ShellOut
       include Ridley::Logging
-      include Ridley::Mixin::ShellOut
       include Ridley::Mixin::Checksum
 
       attr_reader :cookbook_path

data/lib/ridley/chef_object.rb

@@ -85,7 +85,9 @@ module Ridley
     #
     # @return [Object]
     def reload
-      mass_assign(resource.find(self)._attributes_)
+      new_attributes = resource.find(self)._attributes_
+      @_attributes_  = nil
+      mass_assign(new_attributes)
       self
     end
 

data/lib/ridley/chef_objects/node_object.rb

@@ -30,10 +30,13 @@ module Ridley
     alias_method :default_attributes, :default
     alias_method :override_attributes, :override
 
-    alias_method :normal_attributes=, :normal=
-    alias_method :automatic_attributes=, :automatic=
-    alias_method :default_attributes=, :default=
-    alias_method :override_attributes=, :override=
+    # A merged hash containing a deep merge of all of the attributes respecting the node attribute
+    # precedence level.
+    #
+    # @return [hashie::Mash]
+    def chef_attributes
+      default.merge(normal.merge(override.merge(automatic)))
+    end
 
     # Set a node level normal attribute given the dotted path representation of the Chef
     # attribute and value.

data/lib/ridley/errors.rb

@@ -65,6 +65,9 @@ module Ridley
     class SandboxCommitError < RidleyError; end
     class PermissionDenied < RidleyError; end
 
+    class SandboxUploadError < RidleyError; end
+    class ChecksumMismatch < RidleyError; end
+
     class HTTPError < RidleyError
       class << self
         def fabricate(env)

data/lib/ridley/host_connector/winrm.rb

@@ -81,11 +81,7 @@ module Ridley
           end
         end
       ensure
-        begin
-          command_uploaders.map(&:cleanup)
-        rescue ::WinRM::WinRMHTTPTransportError => ex
-          log.info "Error cleaning up leftover Powershell scripts on some hosts"
-        end
+        command_uploaders.map(&:cleanup)
       end
 
       # Returns the command if it does not break the WinRM command length

data/lib/ridley/sandbox_uploader.rb

@@ -4,35 +4,30 @@ module Ridley
     class << self
       # Return the checksum of the contents of the file at the given filepath
       #
-      # @param [String] path
-      #   file to checksum
+      # @param [String] io
+      #   a filepath or an IO
+      # @param [Digest::Base] digest
       #
       # @return [String]
       #   the binary checksum of the contents of the file
-      def checksum(path)
-        File.open(path, 'rb') { |f| checksum_io(f, Digest::MD5.new) }
+      def checksum(io, digest = Digest::MD5.new)
+        io = io.dup
+        while chunk = io.read(1024 * 8)
+          digest.update(chunk)
+        end
+        digest.hexdigest
       end
 
       # Return a base64 encoded checksum of the contents of the given file. This is the expected
       # format of sandbox checksums given to the Chef Server.
       #
-      # @param [String] path
-      #
-      # @return [String]
-      #   a base64 encoded checksum
-      def checksum64(path)
-        Base64.encode64([checksum(path)].pack("H*")).strip
-      end
-
       # @param [String] io
-      # @param [Object] digest
+      #   a filepath or an IO
       #
       # @return [String]
-      def checksum_io(io, digest)
-        while chunk = io.read(1024 * 8)
-          digest.update(chunk)
-        end
-        digest.hexdigest
+      #   a base64 encoded checksum
+      def checksum64(io)
+        Base64.encode64([checksum(io)].pack("H*")).strip
       end
     end
 
@@ -53,22 +48,33 @@ module Ridley
     # @param [Ridley::SandboxObject] sandbox
     # @param [String] chk_id
     #   checksum of the file being uploaded
-    # @param [String] path
-    #   path to the file to upload
+    # @param [String, #read] file
+    #   a filepath or an IO
+    #
+    # @raise [Errors::ChecksumMismatch]
+    #   if the given file does not match the expected checksum
     #
     # @return [Hash, nil]
-    def upload(sandbox, chk_id, path)
+    def upload(sandbox, chk_id, file)
       checksum = sandbox.checksum(chk_id)
 
       unless checksum[:needs_upload]
         return nil
       end
 
-      headers  = {
+      io                  = file.respond_to?(:read) ? file : File.new(file, 'rb')
+      calculated_checksum = self.class.checksum64(io)
+      expected_checksum   = Base64.encode64([chk_id].pack('H*')).strip
+
+      unless calculated_checksum == expected_checksum
+        raise Errors::ChecksumMismatch,
+          "Error uploading #{chk_id}. Expected #{expected_checksum} but got #{calculated_checksum}"
+      end
+
+      headers = {
         'Content-Type' => 'application/x-binary',
-        'content-md5' => self.class.checksum64(path)
+        'content-md5' => calculated_checksum
       }
-      contents = File.open(path, 'rb') { |f| f.read }
 
       url         = URI(checksum[:url])
       upload_path = url.path
@@ -86,7 +92,7 @@ module Ridley
           c.response :follow_redirects
           c.request :chef_auth, self.client_name, self.client_key
           c.adapter :net_http
-        end.put(upload_path, contents, headers)
+        end.put(upload_path, io.read, headers)
       rescue Ridley::Errors::HTTPError => ex
         abort(ex)
       end

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

data/ridley.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 1.9.1"
 
   s.add_runtime_dependency 'addressable'
+  s.add_runtime_dependency 'buff-shell_out',          '~> 0.1'
   s.add_runtime_dependency 'chozo',                   '>= 0.6.0'
   s.add_runtime_dependency 'celluloid',               '~> 0.14.0'
   s.add_runtime_dependency 'celluloid-io',            '~> 0.14.0'

data/spec/acceptance/sandbox_resource_spec.rb

@@ -8,8 +8,8 @@ describe "Sandbox API operations", type: "acceptance" do
 
   let(:checksums) do
     [
-      Ridley::SandboxUploader.checksum(fixtures_path.join("recipe_one.rb")),
-      Ridley::SandboxUploader.checksum(fixtures_path.join("recipe_two.rb"))
+      Ridley::SandboxUploader.checksum(File.open(fixtures_path.join("recipe_one.rb"))),
+      Ridley::SandboxUploader.checksum(File.open(fixtures_path.join("recipe_two.rb")))
     ]
   end
 

data/spec/unit/ridley/chef_object_spec.rb

@@ -142,21 +142,28 @@ describe Ridley::ChefObject do
   end
 
   describe "#reload" do
-    let(:updated_subject) { double('updated_subject', _attributes_: { fake_attribute: "some_value" }) }
+    let(:updated_subject) { double('updated_subject', _attributes_: { one: "val" }) }
 
     before(:each) do
-      subject.class.attribute(:fake_attribute)
-      resource.should_receive(:find).with(subject).and_return(updated_subject)
+      subject.class.attribute(:one)
+      subject.class.attribute(:two)
+      resource.stub(:find).with(subject).and_return(updated_subject)
     end
 
     it "returns itself" do
       subject.reload.should eql(subject)
     end
 
-    it "sets the attributes of self to include those of the reloaded object" do
+    it "sets the attributes of self to equal those of the updated object" do
       subject.reload
 
-      subject.get_attribute(:fake_attribute).should eql("some_value")
+      subject.get_attribute(:one).should eql("val")
+    end
+
+    it "does not include attributes not set by the updated object" do
+      subject.two = "other"
+      subject.reload
+      expect(subject.two).to be_nil
     end
   end
 

data/spec/unit/ridley/chef_objects/node_object_spec.rb

@@ -5,6 +5,55 @@ describe Ridley::NodeObject do
   let(:instance) { described_class.new(resource) }
   subject { instance }
 
+  describe "#chef_attributes" do
+    subject { instance.chef_attributes }
+
+    it "returns a Hashie::Mash" do
+      expect(subject).to be_a(Hashie::Mash)
+    end
+
+    it "includes default attributes" do
+      instance.default = default = { default: { one: "val", two: "val" } }
+      expect(subject.to_hash).to include(default)
+    end
+
+    it "includes normal attributes" do
+      instance.normal = normal = { normal: { one: "new", two: "val" } }
+      expect(subject.to_hash).to include(normal)
+    end
+
+    it "includes override attributes" do
+      instance.override = override = { override: { one: "new", two: "val" } }
+      expect(subject.to_hash).to include(override)
+    end
+
+    it "includes automatic attributes" do
+      instance.automatic = automatic = { automatic: { one: "new", two: "val" } }
+      expect(subject.to_hash).to include(automatic)
+    end
+
+    it "overrides default attributes with normal attributes" do
+      instance.default = default = { one: "old", two: "old" }
+      instance.normal = normal = { one: "new" }
+      expect(subject[:one]).to eql("new")
+      expect(subject[:two]).to eql("old")
+    end
+
+    it "overrides normal attributes with override attributes" do
+      instance.normal = normal = { one: "old", two: "old" }
+      instance.override = override = { one: "new" }
+      expect(subject[:one]).to eql("new")
+      expect(subject[:two]).to eql("old")
+    end
+
+    it "overrides override attributes with automatic attributes" do
+      instance.override = override = { one: "old", two: "old" }
+      instance.automatic = automatic = { one: "new" }
+      expect(subject[:one]).to eql("new")
+      expect(subject[:two]).to eql("old")
+    end
+  end
+
   describe "#set_chef_attribute" do
     it "sets an normal node attribute at the nested path" do
        subject.set_chef_attribute('deep.nested.item', true)

data/spec/unit/ridley/sandbox_uploader_spec.rb

@@ -1,6 +1,24 @@
 require 'spec_helper'
 
 describe Ridley::SandboxUploader do
+  describe "ClassMethods" do
+    subject { described_class }
+
+    describe "::checksum" do
+      let(:io) { StringIO.new("some long string") }
+      subject { described_class.checksum(io) }
+
+      it { should eq("2fb66bbfb88cdf9e07a3f1d1dfad71ab") }
+    end
+
+    describe "::checksum64" do
+      let(:io) { StringIO.new("some long string") }
+      subject { described_class.checksum64(io) }
+
+      it { should eq("L7Zrv7iM354Ho/HR361xqw==") }
+    end
+  end
+
   let(:client_name) { "reset" }
   let(:client_key) { fixtures_path.join('reset.pem') }
   let(:connection) do
@@ -22,35 +40,14 @@ describe Ridley::SandboxUploader do
 
   let(:sandbox) { Ridley::SandboxObject.new(resource, checksums: checksums) }
 
-  describe "ClassMethods" do
-    subject { described_class }
-
-    describe "::checksum" do
-      subject { described_class.checksum(path) }
-
-      let(:path) { fixtures_path.join('reset.pem') }
-
-      it { should eq("a0608f1eb43ee4cca510bf95f8d209f7") }
-    end
-
-    describe "::checksum64" do
-      subject { described_class.checksum64(path) }
-
-      let(:path) { fixtures_path.join('reset.pem') }
-
-      it { should eq("oGCPHrQ+5MylEL+V+NIJ9w==") }
-    end
-  end
-
   subject { described_class.new(client_name, client_key, {}) }
 
   describe "#upload" do
-    let(:chk_id) { "oGCPHrQ+5MylEL+V+NIJ9w==" }
+    let(:chk_id) { "a0608f1eb43ee4cca510bf95f8d209f7" }
     let(:path) { fixtures_path.join('reset.pem').to_s }
+    let(:different_path) { fixtures_path.join('recipe_one.rb').to_s }
 
-    before do
-      connection.stub(foss?: false)
-    end
+    before { connection.stub(foss?: false) }
 
     context "when the checksum needs uploading" do
       let(:checksums) do
@@ -67,6 +64,10 @@ describe Ridley::SandboxUploader do
 
         subject.upload(sandbox, chk_id, path)
       end
+
+      it "raises an exception when the calcuated checksum does not match the expected checksum" do
+        expect { subject.upload(sandbox, chk_id, different_path) }.to raise_error(Ridley::Errors::ChecksumMismatch)
+      end
     end
 
     context "when the checksum doesn't need uploading" do
@@ -78,10 +79,6 @@ describe Ridley::SandboxUploader do
         }
       end
 
-      let(:sandbox) do
-        Ridley::SandboxObject.new(double, checksums: checksums)
-      end
-
       it "returns nil" do
         subject.upload(sandbox, chk_id, path).should be_nil
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-29 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -28,6 +28,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: buff-shell_out
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: chozo
   requirement: !ruby/object:Gem::Requirement
@@ -280,7 +296,6 @@ files:
 - lib/ridley/middleware/retry.rb
 - lib/ridley/mixin.rb
 - lib/ridley/mixin/checksum.rb
-- lib/ridley/mixin/shell_out.rb
 - lib/ridley/resource.rb
 - lib/ridley/resources.rb
 - lib/ridley/resources/client_resource.rb
@@ -356,7 +371,6 @@ files:
 - spec/unit/ridley/middleware/chef_response_spec.rb
 - spec/unit/ridley/middleware/gzip_spec.rb
 - spec/unit/ridley/middleware/parse_json_spec.rb
-- spec/unit/ridley/mixin/shell_out_spec.rb
 - spec/unit/ridley/resource_spec.rb
 - spec/unit/ridley/resources/client_resource_spec.rb
 - spec/unit/ridley/resources/cookbook_resource_spec.rb
@@ -390,7 +404,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1974631482888934392
+      hash: -1556301606897048958
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -457,7 +471,6 @@ test_files:
 - spec/unit/ridley/middleware/chef_response_spec.rb
 - spec/unit/ridley/middleware/gzip_spec.rb
 - spec/unit/ridley/middleware/parse_json_spec.rb
-- spec/unit/ridley/mixin/shell_out_spec.rb
 - spec/unit/ridley/resource_spec.rb
 - spec/unit/ridley/resources/client_resource_spec.rb
 - spec/unit/ridley/resources/cookbook_resource_spec.rb

data/lib/ridley/mixin/shell_out.rb

@@ -1,84 +0,0 @@
-module Ridley
-  module Mixin
-    # A Ruby platform agnostic way of executing shell commands on the local system
-    module ShellOut
-      class Response
-        # @return [Fixnum]
-        attr_reader :exitstatus
-        # @return [String]
-        attr_reader :stdout
-        # @return [String]
-        attr_reader :stderr
-
-        # @param [Fixnum] exitstatus
-        # @param [String] stdout
-        # @param [String] stderr
-        def initialize(exitstatus, stdout, stderr)
-          @exitstatus = exitstatus
-          @stdout     = stdout
-          @stderr     = stderr
-        end
-
-        def success?
-          exitstatus == 0
-        end
-
-        def error?
-          !success?
-        end
-        alias_method :failure?, :error?
-      end
-
-      include Chozo::RubyEngine
-      extend self
-
-      # Executes the given shell command on the local system
-      #
-      # @param [String] command
-      #   The command to execute
-      #
-      # @return [ShellOut::Response]
-      def shell_out(command)
-        process_status, out, err = jruby? ? jruby_out(command) : mri_out(command)
-        Response.new(process_status, out, err)
-      end
-
-      private
-
-        # @param [String] command
-        #   The command to execute
-        def mri_out(command)
-          out, err = Tempfile.new('ridley.shell_out.stdout'), Tempfile.new('ridley.shell_out.stderr')
-
-          begin
-            pid         = Process.spawn(command, out: out.to_i, err: err.to_i)
-            pid, status = Process.waitpid2(pid)
-            exitstatus  = status.exitstatus
-          rescue Errno::ENOENT => ex
-            exitstatus = 127
-            out.write("")
-            err.write("command not found: #{command}")
-          end
-
-          out.close
-          err.close
-
-          [ exitstatus, File.read(out), File.read(err) ]
-        end
-
-        # @param [String] command
-        #   The command to execute
-        def jruby_out(command)
-          out, err = StringIO.new, StringIO.new
-          $stdout, $stderr = out, err
-          system(command)
-
-          out.rewind
-          err.rewind
-          [ $?, out.read, err.read ]
-        ensure
-          $stdout, $stderr = STDOUT, STDERR
-        end
-    end
-  end
-end

data/spec/unit/ridley/mixin/shell_out_spec.rb

@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-describe Ridley::Mixin::ShellOut do
-  describe "shell_out" do
-    let(:command) { "ls" }
-
-    subject(:result) { described_class.shell_out(command) }
-
-    it "returns a ShellOut::Response" do
-      expect(result).to be_a(described_class::Response)
-    end
-
-    its(:stdout) { should be_a(String) }
-    its(:stderr) { should be_a(String) }
-    its(:exitstatus) { should be_a(Fixnum) }
-    its(:success?) { should be_true }
-    its(:error?) { should be_false }
-
-    context "when on MRI" do
-      before { described_class.stub(jruby?: false) }
-
-      it "delegates to #mri_out" do
-        described_class.should_receive(:mri_out).with(command)
-        result
-      end
-    end
-
-    context "when on JRuby" do
-      before { described_class.stub(jruby?: true) }
-
-      it "delegates to #jruby_out" do
-        described_class.should_receive(:jruby_out).with(command)
-        result
-      end
-    end
-  end
-end