librarian 0.0.8 → 0.0.9

data/.rspec

@@ -1,2 +1 @@
 --color
---tag ~slow

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.0.9
+
+* \#11 Fixes a problem where, if the repo is in a path where a component has a space, attempting to resolve a
+    site-sourced dependency fails.
+
 ## 0.0.8
 
 * A `version` task.

data/lib/librarian/chef/source/site.rb

@@ -257,9 +257,14 @@ module Librarian
           version_package_cache_path = version_package_cache_path(dependency, version_uri)
           unless version_package_cache_path.exist?
             dependency_cache_path = dependency_cache_path(dependency)
-            Dir.chdir(dependency_cache_path) do
-              `tar -xzf #{version_archive_cache_path}`
-            end
+            Process.waitpid2(fork do
+              $stdin.reopen("/dev/null")
+              $stdout.reopen("/dev/null")
+              $stderr.reopen("/dev/null")
+              Dir.chdir(dependency_cache_path)
+              exec("tar", "-xzf", version_archive_cache_path.to_s)
+            end)
+            raise StandardError, "Caching #{version_uri} failed with #{$?.inspect}!" unless $?.success?
             version_unpacked_temp_path = dependency_cache_path.join(dependency.name)
             FileUtils.move(version_unpacked_temp_path, version_package_cache_path)
           end

data/lib/librarian/lockfile/parser.rb

@@ -2,6 +2,7 @@ require 'librarian/helpers/debug'
 
 require 'librarian/manifest'
 require 'librarian/dependency'
+require 'librarian/manifest_set'
 
 module Librarian
   class Lockfile
@@ -90,7 +91,7 @@ module Librarian
             dependencies
           )
         end
-        Resolver.new(root_module).sort(manifests)
+        ManifestSet.sort(manifests)
       end
 
       def dsl_class

data/lib/librarian/version.rb

@@ -1,3 +1,3 @@
 module Librarian
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

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

@@ -10,33 +10,42 @@ module Librarian
     module Source
       describe Git do
 
-        project_path = Pathname.new(__FILE__).expand_path
-        project_path = project_path.dirname until project_path.join("Rakefile").exist?
-        tmp_path = project_path.join("tmp/spec/chef/git-source")
+        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/chef/git-source") }
 
-        cookbooks_path = tmp_path.join('cookbooks')
+        let(:cookbooks_path) { tmp_path.join("cookbooks") }
 
         context "a single dependency with a git source" do
 
-          sample_path = tmp_path.join('sample')
-          sample_metadata = Helpers.strip_heredoc(<<-METADATA)
-            version '0.6.5'
-          METADATA
+          let(:sample_path) { tmp_path.join("sample") }
+          let(:sample_metadata) do
+            Helpers.strip_heredoc(<<-METADATA)
+              version "0.6.5"
+            METADATA
+          end
 
-          first_sample_path = cookbooks_path.join('first-sample')
-          first_sample_metadata = Helpers.strip_heredoc(<<-METADATA)
-            version '3.2.1'
-          METADATA
+          let(:first_sample_path) { cookbooks_path.join("first-sample") }
+          let(:first_sample_metadata) do
+            Helpers.strip_heredoc(<<-METADATA)
+              version "3.2.1"
+            METADATA
+          end
 
-          second_sample_path = cookbooks_path.join('second-sample')
-          second_sample_metadata = Helpers.strip_heredoc(<<-METADATA)
-            version '4.3.2'
-          METADATA
+          let(:second_sample_path) { cookbooks_path.join("second-sample") }
+          let(:second_sample_metadata) do
+            Helpers.strip_heredoc(<<-METADATA)
+              version "4.3.2"
+            METADATA
+          end
 
           before :all do
             sample_path.rmtree if sample_path.exist?
             sample_path.mkpath
-            sample_path.join('metadata.rb').open('wb') { |f| f.write(sample_metadata) }
+            sample_path.join("metadata.rb").open("wb") { |f| f.write(sample_metadata) }
             Dir.chdir(sample_path) do
               `git init`
               `git add metadata.rb`
@@ -46,9 +55,9 @@ module Librarian
             cookbooks_path.rmtree if cookbooks_path.exist?
             cookbooks_path.mkpath
             first_sample_path.mkpath
-            first_sample_path.join('metadata.rb').open('wb') { |f| f.write(first_sample_metadata) }
+            first_sample_path.join("metadata.rb").open("wb") { |f| f.write(first_sample_metadata) }
             second_sample_path.mkpath
-            second_sample_path.join('metadata.rb').open('wb') { |f| f.write(second_sample_metadata) }
+            second_sample_path.join("metadata.rb").open("wb") { |f| f.write(second_sample_metadata) }
             Dir.chdir(cookbooks_path) do
               `git init`
               `git add .`
@@ -57,79 +66,79 @@ module Librarian
           end
 
           it "should resolve" do
-            repo_path = tmp_path.join('repo/resolve')
+            repo_path = tmp_path.join("repo/resolve")
             repo_path.rmtree if repo_path.exist?
             repo_path.mkpath
-            repo_path.join('cookbooks').mkpath
+            repo_path.join("cookbooks").mkpath
             cheffile = Helpers.strip_heredoc(<<-CHEFFILE)
               #!/usr/bin/env ruby
               cookbook "sample", :git => #{sample_path.to_s.inspect}
             CHEFFILE
-            repo_path.join('Cheffile').open('wb') { |f| f.write(cheffile) }
+            repo_path.join("Cheffile").open("wb") { |f| f.write(cheffile) }
             Chef.stub!(:project_path) { repo_path }
 
             Chef.resolve!
-            repo_path.join('Cheffile.lock').should be_exist
-            repo_path.join('cookbooks/sample').should_not be_exist
+            repo_path.join("Cheffile.lock").should exist
+            repo_path.join("cookbooks/sample").should_not exist
           end
 
           it "should install" do
-            repo_path = tmp_path.join('repo/install')
+            repo_path = tmp_path.join("repo/install")
             repo_path.rmtree if repo_path.exist?
             repo_path.mkpath
-            repo_path.join('cookbooks').mkpath
+            repo_path.join("cookbooks").mkpath
             cheffile = Helpers.strip_heredoc(<<-CHEFFILE)
               #!/usr/bin/env ruby
               cookbook "sample", :git => #{sample_path.to_s.inspect}
             CHEFFILE
-            repo_path.join('Cheffile').open('wb') { |f| f.write(cheffile) }
+            repo_path.join("Cheffile").open("wb") { |f| f.write(cheffile) }
             Chef.stub!(:project_path) { repo_path }
 
             Chef.install!
-            repo_path.join('Cheffile.lock').should be_exist
-            repo_path.join('cookbooks/sample').should be_exist
-            repo_path.join('cookbooks/sample/metadata.rb').should be_exist
+            repo_path.join("Cheffile.lock").should exist
+            repo_path.join("cookbooks/sample").should exist
+            repo_path.join("cookbooks/sample/metadata.rb").should exist
           end
 
           it "should resolve and separately install" do
-            repo_path = tmp_path.join('repo/resolve-install')
+            repo_path = tmp_path.join("repo/resolve-install")
             repo_path.rmtree if repo_path.exist?
             repo_path.mkpath
-            repo_path.join('cookbooks').mkpath
+            repo_path.join("cookbooks").mkpath
             cheffile = Helpers.strip_heredoc(<<-CHEFFILE)
               #!/usr/bin/env ruby
               cookbook "sample", :git => #{sample_path.to_s.inspect}
             CHEFFILE
-            repo_path.join('Cheffile').open('wb') { |f| f.write(cheffile) }
+            repo_path.join("Cheffile").open("wb") { |f| f.write(cheffile) }
             Chef.stub!(:project_path) { repo_path }
 
             Chef.resolve!
-            repo_path.join('tmp').rmtree if repo_path.join('tmp').exist?
+            repo_path.join("tmp").rmtree if repo_path.join("tmp").exist?
             Chef.install!
-            repo_path.join('cookbooks/sample').should be_exist
-            repo_path.join('cookbooks/sample/metadata.rb').should be_exist
+            repo_path.join("cookbooks/sample").should exist
+            repo_path.join("cookbooks/sample/metadata.rb").should exist
           end
 
           it "should resolve, change, and resolve" do
-            repo_path = tmp_path.join('repo/resolve-update')
+            repo_path = tmp_path.join("repo/resolve-update")
             repo_path.rmtree if repo_path.exist?
             repo_path.mkpath
-            repo_path.join('cookbooks').mkpath
+            repo_path.join("cookbooks").mkpath
             cheffile = Helpers.strip_heredoc(<<-CHEFFILE)
               git #{cookbooks_path.to_s.inspect}
               cookbook "first-sample"
             CHEFFILE
-            repo_path.join('Cheffile').open('wb') { |f| f.write(cheffile) }
+            repo_path.join("Cheffile").open("wb") { |f| f.write(cheffile) }
             Chef.stub!(:project_path) { repo_path }
             Chef.resolve!
-            repo_path.join('Cheffile.lock').should exist
+            repo_path.join("Cheffile.lock").should exist
 
             cheffile = Helpers.strip_heredoc(<<-CHEFFILE)
               git #{cookbooks_path.to_s.inspect}
               cookbook "first-sample"
               cookbook "second-sample"
             CHEFFILE
-            repo_path.join('Cheffile').open('wb') { |f| f.write(cheffile) }
+            repo_path.join("Cheffile").open("wb") { |f| f.write(cheffile) }
             Chef.stub!(:project_path) { repo_path }
             Chef.resolve!
           end
@@ -138,17 +147,19 @@ module Librarian
 
         context "with a path" do
 
-          git_path = tmp_path.join('big-git-repo')
-          sample_path = git_path.join('buttercup')
-          sample_metadata = Helpers.strip_heredoc(<<-METADATA)
-            version '0.6.5'
-          METADATA
+          let(:git_path) { tmp_path.join("big-git-repo") }
+          let(:sample_path) { git_path.join("buttercup") }
+          let(:sample_metadata) do
+            Helpers.strip_heredoc(<<-METADATA)
+              version "0.6.5"
+            METADATA
+          end
 
           before :all do
             git_path.rmtree if git_path.exist?
             git_path.mkpath
             sample_path.mkpath
-            sample_path.join('metadata.rb').open('wb') { |f| f.write(sample_metadata) }
+            sample_path.join("metadata.rb").open("wb") { |f| f.write(sample_metadata) }
             Dir.chdir(git_path) do
               `git init`
               `git add .`
@@ -158,16 +169,16 @@ module Librarian
 
           context "if no path option is given" do
             it "should not resolve" do
-              repo_path = tmp_path.join('repo/resolve')
+              repo_path = tmp_path.join("repo/resolve")
               repo_path.rmtree if repo_path.exist?
               repo_path.mkpath
-              repo_path.join('cookbooks').mkpath
+              repo_path.join("cookbooks").mkpath
               cheffile = Helpers.strip_heredoc(<<-CHEFFILE)
                 #!/usr/bin/env ruby
                 cookbook "sample",
                   :git => #{git_path.to_s.inspect}
               CHEFFILE
-              repo_path.join('Cheffile').open('wb') { |f| f.write(cheffile) }
+              repo_path.join("Cheffile").open("wb") { |f| f.write(cheffile) }
               Chef.stub!(:project_path) { repo_path }
 
               expect{ Chef.resolve! }.to raise_error
@@ -176,17 +187,17 @@ module Librarian
 
           context "if the path option is wrong" do
             it "should not resolve" do
-              repo_path = tmp_path.join('repo/resolve')
+              repo_path = tmp_path.join("repo/resolve")
               repo_path.rmtree if repo_path.exist?
               repo_path.mkpath
-              repo_path.join('cookbooks').mkpath
+              repo_path.join("cookbooks").mkpath
               cheffile = Helpers.strip_heredoc(<<-CHEFFILE)
                 #!/usr/bin/env ruby
                 cookbook "sample",
                   :git => #{git_path.to_s.inspect},
                   :path => "jelly"
               CHEFFILE
-              repo_path.join('Cheffile').open('wb') { |f| f.write(cheffile) }
+              repo_path.join("Cheffile").open("wb") { |f| f.write(cheffile) }
               Chef.stub!(:project_path) { repo_path }
 
               expect{ Chef.resolve! }.to raise_error
@@ -205,19 +216,19 @@ module Librarian
                   :git => #{git_path.to_s.inspect},
                   :path => "buttercup"
               CHEFFILE
-              repo_path.join('Cheffile').open('wb') { |f| f.write(cheffile) }
+              repo_path.join("Cheffile").open("wb") { |f| f.write(cheffile) }
               Chef.stub!(:project_path) { repo_path }
 
               Chef.resolve!
-              repo_path.join('Cheffile.lock').should be_exist
-              repo_path.join('cookbooks/sample').should_not be_exist
+              repo_path.join("Cheffile.lock").should exist
+              repo_path.join("cookbooks/sample").should_not exist
             end
           end
 
         end
 
         context "missing a metadata" do
-          git_path = tmp_path.join('big-git-repo')
+          let(:git_path) { tmp_path.join("big-git-repo") }
 
           it "should explain the problem" do
             repo_path = tmp_path.join("repo/resolve")
@@ -233,8 +244,8 @@ module Librarian
 
             expect { Chef.resolve! }.
               to raise_error(Librarian::Error, /no metadata file found/i)
-            repo_path.join("Cheffile.lock").should_not be_exist
-            repo_path.join("cookbooks/sample").should_not be_exist
+            repo_path.join("Cheffile.lock").should_not exist
+            repo_path.join("cookbooks/sample").should_not exist
           end
         end
 

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

@@ -0,0 +1,156 @@
+require 'webmock'
+
+require 'librarian'
+require 'librarian/helpers'
+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/chef/site-source") }
+        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
+
+        before :all do
+          sample_path.rmtree if sample_path.exist?
+          sample_path.mkpath
+          sample_path.join('metadata.rb').open('wb') { |f| f.write(sample_metadata) }
+          Dir.chdir(sample_path.dirname) do
+            system "tar --create --gzip --file sample.tar.gz #{sample_path.basename}"
+          end
+        end
+
+        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_path.dirname.join("sample.tar.gz").read)
+        end
+
+        after do
+          WebMock.reset!
+        end
+
+        context "a single dependency with a site source" do
+
+          it "should resolve" do
+            repo_path = tmp_path.join("repo/resolve")
+            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) }
+            Chef.stub!(:project_path) { repo_path }
+
+            Chef.resolve!
+            repo_path.join("Cheffile.lock").should exist
+            repo_path.join("cookbooks/sample").should_not exist
+          end
+
+          it "should install" do
+            repo_path = tmp_path.join("repo/install")
+            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) }
+            Chef.stub!(:project_path) { repo_path }
+
+            Chef.install!
+            repo_path.join("Cheffile.lock").should exist
+            repo_path.join("cookbooks/sample").should exist
+            repo_path.join("cookbooks/sample/metadata.rb").should exist
+          end
+
+          it "should resolve and separately install" do
+            repo_path = tmp_path.join("repo/resolve-install")
+            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) }
+            Chef.stub!(:project_path) { repo_path }
+
+            Chef.resolve!
+            repo_path.join("tmp").rmtree if repo_path.join("tmp").exist?
+            Chef.install!
+            repo_path.join("cookbooks/sample").should exist
+            repo_path.join("cookbooks/sample/metadata.rb").should exist
+          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) }
+            Chef.stub!(:project_path) { repo_path }
+          end
+
+          after do
+            repo_path.rmtree
+          end
+
+          it "should resolve" do
+            expect { Chef.resolve! }.to_not raise_error
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/spec/unit/lockfile_spec.rb

@@ -0,0 +1,54 @@
+require 'librarian'
+require 'librarian/mock'
+
+module Librarian
+  describe Lockfile do
+
+    before do
+      Mock.registry :clear => true do
+        source 'source-1' do
+          spec 'alpha', '1.1'
+        end
+      end
+    end
+
+    let(:spec) do
+      Mock.dsl do
+        src 'source-1'
+        dep 'alpha', '1.1'
+      end
+    end
+
+    let(:resolver) { Mock.resolver }
+    let(:resolution) { resolver.resolve(spec) }
+
+    context "sanity" do
+      context "the resolution" do
+        subject { resolution }
+
+        it { should be_correct }
+      end
+    end
+
+    describe "#save" do
+      let(:lockfile) { Mock.ephemeral_lockfile }
+      let(:lockfile_text) { lockfile.save(resolution) }
+
+      context "just saving" do
+        it "should return the lockfile text" do
+          lockfile_text.should_not be_nil
+        end
+      end
+
+      context "bouncing" do
+        let(:bounced_resolution) { lockfile.load(lockfile_text) }
+        let(:bounced_lockfile_text) { lockfile.save(bounced_resolution) }
+
+        it "should return the same lockfile text after bouncing as before bouncing" do
+          bounced_lockfile_text.should == lockfile_text
+        end
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-05 00:00:00.000000000Z
+date: 2011-10-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &34375080 !ruby/object:Gem::Requirement
+  requirement: &25393320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *34375080
+  version_requirements: *25393320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &34374660 !ruby/object:Gem::Requirement
+  requirement: &25392900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *34374660
+  version_requirements: *25392900
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &34374240 !ruby/object:Gem::Requirement
+  requirement: &25392480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *34374240
+  version_requirements: *25392480
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &34373820 !ruby/object:Gem::Requirement
+  requirement: &25392060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *34373820
+  version_requirements: *25392060
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &34373400 !ruby/object:Gem::Requirement
+  requirement: &25391640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *34373400
+  version_requirements: *25391640
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &34372900 !ruby/object:Gem::Requirement
+  requirement: &25391140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0.10'
   type: :runtime
   prerelease: false
-  version_requirements: *34372900
+  version_requirements: *25391140
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &34372480 !ruby/object:Gem::Requirement
+  requirement: &25390720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *34372480
+  version_requirements: *25390720
 description: Librarian
 email:
 - y_feldblum@yahoo.com
@@ -159,13 +159,12 @@ files:
 - lib/librarian/ui.rb
 - lib/librarian/version.rb
 - librarian.gemspec
-- spec/chef/git_source_spec.rb
-- spec/chef/site_source_spec.rb
-- spec/dsl_spec.rb
-- spec/lockfile_spec.rb
-- spec/meta/requires_spec.rb
-- spec/resolver_spec.rb
-- spec/spec_change_set_spec.rb
+- spec/functional/chef/source/git_spec.rb
+- spec/functional/chef/source/site_spec.rb
+- spec/unit/dsl_spec.rb
+- spec/unit/lockfile_spec.rb
+- spec/unit/resolver_spec.rb
+- spec/unit/spec_change_set_spec.rb
 homepage: ''
 licenses: []
 post_install_message: 

data/spec/chef/site_source_spec.rb

@@ -1,120 +0,0 @@
-require 'webmock'
-
-require 'librarian'
-require 'librarian/helpers'
-require 'librarian/chef'
-
-module Librarian
-  module Chef
-    module Source
-      describe Site do
-
-        include WebMock::API
-
-        project_path = Pathname.new(__FILE__).expand_path
-        project_path = project_path.dirname until project_path.join("Rakefile").exist?
-        tmp_path = project_path.join("tmp/spec/chef/site-source")
-        sample_path = tmp_path.join('sample')
-        sample_metadata = Helpers.strip_heredoc(<<-METADATA)
-          version '0.6.5'
-        METADATA
-
-        api_url = "http://site.cookbooks.com"
-
-        sample_index_data = {
-          "name" => "sample",
-          "versions" => [
-            "#{api_url}/cookbooks/sample/versions/0_6_5"
-          ]
-        }
-        sample_0_6_5_data = {
-          "version" => "0.6.5",
-          "file" => "#{api_url}/cookbooks/sample/versions/0_6_5/file.tar.gz"
-        }
-
-        before :all do
-          sample_path.rmtree if sample_path.exist?
-          sample_path.mkpath
-          sample_path.join('metadata.rb').open('wb') { |f| f.write(sample_metadata) }
-          Dir.chdir(sample_path.dirname) do
-            system "tar --create --gzip --file sample.tar.gz #{sample_path.basename}"
-          end
-        end
-
-        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_path.dirname.join("sample.tar.gz").read)
-        end
-
-        after do
-          WebMock.reset!
-        end
-
-        context "a single dependency with a site source" do
-
-          it "should resolve" do
-            repo_path = tmp_path.join('repo/resolve')
-            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}"
-            CHEFFILE
-            repo_path.join('Cheffile').open('wb') { |f| f.write(cheffile) }
-            Chef.stub!(:project_path) { repo_path }
-
-            Chef.resolve!
-            repo_path.join('Cheffile.lock').should be_exist
-            repo_path.join('cookbooks/sample').should_not be_exist
-          end
-
-          it "should install" do
-            repo_path = tmp_path.join('repo/install')
-            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}"
-            CHEFFILE
-            repo_path.join('Cheffile').open('wb') { |f| f.write(cheffile) }
-            Chef.stub!(:project_path) { repo_path }
-
-            Chef.install!
-            repo_path.join('Cheffile.lock').should be_exist
-            repo_path.join('cookbooks/sample').should be_exist
-            repo_path.join('cookbooks/sample/metadata.rb').should be_exist
-          end
-
-          it "should resolve and separately install" do
-            repo_path = tmp_path.join('repo/resolve-install')
-            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}"
-            CHEFFILE
-            repo_path.join('Cheffile').open('wb') { |f| f.write(cheffile) }
-            Chef.stub!(:project_path) { repo_path }
-
-            Chef.resolve!
-            repo_path.join('tmp').rmtree if repo_path.join('tmp').exist?
-            Chef.install!
-            repo_path.join('cookbooks/sample').should be_exist
-            repo_path.join('cookbooks/sample/metadata.rb').should be_exist
-          end
-
-        end
-
-      end
-    end
-  end
-end

data/spec/lockfile_spec.rb

@@ -1,44 +0,0 @@
-require 'librarian'
-require 'librarian/mock'
-
-module Librarian
-  describe Lockfile do
-
-    it "should save" do
-      Mock.registry :clear => true do
-        source 'source-1' do
-          spec 'alpha', '1.1'
-        end
-      end
-      spec = Mock.dsl do
-        src 'source-1'
-        dep 'alpha', '1.1'
-      end
-      resolution = Mock.resolver.resolve(spec)
-      resolution.should be_correct
-      lockfile = Mock.ephemeral_lockfile
-      lockfile_text = lockfile.save(resolution)
-      lockfile_text.should_not be_nil
-    end
-
-    it "should bounce" do
-      Mock.registry :clear => true do
-        source 'source-1' do
-          spec 'alpha', '1.1'
-        end
-      end
-      spec = Mock.dsl do
-        src 'source-1'
-        dep 'alpha', '1.1'
-      end
-      resolution = Mock.resolver.resolve(spec)
-      resolution.should be_correct
-      lockfile = Mock.ephemeral_lockfile
-      lockfile_text = lockfile.save(resolution)
-      bounced_resolution = lockfile.load(lockfile_text)
-      bounced_lockfile_text = lockfile.save(bounced_resolution)
-      bounced_lockfile_text.should == lockfile_text
-    end
-
-  end
-end

data/spec/meta/requires_spec.rb

@@ -1,27 +0,0 @@
-require 'pathname'
-require 'open3'
-
-describe 'Meta' do
-  describe 'Requires', :slow => true do
-
-    root_path = Pathname.new('../../..').expand_path(__FILE__)
-
-    Pathname.glob(root_path.join('lib/**/*.rb')).sort.each do |path|
-
-      it "require '#{path.relative_path_from(root_path.join('lib'))}'" do
-        script = <<-SCRIPT
-          lib = File.expand_path(%{lib}, %{#{root_path}})
-          $:.unshift(lib) unless $:.include?(lib)
-          require %{#{path}}
-        SCRIPT
-        cmd = <<-CMD
-          ruby -e '#{script}'
-        CMD
-        err = Open3.popen3(cmd) { |i, o, e, t| e.read }
-        raise Exception, err if err != ''
-      end
-
-    end
-
-  end
-end