librarian 0.0.22 → 0.0.23

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Change Log
 
+## 0.0.23
+
+* \#41. Build gems with a built gemspec.
+
+* \#67. Cache remote objects at the latest possible moments, and only when they
+  are needed.
+
+* \#68. Fix unpacking chef site-sourced packages on Windows by pivoting from a
+  Librarian-managed scratch space, rather than pivoting from Windows' temp
+  directory. There were unexplained problems with using the Windows temp
+  directory in certain cases, possibly related to the temp directory and the
+  Librarian cache directory being on different volumes.
+
+* \#69. Fix invoking Librarian with git-sourced dependencies from git hooks by
+  unsetting `GIT_DIR` around shelling out to git.
+
+* Print general environment information when running with `--verbose`.
+
 ## 0.0.22
 
 * Fix the `outdated` CLI command.

data/Rakefile

@@ -1,4 +1,25 @@
 require 'bundler'
+
+module Bundler
+  class GemHelper
+
+    def build_gem_with_built_spec
+      spec = Gem::Specification.load(spec_path)
+      spec_ruby = spec.to_ruby
+      original_spec_path = spec_path + ".original"
+      FileUtils.mv(spec_path, original_spec_path)
+      File.open(spec_path, "wb"){|f| f.write(spec_ruby)}
+      build_gem_without_built_spec
+    ensure
+      FileUtils.mv(original_spec_path, spec_path)
+    end
+
+    alias build_gem_without_built_spec build_gem
+    alias build_gem build_gem_with_built_spec
+
+  end
+end
+
 Bundler::GemHelper.install_tasks
 
 begin

data/lib/librarian/action/install.rb

@@ -35,17 +35,10 @@ module Librarian
       def perform_installation
         manifests = sorted_manifests
 
-        cache_manifests(manifests)
         create_install_path
         install_manifests(manifests)
       end
 
-      def cache_manifests(manifests)
-        manifests.each do |manifest|
-          manifest.source.cache!([manifest.name])
-        end
-      end
-
       def create_install_path
         install_path.rmtree if install_path.exist?
         install_path.mkpath

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

@@ -5,7 +5,7 @@ require 'net/http'
 require 'json'
 require 'digest'
 require 'zlib'
-require 'tmpdir'
+require 'securerandom'
 require 'archive/tar/minitar'
 
 require 'librarian/helpers/debug'
@@ -233,12 +233,8 @@ module Librarian
 
             package_path = version_uri_package_cache_path(version_uri)
             unpacked_path = version_uri_unpacked_cache_path(version_uri)
-            temp_path = Pathname(Dir.tmpdir)
 
-            Zlib::GzipReader.open(package_path) do |input|
-              Archive::Tar::Minitar.unpack(input, temp_path.to_s)
-            end
-            FileUtils.move(temp_path.join(name), unpacked_path)
+            unpack_package! unpacked_path, package_path
           end
 
           def cache_remote_json!(path, uri)
@@ -282,6 +278,28 @@ module Librarian
             path.open("wb"){|f| f.write(bytes)}
           end
 
+          def unpack_package!(path, source)
+            path = Pathname(path)
+            source = Pathname(source)
+
+            temp = environment.scratch_path.join(SecureRandom.hex(16))
+            temp.mkpath
+
+            debug { "Unpacking #{relative_path_to(source)} to #{relative_path_to(temp)}" }
+            Zlib::GzipReader.open(source) do |input|
+              Archive::Tar::Minitar.unpack(input, temp.to_s)
+            end
+
+            # Cookbook files, as pulled from Opscode Community Site API, are
+            # embedded in a subdirectory of the tarball, and the subdirectory's
+            # name is equal to the name of the cookbook.
+            subtemp = temp.join(name)
+            debug { "Moving #{relative_path_to(subtemp)} to #{relative_path_to(path)}" }
+            FileUtils.mv(subtemp, path)
+          ensure
+            temp.rmtree if temp && temp.exist?
+          end
+
           def parse_local_json(path)
             JSON.parse(path.read)
           end
@@ -358,9 +376,6 @@ module Librarian
         def unpin!
         end
 
-        def cache!(names)
-        end
-
         def install!(manifest)
           manifest.source == self or raise ArgumentError
 

data/lib/librarian/cli.rb

@@ -6,6 +6,8 @@ require 'librarian/error'
 require 'librarian/action'
 require "librarian/ui"
 
+require "librarian/helpers/debug"
+
 module Librarian
   class Cli < Thor
 
@@ -22,6 +24,8 @@ module Librarian
     include Particularity
     extend Particularity
 
+    include Helpers::Debug
+
     class << self
       def bin!
         begin
@@ -44,6 +48,8 @@ module Librarian
       environment.ui = UI::Shell.new(the_shell)
       environment.ui.debug! if options["verbose"]
       environment.ui.debug_line_numbers! if options["verbose"] && options["line-numbers"]
+
+      write_debug_header
     end
 
     desc "version", "Displays the version."
@@ -91,7 +97,6 @@ module Librarian
       resolution = environment.lock
       resolution.manifests.sort_by(&:name).each do |manifest|
         source = manifest.source
-        source.cache!([manifest.name])
         source_manifest = source.manifests(manifest.name).first
         next if manifest.version == source_manifest.version
         say "#{manifest.name} (#{manifest.version} -> #{source_manifest.version})"
@@ -142,5 +147,29 @@ module Librarian
       ManifestPresenter.new(self, environment.lock.manifests)
     end
 
+    def write_debug_header
+      debug { "Ruby Version: #{RUBY_VERSION}" }
+      debug { "Ruby Platform: #{RUBY_PLATFORM}" }
+      debug { "Rubinius Version: #{Rubinius::VERSION}" } if defined?(Rubinius)
+      debug { "JRuby Version: #{JRUBY_VERSION}" } if defined?(JRUBY_VERSION)
+      debug { "Rubygems Version: #{Gem::VERSION}" }
+      debug { "Librarian Version: #{VERSION}" }
+      debug { "Librarian Adapter: #{environment.adapter_name}"}
+      debug { "Project: #{environment.project_path}" }
+      debug { "Specfile: #{relative_path_to(environment.specfile_path)}" }
+      debug { "Lockfile: #{relative_path_to(environment.lockfile_path)}" }
+      debug { "Git: #{Source::Git::Repository.bin}" }
+      debug { "Git Version: #{Source::Git::Repository.new(environment, environment.project_path).version(:silent => true)}" }
+      debug { "Git Environment Variables:" }
+      git_env = ENV.to_a.select{|(k, v)| k =~ /\AGIT/}.sort_by{|(k, v)| k}
+      if git_env.empty?
+        debug { "  (empty)" }
+      else
+        git_env.each do |(k, v)|
+          debug { "  #{k}=#{v}"}
+        end
+      end
+    end
+
   end
 end

data/lib/librarian/dependency.rb

@@ -28,16 +28,18 @@ module Librarian
         to_gem_requirement.to_s
       end
 
+      protected
+
+      attr_accessor :backing
+
       private
 
       def initialize_normalize_args(args)
         args.map do |arg|
-          arg = [arg] if self.class === arg
+          arg = arg.backing if self.class === arg
           arg
         end
       end
-
-      attr_accessor :backing
     end
 
     include Helpers::Debug
@@ -60,7 +62,6 @@ module Librarian
     end
 
     def cache_manifests!
-      source.cache!([name])
       source.manifests(name)
     end
 

data/lib/librarian/environment.rb

@@ -95,6 +95,10 @@ module Librarian
       project_path.join("tmp/librarian/cache")
     end
 
+    def scratch_path
+      project_path.join("tmp/librarian/scratch")
+    end
+
     def project_relative_path_to(path)
       Pathname.new(path).relative_path_from(project_path)
     end

data/lib/librarian/lockfile/parser.rb

@@ -28,7 +28,7 @@ module Librarian
         string = string.dup
         source_type_names_map = Hash[dsl_class.source_types.map{|t| [t[1].lock_name, t[1]]}]
         source_type_names = dsl_class.source_types.map{|t| t[1].lock_name}
-        lines = string.split(/(\r?\n)+/).reject{|l| l =~ /^\s*$/}
+        lines = string.split(/(\r|\n|\r\n)+/).select{|l| l =~ /\S/}
         sources = []
         while source_type_names.include?(lines.first)
           source = {}
@@ -60,7 +60,7 @@ module Librarian
         dependencies = []
         while lines.first =~ /^ {2}([\w-]+)(?: \((.*)\))?$/
           lines.shift
-          name, requirement = $1, $2
+          name, requirement = $1, $2.split(/,\s*/)
           dependencies << Dependency.new(name, requirement, manifests_index[name].source)
         end
         Resolution.new(dependencies, manifests)

data/lib/librarian/manifest_set.rb

@@ -113,10 +113,14 @@ module Librarian
 
     def consistent?
       index.values.all? do |manifest|
-        manifest.dependencies.all? do |dependency|
-          match = index[dependency.name]
-          match && match.satisfies?(dependency)
-        end
+        in_compliance_with?(manifest.dependencies)
+      end
+    end
+
+    def in_compliance_with?(dependencies)
+      dependencies.all? do |dependency|
+        manifest = index[dependency.name]
+        manifest && manifest.satisfies?(dependency)
       end
     end
 

data/lib/librarian/mock/source/mock.rb

@@ -74,9 +74,6 @@ module Librarian
           end
         end
 
-        def cache!(names)
-        end
-
         def install!(manifest)
         end
 

data/lib/librarian/resolution.rb

@@ -33,10 +33,7 @@ module Librarian
     end
 
     def manifests_consistent_with_dependencies?
-      dependencies.all? do |dependency|
-        manifest = manifests_index[dependency.name]
-        dependency.satisfied_by?(manifest)
-      end
+      ManifestSet.new(manifests).in_compliance_with?(dependencies)
     end
 
     def manifests_internally_consistent?

data/lib/librarian/source/git.rb

@@ -39,14 +39,17 @@ module Librarian
 
       attr_accessor :environment
       private :environment=
-      attr_reader :uri, :ref, :sha, :path
+
+      attr_accessor :uri, :ref, :sha, :path
+      private :uri=, :ref=, :sha=, :path=
 
       def initialize(environment, uri, options)
         self.environment = environment
-        @uri = uri
-        @ref = options[:ref] || DEFAULTS[:ref]
-        @sha = options[:sha]
-        @path = options[:path]
+        self.uri = uri
+        self.ref = options[:ref] || DEFAULTS[:ref]
+        self.sha = options[:sha]
+        self.path = options[:path]
+
         @repository = nil
         @repository_cache_path = nil
       end
@@ -85,30 +88,40 @@ module Librarian
         @sha = nil
       end
 
-      def cache!(names)
+      def cache!
+        repository_cached? and return or repository_cached!
+
         unless repository.git?
           repository.path.rmtree if repository.path.exist?
           repository.path.mkpath
           repository.clone!(uri)
         end
         repository.reset_hard!
-        unless sha == repository.current_commit_hash
+        repository.clean!
+        unless repository.checked_out?(sha)
           remote = repository.default_remote
           repository.fetch!(remote)
           repository.fetch!(remote, :tags => true)
 
-          new_sha = repository.hash_from(remote, sha || ref)
-          repository.checkout!(new_sha)
+          self.sha = repository.hash_from(remote, ref) unless sha
+          repository.checkout!(sha) unless repository.checked_out?(sha)
 
-          @sha ||= new_sha
+          raise Error, "failed to checkout #{sha}" unless repository.checked_out?(sha)
         end
       end
 
+    private
+
+      attr_accessor :repository_cached
+      alias repository_cached? repository_cached
+
+      def repository_cached!
+        self.repository_cached = true
+      end
+
       def repository_cache_path
         @repository_cache_path ||= begin
-          dir = path ? "#{uri}/#{path}" : uri
-          dir = Digest::MD5.hexdigest(dir)
-          environment.cache_path.join("source/git/#{dir}")
+          environment.cache_path.join("source/git/#{cache_key}")
         end
       end
 
@@ -122,6 +135,16 @@ module Librarian
         @filesystem_path ||= path ? repository.path.join(path) : repository.path
       end
 
+      def cache_key
+        @cache_key ||= begin
+          uri_part = uri
+          path_part = "/#{path}" if path
+          ref_part = "##{ref}"
+          key_source = [uri_part, path_part, ref_part].join
+          Digest::MD5.hexdigest(key_source)
+        end
+      end
+
     end
   end
 end

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

@@ -59,6 +59,17 @@ module Librarian
           "origin"
         end
 
+        def version(options = { })
+          version!(options).strip
+        end
+
+        def version!(options = { })
+          silent = options.delete(:silent)
+
+          command = %w(--version)
+          run!(command, :silent => silent)
+        end
+
         def clone!(repository_url)
           command = %W(clone #{repository_url} . --quiet)
           run!(command, :chdir => true)
@@ -81,6 +92,15 @@ module Librarian
           run!(command, :chdir => true)
         end
 
+        def clean!
+          command = %w(clean -x -d --force --force)
+          run!(command, :chdir => true)
+        end
+
+        def checked_out?(sha)
+          current_commit_hash == sha
+        end
+
         def remote_names
           command = %W(remote)
           run!(command, :chdir => true).strip.lines.map(&:strip)
@@ -126,28 +146,67 @@ module Librarian
           chdir = options.delete(:chdir)
           chdir = path.to_s if chdir == true
 
+          silent = options.delete(:silent)
+
           command = [bin]
           command.concat(args)
 
           maybe_within(chdir) do
-            debug { "Running `#{command.join(' ')}` in #{relative_path_to(Dir.pwd)}" }
-            out = Open3.popen3(*command) do |i, o, e, t|
-              raise StandardError, e.read unless (t ? t.value : $?).success?
-              o.read
+            logging_command(command, :silent => silent) do
+              run_command_internal(command)
             end
-            debug { "    ->  #{out}" } if out.size > 0
-            out
           end
         end
 
         def maybe_within(path)
           if path
-            Dir.chdir(path) { yield }
+            Dir.chdir(path) { with_env_var("GIT_DIR", nil) { yield } }
           else
             yield
           end
         end
 
+        def with_env_var(name, value)
+          original_value = ENV[name]
+          begin
+            ENV[name] = value
+            yield
+          ensure
+            ENV[name] = original_value
+          end
+        end
+
+        def logging_command(command, options)
+          silent = options.delete(:silent)
+
+          pwd = Dir.pwd
+
+          unless silent
+            debug { "Running `#{command.join(' ')}` in #{relative_path_to(pwd)}" }
+          end
+
+          out = yield
+
+          unless silent
+            if out.size > 0
+              out.lines.each do |line|
+                debug { "    --> #{line}" }
+              end
+            else
+              debug { "    --- No output" }
+            end
+          end
+
+          out
+        end
+
+        def run_command_internal(command)
+          Open3.popen3(*command) do |i, o, e, t|
+            raise StandardError, e.read unless (t ? t.value : $?).success?
+            o.read
+          end
+        end
+
       end
     end
   end

data/lib/librarian/source/local.rb

@@ -11,7 +11,7 @@ module Librarian
       include Helpers::Debug
       include Support::AbstractMethod
 
-      abstract_method :path
+      abstract_method :path, :fetch_version, :fetch_dependencies
 
       def manifests(name)
         manifest = Manifest.new(self, name)
@@ -26,8 +26,12 @@ module Librarian
       end
 
       def manifest_search_paths(name)
-        paths = [filesystem_path, filesystem_path.join(name)]
-        paths.select{|s| s.exist?}
+        @manifest_search_paths ||= { }
+        @manifest_search_paths[name] ||= begin
+          cache!
+          paths = [filesystem_path, filesystem_path.join(name)]
+          paths.select{|s| s.exist?}
+        end
       end
 
       def found_path(name)

data/lib/librarian/source/path.rb

@@ -62,7 +62,7 @@ module Librarian
       def unpin!
       end
 
-      def cache!(names)
+      def cache!
       end
 
       def filesystem_path

data/lib/librarian/version.rb

@@ -1,3 +1,3 @@
 module Librarian
-  VERSION = "0.0.22"
+  VERSION = "0.0.23"
 end

data/librarian.gemspec

@@ -1,33 +1,55 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "librarian/version"
 
 Gem::Specification.new do |s|
-  s.name        = "librarian"
-  s.version     = Librarian::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Jay Feldblum"]
-  s.email       = ["y_feldblum@yahoo.com"]
-  s.homepage    = ""
-  s.summary     = %q{Librarian}
-  s.description = %q{Librarian}
+  s.name = "librarian"
+  s.version = "0.0.23"
 
-  s.rubyforge_project = "librarian"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jay Feldblum"]
+  s.date = "2012-05-14"
+  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", "config/cucumber.yaml", "features/chef/cli/init.feature", "features/chef/cli/install.feature", "features/chef/cli/show.feature", "features/chef/cli/version.feature", "features/support/env.rb", "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/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/helpers/debug.rb", "lib/librarian/lockfile.rb", "lib/librarian/lockfile/compiler.rb", "lib/librarian/lockfile/parser.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/source/git_spec.rb", "spec/functional/chef/source/site_spec.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/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"
+  s.rubygems_version = "1.8.17"
+  s.summary = "Librarian"
 
-  s.add_dependency "thor", "~> 0.15"
-
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "cucumber"
-  s.add_development_dependency "aruba"
-  s.add_development_dependency "webmock"
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
 
-  s.add_dependency "chef", ">= 0.10"
-  s.add_dependency "highline"
-  s.add_dependency "archive-tar-minitar", ">= 0.5.2"
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<thor>, ["~> 0.15"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<cucumber>, [">= 0"])
+      s.add_development_dependency(%q<aruba>, [">= 0"])
+      s.add_development_dependency(%q<webmock>, [">= 0"])
+      s.add_runtime_dependency(%q<chef>, [">= 0.10"])
+      s.add_runtime_dependency(%q<highline>, [">= 0"])
+      s.add_runtime_dependency(%q<archive-tar-minitar>, [">= 0.5.2"])
+    else
+      s.add_dependency(%q<thor>, ["~> 0.15"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<cucumber>, [">= 0"])
+      s.add_dependency(%q<aruba>, [">= 0"])
+      s.add_dependency(%q<webmock>, [">= 0"])
+      s.add_dependency(%q<chef>, [">= 0.10"])
+      s.add_dependency(%q<highline>, [">= 0"])
+      s.add_dependency(%q<archive-tar-minitar>, [">= 0.5.2"])
+    end
+  else
+    s.add_dependency(%q<thor>, ["~> 0.15"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<cucumber>, [">= 0"])
+    s.add_dependency(%q<aruba>, [">= 0"])
+    s.add_dependency(%q<webmock>, [">= 0"])
+    s.add_dependency(%q<chef>, [">= 0.10"])
+    s.add_dependency(%q<highline>, [">= 0"])
+    s.add_dependency(%q<archive-tar-minitar>, [">= 0.5.2"])
+  end
 end

data/spec/unit/action/install_spec.rb

@@ -81,15 +81,9 @@ module Librarian
             action.run
           end
 
-          it "should sort, cache, and install the manifests" do
+          it "should sort and install the manifests" do
             ManifestSet.should_receive(:sort).with(manifests).exactly(:once).ordered { sorted_manifests }
 
-            sorted_manifests.each do |manifest|
-              source = mock
-              manifest.stub(:source) { source }
-              source.should_receive(:cache!).with([manifest.name]).exactly(:once).ordered
-            end
-
             install_path.stub(:exist?) { false }
             install_path.should_receive(:mkpath).exactly(:once).ordered
 
@@ -100,7 +94,6 @@ module Librarian
 
           it "should recreate the install path if it already exists" do
             action.stub(:sorted_manifests) { sorted_manifests }
-            action.stub(:cache_manifests)
             action.stub(:install_manifests)
 
             install_path.stub(:exist?) { true }

data/spec/unit/lockfile/parser_spec.rb

@@ -0,0 +1,162 @@
+require "librarian/helpers"
+require "librarian/lockfile/parser"
+require "librarian/mock"
+
+module Librarian
+  describe Lockfile::Parser do
+
+    let(:env) { Mock::Environment.new }
+    let(:parser) { described_class.new(env) }
+    let(:resolution) { parser.parse(lockfile) }
+
+    context "a mock lockfile with one source and no dependencies" do
+      let(:lockfile) do
+        Helpers.strip_heredoc <<-LOCKFILE
+          MOCK
+            remote: source-a
+            specs:
+
+          DEPENDENCIES
+
+        LOCKFILE
+      end
+
+      it "should give an empty list of dependencies" do
+        resolution.dependencies.should be_empty
+      end
+
+      it "should give an empty list of manifests" do
+        resolution.manifests.should be_empty
+      end
+    end
+
+    context "a mock lockfile with one source and one dependency" do
+      let(:lockfile) do
+        Helpers.strip_heredoc <<-LOCKFILE
+          MOCK
+            remote: source-a
+            specs:
+              jelly (1.3.5)
+
+          DEPENDENCIES
+            jelly (!= 1.2.6, ~> 1.1)
+
+        LOCKFILE
+      end
+
+      it "should give a list of one dependency" do
+        resolution.should have(1).dependencies
+      end
+
+      it "should give a dependency with the expected name" do
+        dependency = resolution.dependencies.first
+
+        dependency.name.should == "jelly"
+      end
+
+      it "should give a dependency with the expected requirement" do
+        dependency = resolution.dependencies.first
+
+        # Note: it must be this order because this order is lexicographically sorted.
+        dependency.requirement.to_s.should == "!= 1.2.6, ~> 1.1"
+      end
+
+      it "should give a dependency wth the expected source" do
+        dependency = resolution.dependencies.first
+        source = dependency.source
+
+        source.name.should == "source-a"
+      end
+
+      it "should give a list of one manifest" do
+        resolution.should have(1).manifests
+      end
+
+      it "should give a manifest with the expected name" do
+        manifest = resolution.manifests.first
+
+        manifest.name.should == "jelly"
+      end
+
+      it "should give a manifest with the expected version" do
+        manifest = resolution.manifests.first
+
+        manifest.version.to_s.should == "1.3.5"
+      end
+
+      it "should give a manifest with no dependencies" do
+        manifest = resolution.manifests.first
+
+        manifest.dependencies.should be_empty
+      end
+
+      it "should give a manifest with the expected source" do
+        manifest = resolution.manifests.first
+        source = manifest.source
+
+        source.name.should == "source-a"
+      end
+
+      it "should give the dependency and the manifest the same source instance" do
+        dependency = resolution.dependencies.first
+        manifest = resolution.manifests.first
+
+        dependency_source = dependency.source
+        manifest_source = manifest.source
+
+        manifest_source.should be dependency_source
+      end
+    end
+
+    context "a mock lockfile with one source and a complex dependency" do
+      let(:lockfile) do
+        Helpers.strip_heredoc <<-LOCKFILE
+          MOCK
+            remote: source-a
+            specs:
+              butter (2.5.3)
+              jelly (1.3.5)
+                butter (< 3, >= 1.1)
+
+          DEPENDENCIES
+            jelly (!= 1.2.6, ~> 1.1)
+
+        LOCKFILE
+      end
+
+      it "should give a list of one dependency" do
+        resolution.should have(1).dependencies
+      end
+
+      it "should have the expected dependency" do
+        dependency = resolution.dependencies.first
+
+        dependency.name.should == "jelly"
+      end
+
+      it "should give a list of all the manifests" do
+        resolution.should have(2).manifests
+      end
+
+      it "should include all the expected manifests" do
+        manifests = ManifestSet.new(resolution.manifests)
+
+        manifests.to_hash.keys.should =~ %w(butter jelly)
+      end
+
+      it "should have an internally consistent set of manifests" do
+        manifests = ManifestSet.new(resolution.manifests)
+
+        manifests.should be_consistent
+      end
+
+      it "should have an externally consistent set of manifests" do
+        dependencies = resolution.dependencies
+        manifests = ManifestSet.new(resolution.manifests)
+
+        manifests.should be_in_compliance_with dependencies
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-11 00:00:00.000000000 Z
+date: 2012-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &15422220 !ruby/object:Gem::Requirement
+  requirement: &9010000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.15'
   type: :runtime
   prerelease: false
-  version_requirements: *15422220
+  version_requirements: *9010000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &15421620 !ruby/object:Gem::Requirement
+  requirement: &9008640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15421620
+  version_requirements: *9008640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15420780 !ruby/object:Gem::Requirement
+  requirement: &9006600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15420780
+  version_requirements: *9006600
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &15419740 !ruby/object:Gem::Requirement
+  requirement: &9004980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15419740
+  version_requirements: *9004980
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &15419140 !ruby/object:Gem::Requirement
+  requirement: &9003760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15419140
+  version_requirements: *9003760
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &15418540 !ruby/object:Gem::Requirement
+  requirement: &8997140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15418540
+  version_requirements: *8997140
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &15417660 !ruby/object:Gem::Requirement
+  requirement: &8956960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0.10'
   type: :runtime
   prerelease: false
-  version_requirements: *15417660
+  version_requirements: *8956960
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &15416820 !ruby/object:Gem::Requirement
+  requirement: &8951000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15416820
+  version_requirements: *8951000
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &15416020 !ruby/object:Gem::Requirement
+  requirement: &8947440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *15416020
+  version_requirements: *8947440
 description: Librarian
 email:
 - y_feldblum@yahoo.com
@@ -203,10 +203,11 @@ files:
 - 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.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
@@ -222,18 +223,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1509747376632430187
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1509747376632430187
 requirements: []
 rubyforge_project: librarian
 rubygems_version: 1.8.17
@@ -241,3 +236,4 @@ signing_key:
 specification_version: 3
 summary: Librarian
 test_files: []
+has_rdoc: