ridley 0.11.0.rc1 → 0.11.1

data/spec/acceptance/sandbox_resource_spec.rb

@@ -1,20 +1,10 @@
 require 'spec_helper'
 
 describe "Sandbox API operations", type: "acceptance" do
-  let(:server_url) { "https://api.opscode.com/organizations/ridley" }
+  let(:server_url)  { Ridley::RSpec::ChefServer.server_url }
   let(:client_name) { "reset" }
-  let(:client_key) { "/Users/reset/.chef/reset.pem" }
-
-  let(:connection) do
-    Ridley.new(
-      server_url: server_url,
-      client_name: client_name,
-      client_key: client_key
-    )
-  end
-
-  before(:all) { WebMock.allow_net_connect! }
-  after(:all) { WebMock.disable_net_connect! }
+  let(:client_key)  { fixtures_path.join('reset.pem').to_s }
+  let(:connection)  { Ridley.new(server_url: server_url, client_name: client_name, client_key: client_key) }
 
   let(:checksums) do
     [

data/spec/acceptance/search_resource_spec.rb

@@ -1,24 +1,14 @@
 require 'spec_helper'
 
 describe "Search API operations", type: "acceptance" do
-  let(:server_url) { "https://api.opscode.com/organizations/ridley" }
+  let(:server_url)  { Ridley::RSpec::ChefServer.server_url }
   let(:client_name) { "reset" }
-  let(:client_key) { "/Users/reset/.chef/reset.pem" }
-
-  let(:client) do
-    Ridley.new(
-      server_url: server_url,
-      client_name: client_name,
-      client_key: client_key
-    )
-  end
-
-  before(:all) { WebMock.allow_net_connect! }
-  after(:all) { WebMock.disable_net_connect! }
+  let(:client_key)  { fixtures_path.join('reset.pem').to_s }
+  let(:connection)  { Ridley.new(server_url: server_url, client_name: client_name, client_key: client_key) }
 
   describe "listing indexes" do
     it "returns an array of indexes" do
-      indexes = client.search_indexes
+      indexes = connection.search_indexes
 
       indexes.should include("role")
       indexes.should include("node")
@@ -30,7 +20,7 @@ describe "Search API operations", type: "acceptance" do
   describe "searching an index that doesn't exist" do
     it "it raises a Ridley::Errors::HTTPNotFound error" do
       lambda {
-        client.search(:notthere)
+        connection.search(:notthere)
       }.should raise_error(Ridley::Errors::HTTPNotFound)
     end
   end

data/spec/fixtures/chefignore

@@ -0,0 +1,8 @@
+#
+# The ignore file allows you to skip files in cookbooks with the same name that appear
+# later in the search path.
+#
+
+recipes/ignoreme.rb
+  # comments can be indented
+ignored

data/spec/spec_helper.rb

@@ -11,6 +11,7 @@ def setup_rspec
 
   RSpec.configure do |config|
     config.include Ridley::SpecHelpers
+    config.include Ridley::RSpec::ChefServer
     config.include JsonSpec::Helpers
 
     config.mock_with :rspec
@@ -19,12 +20,25 @@ def setup_rspec
     config.run_all_when_everything_filtered = true
 
     config.before(:all) do
-      Ridley.logger = nil
       Celluloid.logger = nil
+      Ridley.logger = nil
+      WebMock.disable_net_connect!(allow_localhost: true, net_http_connect_on_start: true)
+      Ridley::RSpec::ChefServer.start
+    end
+
+    config.after(:all) do
+      Ridley::RSpec::ChefServer.stop
     end
 
     config.before(:each) do
+      Celluloid.shutdown
+      Celluloid.boot
       clean_tmp_path
+      Ridley::RSpec::ChefServer.server.clear_data
+    end
+
+    config.after(:each) do
+      Ridley::RSpec::ChefServer.server.clear_data
     end
   end
 end

data/spec/support/chef_server.rb

@@ -0,0 +1,77 @@
+require 'chef_zero/server'
+require_relative 'spec_helpers'
+
+module Ridley::RSpec
+  module ChefServer
+    PORT = 8889
+
+    class << self
+      include Ridley::SpecHelpers
+
+      def clear_request_log
+        @request_log = Array.new
+      end
+
+      def request_log
+        @request_log ||= Array.new
+      end
+
+      def server
+        @server ||= ChefZero::Server.new(port: PORT, signals: false, log_requests: true)
+      end
+
+      def server_url
+        "http://localhost:#{PORT}"
+      end
+
+      def start
+        Thin::Logging.silent = true
+        server.start_background
+        server.on_response do |request, response|
+          request_log << [ request, response ]
+        end
+        clear_request_log
+
+        server
+      end
+
+      def stop
+        @server.stop if @server
+      end
+
+      def running?
+        @server && @server.running?
+      end
+    end
+
+    def chef_client(name, hash = Hash.new)
+      load_data(:clients, name, hash)
+    end
+
+    def chef_cookbook(name, version, cookbook = Hash.new)
+      ChefServer.server.load_data("cookbooks" => { "#{name}-#{version}" => cookbook })
+    end
+
+    def chef_data_bag(name, hash = Hash.new)
+      ChefServer.server.load_data({ 'data' => { name => hash }})
+    end
+
+    def chef_environment(name, hash = Hash.new)
+      load_data(:environments, name, hash)
+    end
+
+    def chef_node(name, hash = Hash.new)
+      load_data(:nodes, name, hash)
+    end
+
+    def chef_role(name, hash = Hash.new)
+      load_data(:roles, name, hash)
+    end
+
+    private
+
+      def load_data(key, name, hash)
+        ChefServer.server.load_data(key.to_s => { name => MultiJson.encode(hash) })
+      end
+  end
+end

data/spec/unit/ridley/chef/chefignore_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe Ridley::Chef::Chefignore do
+  describe "ClassMethods" do
+    subject { described_class }
+
+    describe "::find_relative_to" do
+      let(:path) { tmp_path.join('chefignore-test') }
+      before(:each) { FileUtils.mkdir_p(path) }
+
+      it "finds a chefignore file in a 'cookbooks' directory relative to the given path" do
+        FileUtils.touch(path.join('chefignore'))
+        subject.find_relative_to(path)
+      end
+
+      it "finds a chefignore file relative to the given path" do
+        FileUtils.mkdir_p(path.join('cookbooks'))
+        FileUtils.touch(path.join('cookbooks', 'chefignore'))
+        subject.find_relative_to(path)
+      end
+    end
+  end
+
+  subject { described_class.new(File.join(fixtures_path)) }
+
+  it "loads the globs in the chefignore file" do
+    subject.ignores.should =~ %w[recipes/ignoreme.rb ignored]
+  end
+
+  it "removes items from an array that match the ignores" do
+    file_list = %w[ recipes/ignoreme.rb recipes/dontignoreme.rb ]
+    subject.remove_ignores_from(file_list).should == %w[recipes/dontignoreme.rb]
+  end
+
+  it "determines if a file is ignored" do
+    subject.ignored?('ignored').should be_true
+    subject.ignored?('recipes/ignoreme.rb').should be_true
+    subject.ignored?('recipes/dontignoreme.rb').should be_false
+  end
+end

data/spec/unit/ridley/chef/cookbook_spec.rb

@@ -4,7 +4,7 @@ describe Ridley::Chef::Cookbook do
   describe "ClassMethods" do
     subject { described_class }
 
-    describe "#from_path" do
+    describe "::from_path" do
       let(:cookbook_path) { fixtures_path.join("example_cookbook") }
 
       it "returns an instance of Ridley::Chef::Cookbook" do
@@ -26,9 +26,37 @@ describe Ridley::Chef::Cookbook do
           }.should raise_error(IOError)
         end
       end
+
+      context "when the metadata does not contain a value for name and no value for :name option was given" do
+        let(:cookbook_path) { tmp_path.join("directory_name").to_s }
+
+        before do
+          FileUtils.mkdir_p(cookbook_path)
+          FileUtils.touch(File.join(cookbook_path, 'metadata.rb'))
+        end
+
+        it "sets the name of the cookbook to the name of the directory containing it" do
+          subject.from_path(cookbook_path).cookbook_name.should eql("directory_name")
+        end
+      end
+
+      context "when a metadata.rb is missing but metadata.json is present", focus: true do
+        let(:cookbook_path) { tmp_path.join("temp_cookbook").to_s }
+
+        before do
+          FileUtils.mkdir_p(cookbook_path)
+          File.open(File.join(cookbook_path, 'metadata.json'), 'w+') do |f|
+            f.write MultiJson.encode(name: "rspec_test")
+          end
+        end
+
+        it "sets the name of the cookbook from the metadata.json" do
+          subject.from_path(cookbook_path).cookbook_name.should eql("rspec_test")
+        end
+      end
     end
 
-    describe "#checksum" do
+    describe "::checksum" do
       it "delegates to Ridley::Chef::Digester.md5_checksum_for_file" do
         path = fixtures_path.join("example_cookbook", "metadata.rb")
         Ridley::Chef::Digester.should_receive(:md5_checksum_for_file).with(path)

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

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 describe Ridley::CookbookObject do
-  let(:connection) { double('chef-connection') }
-  subject { described_class.new(double('registry')) }
-  before  { subject.stub(connection: connection) }
+  let(:connection) { double('connection') }
+  let(:resource) { double('resource', connection: connection) }
+  subject { described_class.new(resource) }
 
   describe "#download" do
     it "downloads each file" do

data/spec/unit/ridley/connection_spec.rb

@@ -56,8 +56,7 @@ describe Ridley::Connection do
     let(:contents) { "SOME STRING STUFF\nHERE.\n" }
 
     before(:each) do
-      stub_request(:get, "http://test.it/file").
-        to_return(status: 200, body: contents)
+      stub_request(:get, "http://test.it/file").to_return(status: 200, body: contents)
     end
 
     it "creates a destination file on disk" do

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

@@ -3,85 +3,122 @@ require 'spec_helper'
 describe Ridley::CookbookResource do
   let(:client_name) { "reset" }
   let(:client_key) { fixtures_path.join('reset.pem') }
-  let(:connection) { double('connection') }
+  let(:connection) { Ridley::Connection.new("http://localhost:8889", "reset", fixtures_path.join("reset.pem").to_s) }
   subject { described_class.new(double('registry'), client_name, client_key) }
   before  { subject.stub(connection: connection) }
 
   describe "#download" do
-    pending
+    let(:name) { "example_cookbook" }
+    let(:version) { "0.1.0" }
+    let(:destination) { tmp_path.join("example_cookbook-0.1.0").to_s }
+
+    context "when the cookbook of the name/version is found" do
+      it "downloads the cookbook to the destination" do
+        pending "can't test downloading until https://github.com/jkeiser/chef-zero/issues/5 is fixed"
+      end
+    end
+
+    context "when the cookbook of the name/version is not found" do
+      before { subject.should_receive(:find).with(name, version).and_return(nil) }
+
+      it "raises a ResourceNotFound error" do
+        expect {
+          subject.download(name, version, destination)
+        }.to raise_error(Ridley::Errors::ResourceNotFound)
+      end
+    end
   end
 
   describe "#latest_version" do
     let(:name) { "ant" }
 
-    before(:each) do
-      subject.should_receive(:versions).with(name).and_return(versions)
-    end
-
     context "when the cookbook has no versions" do
-      let(:versions) { Array.new }
-
-      it "returns nil" do
-        subject.latest_version(name).should be_nil
+      it "returns a ResourceNotFound error" do
+        expect {
+          subject.latest_version(name)
+        }.to raise_error(Ridley::Errors::ResourceNotFound)
       end
     end
 
     context "when the cookbook has versions" do
-      let(:versions) do
-        [ "1.0.0", "1.2.0", "3.0.0", "1.4.1" ]
+      before do
+        chef_cookbook(name, "1.0.0")
+        chef_cookbook(name, "1.2.0")
+        chef_cookbook(name, "3.0.0")
       end
 
-      it "returns nil" do
+      it "returns the latest version" do
         subject.latest_version(name).should eql("3.0.0")
       end
     end
   end
 
   describe "#versions" do
-    let(:cookbook) { "artifact" }
-    let(:versions_path) { "#{described_class.resource_path}/#{cookbook}" }
-    let(:response) do
-      double(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"
-        }
-      })
+    let(:name) { "artifact" }
+
+    context "when the cookbook has versions" do
+      before do
+        chef_cookbook(name, "1.0.0")
+        chef_cookbook(name, "1.1.0")
+        chef_cookbook(name, "1.2.0")
+      end
+
+      it "returns an array" do
+        subject.versions(name).should be_a(Array)
+      end
+
+      it "contains a version string for each cookbook version available" do
+        result = subject.versions(name)
+
+        result.should have(3).versions
+        result.should include("1.0.0")
+        result.should include("1.1.0")
+        result.should include("1.2.0")
+      end
     end
 
-    before(:each) do
-      connection.should_receive(:get).with(versions_path).and_return(response)
+    context "when the cookbook has no versions" do
+      it "raises a ResourceNotFound error" do
+        expect {
+          subject.versions(name)
+        }.to raise_error(Ridley::Errors::ResourceNotFound)
+      end
     end
+  end
 
-    it "returns an array" do
-      subject.versions(cookbook).should be_a(Array)
+  describe "#satisfy" do
+    let(:name) { "ridley_test" }
+
+    context "when there is a solution" do
+      before do
+        chef_cookbook(name, "2.0.0")
+        chef_cookbook(name, "3.0.0")
+      end
+
+      it "returns a CookbookObject" do
+        subject.satisfy(name, ">= 2.0.0").should be_a(Ridley::CookbookObject)
+      end
+
+      it "is the best solution" do
+        subject.satisfy(name, ">= 2.0.0").version.should eql("3.0.0")
+      end
     end
 
-    it "contains a version string for each cookbook version available" do
-      result = subject.versions(cookbook)
+    context "when there is no solution" do
+      before { chef_cookbook(name, "1.0.0") }
 
-      result.should have(3).versions
-      result.should include("1.0.0")
-      result.should include("1.1.0")
-      result.should include("1.2.0")
+      it "returns nil" do
+        subject.satisfy(name, ">= 2.0.0").should be_nil
+      end
     end
-  end
 
-  describe "#satisfy" do
-    pending
+    context "when the cookbook does not exist" do
+      it "raises a ResourceNotFound error" do
+        expect {
+          subject.satisfy(name, ">= 1.2.3")
+          }.to raise_error(Ridley::Errors::ResourceNotFound)
+      end
+    end
   end
 
   describe "#upload" do