librarian 0.1.1 → 0.1.2

data/spec/unit/mock/environment_spec.rb

@@ -6,19 +6,19 @@ module Librarian::Mock
     let(:env) { described_class.new }
 
     describe "#version" do
-      specify { env.version.should be == Librarian::VERSION }
+      specify { expect(env.version).to eq Librarian::VERSION }
     end
 
     describe "#adapter_module" do
-      specify { env.adapter_module.should be Librarian::Mock }
+      specify { expect(env.adapter_module).to eq Librarian::Mock }
     end
 
     describe "#adapter_name" do
-      specify { env.adapter_name.should be == "mock" }
+      specify { expect(env.adapter_name).to eq "mock" }
     end
 
     describe "#adapter_version" do
-      specify { env.adapter_version.should be == Librarian::Mock::VERSION }
+      specify { expect(env.adapter_version).to eq Librarian::Mock::VERSION }
     end
 
   end

data/spec/unit/resolver_spec.rb

@@ -33,7 +33,7 @@ module Librarian
 
       let(:resolution) { resolver.resolve(spec) }
 
-      specify { resolution.should be_correct }
+      specify { expect(resolution).to be_correct }
 
     end
 
@@ -63,7 +63,7 @@ module Librarian
 
       let(:resolution) { resolver.resolve(spec) }
 
-      specify { resolution.should be_correct }
+      specify { expect(resolution).to be_correct }
 
     end
 
@@ -94,16 +94,16 @@ module Librarian
       end
 
       it "should have the expected number of sources" do
-        spec.should have(2).sources
+        expect(spec).to have(2).sources
       end
 
       let(:resolution) { resolver.resolve(spec) }
 
-      specify { resolution.should be_correct }
+      specify { expect(resolution).to be_correct }
 
       it "should have the manifest from the final source with a matching manifest" do
         manifest = resolution.manifests.find{|m| m.name == "butter"}
-        manifest.source.name.should == "source-2"
+        expect(manifest.source.name).to eq "source-2"
       end
 
     end
@@ -129,7 +129,7 @@ module Librarian
 
       let(:resolution) { resolver.resolve(spec) }
 
-      specify { resolution.should be_nil }
+      specify { expect(resolution).to be_nil }
 
     end
 
@@ -157,7 +157,48 @@ module Librarian
 
       let(:resolution) { resolver.resolve(spec) }
 
-      specify { resolution.should be_nil }
+      specify { expect(resolution).to be_nil }
+
+    end
+
+    context "a specfile with cyclic constraints" do
+
+      before do
+        env.registry :clear => true do
+          source 'source-1' do
+            spec 'butter', '1.0' do
+              dependency 'jam', '2.0'
+            end
+            spec 'jam', '2.0' do
+              dependency 'butter', '1.0'
+            end
+          end
+        end
+      end
+
+      let(:spec) do
+        env.dsl do
+          src 'source-1'
+          dep 'butter'
+        end
+      end
+
+      let(:resolution) { resolver.resolve(spec) }
+
+      context "when cyclic resolutions are forbidden" do
+        let(:resolver) { env.resolver(:cyclic => false) }
+
+        specify { expect(resolution).to be_nil }
+      end
+
+      context "when cyclic resolutions are permitted" do
+        let(:resolver) { env.resolver(:cyclic => true) }
+
+        it "should have all the manifests" do
+          manifest_names = resolution.manifests.map(&:name).sort
+          expect(manifest_names).to be == %w[butter jam]
+        end
+      end
 
     end
 
@@ -179,10 +220,10 @@ module Librarian
           dep 'jam'
         end
         first_resolution = resolver.resolve(first_spec)
-        first_resolution.should be_correct
+        expect(first_resolution).to 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'
+        expect(first_manifests_index['butter'].version.to_s).to eq '1.1'
 
         second_spec = env.dsl do
           src 'source-1'
@@ -191,10 +232,10 @@ module Librarian
         end
         locked_manifests = ManifestSet.deep_strip(first_manifests, ['butter'])
         second_resolution =resolver.resolve(second_spec, locked_manifests)
-        second_resolution.should be_correct
+        expect(second_resolution).to be_correct
         second_manifests = second_resolution.manifests
         second_manifests_index = Hash[second_manifests.map{|m| [m.name, m]}]
-        second_manifests_index['butter'].version.to_s.should == '1.0'
+        expect(second_manifests_index['butter'].version.to_s).to eq '1.0'
       end
 
     end
@@ -215,22 +256,22 @@ module Librarian
           dep 'butter'
         end
         lock = resolver.resolve(spec)
-        lock.should be_correct
+        expect(lock).to be_correct
 
         spec = env.dsl do
           src 'source-1'
           dep 'butter', :src => 'source-2'
         end
         changes = SpecChangeSet.new(env, spec, lock)
-        changes.should_not be_same
+        expect(changes).to_not be_same
         manifests = ManifestSet.new(changes.analyze).to_hash
-        manifests.should_not have_key('butter')
+        expect(manifests).to_not have_key('butter')
         lock = resolver.resolve(spec, changes.analyze)
-        lock.should be_correct
-        lock.manifests.map{|m| m.name}.should include('butter')
+        expect(lock).to be_correct
+        expect(lock.manifests.map{|m| m.name}).to include('butter')
         manifest = lock.manifests.find{|m| m.name == 'butter'}
-        manifest.should_not be_nil
-        manifest.source.name.should == 'source-2'
+        expect(manifest).to_not be_nil
+        expect(manifest.source.name).to eq 'source-2'
       end
 
     end
@@ -247,9 +288,9 @@ module Librarian
       it "loads the specfile with the __FILE__" do
         write! specfile_path, "src __FILE__"
         spec = env.dsl(specfile_path)
-        spec.sources.should have(1).item
+        expect(spec.sources).to have(1).item
         source = spec.sources.first
-        source.name.should == specfile_path.to_s
+        expect(source.name).to eq specfile_path.to_s
       end
 
     end

data/spec/unit/spec_change_set_spec.rb

@@ -23,18 +23,18 @@ module Librarian
           dep 'jam'
         end
         lock = resolver.resolve(spec)
-        lock.should be_correct
+        expect(lock).to be_correct
 
         spec = env.dsl do
           src 'source-1'
           dep 'jam'
         end
         changes = described_class.new(env, spec, lock)
-        changes.should_not be_same
+        expect(changes).to_not be_same
 
         manifests = ManifestSet.new(changes.analyze).to_hash
-        manifests.should have_key('jam')
-        manifests.should_not have_key('butter')
+        expect(manifests).to have_key('jam')
+        expect(manifests).to_not have_key('butter')
       end
 
     end
@@ -53,7 +53,7 @@ module Librarian
           dep 'jam'
         end
         lock = resolver.resolve(spec)
-        lock.should be_correct
+        expect(lock).to be_correct
 
         spec = env.dsl do
           src 'source-1'
@@ -61,10 +61,10 @@ module Librarian
           dep 'jam'
         end
         changes = described_class.new(env, spec, lock)
-        changes.should_not be_same
+        expect(changes).to_not be_same
         manifests = ManifestSet.new(changes.analyze).to_hash
-        manifests.should have_key('jam')
-        manifests.should_not have_key('butter')
+        expect(manifests).to have_key('jam')
+        expect(manifests).to_not have_key('butter')
       end
 
     end
@@ -87,7 +87,7 @@ module Librarian
             dep 'jam', '= 1.1'
           end
           lock = resolver.resolve(spec)
-          lock.should be_correct
+          expect(lock).to be_correct
 
           spec = env.dsl do
             src 'source-1'
@@ -95,10 +95,10 @@ module Librarian
             dep 'jam', '>= 1.0'
           end
           changes = described_class.new(env, spec, lock)
-          changes.should_not be_same
+          expect(changes).to_not be_same
           manifests = ManifestSet.new(changes.analyze).to_hash
-          manifests.should have_key('butter')
-          manifests.should have_key('jam')
+          expect(manifests).to have_key('butter')
+          expect(manifests).to have_key('jam')
         end
 
       end
@@ -119,7 +119,7 @@ module Librarian
             dep 'jam', '= 1.0'
           end
           lock = resolver.resolve(spec)
-          lock.should be_correct
+          expect(lock).to be_correct
 
           spec = env.dsl do
             src 'source-1'
@@ -127,10 +127,10 @@ module Librarian
             dep 'jam', '>= 1.1'
           end
           changes = described_class.new(env, spec, lock)
-          changes.should_not be_same
+          expect(changes).to_not be_same
           manifests = ManifestSet.new(changes.analyze).to_hash
-          manifests.should have_key('butter')
-          manifests.should_not have_key('jam')
+          expect(manifests).to have_key('butter')
+          expect(manifests).to_not have_key('jam')
         end
 
       end
@@ -152,16 +152,16 @@ module Librarian
           dep 'butter'
         end
         lock = resolver.resolve(spec)
-        lock.should be_correct
+        expect(lock).to be_correct
 
         spec = env.dsl do
           src 'source-1'
           dep 'butter', :src => 'source-2'
         end
         changes = described_class.new(env, spec, lock)
-        changes.should_not be_same
+        expect(changes).to_not be_same
         manifests = ManifestSet.new(changes.analyze).to_hash
-        manifests.should_not have_key('butter')
+        expect(manifests).to_not have_key('butter')
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: librarian
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jay Feldblum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-17 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -109,6 +109,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- VERSION
 - lib/librarian.rb
 - lib/librarian/action.rb
 - lib/librarian/action/base.rb
@@ -118,6 +119,7 @@ files:
 - lib/librarian/action/persist_resolution_mixin.rb
 - lib/librarian/action/resolve.rb
 - lib/librarian/action/update.rb
+- lib/librarian/algorithms.rb
 - lib/librarian/cli.rb
 - lib/librarian/cli/manifest_presenter.rb
 - lib/librarian/config.rb
@@ -130,6 +132,7 @@ files:
 - lib/librarian/dsl/receiver.rb
 - lib/librarian/dsl/target.rb
 - lib/librarian/environment.rb
+- lib/librarian/environment/runtime_cache.rb
 - lib/librarian/error.rb
 - lib/librarian/helpers.rb
 - lib/librarian/linter/source_linter.rb
@@ -172,17 +175,22 @@ files:
 - spec/functional/source/git_spec.rb
 - spec/support/fakefs.rb
 - spec/support/method_patch_macro.rb
+- spec/support/project_path_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/algorithms_spec.rb
 - spec/unit/config/database_spec.rb
+- spec/unit/dependency/requirement_spec.rb
 - spec/unit/dependency_spec.rb
 - spec/unit/dsl_spec.rb
+- spec/unit/environment/runtime_cache_spec.rb
 - spec/unit/environment_spec.rb
 - spec/unit/lockfile/parser_spec.rb
 - spec/unit/lockfile_spec.rb
+- spec/unit/manifest/version_spec.rb
 - spec/unit/manifest_set_spec.rb
 - spec/unit/manifest_spec.rb
 - spec/unit/mock/environment_spec.rb
@@ -190,8 +198,9 @@ files:
 - spec/unit/resolver_spec.rb
 - spec/unit/source/git_spec.rb
 - spec/unit/spec_change_set_spec.rb
-homepage: ''
-licenses: []
+homepage: https://github.com/applicationsonline/librarian
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -209,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.3
 signing_key: 
 specification_version: 4
 summary: A Framework for Bundlers.
@@ -220,17 +229,22 @@ test_files:
 - spec/functional/source/git_spec.rb
 - spec/support/fakefs.rb
 - spec/support/method_patch_macro.rb
+- spec/support/project_path_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/algorithms_spec.rb
 - spec/unit/config/database_spec.rb
+- spec/unit/dependency/requirement_spec.rb
 - spec/unit/dependency_spec.rb
 - spec/unit/dsl_spec.rb
+- spec/unit/environment/runtime_cache_spec.rb
 - spec/unit/environment_spec.rb
 - spec/unit/lockfile/parser_spec.rb
 - spec/unit/lockfile_spec.rb
+- spec/unit/manifest/version_spec.rb
 - spec/unit/manifest_set_spec.rb
 - spec/unit/manifest_spec.rb
 - spec/unit/mock/environment_spec.rb