librarian 0.0.25 → 0.0.26

data/lib/librarian/source/git/repository.rb

@@ -105,7 +105,7 @@ module Librarian
         def remote_branch_names
           remotes = remote_names.sort_by(&:length).reverse
 
-          command = %W(branch -r)
+          command = %W(branch -r --no-color)
           names = run!(command, :chdir => true).strip.lines.map(&:strip).to_a
           names.each{|n| n.gsub!(/\s*->.*$/, "")}
           names.reject!{|n| n =~ /\/HEAD$/}

data/lib/librarian/source/local.rb

@@ -16,13 +16,6 @@ module Librarian
         [manifest].compact
       end
 
-      def manifest(name, version, dependencies)
-        manifest = Manifest.new(self, name)
-        manifest.version = version
-        manifest.dependencies = dependencies
-        manifest
-      end
-
       def manifest_search_paths(name)
         @manifest_search_paths ||= { }
         @manifest_search_paths[name] ||= begin

data/lib/librarian/source/path.rb

@@ -1,32 +1,14 @@
+require 'librarian/source/basic_api'
 require 'librarian/source/local'
 
 module Librarian
   module Source
     class Path
-
+      include BasicApi
       include Local
 
-      class << self
-
-        LOCK_NAME = 'PATH'
-
-        def lock_name
-          LOCK_NAME
-        end
-
-        def from_lock_options(environment, options)
-          new(environment, options[:remote], options.reject{|k, v| k == :remote})
-        end
-
-        def from_spec_args(environment, path, options)
-          recognized_options = []
-          unrecognized_options = options.keys - recognized_options
-          unrecognized_options.empty? or raise Error, "unrecognized options: #{unrecognized_options.join(", ")}"
-
-          new(environment, path, options)
-        end
-
-      end
+      lock_name 'PATH'
+      spec_options []
 
       attr_accessor :environment
       private :environment=

data/lib/librarian/version.rb

@@ -1,3 +1,3 @@
 module Librarian
-  VERSION = "0.0.25"
+  VERSION = "0.0.26"
 end

data/librarian.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = "librarian"
-  s.version = "0.0.25"
+  s.version = "0.0.26"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jay Feldblum"]
-  s.date = "2012-10-12"
+  s.date = "2012-12-30"
   s.description = "Librarian"
   s.email = ["y_feldblum@yahoo.com"]
   s.executables = ["librarian-chef", "librarian-mock"]
-  s.files = [".gitignore", ".rspec", ".travis.yml", "CHANGELOG.md", "Gemfile", "MIT-LICENSE", "README.md", "Rakefile", "bin/librarian-chef", "bin/librarian-mock", "lib/librarian.rb", "lib/librarian/action.rb", "lib/librarian/action/base.rb", "lib/librarian/action/clean.rb", "lib/librarian/action/ensure.rb", "lib/librarian/action/install.rb", "lib/librarian/action/resolve.rb", "lib/librarian/action/update.rb", "lib/librarian/chef.rb", "lib/librarian/chef/cli.rb", "lib/librarian/chef/dsl.rb", "lib/librarian/chef/environment.rb", "lib/librarian/chef/extension.rb", "lib/librarian/chef/integration/knife.rb", "lib/librarian/chef/manifest_reader.rb", "lib/librarian/chef/source.rb", "lib/librarian/chef/source/git.rb", "lib/librarian/chef/source/local.rb", "lib/librarian/chef/source/path.rb", "lib/librarian/chef/source/site.rb", "lib/librarian/chef/templates/Cheffile", "lib/librarian/cli.rb", "lib/librarian/cli/manifest_presenter.rb", "lib/librarian/config.rb", "lib/librarian/config/database.rb", "lib/librarian/config/file_source.rb", "lib/librarian/config/hash_source.rb", "lib/librarian/config/source.rb", "lib/librarian/dependency.rb", "lib/librarian/dsl.rb", "lib/librarian/dsl/receiver.rb", "lib/librarian/dsl/target.rb", "lib/librarian/environment.rb", "lib/librarian/error.rb", "lib/librarian/helpers.rb", "lib/librarian/lockfile.rb", "lib/librarian/lockfile/compiler.rb", "lib/librarian/lockfile/parser.rb", "lib/librarian/logger.rb", "lib/librarian/manifest.rb", "lib/librarian/manifest_set.rb", "lib/librarian/mock.rb", "lib/librarian/mock/cli.rb", "lib/librarian/mock/dsl.rb", "lib/librarian/mock/environment.rb", "lib/librarian/mock/extension.rb", "lib/librarian/mock/source.rb", "lib/librarian/mock/source/mock.rb", "lib/librarian/mock/source/mock/registry.rb", "lib/librarian/resolution.rb", "lib/librarian/resolver.rb", "lib/librarian/resolver/implementation.rb", "lib/librarian/source.rb", "lib/librarian/source/git.rb", "lib/librarian/source/git/repository.rb", "lib/librarian/source/local.rb", "lib/librarian/source/path.rb", "lib/librarian/spec.rb", "lib/librarian/spec_change_set.rb", "lib/librarian/specfile.rb", "lib/librarian/support/abstract_method.rb", "lib/librarian/ui.rb", "lib/librarian/version.rb", "librarian.gemspec", "spec/functional/chef/cli_spec.rb", "spec/functional/chef/source/git_spec.rb", "spec/functional/chef/source/site_spec.rb", "spec/functional/source/git/repository_spec.rb", "spec/support/cli_macro.rb", "spec/support/with_env_macro.rb", "spec/unit/action/base_spec.rb", "spec/unit/action/clean_spec.rb", "spec/unit/action/ensure_spec.rb", "spec/unit/action/install_spec.rb", "spec/unit/config/database_spec.rb", "spec/unit/dependency_spec.rb", "spec/unit/dsl_spec.rb", "spec/unit/environment_spec.rb", "spec/unit/lockfile/parser_spec.rb", "spec/unit/lockfile_spec.rb", "spec/unit/manifest_set_spec.rb", "spec/unit/manifest_spec.rb", "spec/unit/mock/source/mock_spec.rb", "spec/unit/resolver_spec.rb", "spec/unit/source/git_spec.rb", "spec/unit/spec_change_set_spec.rb"]
+  s.files = [".gitignore", ".rspec", ".travis.yml", "CHANGELOG.md", "Gemfile", "MIT-LICENSE", "README.md", "Rakefile", "bin/librarian-chef", "bin/librarian-mock", "lib/librarian.rb", "lib/librarian/action.rb", "lib/librarian/action/base.rb", "lib/librarian/action/clean.rb", "lib/librarian/action/ensure.rb", "lib/librarian/action/install.rb", "lib/librarian/action/persist_resolution_mixin.rb", "lib/librarian/action/resolve.rb", "lib/librarian/action/update.rb", "lib/librarian/chef.rb", "lib/librarian/chef/cli.rb", "lib/librarian/chef/dsl.rb", "lib/librarian/chef/environment.rb", "lib/librarian/chef/extension.rb", "lib/librarian/chef/integration/knife.rb", "lib/librarian/chef/manifest_reader.rb", "lib/librarian/chef/source.rb", "lib/librarian/chef/source/git.rb", "lib/librarian/chef/source/github.rb", "lib/librarian/chef/source/local.rb", "lib/librarian/chef/source/path.rb", "lib/librarian/chef/source/site.rb", "lib/librarian/chef/templates/Cheffile", "lib/librarian/cli.rb", "lib/librarian/cli/manifest_presenter.rb", "lib/librarian/config.rb", "lib/librarian/config/database.rb", "lib/librarian/config/file_source.rb", "lib/librarian/config/hash_source.rb", "lib/librarian/config/source.rb", "lib/librarian/dependency.rb", "lib/librarian/dsl.rb", "lib/librarian/dsl/receiver.rb", "lib/librarian/dsl/target.rb", "lib/librarian/environment.rb", "lib/librarian/error.rb", "lib/librarian/helpers.rb", "lib/librarian/linter/source_linter.rb", "lib/librarian/lockfile.rb", "lib/librarian/lockfile/compiler.rb", "lib/librarian/lockfile/parser.rb", "lib/librarian/logger.rb", "lib/librarian/manifest.rb", "lib/librarian/manifest_set.rb", "lib/librarian/mock.rb", "lib/librarian/mock/cli.rb", "lib/librarian/mock/dsl.rb", "lib/librarian/mock/environment.rb", "lib/librarian/mock/extension.rb", "lib/librarian/mock/source.rb", "lib/librarian/mock/source/mock.rb", "lib/librarian/mock/source/mock/registry.rb", "lib/librarian/resolution.rb", "lib/librarian/resolver.rb", "lib/librarian/resolver/implementation.rb", "lib/librarian/source.rb", "lib/librarian/source/basic_api.rb", "lib/librarian/source/git.rb", "lib/librarian/source/git/repository.rb", "lib/librarian/source/local.rb", "lib/librarian/source/path.rb", "lib/librarian/spec.rb", "lib/librarian/spec_change_set.rb", "lib/librarian/specfile.rb", "lib/librarian/support/abstract_method.rb", "lib/librarian/ui.rb", "lib/librarian/version.rb", "librarian.gemspec", "spec/functional/chef/cli_spec.rb", "spec/functional/chef/source/site_spec.rb", "spec/functional/source/git/repository_spec.rb", "spec/integration/chef/source/git_spec.rb", "spec/integration/chef/source/site_spec.rb", "spec/support/cli_macro.rb", "spec/support/method_patch_macro.rb", "spec/support/with_env_macro.rb", "spec/unit/action/base_spec.rb", "spec/unit/action/clean_spec.rb", "spec/unit/action/ensure_spec.rb", "spec/unit/action/install_spec.rb", "spec/unit/config/database_spec.rb", "spec/unit/dependency_spec.rb", "spec/unit/dsl_spec.rb", "spec/unit/environment_spec.rb", "spec/unit/lockfile/parser_spec.rb", "spec/unit/lockfile_spec.rb", "spec/unit/manifest_set_spec.rb", "spec/unit/manifest_spec.rb", "spec/unit/mock/source/mock_spec.rb", "spec/unit/resolver_spec.rb", "spec/unit/source/git_spec.rb", "spec/unit/spec_change_set_spec.rb"]
   s.homepage = ""
   s.require_paths = ["lib"]
   s.rubyforge_project = "librarian"

data/spec/functional/chef/source/site_spec.rb

@@ -4,9 +4,8 @@ require 'webmock'
 
 require 'librarian'
 require 'librarian/helpers'
-require 'librarian/action/resolve'
-require 'librarian/action/install'
 require 'librarian/chef'
+require 'librarian/linter/source_linter'
 
 module Librarian
   module Chef
@@ -20,7 +19,8 @@ module Librarian
           project_path = project_path.dirname until project_path.join("Rakefile").exist?
           project_path
         end
-        let(:tmp_path) { project_path.join("tmp/spec/chef/site-source") }
+        let(:tmp_path) { project_path.join("tmp/spec/functional/chef/source/site") }
+        after { tmp_path.rmtree if tmp_path && tmp_path.exist? }
         let(:sample_path) { tmp_path.join("sample") }
         let(:sample_metadata) do
           Helpers.strip_heredoc(<<-METADATA)
@@ -73,141 +73,191 @@ module Librarian
           WebMock.reset!
         end
 
-        context "a single dependency with a site source" do
+        let(:repo_path) { tmp_path.join("methods") }
+        before { repo_path.mkpath }
 
-          context "resolving" do
-            let(:repo_path) { tmp_path.join("repo/resolve") }
-            before do
-              repo_path.rmtree if repo_path.exist?
-              repo_path.mkpath
-              repo_path.join("cookbooks").mkpath
-              cheffile = Helpers.strip_heredoc(<<-CHEFFILE)
-                #!/usr/bin/env ruby
-                cookbook "sample", :site => #{api_url.inspect}
-              CHEFFILE
-              repo_path.join("Cheffile").open("wb") { |f| f.write(cheffile) }
-            end
-
-            context "the resolve" do
-              it "should not raise an exception" do
-                expect { Action::Resolve.new(env).run }.to_not raise_error
-              end
+        describe "lint" do
+          it "lints" do
+            Librarian::Linter::SourceLinter.lint! described_class
+          end
+        end
+
+        describe "class methods" do
+
+          describe ".lock_name" do
+            specify { described_class.lock_name.should == "SITE" }
+          end
+
+          describe ".from_spec_args" do
+            it "gives the expected source" do
+              args = { }
+              source = described_class.from_spec_args(env, api_url, args)
+              source.uri.should == api_url
             end
 
-            context "the results" do
-              before { Action::Resolve.new(env).run }
+            it "raises on unexpected args" do
+              args = {:k => 3}
+              expect { described_class.from_spec_args(env, api_url, args) }.
+                to raise_error Librarian::Error, "unrecognized options: k"
+            end
+          end
 
-              it "should create the lockfile" do
-                repo_path.join("Cheffile.lock").should exist
-              end
+          describe ".from_lock_options" do
+            it "gives the expected source" do
+              options = {:remote => api_url}
+              source = described_class.from_lock_options(env, options)
+              source.uri.should == api_url
+            end
 
-              it "should not attempt to install the cookbok" do
-                repo_path.join("cookbooks/sample").should_not exist
-              end
+            it "roundtrips" do
+              options = {:remote => api_url}
+              source = described_class.from_lock_options(env, options)
+              source.to_lock_options.should == options
             end
           end
 
-          context "intalling" do
-            let(:repo_path) { tmp_path.join("repo/install") }
-            before do
-              repo_path.rmtree if repo_path.exist?
-              repo_path.mkpath
-              repo_path.join("cookbooks").mkpath
-              cheffile = Helpers.strip_heredoc(<<-CHEFFILE)
-                #!/usr/bin/env ruby
-                cookbook "sample", :site => #{api_url.inspect}
-              CHEFFILE
-              repo_path.join("Cheffile").open("wb") { |f| f.write(cheffile) }
+        end
 
-              Action::Resolve.new(env).run
+        describe "instance methods" do
+          let(:source) { described_class.new(env, api_url) }
+
+          describe "#manifests" do
+            it "gives a list of all manifests" do
+              manifests = source.manifests("sample")
+              manifests.should have(1).item
+              manifest = manifests.first
+              manifest.source.should be source
+              manifest.version.should == Manifest::Version.new("0.6.5")
+              manifest.dependencies.should be_empty
             end
+          end
 
-            context "the install" do
-              it "should not raise an exception" do
-                expect { Action::Install.new(env).run }.to_not raise_error
-              end
+          describe "#fetch_version" do
+            it "fetches the version based on extra" do
+              extra = "#{api_url}/cookbooks/sample/versions/0_6_5"
+              source.fetch_version("sample", extra).should == "0.6.5"
             end
+          end
 
-            context "the results" do
-              before { Action::Install.new(env).run }
+          describe "#fetch_dependencies" do
+            it "fetches the dependencies based on extra" do
+              extra = "#{api_url}/cookbooks/sample/versions/0_6_5"
+              source.fetch_dependencies("sample", "0.6.5", extra).should == [ ]
+            end
+          end
 
-              it "should create the lockfile" do
-                repo_path.join("Cheffile.lock").should exist
-              end
+          describe "#pinned?" do
+            it "returns false" do
+              source.should_not be_pinned
+            end
+          end
 
-              it "should create a directory for the cookbook" do
-                repo_path.join("cookbooks/sample").should exist
-              end
+          describe "#unpin!" do
+            it "is a no-op" do
+              source.unpin!
+            end
+          end
+
+          describe "#install!" do
+            before { env.install_path.mkpath }
 
-              it "should copy the cookbook files into the cookbook directory" do
-                repo_path.join("cookbooks/sample/metadata.rb").should exist
+            context "directly" do
+              it "installs the manifest" do
+                manifest = Manifest.new(source, "sample")
+                manifest.version = "0.6.5"
+                source.install!(manifest)
+                text = env.install_path.join("sample/metadata.rb").read
+                text.should == sample_metadata
               end
             end
-          end
 
-          context "resolving and separately installing" do
-            let(:repo_path) { tmp_path.join("repo/resolve-install") }
-            before do
-              repo_path.rmtree if repo_path.exist?
-              repo_path.mkpath
-              repo_path.join("cookbooks").mkpath
-              cheffile = Helpers.strip_heredoc(<<-CHEFFILE)
-                #!/usr/bin/env ruby
-                cookbook "sample", :site => #{api_url.inspect}
-              CHEFFILE
-              repo_path.join("Cheffile").open("wb") { |f| f.write(cheffile) }
-
-              Action::Resolve.new(env).run
-              repo_path.join("tmp").rmtree if repo_path.join("tmp").exist?
-            end
-
-            context "the install" do
-              it "should not raise an exception" do
-                expect { Action::Install.new(env).run }.to_not raise_error
+            context "indirectly" do
+              it "installs the manifest" do
+                manifest = source.manifests("sample").first
+                source.install!(manifest)
+                text = env.install_path.join("sample/metadata.rb").read
+                text.should == sample_metadata
               end
             end
+          end
 
-            context "the results" do
-              before { Action::Install.new(env).run }
+          describe "#to_spec_args" do
+            it "gives the expected spec args" do
+              source.to_spec_args.should == [api_url, { }]
+            end
+          end
 
-              it "should create a directory for the cookbook" do
-                repo_path.join("cookbooks/sample").should exist
-              end
+          describe "#to_lock_options" do
+            it "gives the expected lock options" do
+              source.to_lock_options.should == {:remote => api_url}
+            end
 
-              it "should copy the cookbook files into the cookbook directory" do
-                repo_path.join("cookbooks/sample/metadata.rb").should exist
-              end
+            it "roundtrips" do
+              options = source.to_lock_options
+              described_class.from_lock_options(env, options).should == source
             end
           end
 
         end
 
-        context "when the repo path has a space" do
+        describe "following http redirects" do
+          let(:source) { described_class.new(env, api_url) }
 
-          let(:repo_path) { tmp_path.join("repo/with extra spaces/resolve") }
+          def redirect_to(url)
+            {:status => 302, :headers => {"Location" => url}}
+          end
 
-          before do
-            repo_path.rmtree if repo_path.exist?
-            repo_path.mkpath
-            repo_path.join("cookbooks").mkpath
+          context "with a sequence of http redirects" do
+            before do
+              stub_request(:get, "#{api_url}/cookbooks/sample").
+                to_return redirect_to "#{api_url}/cookbooks/sample-1"
+              stub_request(:get, "#{api_url}/cookbooks/sample-1").
+                to_return redirect_to "#{api_url}/cookbooks/sample-2"
+              stub_request(:get, "#{api_url}/cookbooks/sample-2").
+                to_return(:body => JSON.dump(sample_index_data))
+            end
 
-            cheffile = Helpers.strip_heredoc(<<-CHEFFILE)
-              #!/usr/bin/env ruby
-              cookbook "sample", :site => #{api_url.inspect}
-            CHEFFILE
-            repo_path.join("Cheffile").open("wb") { |f| f.write(cheffile) }
+            it "follows a sequence of redirects" do
+              manifest = source.manifests("sample").first
+              manifest.version.to_s.should == "0.6.5"
+            end
           end
 
-          after do
-            repo_path.rmtree
-          end
+          context "with too many http redirects" do
+            before do
+              stub_request(:get, "#{api_url}/cookbooks/sample").
+                to_return redirect_to "#{api_url}/cookbooks/sample-1"
+              (1 .. 11).each do |i|
+                stub_request(:get, "#{api_url}/cookbooks/sample-#{i}").
+                  to_return redirect_to "#{api_url}/cookbooks/sample-#{i + 1}"
+              end
+              stub_request(:get, "#{api_url}/cookbooks/sample-12").
+                to_return(:body => JSON.dump(sample_index_data))
+            end
 
-          context "the resolution" do
-            it "should not raise an exception" do
-              expect { Action::Resolve.new(env).run }.to_not raise_error
+            it "raises, warning of too many redirects" do
+              expect { source.manifests("sample").first }.
+                to raise_error Librarian::Error, /because too many redirects!/
             end
           end
 
+          context "with a redirect cycle" do
+            before do
+              stub_request(:get, "#{api_url}/cookbooks/sample").
+                to_return redirect_to "#{api_url}/cookbooks/sample-1"
+              (1 .. 8).each do |i|
+                stub_request(:get, "#{api_url}/cookbooks/sample-#{i}").
+                  to_return redirect_to "#{api_url}/cookbooks/sample-#{i + 1}"
+              end
+              stub_request(:get, "#{api_url}/cookbooks/sample-9").
+                to_return redirect_to "#{api_url}/cookbooks/sample-6"
+            end
+
+            it "raises, warning of a redirect cycle" do
+              expect { source.manifests("sample").first }.
+                to raise_error Librarian::Error, /because redirect cycle!/
+            end
+          end
         end
 
       end

data/spec/functional/source/git/repository_spec.rb

@@ -15,7 +15,8 @@ describe Librarian::Source::Git::Repository do
     project_path = project_path.dirname until project_path.join("Rakefile").exist?
     project_path
   end
-  let(:tmp_path) { project_path + "tmp/spec/unit/source/git/repository-spec" }
+  let(:tmp_path) { project_path + "tmp/spec/functional/source/git/repository" }
+  after { tmp_path.rmtree if tmp_path && tmp_path.exist? }
   let(:git_source_path) { tmp_path + SecureRandom.hex(16) }
   let(:branch) { "the-branch" }
   let(:tag) { "the-tag" }

data/spec/{functional → integration}/chef/source/git_spec.rb

@@ -19,7 +19,8 @@ module Librarian
           project_path = project_path.dirname until project_path.join("Rakefile").exist?
           project_path
         end
-        let(:tmp_path) { project_path.join("tmp/spec/chef/git-source") }
+        let(:tmp_path) { project_path.join("tmp/spec/integration/chef/source/git") }
+        after { tmp_path.rmtree if tmp_path && tmp_path.exist? }
 
         let(:cookbooks_path) { tmp_path.join("cookbooks") }
 
@@ -49,7 +50,7 @@ module Librarian
             METADATA
           end
 
-          before :all do
+          before do
             sample_path.rmtree if sample_path.exist?
             sample_path.mkpath
             sample_path.join("metadata.rb").open("wb") { |f| f.write(sample_metadata) }
@@ -217,7 +218,7 @@ module Librarian
             METADATA
           end
 
-          before :all do
+          before do
             git_path.rmtree if git_path.exist?
             git_path.mkpath
             sample_path.mkpath
@@ -304,6 +305,14 @@ module Librarian
           let(:git_path) { tmp_path.join("big-git-repo") }
           let(:repo_path) { tmp_path.join("repo/resolve") }
           before do
+            git_path.rmtree if git_path.exist?
+            git_path.mkpath
+            Dir.chdir(git_path) do
+              `git init`
+              `touch not-a-metadata`
+              `git add .`
+              `git commit -m "Initial commit."`
+            end
             repo_path.rmtree if repo_path.exist?
             repo_path.mkpath
             repo_path.join("cookbooks").mkpath

data/spec/integration/chef/source/site_spec.rb

@@ -0,0 +1,217 @@
+require 'pathname'
+require 'json'
+require 'webmock'
+
+require 'librarian'
+require 'librarian/helpers'
+require 'librarian/action/resolve'
+require 'librarian/action/install'
+require 'librarian/chef'
+
+module Librarian
+  module Chef
+    module Source
+      describe Site do
+
+        include WebMock::API
+
+        let(:project_path) do
+          project_path = Pathname.new(__FILE__).expand_path
+          project_path = project_path.dirname until project_path.join("Rakefile").exist?
+          project_path
+        end
+        let(:tmp_path) { project_path.join("tmp/spec/integration/chef/source/site") }
+        after { tmp_path.rmtree if tmp_path && tmp_path.exist? }
+        let(:sample_path) { tmp_path.join("sample") }
+        let(:sample_metadata) do
+          Helpers.strip_heredoc(<<-METADATA)
+            version "0.6.5"
+          METADATA
+        end
+
+        let(:api_url) { "http://site.cookbooks.com" }
+
+        let(:sample_index_data) do
+          {
+            "name" => "sample",
+            "versions" => [
+              "#{api_url}/cookbooks/sample/versions/0_6_5"
+            ]
+          }
+        end
+        let(:sample_0_6_5_data) do
+          {
+            "version" => "0.6.5",
+            "file" => "#{api_url}/cookbooks/sample/versions/0_6_5/file.tar.gz"
+          }
+        end
+        let(:sample_0_6_5_package) do
+          s = StringIO.new
+          z = Zlib::GzipWriter.new(s, Zlib::NO_COMPRESSION)
+          t = Archive::Tar::Minitar::Output.new(z)
+          t.tar.add_file_simple("sample/metadata.rb", :mode => 0700,
+            :size => sample_metadata.bytesize){|io| io.write(sample_metadata)}
+          t.close
+          z.close unless z.closed?
+          s.string
+        end
+
+        # depends on repo_path being defined in each context
+        let(:env) { Environment.new(:project_path => repo_path) }
+
+        before do
+          stub_request(:get, "#{api_url}/cookbooks/sample").
+            to_return(:body => JSON.dump(sample_index_data))
+
+          stub_request(:get, "#{api_url}/cookbooks/sample/versions/0_6_5").
+            to_return(:body => JSON.dump(sample_0_6_5_data))
+
+          stub_request(:get, "#{api_url}/cookbooks/sample/versions/0_6_5/file.tar.gz").
+            to_return(:body => sample_0_6_5_package)
+        end
+
+        after do
+          WebMock.reset!
+        end
+
+        context "a single dependency with a site source" do
+
+          context "resolving" do
+            let(:repo_path) { tmp_path.join("repo/resolve") }
+            before do
+              repo_path.rmtree if repo_path.exist?
+              repo_path.mkpath
+              repo_path.join("cookbooks").mkpath
+              cheffile = Helpers.strip_heredoc(<<-CHEFFILE)
+                #!/usr/bin/env ruby
+                cookbook "sample", :site => #{api_url.inspect}
+              CHEFFILE
+              repo_path.join("Cheffile").open("wb") { |f| f.write(cheffile) }
+            end
+
+            context "the resolve" do
+              it "should not raise an exception" do
+                expect { Action::Resolve.new(env).run }.to_not raise_error
+              end
+            end
+
+            context "the results" do
+              before { Action::Resolve.new(env).run }
+
+              it "should create the lockfile" do
+                repo_path.join("Cheffile.lock").should exist
+              end
+
+              it "should not attempt to install the cookbok" do
+                repo_path.join("cookbooks/sample").should_not exist
+              end
+            end
+          end
+
+          context "intalling" do
+            let(:repo_path) { tmp_path.join("repo/install") }
+            before do
+              repo_path.rmtree if repo_path.exist?
+              repo_path.mkpath
+              repo_path.join("cookbooks").mkpath
+              cheffile = Helpers.strip_heredoc(<<-CHEFFILE)
+                #!/usr/bin/env ruby
+                cookbook "sample", :site => #{api_url.inspect}
+              CHEFFILE
+              repo_path.join("Cheffile").open("wb") { |f| f.write(cheffile) }
+
+              Action::Resolve.new(env).run
+            end
+
+            context "the install" do
+              it "should not raise an exception" do
+                expect { Action::Install.new(env).run }.to_not raise_error
+              end
+            end
+
+            context "the results" do
+              before { Action::Install.new(env).run }
+
+              it "should create the lockfile" do
+                repo_path.join("Cheffile.lock").should exist
+              end
+
+              it "should create a directory for the cookbook" do
+                repo_path.join("cookbooks/sample").should exist
+              end
+
+              it "should copy the cookbook files into the cookbook directory" do
+                repo_path.join("cookbooks/sample/metadata.rb").should exist
+              end
+            end
+          end
+
+          context "resolving and separately installing" do
+            let(:repo_path) { tmp_path.join("repo/resolve-install") }
+            before do
+              repo_path.rmtree if repo_path.exist?
+              repo_path.mkpath
+              repo_path.join("cookbooks").mkpath
+              cheffile = Helpers.strip_heredoc(<<-CHEFFILE)
+                #!/usr/bin/env ruby
+                cookbook "sample", :site => #{api_url.inspect}
+              CHEFFILE
+              repo_path.join("Cheffile").open("wb") { |f| f.write(cheffile) }
+
+              Action::Resolve.new(env).run
+              repo_path.join("tmp").rmtree if repo_path.join("tmp").exist?
+            end
+
+            context "the install" do
+              it "should not raise an exception" do
+                expect { Action::Install.new(env).run }.to_not raise_error
+              end
+            end
+
+            context "the results" do
+              before { Action::Install.new(env).run }
+
+              it "should create a directory for the cookbook" do
+                repo_path.join("cookbooks/sample").should exist
+              end
+
+              it "should copy the cookbook files into the cookbook directory" do
+                repo_path.join("cookbooks/sample/metadata.rb").should exist
+              end
+            end
+          end
+
+        end
+
+        context "when the repo path has a space" do
+
+          let(:repo_path) { tmp_path.join("repo/with extra spaces/resolve") }
+
+          before do
+            repo_path.rmtree if repo_path.exist?
+            repo_path.mkpath
+            repo_path.join("cookbooks").mkpath
+
+            cheffile = Helpers.strip_heredoc(<<-CHEFFILE)
+              #!/usr/bin/env ruby
+              cookbook "sample", :site => #{api_url.inspect}
+            CHEFFILE
+            repo_path.join("Cheffile").open("wb") { |f| f.write(cheffile) }
+          end
+
+          after do
+            repo_path.rmtree
+          end
+
+          context "the resolution" do
+            it "should not raise an exception" do
+              expect { Action::Resolve.new(env).run }.to_not raise_error
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end