librarian 0.1.1 → 0.1.2

data/spec/unit/action/install_spec.rb

@@ -82,13 +82,13 @@ module Librarian
           end
 
           it "should sort and install the manifests" do
-            ManifestSet.should_receive(:sort).with(manifests).exactly(:once).ordered { sorted_manifests }
+            expect(ManifestSet).to receive(:sort).with(manifests).exactly(:once).ordered { sorted_manifests }
 
             install_path.stub(:exist?) { false }
-            install_path.should_receive(:mkpath).exactly(:once).ordered
+            expect(install_path).to receive(:mkpath).exactly(:once).ordered
 
             sorted_manifests.each do |manifest|
-              manifest.should_receive(:install!).exactly(:once).ordered
+              expect(manifest).to receive(:install!).exactly(:once).ordered
             end
           end
 
@@ -97,8 +97,8 @@ module Librarian
             action.stub(:install_manifests)
 
             install_path.stub(:exist?) { true }
-            install_path.should_receive(:rmtree)
-            install_path.should_receive(:mkpath)
+            expect(install_path).to receive(:rmtree)
+            expect(install_path).to receive(:mkpath)
           end
 
         end

data/spec/unit/algorithms_spec.rb

@@ -0,0 +1,131 @@
+require "librarian/algorithms"
+
+module Librarian
+  module Algorithms
+
+    describe AdjacencyListDirectedGraph do
+
+      describe :cyclic? do
+        subject(:result) { described_class.cyclic?(graph) }
+
+        context "with an empty graph" do
+          let(:graph) { { } }
+          it { should be false }
+        end
+
+        context "with a 1-node acyclic graph" do
+          let(:graph) { { ?a => nil } }
+          it { should be false }
+        end
+
+        context "with a 1-node cyclic graph" do
+          let(:graph) { { ?a => [?a] } }
+          it { should be true }
+        end
+
+        context "with a 2-node no-edge graph" do
+          let(:graph) { { ?a => nil, ?b => nil } }
+          it { should be false }
+        end
+
+        context "with a 2-node acyclic graph" do
+          let(:graph) { { ?a => [?b], ?b => nil } }
+          it { should be false }
+        end
+
+        context "with a 2-node cyclic graph" do
+          let(:graph) { { ?a => [?b], ?b => [?a] } }
+          it { should be true }
+        end
+
+        context "with a 2-scc graph" do
+          let(:graph) { { ?a => [?b], ?b => [?a], ?c => [?d, ?b], ?d => [?c] } }
+          it { should be true }
+        end
+
+      end
+
+      describe :feedback_arc_set do
+        subject(:result) { described_class.feedback_arc_set(graph) }
+
+        context "with an empty graph" do
+          let(:graph) { { } }
+          it { should be_empty }
+        end
+
+        context "with a 1-node acyclic graph" do
+          let(:graph) { { ?a => nil } }
+          it { should be_empty }
+        end
+
+        context "with a 1-node cyclic graph" do
+          let(:graph) { { ?a => [?a] } }
+          it { should be == [[?a, ?a]] }
+        end
+
+        context "with a 2-node no-edge graph" do
+          let(:graph) { { ?a => nil, ?b => nil } }
+          it { should be_empty }
+        end
+
+        context "with a 2-node acyclic graph" do
+          let(:graph) { { ?a => [?b], ?b => nil } }
+          it { should be_empty }
+        end
+
+        context "with a 2-node cyclic graph" do
+          let(:graph) { { ?a => [?b], ?b => [?a] } }
+          it { should be == [[?a, ?b]] } # based on the explicit sort
+        end
+
+        context "with a 2-scc graph" do
+          let(:graph) { { ?a => [?b], ?b => [?a], ?c => [?d, ?b], ?d => [?c] } }
+          it { should be == [[?a, ?b], [?c, ?d]] }
+        end
+
+      end
+
+      describe :tsort_cyclic do
+        subject(:result) { described_class.tsort_cyclic(graph) }
+
+        context "with an empty graph" do
+          let(:graph) { { } }
+          it { should be == [] }
+        end
+
+        context "with a 1-node acyclic graph" do
+          let(:graph) { { ?a => nil } }
+          it { should be == [?a] }
+        end
+
+        context "with a 1-node cyclic graph" do
+          let(:graph) { { ?a => [?a] } }
+          it { should be == [?a] }
+        end
+
+        context "with a 2-node no-edge graph" do
+          let(:graph) { { ?a => nil, ?b => nil } }
+          it { should be == [?a, ?b] }
+        end
+
+        context "with a 2-node acyclic graph" do
+          let(:graph) { { ?a => [?b], ?b => nil } }
+          it { should be == [?b, ?a] } # based on the explicit sort
+        end
+
+        context "with a 2-node cyclic graph" do
+          let(:graph) { { ?a => [?b], ?b => [?a] } }
+          it { should be == [?a, ?b] } # based on the explicit sort
+        end
+
+        context "with a 2-scc graph" do
+          let(:graph) { { ?a => [?b], ?b => [?a], ?c => [?d, ?b], ?d => [?c] } }
+          it { should be == [?a, ?b, ?c, ?d] }
+        end
+
+      end
+
+    end
+
+  end
+end

data/spec/unit/config/database_spec.rb

@@ -52,19 +52,19 @@ describe Librarian::Config::Database do
     end
 
     it "should have the key globally" do
-      database.global[key].should == value
+      expect(database.global[key]).to eq value
     end
 
     it "should not have the key in the env" do
-      database.env[key].should be_nil
+      expect(database.env[key]).to be_nil
     end
 
     it "should not have the key locally" do
-      database.local[key].should be_nil
+      expect(database.local[key]).to be_nil
     end
 
     it "should have the key generally" do
-      database[key].should == value
+      expect(database[key]).to eq value
     end
   end
 
@@ -78,25 +78,25 @@ describe Librarian::Config::Database do
     end
 
     it "should have the key globally" do
-      database.global[key].should == value
+      expect(database.global[key]).to eq value
     end
 
     it "should not have the key in the env" do
-      database.env[key].should be_nil
+      expect(database.env[key]).to be_nil
     end
 
     it "should not have the key locally" do
-      database.local[key].should be_nil
+      expect(database.local[key]).to be_nil
     end
 
     it "should have the key generally" do
-      database[key].should == value
+      expect(database[key]).to eq value
     end
 
     it "should persist the key" do
       data = YAML.load_file(global)
 
-      data.should == {raw_key => value}
+      expect(data).to eq({raw_key => value})
     end
   end
 
@@ -111,23 +111,23 @@ describe Librarian::Config::Database do
     end
 
     it "should not have the key globally" do
-      database.global[key].should be_nil
+      expect(database.global[key]).to be_nil
     end
 
     it "should not have the key in the env" do
-      database.env[key].should be_nil
+      expect(database.env[key]).to be_nil
     end
 
     it "should not have the key locally" do
-      database.local[key].should be_nil
+      expect(database.local[key]).to be_nil
     end
 
     it "should not have the key generally" do
-      database[key].should be_nil
+      expect(database[key]).to be_nil
     end
 
     it "should unpersist the key" do
-      File.should_not exist global
+      expect(File).to_not exist global
     end
   end
 
@@ -140,19 +140,19 @@ describe Librarian::Config::Database do
     let(:env) { {raw_key => value} }
 
     it "should not have the key globally" do
-      database.global[key].should be_nil
+      expect(database.global[key]).to be_nil
     end
 
     it "should have the key in the env" do
-      database.env[key].should == value
+      expect(database.env[key]).to eq value
     end
 
     it "should not have the key locally" do
-      database.local[key].should be_nil
+      expect(database.local[key]).to be_nil
     end
 
     it "should have the key generally" do
-      database[key].should == value
+      expect(database[key]).to eq value
     end
   end
 
@@ -166,19 +166,19 @@ describe Librarian::Config::Database do
     end
 
     it "should not have the key globally" do
-      database.global[key].should be_nil
+      expect(database.global[key]).to be_nil
     end
 
     it "should not have the key in the env" do
-      database.env[key].should be_nil
+      expect(database.env[key]).to be_nil
     end
 
     it "should have the key locally" do
-      database.local[key].should == value
+      expect(database.local[key]).to eq value
     end
 
     it "should have the key generally" do
-      database[key].should == value
+      expect(database[key]).to eq value
     end
   end
 
@@ -192,25 +192,25 @@ describe Librarian::Config::Database do
     end
 
     it "should not have the key globally" do
-      database.global[key].should be_nil
+      expect(database.global[key]).to be_nil
     end
 
     it "should not have the key in the env" do
-      database.env[key].should be_nil
+      expect(database.env[key]).to be_nil
     end
 
     it "should have the key locally" do
-      database.local[key].should == value
+      expect(database.local[key]).to eq value
     end
 
     it "should have the key generally" do
-      database[key].should == value
+      expect(database[key]).to eq value
     end
 
     it "should persist the key" do
       data = YAML.load_file(local)
 
-      data.should == {raw_key => value}
+      expect(data).to eq({raw_key => value})
     end
   end
 
@@ -225,23 +225,23 @@ describe Librarian::Config::Database do
     end
 
     it "should not have the key globally" do
-      database.global[key].should be_nil
+      expect(database.global[key]).to be_nil
     end
 
     it "should not have the key in the env" do
-      database.env[key].should be_nil
+      expect(database.env[key]).to be_nil
     end
 
     it "should not have the key locally" do
-      database.local[key].should be_nil
+      expect(database.local[key]).to be_nil
     end
 
     it "should not have the key generally" do
-      database[key].should be_nil
+      expect(database[key]).to be_nil
     end
 
     it "should unpersist the key" do
-      File.should_not exist local
+      expect(File).to_not exist local
     end
   end
 
@@ -272,7 +272,7 @@ describe Librarian::Config::Database do
   context "project_path" do
     context "by default" do
       it "should give the default project path" do
-        database.project_path.should == Pathname("/tmp")
+        expect(database.project_path).to eq Pathname("/tmp")
       end
     end
 
@@ -280,7 +280,7 @@ describe Librarian::Config::Database do
       let(:env) { {"LIBRARIAN_GEM_GEMFILE" => "/non/sense/path/to/Sillyfile"} }
 
       it "should give the project path from the env-set specfile" do
-        database.project_path.should == Pathname("/non/sense/path/to")
+        expect(database.project_path).to eq Pathname("/non/sense/path/to")
       end
     end
   end
@@ -288,7 +288,7 @@ describe Librarian::Config::Database do
   context "specfile_path" do
     context "by default" do
       it "should give the default specfile path" do
-        database.specfile_path.should == specfile
+        expect(database.specfile_path).to eq specfile
       end
     end
 
@@ -296,7 +296,7 @@ describe Librarian::Config::Database do
       let(:env) { {"LIBRARIAN_GEM_GEMFILE" => "/non/sense/path/to/Sillyfile"} }
 
       it "should give the given specfile path" do
-        database.specfile_path.should == Pathname("/non/sense/path/to/Sillyfile")
+        expect(database.specfile_path).to eq Pathname("/non/sense/path/to/Sillyfile")
       end
     end
 
@@ -304,7 +304,7 @@ describe Librarian::Config::Database do
       let(:project_path) { "/non/sense/path/to" }
 
       it "should give the assigned specfile path" do
-        database.specfile_path.should == Pathname("/non/sense/path/to/Gemfile")
+        expect(database.specfile_path).to eq Pathname("/non/sense/path/to/Gemfile")
       end
     end
 
@@ -312,7 +312,7 @@ describe Librarian::Config::Database do
       let(:specfile_name) { "Sillyfile" }
 
       it "should give the assigned specfile path" do
-        database.specfile_path.should == Pathname("/tmp/Sillyfile")
+        expect(database.specfile_path).to eq Pathname("/tmp/Sillyfile")
       end
     end
   end

data/spec/unit/dependency/requirement_spec.rb

@@ -0,0 +1,12 @@
+require "librarian/dependency"
+
+describe Librarian::Dependency::Requirement do
+
+  describe "#inspect" do
+    subject(:requirement) { described_class.new(">= 3.2.1") }
+
+    specify { expect(requirement.inspect).
+      to eq "#<Librarian::Dependency::Requirement >= 3.2.1>" }
+  end
+
+end

data/spec/unit/dsl_spec.rb

@@ -26,10 +26,10 @@ module Librarian
             dep 'dependency-1',
               :src => 'source-1'
           end
-          spec.dependencies.should_not be_empty
-          spec.dependencies.first.name.should == 'dependency-1'
-          spec.dependencies.first.source.name.should == 'source-1'
-          spec.sources.should be_empty
+          expect(spec.dependencies).to_not be_empty
+          expect(spec.dependencies.first.name).to eq 'dependency-1'
+          expect(spec.dependencies.first.source.name).to eq 'source-1'
+          expect(spec.sources).to be_empty
         end
 
         it "should run with a shortcut source" do
@@ -37,10 +37,10 @@ module Librarian
             dep 'dependency-1',
               :source => :a
           end
-          spec.dependencies.should_not be_empty
-          spec.dependencies.first.name.should == 'dependency-1'
-          spec.dependencies.first.source.name.should == 'source-a'
-          spec.sources.should be_empty
+          expect(spec.dependencies).to_not be_empty
+          expect(spec.dependencies.first.name).to eq 'dependency-1'
+          expect(spec.dependencies.first.source.name).to eq 'source-a'
+          expect(spec.sources).to be_empty
         end
 
         it "should run with a block hash source" do
@@ -49,10 +49,10 @@ module Librarian
               dep 'dependency-1'
             end
           end
-          spec.dependencies.should_not be_empty
-          spec.dependencies.first.name.should == 'dependency-1'
-          spec.dependencies.first.source.name.should == 'source-1'
-          spec.sources.should be_empty
+          expect(spec.dependencies).to_not be_empty
+          expect(spec.dependencies.first.name).to eq 'dependency-1'
+          expect(spec.dependencies.first.source.name).to eq 'source-1'
+          expect(spec.sources).to be_empty
         end
 
         it "should run with a block named source" do
@@ -61,10 +61,10 @@ module Librarian
               dep 'dependency-1'
             end
           end
-          spec.dependencies.should_not be_empty
-          spec.dependencies.first.name.should == 'dependency-1'
-          spec.dependencies.first.source.name.should == 'source-1'
-          spec.sources.should be_empty
+          expect(spec.dependencies).to_not be_empty
+          expect(spec.dependencies.first.name).to eq 'dependency-1'
+          expect(spec.dependencies.first.source.name).to eq 'source-1'
+          expect(spec.sources).to be_empty
         end
 
         it "should run with a default hash source" do
@@ -72,11 +72,11 @@ module Librarian
             source :src => 'source-1'
             dep 'dependency-1'
           end
-          spec.dependencies.should_not be_empty
-          spec.dependencies.first.name.should == 'dependency-1'
-          spec.dependencies.first.source.name.should == 'source-1'
-          spec.sources.should_not be_empty
-          spec.dependencies.first.source.should == spec.sources.first
+          expect(spec.dependencies).to_not be_empty
+          expect(spec.dependencies.first.name).to eq 'dependency-1'
+          expect(spec.dependencies.first.source.name).to eq 'source-1'
+          expect(spec.sources).to_not be_empty
+          expect(spec.dependencies.first.source).to eq spec.sources.first
         end
 
         it "should run with a default named source" do
@@ -84,11 +84,11 @@ module Librarian
             src 'source-1'
             dep 'dependency-1'
           end
-          spec.dependencies.should_not be_empty
-          spec.dependencies.first.name.should == 'dependency-1'
-          spec.dependencies.first.source.name.should == 'source-1'
-          spec.sources.should_not be_empty
-          spec.dependencies.first.source.should == spec.sources.first
+          expect(spec.dependencies).to_not be_empty
+          expect(spec.dependencies.first.name).to eq 'dependency-1'
+          expect(spec.dependencies.first.source.name).to eq 'source-1'
+          expect(spec.sources).to_not be_empty
+          expect(spec.dependencies.first.source).to eq spec.sources.first
         end
 
         it "should run with a default shortcut source" do
@@ -96,11 +96,11 @@ module Librarian
             source :a
             dep 'dependency-1'
           end
-          spec.dependencies.should_not be_empty
-          spec.dependencies.first.name.should == 'dependency-1'
-          spec.dependencies.first.source.name.should == 'source-a'
-          spec.sources.should_not be_empty
-          spec.dependencies.first.source.should == spec.sources.first
+          expect(spec.dependencies).to_not be_empty
+          expect(spec.dependencies.first.name).to eq 'dependency-1'
+          expect(spec.dependencies.first.source.name).to eq 'source-a'
+          expect(spec.sources).to_not be_empty
+          expect(spec.dependencies.first.source).to eq spec.sources.first
         end
 
         it "should run with a shortcut source hash definition" do
@@ -108,10 +108,10 @@ module Librarian
             source :b, :src => 'source-b'
             dep 'dependency-1', :source => :b
           end
-          spec.dependencies.should_not be_empty
-          spec.dependencies.first.name.should == 'dependency-1'
-          spec.dependencies.first.source.name.should == 'source-b'
-          spec.sources.should be_empty
+          expect(spec.dependencies).to_not be_empty
+          expect(spec.dependencies.first.name).to eq 'dependency-1'
+          expect(spec.dependencies.first.source.name).to eq 'source-b'
+          expect(spec.sources).to be_empty
         end
 
         it "should run with a shortcut source block definition" do
@@ -119,10 +119,10 @@ module Librarian
             source :b, proc { src 'source-b' }
             dep 'dependency-1', :source => :b
           end
-          spec.dependencies.should_not be_empty
-          spec.dependencies.first.name.should == 'dependency-1'
-          spec.dependencies.first.source.name.should == 'source-b'
-          spec.sources.should be_empty
+          expect(spec.dependencies).to_not be_empty
+          expect(spec.dependencies.first.name).to eq 'dependency-1'
+          expect(spec.dependencies.first.source.name).to eq 'source-b'
+          expect(spec.sources).to be_empty
         end
 
         it "should run with a default shortcut source hash definition" do
@@ -131,11 +131,11 @@ module Librarian
             source :b
             dep 'dependency-1'
           end
-          spec.dependencies.should_not be_empty
-          spec.dependencies.first.name.should == 'dependency-1'
-          spec.dependencies.first.source.name.should == 'source-b'
-          spec.sources.should_not be_empty
-          spec.sources.first.name.should == 'source-b'
+          expect(spec.dependencies).to_not be_empty
+          expect(spec.dependencies.first.name).to eq 'dependency-1'
+          expect(spec.dependencies.first.source.name).to eq 'source-b'
+          expect(spec.sources).to_not be_empty
+          expect(spec.sources.first.name).to eq 'source-b'
         end
 
         it "should run with a default shortcut source block definition" do
@@ -144,11 +144,11 @@ module Librarian
             source :b
             dep 'dependency-1'
           end
-          spec.dependencies.should_not be_empty
-          spec.dependencies.first.name.should == 'dependency-1'
-          spec.dependencies.first.source.name.should == 'source-b'
-          spec.sources.should_not be_empty
-          spec.sources.first.name.should == 'source-b'
+          expect(spec.dependencies).to_not be_empty
+          expect(spec.dependencies.first.name).to eq 'dependency-1'
+          expect(spec.dependencies.first.source.name).to eq 'source-b'
+          expect(spec.sources).to_not be_empty
+          expect(spec.sources.first.name).to eq 'source-b'
         end
 
       end