librarian 0.0.9 → 0.0.10

data/spec/unit/dsl_spec.rb

@@ -6,11 +6,13 @@ module Librarian
 
     describe Dsl do
 
+      let(:env) { Environment.new }
+
       context "a single dependency but no applicable source" do
 
         it "should not run without any sources" do
           expect do
-            Dsl.run do
+            env.dsl do
               dep 'dependency-1'
             end
           end.to raise_error(Dsl::Error)
@@ -18,7 +20,7 @@ module Librarian
 
         it "should not run when a block source is defined but the dependency is outside the block" do
           expect do
-            Dsl.run do
+            env.dsl do
               src 'source-1' do end
               dep 'dependency-1'
             end
@@ -30,7 +32,7 @@ module Librarian
       context "a simple specfile - a single source, a single dependency, no transitive dependencies" do
 
         it "should run with a hash source" do
-          spec = Dsl.run do
+          spec = env.dsl do
             dep 'dependency-1',
               :src => 'source-1'
           end
@@ -41,7 +43,7 @@ module Librarian
         end
 
         it "should run with a shortcut source" do
-          spec = Dsl.run do
+          spec = env.dsl do
             dep 'dependency-1',
               :source => :a
           end
@@ -52,7 +54,7 @@ module Librarian
         end
 
         it "should run with a block hash source" do
-          spec = Dsl.run do
+          spec = env.dsl do
             source :src => 'source-1' do
               dep 'dependency-1'
             end
@@ -64,7 +66,7 @@ module Librarian
         end
 
         it "should run with a block named source" do
-          spec = Dsl.run do
+          spec = env.dsl do
             src 'source-1' do
               dep 'dependency-1'
             end
@@ -76,7 +78,7 @@ module Librarian
         end
 
         it "should run with a default hash source" do
-          spec = Dsl.run do
+          spec = env.dsl do
             source :src => 'source-1'
             dep 'dependency-1'
           end
@@ -88,7 +90,7 @@ module Librarian
         end
 
         it "should run with a default named source" do
-          spec = Dsl.run do
+          spec = env.dsl do
             src 'source-1'
             dep 'dependency-1'
           end
@@ -100,7 +102,7 @@ module Librarian
         end
 
         it "should run with a default shortcut source" do
-          spec = Dsl.run do
+          spec = env.dsl do
             source :a
             dep 'dependency-1'
           end
@@ -112,7 +114,7 @@ module Librarian
         end
 
         it "should run with a shortcut source hash definition" do
-          spec = Dsl.run do
+          spec = env.dsl do
             source :b, :src => 'source-b'
             dep 'dependency-1', :source => :b
           end
@@ -123,7 +125,7 @@ module Librarian
         end
 
         it "should run with a shortcut source block definition" do
-          spec = Dsl.run do
+          spec = env.dsl do
             source :b, proc { src 'source-b' }
             dep 'dependency-1', :source => :b
           end
@@ -134,7 +136,7 @@ module Librarian
         end
 
         it "should run with a default shortcut source hash definition" do
-          spec = Dsl.run do
+          spec = env.dsl do
             source :b, :src => 'source-b'
             source :b
             dep 'dependency-1'
@@ -147,7 +149,7 @@ module Librarian
         end
 
         it "should run with a default shortcut source block definition" do
-          spec = Dsl.run do
+          spec = env.dsl do
             source :b, proc { src 'source-b' }
             source :b
             dep 'dependency-1'

data/spec/unit/environment_spec.rb

@@ -0,0 +1,9 @@
+require "librarian/environment"
+
+module Librarian
+  describe Environment do
+
+    let(:env) { described_class.new }
+
+  end
+end

data/spec/unit/lockfile_spec.rb

@@ -4,8 +4,10 @@ require 'librarian/mock'
 module Librarian
   describe Lockfile do
 
+    let(:env) { Mock::Environment.new }
+
     before do
-      Mock.registry :clear => true do
+      env.registry :clear => true do
         source 'source-1' do
           spec 'alpha', '1.1'
         end
@@ -13,13 +15,13 @@ module Librarian
     end
 
     let(:spec) do
-      Mock.dsl do
+      env.dsl do
         src 'source-1'
         dep 'alpha', '1.1'
       end
     end
 
-    let(:resolver) { Mock.resolver }
+    let(:resolver) { env.resolver }
     let(:resolution) { resolver.resolve(spec) }
 
     context "sanity" do
@@ -27,11 +29,12 @@ module Librarian
         subject { resolution }
 
         it { should be_correct }
+        it { should have(1).manifests }
       end
     end
 
     describe "#save" do
-      let(:lockfile) { Mock.ephemeral_lockfile }
+      let(:lockfile) { env.ephemeral_lockfile }
       let(:lockfile_text) { lockfile.save(resolution) }
 
       context "just saving" do
@@ -40,6 +43,14 @@ module Librarian
         end
       end
 
+      context "saving and reloading" do
+        let(:reloaded_resolution) { lockfile.load(lockfile_text) }
+
+        it "should have the expected manifests" do
+          reloaded_resolution.manifests.count.should == resolution.manifests.count
+        end
+      end
+
       context "bouncing" do
         let(:bounced_resolution) { lockfile.load(lockfile_text) }
         let(:bounced_lockfile_text) { lockfile.save(bounced_resolution) }

data/spec/unit/mock/source/mock.rb

@@ -0,0 +1,22 @@
+require "librarian/mock"
+
+module Librarian
+  module Mock
+    module Source
+      describe Mock do
+
+        let(:env) { Librarian::Mock::Environment.new }
+
+        describe ".new" do
+
+          let(:source) { described_class.new(env, "source-a", {}) }
+          subject { source }
+
+          its(:environment) { should_not be_nil }
+
+        end
+
+      end
+    end
+  end
+end

data/spec/unit/resolver_spec.rb

@@ -1,22 +1,25 @@
-require 'librarian'
+require 'librarian/resolver'
+require 'librarian/spec_change_set'
 require 'librarian/mock'
 
 module Librarian
   describe Resolver do
 
+    let(:env) { Mock::Environment.new }
+    let(:resolver) { env.resolver }
+
     context "a simple specfile" do
 
       it "should work" do
-        Mock.registry :clear => true do
+        env.registry :clear => true do
           source 'source-1' do
             spec 'butter', '1.1'
           end
         end
-        spec = Mock.dsl do
+        spec = env.dsl do
           src 'source-1'
           dep 'butter'
         end
-        resolver = Mock.resolver
         resolution = resolver.resolve(spec)
         resolution.should be_correct
       end
@@ -26,7 +29,7 @@ module Librarian
     context "a specfile with a dep from one src depending on a dep from another src" do
 
       it "should work" do
-        Mock.registry :clear => true do
+        env.registry :clear => true do
           source 'source-1' do
             spec 'butter', '1.1'
           end
@@ -36,13 +39,12 @@ module Librarian
             end
           end
         end
-        spec = Mock.dsl do
+        spec = env.dsl do
           src 'source-1'
           src 'source-2' do
             dep 'jam'
           end
         end
-        resolver = Mock.resolver
         resolution = resolver.resolve(spec)
         resolution.should be_correct
       end
@@ -52,18 +54,17 @@ module Librarian
     context "a specfile with a dep depending on a nonexistent dep" do
 
       it "should not work" do
-        Mock.registry :clear => true do
+        env.registry :clear => true do
           source 'source-1' do
             spec 'jam', '1.2' do
               dependency 'butter', '>= 1.0'
             end
           end
         end
-        spec = Mock.dsl do
+        spec = env.dsl do
           src 'source-1'
           dep 'jam'
         end
-        resolver = Mock.resolver
         resolution = resolver.resolve(spec)
         resolution.should_not be_correct
       end
@@ -73,7 +74,7 @@ module Librarian
     context "a specfile with conflicting constraints" do
 
       it "should not work" do
-        Mock.registry :clear => true do
+        env.registry :clear => true do
           source 'source-1' do
             spec 'butter', '1.0'
             spec 'butter', '1.1'
@@ -82,12 +83,11 @@ module Librarian
             end
           end
         end
-        spec = Mock.dsl do
+        spec = env.dsl do
           src 'source-1'
           dep 'butter', '1.0'
           dep 'jam'
         end
-        resolver = Mock.resolver
         resolution = resolver.resolve(spec)
         resolution.should_not be_correct
       end
@@ -97,7 +97,7 @@ module Librarian
     context "updating" do
 
       it "should not work" do
-        Mock.registry :clear => true do
+        env.registry :clear => true do
           source 'source-1' do
             spec 'butter', '1.0'
             spec 'butter', '1.1'
@@ -106,24 +106,24 @@ module Librarian
             end
           end
         end
-        first_spec = Mock.dsl do
+        first_spec = env.dsl do
           src 'source-1'
           dep 'butter', '1.1'
           dep 'jam'
         end
-        first_resolution = Mock.resolver.resolve(first_spec)
+        first_resolution = resolver.resolve(first_spec)
         first_resolution.should be_correct
         first_manifests = first_resolution.manifests
         first_manifests_index = Hash[first_manifests.map{|m| [m.name, m]}]
         first_manifests_index['butter'].version.to_s.should == '1.1'
 
-        second_spec = Mock.dsl do
+        second_spec = env.dsl do
           src 'source-1'
           dep 'butter', '1.0'
           dep 'jam'
         end
         locked_manifests = ManifestSet.deep_strip(first_manifests, ['butter'])
-        second_resolution = Mock.resolver.resolve(second_spec, locked_manifests)
+        second_resolution =resolver.resolve(second_spec, locked_manifests)
         second_resolution.should be_correct
         second_manifests = second_resolution.manifests
         second_manifests_index = Hash[second_manifests.map{|m| [m.name, m]}]
@@ -135,7 +135,7 @@ module Librarian
     context "a change to the spec" do
 
       it "should work" do
-        Mock.registry :clear => true do
+        env.registry :clear => true do
           source 'source-1' do
             spec 'butter', '1.0'
           end
@@ -143,22 +143,22 @@ module Librarian
             spec 'butter', '1.0'
           end
         end
-        spec = Mock.dsl do
+        spec = env.dsl do
           src 'source-1'
           dep 'butter'
         end
-        lock = Mock.resolver.resolve(spec)
+        lock = resolver.resolve(spec)
         lock.should be_correct
 
-        spec = Mock.dsl do
+        spec = env.dsl do
           src 'source-1'
           dep 'butter', :src => 'source-2'
         end
-        changes = Mock.spec_change_set(spec, lock)
+        changes = SpecChangeSet.new(env, spec, lock)
         changes.should_not be_same
         manifests = ManifestSet.new(changes.analyze).to_hash
         manifests.should_not have_key('butter')
-        lock = Mock.resolver.resolve(spec, changes.analyze)
+        lock = resolver.resolve(spec, changes.analyze)
         lock.should be_correct
         lock.manifests.map{|m| m.name}.should include('butter')
         manifest = lock.manifests.find{|m| m.name == 'butter'}

data/spec/unit/spec_change_set_spec.rb

@@ -1,31 +1,35 @@
 require 'librarian'
+require 'librarian/spec_change_set'
 require 'librarian/mock'
 
 module Librarian
   describe SpecChangeSet do
 
+    let(:env) { Mock::Environment.new }
+    let(:resolver) { env.resolver }
+
     context "a simple root removal" do
 
       it "should work" do
-        Mock.registry :clear => true do
+        env.registry :clear => true do
           source 'source-1' do
             spec 'butter', '1.0'
             spec 'jam', '1.0'
           end
         end
-        spec = Mock.dsl do
+        spec = env.dsl do
           src 'source-1'
           dep 'butter'
           dep 'jam'
         end
-        lock = Mock.resolver.resolve(spec)
+        lock = resolver.resolve(spec)
         lock.should be_correct
 
-        spec = Mock.dsl do
+        spec = env.dsl do
           src 'source-1'
           dep 'jam'
         end
-        changes = Mock.spec_change_set(spec, lock)
+        changes = described_class.new(env, spec, lock)
         changes.should_not be_same
 
         manifests = ManifestSet.new(changes.analyze).to_hash
@@ -38,25 +42,25 @@ module Librarian
     context "a simple root add" do
 
       it "should work" do
-        Mock.registry :clear => true do
+        env.registry :clear => true do
           source 'source-1' do
             spec 'butter', '1.0'
             spec 'jam', '1.0'
           end
         end
-        spec = Mock.dsl do
+        spec = env.dsl do
           src 'source-1'
           dep 'jam'
         end
-        lock = Mock.resolver.resolve(spec)
+        lock = resolver.resolve(spec)
         lock.should be_correct
 
-        spec = Mock.dsl do
+        spec = env.dsl do
           src 'source-1'
           dep 'butter'
           dep 'jam'
         end
-        changes = Mock.spec_change_set(spec, lock)
+        changes = described_class.new(env, spec, lock)
         changes.should_not be_same
         manifests = ManifestSet.new(changes.analyze).to_hash
         manifests.should have_key('jam')
@@ -70,27 +74,27 @@ module Librarian
       context "when the change is consistent" do
 
         it "should work" do
-          Mock.registry :clear => true do
+          env.registry :clear => true do
             source 'source-1' do
               spec 'butter', '1.0'
               spec 'jam', '1.0'
               spec 'jam', '1.1'
             end
           end
-          spec = Mock.dsl do
+          spec = env.dsl do
             src 'source-1'
             dep 'butter'
             dep 'jam', '= 1.1'
           end
-          lock = Mock.resolver.resolve(spec)
+          lock = resolver.resolve(spec)
           lock.should be_correct
 
-          spec = Mock.dsl do
+          spec = env.dsl do
             src 'source-1'
             dep 'butter'
             dep 'jam', '>= 1.0'
           end
-          changes = Mock.spec_change_set(spec, lock)
+          changes = described_class.new(env, spec, lock)
           changes.should_not be_same
           manifests = ManifestSet.new(changes.analyze).to_hash
           manifests.should have_key('butter')
@@ -102,27 +106,27 @@ module Librarian
       context "when the change is inconsistent" do
 
         it "should work" do
-          Mock.registry :clear => true do
+          env.registry :clear => true do
             source 'source-1' do
               spec 'butter', '1.0'
               spec 'jam', '1.0'
               spec 'jam', '1.1'
             end
           end
-          spec = Mock.dsl do
+          spec = env.dsl do
             src 'source-1'
             dep 'butter'
             dep 'jam', '= 1.0'
           end
-          lock = Mock.resolver.resolve(spec)
+          lock = resolver.resolve(spec)
           lock.should be_correct
 
-          spec = Mock.dsl do
+          spec = env.dsl do
             src 'source-1'
             dep 'butter'
             dep 'jam', '>= 1.1'
           end
-          changes = Mock.spec_change_set(spec, lock)
+          changes = described_class.new(env, spec, lock)
           changes.should_not be_same
           manifests = ManifestSet.new(changes.analyze).to_hash
           manifests.should have_key('butter')
@@ -135,7 +139,7 @@ module Librarian
 
     context "a simple root source change" do
       it "should work" do
-        Mock.registry :clear => true do
+        env.registry :clear => true do
           source 'source-1' do
             spec 'butter', '1.0'
           end
@@ -143,18 +147,18 @@ module Librarian
             spec 'butter', '1.0'
           end
         end
-        spec = Mock.dsl do
+        spec = env.dsl do
           src 'source-1'
           dep 'butter'
         end
-        lock = Mock.resolver.resolve(spec)
+        lock = resolver.resolve(spec)
         lock.should be_correct
 
-        spec = Mock.dsl do
+        spec = env.dsl do
           src 'source-1'
           dep 'butter', :src => 'source-2'
         end
-        changes = Mock.spec_change_set(spec, lock)
+        changes = described_class.new(env, spec, lock)
         changes.should_not be_same
         manifests = ManifestSet.new(changes.analyze).to_hash
         manifests.should_not have_key('butter')