ridley 0.7.0.rc1 → 0.7.0.rc3

data/lib/ridley/resources/data_bag_item_resource.rb

@@ -47,7 +47,7 @@ module Ridley
         end
 
         new_attributes = client.connection.post("#{data_bag.class.resource_path}/#{data_bag.name}", resource.to_json).body
-        resource.from_hash(resource.attributes.deep_merge(new_attributes))
+        resource.mass_assign(new_attributes)
         resource
       end
 
@@ -98,6 +98,9 @@ module Ridley
       type: String,
       required: true
 
+    alias_method :attributes=, :mass_assign
+    alias_method :attributes, :_attributes_
+
     # @param [Ridley::Client] client
     # @param [Ridley::DataBagResource] data_bag
     # @param [#to_hash] new_attrs
@@ -124,7 +127,7 @@ module Ridley
     def save
       raise Errors::InvalidResource.new(self.errors) unless valid?
 
-      mass_assign(self.class.create(client, data_bag, self).attributes)
+      mass_assign(self.class.create(client, data_bag, self)._attributes_)
       true
     rescue Errors::HTTPConflict
       self.update
@@ -135,7 +138,7 @@ module Ridley
     #
     # @return [Hash] decrypted attributes
     def decrypt
-      decrypted_hash = Hash[attributes.map { |key, value| [key, key == "id" ? value : decrypt_value(value)] }]
+      decrypted_hash = Hash[_attributes_.map { |key, value| [key, key == "id" ? value : decrypt_value(value)] }]
       mass_assign(decrypted_hash)
     end
 
@@ -154,7 +157,7 @@ module Ridley
     #
     # @return [Object]
     def reload
-      mass_assign(self.class.find(client, data_bag, self).attributes)
+      mass_assign(self.class.find(client, data_bag, self)._attributes_)
       self
     end
 
@@ -168,7 +171,7 @@ module Ridley
     def update
       raise Errors::InvalidResource.new(self.errors) unless valid?
 
-      mass_assign(sself.class.update(client, data_bag, self).attributes)
+      mass_assign(sself.class.update(client, data_bag, self)._attributes_)
       true
     end
 
@@ -176,14 +179,10 @@ module Ridley
     #
     # @return [Object]
     def from_hash(hash)
-      hash = HashWithIndifferentAccess.new(hash.to_hash)
+      hash = Hashie::Mash.new(hash.to_hash)
 
       mass_assign(hash.has_key?(:raw_data) ? hash[:raw_data] : hash)
       self
     end
-
-    def to_s
-      self.attributes
-    end
   end
 end

data/lib/ridley/resources/encrypted_data_bag_item_resource.rb

@@ -26,7 +26,7 @@ module Ridley
       #
       # @return [nil, Ridley::DataBagItemResource]
       def find!(client, data_bag, object)
-        data_bag_item = DataBagItem.find!(client, data_bag, object)
+        data_bag_item = DataBagItemResource.find!(client, data_bag, object)
         data_bag_item.decrypt
         new(client, data_bag, data_bag_item.attributes)
       end

data/lib/ridley/sandbox_uploader.rb

@@ -109,7 +109,7 @@ module Ridley
       upload_path = url.path
       url.path    = ""
 
-      Faraday.new(url) do |c|
+      Faraday.new(url, client.options.slice(*Connection::VALID_OPTIONS)) do |c|
         c.request :chef_auth, client.client_name, client.client_key
         c.adapter :net_http
       end.put(upload_path, contents, headers)

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.7.0.rc1"
+  VERSION = "0.7.0.rc3"
 end

data/ridley.gemspec

@@ -19,12 +19,13 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'json', '>= 1.5.0'
   s.add_runtime_dependency 'multi_json', '>= 1.0.4'
-  s.add_runtime_dependency 'chozo', '>= 0.4.1'
-  s.add_runtime_dependency 'mixlib-log'
-  s.add_runtime_dependency 'mixlib-authentication'
+  s.add_runtime_dependency 'chozo', '>= 0.5.0'
+  s.add_runtime_dependency 'mixlib-log', '>= 1.3.0'
+  s.add_runtime_dependency 'mixlib-authentication', '>= 1.3.0'
   s.add_runtime_dependency 'addressable'
   s.add_runtime_dependency 'faraday', '>= 0.8.4'
   s.add_runtime_dependency 'activesupport', '>= 3.2.0'
+  s.add_runtime_dependency 'solve', '>= 0.4.1'
   s.add_runtime_dependency 'celluloid'
   s.add_runtime_dependency 'net-ssh'
   s.add_runtime_dependency 'erubis'

data/spec/spec_helper.rb

@@ -22,6 +22,10 @@ def setup_rspec
       Ridley.logger = nil
       Celluloid.logger = nil
     end
+
+    config.before(:each) do
+      clean_tmp_path
+    end
   end
 end
 

data/spec/support/shared_examples/ridley_resource.rb

@@ -106,7 +106,7 @@ shared_examples_for "a Ridley Resource" do |resource_klass|
 
       it "sends a create message to the implementing class" do
         updated = double('updated')
-        updated.stub(:attributes).and_return(Hash.new)
+        updated.stub(:_attributes_).and_return(Hash.new)
         subject.class.should_receive(:create).with(client, subject).and_return(updated)
 
         subject.save
@@ -116,7 +116,7 @@ shared_examples_for "a Ridley Resource" do |resource_klass|
         it "sends the update message to self" do
           updated = double('updated')
           updated.stub(:[]).and_return(Hash.new)
-          updated.stub(:attributes).and_return(Hash.new)
+          updated.stub(:_attributes_).and_return(Hash.new)
           subject.class.should_receive(:create).and_raise(Ridley::Errors::HTTPConflict.new(updated))
           subject.should_receive(:update).and_return(updated)
 
@@ -141,7 +141,7 @@ shared_examples_for "a Ridley Resource" do |resource_klass|
       let(:updated) do
         updated = double('updated')
         updated.stub(:[]).and_return(Hash.new)
-        updated.stub(:attributes).and_return(Hash.new)
+        updated.stub(:_attributes_).and_return(Hash.new)
         updated
       end
 
@@ -173,14 +173,14 @@ shared_examples_for "a Ridley Resource" do |resource_klass|
     it "returns the value of the chef_id attribute" do
       subject.class.attribute(:name)
       subject.class.stub(:chef_id) { :name }
-      subject.attributes = { name: "reset" }
+      subject.mass_assign(name: "reset")
 
       subject.chef_id.should eql("reset")
     end
   end
 
   describe "#reload" do
-    let(:updated_subject) { double('updated_subject', attributes: { fake_attribute: "some_value" }) }
+    let(:updated_subject) { double('updated_subject', _attributes_: { fake_attribute: "some_value" }) }
 
     before(:each) do
       subject.class.attribute(:fake_attribute)
@@ -194,8 +194,7 @@ shared_examples_for "a Ridley Resource" do |resource_klass|
     it "sets the attributes of self to include those of the reloaded object" do
       subject.reload
 
-      subject.attributes.should have_key(:fake_attribute)
-      subject.attributes[:fake_attribute].should eql("some_value")
+      subject.get_attribute(:fake_attribute).should eql("some_value")
     end
   end
 end

data/spec/support/spec_helpers.rb

@@ -4,8 +4,17 @@ module Ridley
       Pathname.new(File.expand_path('../../../', __FILE__))
     end
 
+    def clean_tmp_path
+      FileUtils.rm_rf(tmp_path)
+      FileUtils.mkdir_p(tmp_path)
+    end
+
     def fixtures_path
       app_root_path.join('spec/fixtures')
     end
+
+    def tmp_path
+      app_root_path.join('spec/tmp')
+    end
   end
 end

data/spec/unit/ridley/connection_spec.rb

@@ -22,4 +22,27 @@ describe Ridley::Connection do
       subject.api_type.should eql(:hosted)
     end
   end
+
+  describe "#stream" do
+    let(:target) { "http://test.it/file" }
+    let(:destination) { tmp_path.join("test.file") }
+    let(:contents) { "SOME STRING STUFF\nHERE.\n" }
+
+    before(:each) do
+      stub_request(:get, "http://test.it/file").
+        to_return(status: 200, body: contents)
+    end
+
+    it "creates a destination file on disk" do
+      subject.stream(target, destination)
+
+      File.exist?(destination).should be_true
+    end
+
+    it "contains the contents of the response body" do
+      subject.stream(target, destination)
+
+      File.read(destination).should include(contents)
+    end
+  end
 end

data/spec/unit/ridley/middleware/chef_auth_spec.rb

@@ -3,12 +3,28 @@ require 'spec_helper'
 describe Ridley::Middleware::ChefAuth do
   let(:server_url) { "https://api.opscode.com/organizations/vialstudios/" }
 
+  describe "ClassMethods" do
+    subject { described_class }
+
+    describe "#authentication_headers" do
+      let(:client_name) { "reset" }
+      let(:client_key) { fixtures_path.join("reset.pem") }
+
+      it "returns a Hash of authentication headers" do
+        options = {
+          http_method: "GET",
+          host: "https://api.opscode.com",
+          path: "/something.file"
+        }
+        subject.authentication_headers(client_name, client_key, options).should be_a(Hash)
+      end
+    end
+  end
+
   subject do
     Faraday.new(server_url) do |conn|
       conn.request :chef_auth, "reset", "/Users/reset/.chef/reset.pem"
       conn.adapter Faraday.default_adapter
     end
   end
-
-  pending
 end

data/spec/unit/ridley/resource_spec.rb

@@ -82,20 +82,6 @@ describe Ridley::Resource do
     Class.new(Ridley::Resource).new(connection)
   end
 
-  describe "#attributes=" do
-    subject do
-      Class.new(Ridley::Resource) do
-        attribute :name
-      end.new(connection)
-    end
-
-    it "assigns the hash of attributes to the objects attributes" do
-      subject.attributes = { name: "reset" }
-
-      subject.attributes[:name].should eql("reset")
-    end
-  end
-
   describe "comparable" do
     subject do
       Class.new(Ridley::Resource) do
@@ -112,8 +98,8 @@ describe Ridley::Resource do
 
     context "given two objects with the same value for their 'chef_id'" do
       before(:each) do
-        one.attributes = { name: "reset", other_extra: "stuff" }
-        two.attributes = { name: "reset", extra: "stuff" }
+        one.mass_assign(name: "reset", other_extra: "stuff")
+        two.mass_assign(name: "reset", extra: "stuff")
       end
 
       it "is equal" do
@@ -123,8 +109,8 @@ describe Ridley::Resource do
 
     context "given two objects with different values for their 'chef_id'" do
       before(:each) do
-        one.attributes = { name: "jamie", other_extra: "stuff" }
-        two.attributes = { name: "winsor", extra: "stuff" }
+        one.mass_assign(name: "jamie", other_extra: "stuff")
+        two.mass_assign(name: "winsor", extra: "stuff")
       end
 
       it "is not equal" do
@@ -149,8 +135,8 @@ describe Ridley::Resource do
 
     context "given an array of objects with the same value for their 'chef_id'" do
       let(:nodes) do
-        one.attributes = { name: "reset", other_extra: "stuff" }
-        two.attributes = { name: "reset", extra: "stuff" }
+        one.mass_assign(name: "reset", other_extra: "stuff")
+        two.mass_assign(name: "reset", extra: "stuff")
 
         [ one, two ]
       end
@@ -162,8 +148,8 @@ describe Ridley::Resource do
 
     context "given an array of objects with different values for their 'chef_id'" do
       let(:nodes) do
-        one.attributes = { name: "jamie", other_extra: "stuff" }
-        two.attributes = { name: "winsor", extra: "stuff" }
+        one.mass_assign(name: "jamie", other_extra: "stuff")
+        two.mass_assign(name: "winsor", extra: "stuff")
 
         [ one, two ]
       end

data/spec/unit/ridley/resources/cookbook_resource_spec.rb

@@ -1,5 +1,259 @@
 require 'spec_helper'
 
 describe Ridley::CookbookResource do
-  pending
+  let(:client) { double('client', connection: double('connection')) }
+
+  subject { described_class.new(client) }
+
+  describe "ClassMethods" do
+    let(:server_url) { "https://api.opscode.com/organizations/vialstudios" }
+    let(:client_name) { "reset" }
+    let(:client_key) { fixtures_path.join("reset.pem") }
+
+    let(:client) do
+      Ridley.new(
+        server_url: server_url,
+        client_name: client_name,
+        client_key: client_key
+      )
+    end
+
+    describe "::all" do
+      subject { described_class.all(client) }
+
+      before(:each) do
+        stub_request(:get, File.join(server_url, "cookbooks")).
+          to_return(status: 200, body: {
+            "ant" => {
+              "url" => "https://api.opscode.com/organizations/vialstudios/cookbooks/ant",
+              "versions" => [ 
+                {
+                  "url" => "https://api.opscode.com/organizations/vialstudios/cookbooks/ant/0.10.1",
+                  "version" => "0.10.1"
+                }
+              ]
+            },
+            "apache2" => {
+              "url" => "https://api.opscode.com/organizations/vialstudios/cookbooks/apache2",
+              "versions" => [
+                {
+                  "url" => "https://api.opscode.com/organizations/vialstudios/cookbooks/apache2/1.4.0",
+                  "version" => "1.4.0"
+                }
+              ]
+            }
+          }
+        )
+      end
+
+      it "returns a Hash" do
+        subject.should be_a(Hash)
+      end
+
+      it "contains a key for each cookbook" do
+        subject.should include("ant")
+        subject.should include("apache2")
+      end
+
+      it "contains an array of versions for each cookbook" do
+        subject["ant"].should be_a(Array)
+        subject["ant"].should have(1).item
+        subject["ant"].should include("0.10.1")
+        subject["apache2"].should be_a(Array)
+        subject["apache2"].should have(1).item
+        subject["apache2"].should include("1.4.0")
+      end
+    end
+
+    describe "::delete" do
+      let(:name) { "ant" }
+      let(:version) { "1.0.0" }
+
+      it "sends a DELETE to the cookbook version URL" do
+        stub_request(:delete, File.join(server_url, "cookbooks", name, version)).
+          to_return(status: 200, body: {})
+
+        described_class.delete(client, name, version)
+      end
+
+      context "when :purge is true" do
+        it "appends ?purge=true to the end of the URL" do
+          stub_request(:delete, File.join(server_url, "cookbooks", name, "#{version}?purge=true")).
+            to_return(status: 200, body: {})
+
+          described_class.delete(client, name, version, purge: true)
+        end
+      end
+    end
+
+    describe "::delete_all" do
+      let(:name) { "ant" }
+      let(:versions) { ["1.0.0", "1.2.0", "2.0.0"] }
+      let(:options) { Hash.new }
+
+      subject { described_class }
+
+      it "deletes each version of the cookbook" do
+        subject.should_receive(:versions).with(client, name).and_return(versions)
+
+        versions.each do |version|
+          subject.should_receive(:delete).with(client, name, version, options)
+        end
+
+        subject.delete_all(client, name, options)
+      end
+    end
+
+    describe "::latest_version" do
+      let(:name) { "ant" }
+      subject { described_class }
+
+      before(:each) do
+        subject.should_receive(:versions).with(client, name).and_return(versions)
+      end
+
+      context "when the cookbook has no versions" do
+        let(:versions) { Array.new }
+
+        it "returns nil" do
+          subject.latest_version(client, name).should be_nil
+        end
+      end
+
+      context "when the cookbook has versions" do
+        let(:versions) do
+          [ "1.0.0", "1.2.0", "3.0.0", "1.4.1" ]
+        end
+
+        it "returns nil" do
+          subject.latest_version(client, name).should eql("3.0.0")
+        end
+      end
+    end
+
+    describe "::versions" do
+      let(:cookbook) { "artifact" }      
+      subject { described_class.versions(client, cookbook) }
+
+      before(:each) do
+        stub_request(:get, File.join(server_url, "cookbooks", cookbook)).
+          to_return(status: 200, body: {
+            cookbook => {
+              "versions" => [
+                {
+                  "url" => "https://api.opscode.com/organizations/ridley/cookbooks/artifact/1.0.0",
+                  "version" => "1.0.0"
+                },
+                {
+                  "url" => "https://api.opscode.com/organizations/ridley/cookbooks/artifact/1.1.0",
+                  "version" => "1.1.0"
+                },
+                {
+                  "url" => "https://api.opscode.com/organizations/ridley/cookbooks/artifact/1.2.0",
+                  "version" => "1.2.0"
+                }
+              ],
+              "url" => "https://api.opscode.com/organizations/ridley/cookbooks/artifact"}
+            }
+          )
+      end
+
+      it "returns an array" do
+        subject.should be_a(Array)
+      end
+
+      it "contains a version string for each cookbook version available" do
+        subject.should have(3).versions
+        subject.should include("1.0.0")
+        subject.should include("1.1.0")
+        subject.should include("1.2.0")
+      end
+    end
+  end
+
+  describe "#download" do
+    it "downloads each file" do
+      subject.stub(:manifest) do
+        {
+          resources: [],
+          providers: [],
+          recipes: [
+            {
+              checksum: "aa3505d3eb8ce328ea84a4333df05b07",
+              name: "default.rb",
+              path: "recipes/default.rb",
+              specificity: "default",
+              url: "https://chef.lax1.riotgames.com/organizations/reset/cookbooks/ohai/1.0.2/files/aa3505d3eb8ce328ea84a4333df05b07"
+            }
+          ],
+          definitions: [],
+          libraries: [],
+          attributes: [],
+          files: [
+            {
+              checksum: "85bc3bb921efade3f2566a668ab4b639",
+              name: "README",
+              path: "files/default/plugins/README",
+              specificity: "plugins",
+              url: "https://chef.lax1.riotgames.com/organizations/reset/cookbooks/ohai/1.0.2/files/85bc3bb921efade3f2566a668ab4b639"
+            }
+          ],
+          templates: [],
+          root_files: []
+        }
+      end
+
+      subject.should_receive(:download_file).with(:recipes, "default.rb", anything)
+      subject.should_receive(:download_file).with(:files, "README", anything)
+
+      subject.download
+    end
+  end
+
+  describe "#download_file" do
+    let(:destination) { tmp_path.join('fake.file') }
+
+    before(:each) do
+      subject.stub(:root_files) { [ { name: 'metadata.rb', url: "http://test.it/file" } ] }
+    end
+
+    it "downloads the file from the file's url" do
+      client.connection.should_receive(:stream).with("http://test.it/file", destination)
+
+      subject.download_file(:root_file, "metadata.rb", destination)
+    end
+
+    context "when given an unknown filetype" do
+      it "raises an UnknownCookbookFileType error" do
+        expect {
+          subject.download_file(:not_existant, "default.rb", destination)
+        }.to raise_error(Ridley::Errors::UnknownCookbookFileType)
+      end
+    end
+
+    context "when the cookbook doesn't have the specified file" do
+      before(:each) do
+        subject.stub(:root_files) { Array.new }
+      end
+
+      it "returns nil" do
+        subject.download_file(:root_file, "metadata.rb", destination).should be_nil
+      end
+    end
+  end
+
+  describe "#manifest" do
+    it "returns a Hash" do
+      subject.manifest.should be_a(Hash)
+    end
+
+    it "has a key for each item in FILE_TYPES" do
+      subject.manifest.keys.should =~ described_class::FILE_TYPES
+    end
+
+    it "contains an empty array for each key" do
+      subject.manifest.should each be_a(Array)
+      subject.manifest.values.should each be_empty
+    end
+  end
 end