librarian 0.0.20 → 0.0.21

data/spec/unit/manifest_set_spec.rb

@@ -0,0 +1,202 @@
+require 'librarian'
+
+module Librarian
+  describe ManifestSet do
+
+    describe ".new" do
+      let(:jelly) { double(:name => "jelly") }
+      let(:butter) { double(:name => "butter") }
+      let(:jam) { double(:name => "jam") }
+
+      let(:array) { [jelly, butter, jam] }
+      let(:hash) { {"jelly" => jelly, "butter" => butter, "jam" => jam} }
+
+      context "with an array" do
+        let(:set) { described_class.new(array) }
+
+        it "should give back the array" do
+          set.to_a.should =~ array
+        end
+
+        it "should give back the hash" do
+          set.to_hash.should == hash
+        end
+      end
+
+      context "with a hash" do
+        let(:set) { described_class.new(hash) }
+
+        it "should give back the array" do
+          set.to_a.should =~ array
+        end
+
+        it "should give back the hash" do
+          set.to_hash.should == hash
+        end
+      end
+    end
+
+    # Does not trace dependencies.
+    # That's why it's "shallow".
+    describe "#shallow_strip!" do
+      let(:jelly) { double(:name => "jelly") }
+      let(:butter) { double(:name => "butter") }
+      let(:jam) { double(:name => "jam") }
+
+      let(:set) { described_class.new([jelly, butter, jam]) }
+
+      it "should not do anything when given no names" do
+        set.shallow_strip!([])
+
+        set.to_a.should =~ [jelly, butter, jam]
+      end
+
+      it "should remove only the named elements" do
+        set.shallow_strip!(["butter", "jam"])
+
+        set.to_a.should =~ [jelly]
+      end
+
+      it "should allow removing all the elements" do
+        set.shallow_strip!(["jelly", "butter", "jam"])
+
+        set.to_a.should =~ []
+      end
+    end
+
+    # Does not trace dependencies.
+    # That's why it's "shallow".
+    describe "#shallow_keep!" do
+      let(:jelly) { double(:name => "jelly") }
+      let(:butter) { double(:name => "butter") }
+      let(:jam) { double(:name => "jam") }
+
+      let(:set) { described_class.new([jelly, butter, jam]) }
+
+      it "should empty the set when given no names" do
+        set.shallow_keep!([])
+
+        set.to_a.should =~ []
+      end
+
+      it "should keep only the named elements" do
+        set.shallow_keep!(["butter", "jam"])
+
+        set.to_a.should =~ [butter, jam]
+      end
+
+      it "should allow keeping all the elements" do
+        set.shallow_keep!(["jelly", "butter", "jam"])
+
+        set.to_a.should =~ [jelly, butter, jam]
+      end
+    end
+
+    describe "#deep_strip!" do
+      def man(o)
+        k, v = o.keys.first, o.values.first
+        double(k, :name => k, :dependencies => deps(v))
+      end
+
+      def deps(names)
+        names.map{|n| double(:name => n)}
+      end
+
+      let(:a) { man("a" => %w[b c]) }
+      let(:b) { man("b" => %w[c d]) }
+      let(:c) { man("c" => %w[   ]) }
+      let(:d) { man("d" => %w[   ]) }
+
+      let(:e) { man("e" => %w[f g]) }
+      let(:f) { man("f" => %w[g h]) }
+      let(:g) { man("g" => %w[   ]) }
+      let(:h) { man("h" => %w[   ]) }
+
+      let(:set) { described_class.new([a, b, c, d, e, f, g, h]) }
+
+      it "should not do anything when given no names" do
+        set.deep_strip!([])
+
+        set.to_a.should =~ [a, b, c, d, e, f, g, h]
+      end
+
+      it "should remove just the named elements if they have no dependencies" do
+        set.deep_strip!(["c", "h"])
+
+        set.to_a.should =~ [a, b, d, e, f, g]
+      end
+
+      it "should remove the named elements and all their dependencies" do
+        set.deep_strip!(["b"])
+
+        set.to_a.should =~ [a, e, f, g, h]
+      end
+
+      it "should remove an entire tree of dependencies" do
+        set.deep_strip!(["e"])
+
+        set.to_a.should =~ [a, b, c, d]
+      end
+
+      it "should allow removing all the elements" do
+        set.deep_strip!(["a", "e"])
+
+        set.to_a.should =~ []
+      end
+    end
+
+    describe "#deep_keep!" do
+      def man(o)
+        k, v = o.keys.first, o.values.first
+        double(k, :name => k, :dependencies => deps(v))
+      end
+
+      def deps(names)
+        names.map{|n| double(:name => n)}
+      end
+
+      let(:a) { man("a" => %w[b c]) }
+      let(:b) { man("b" => %w[c d]) }
+      let(:c) { man("c" => %w[   ]) }
+      let(:d) { man("d" => %w[   ]) }
+
+      let(:e) { man("e" => %w[f g]) }
+      let(:f) { man("f" => %w[g h]) }
+      let(:g) { man("g" => %w[   ]) }
+      let(:h) { man("h" => %w[   ]) }
+
+      let(:set) { described_class.new([a, b, c, d, e, f, g, h]) }
+
+      it "should remove all the elements when given no names" do
+        set.deep_keep!([])
+
+        set.to_a.should =~ []
+      end
+
+      it "should keep just the named elements if they have no dependencies" do
+        set.deep_keep!(["c", "h"])
+
+        set.to_a.should =~ [c, h]
+      end
+
+      it "should keep the named elements and all their dependencies" do
+        set.deep_keep!(["b"])
+
+        set.to_a.should =~ [b, c, d]
+      end
+
+      it "should keep an entire tree of dependencies" do
+        set.deep_keep!(["e"])
+
+        set.to_a.should =~ [e, f, g, h]
+      end
+
+      it "should allow keeping all the elements" do
+        set.deep_keep!(["a", "e"])
+
+        set.to_a.should =~ [a, b, c, d, e, f, g, h]
+      end
+    end
+
+  end
+end

data/spec/unit/resolver_spec.rb

@@ -10,25 +10,30 @@ module Librarian
 
     context "a simple specfile" do
 
-      it "should work" do
+      before do
         env.registry :clear => true do
           source 'source-1' do
             spec 'butter', '1.1'
           end
         end
-        spec = env.dsl do
+      end
+
+      let(:spec) do
+        env.dsl do
           src 'source-1'
           dep 'butter'
         end
-        resolution = resolver.resolve(spec)
-        resolution.should be_correct
       end
 
+      let(:resolution) { resolver.resolve(spec) }
+
+      specify { resolution.should be_correct }
+
     end
 
     context "a specfile with a dep from one src depending on a dep from another src" do
 
-      it "should work" do
+      before do
         env.registry :clear => true do
           source 'source-1' do
             spec 'butter', '1.1'
@@ -39,21 +44,26 @@ module Librarian
             end
           end
         end
-        spec = env.dsl do
+      end
+
+      let(:spec) do
+        env.dsl do
           src 'source-1'
           src 'source-2' do
             dep 'jam'
           end
         end
-        resolution = resolver.resolve(spec)
-        resolution.should be_correct
       end
 
+      let(:resolution) { resolver.resolve(spec) }
+
+      specify { resolution.should be_correct }
+
     end
 
     context "a specfile with a dep depending on a nonexistent dep" do
 
-      it "should not work" do
+      before do
         env.registry :clear => true do
           source 'source-1' do
             spec 'jam', '1.2' do
@@ -61,19 +71,24 @@ module Librarian
             end
           end
         end
-        spec = env.dsl do
+      end
+
+      let(:spec) do
+        env.dsl do
           src 'source-1'
           dep 'jam'
         end
-        resolution = resolver.resolve(spec)
-        resolution.should_not be_correct
       end
 
+      let(:resolution) { resolver.resolve(spec) }
+
+      specify { resolution.should_not be_correct }
+
     end
 
     context "a specfile with conflicting constraints" do
 
-      it "should not work" do
+      before do
         env.registry :clear => true do
           source 'source-1' do
             spec 'butter', '1.0'
@@ -83,15 +98,20 @@ module Librarian
             end
           end
         end
-        spec = env.dsl do
+      end
+
+      let(:spec) do
+        env.dsl do
           src 'source-1'
           dep 'butter', '1.0'
           dep 'jam'
         end
-        resolution = resolver.resolve(spec)
-        resolution.should_not be_correct
       end
 
+      let(:resolution) { resolver.resolve(spec) }
+
+      specify { resolution.should_not be_correct }
+
     end
 
     context "updating" do

data/spec/unit/source/git_spec.rb

@@ -0,0 +1,29 @@
+require "librarian"
+
+module Librarian
+  module Source
+    describe Git do
+
+      let(:env) { Environment.new }
+
+      describe "validating options for the specfile" do
+
+        context "with only known options" do
+          it "should not raise" do
+            expect { described_class.from_spec_args(env, "some://git/repo.git", :ref => "megapatches") }.
+              to_not raise_error
+          end
+        end
+
+        context "with an unknown option" do
+          it "should raise" do
+            expect { described_class.from_spec_args(env, "some://git/repo.git", :branch => "megapatches") }.
+              to raise_error Error, "unrecognized options: branch"
+          end
+        end
+
+      end
+
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &9877880 !ruby/object:Gem::Requirement
+  requirement: &19516800 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.15'
   type: :runtime
   prerelease: false
-  version_requirements: *9877880
+  version_requirements: *19516800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &9877220 !ruby/object:Gem::Requirement
+  requirement: &19496240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9877220
+  version_requirements: *19496240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &9876800 !ruby/object:Gem::Requirement
+  requirement: &19493040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9876800
+  version_requirements: *19493040
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &9876380 !ruby/object:Gem::Requirement
+  requirement: &19491840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9876380
+  version_requirements: *19491840
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &9875940 !ruby/object:Gem::Requirement
+  requirement: &19490840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9875940
+  version_requirements: *19490840
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &9875500 !ruby/object:Gem::Requirement
+  requirement: &19489740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9875500
+  version_requirements: *19489740
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &9874980 !ruby/object:Gem::Requirement
+  requirement: &19487700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0.10'
   type: :runtime
   prerelease: false
-  version_requirements: *9874980
+  version_requirements: *19487700
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &9874560 !ruby/object:Gem::Requirement
+  requirement: &19485200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9874560
+  version_requirements: *19485200
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &9874020 !ruby/object:Gem::Requirement
+  requirement: &19482760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *9874020
+  version_requirements: *19482760
 description: Librarian
 email:
 - y_feldblum@yahoo.com
@@ -132,6 +132,7 @@ files:
 - 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
@@ -148,16 +149,15 @@ files:
 - lib/librarian/chef/environment.rb
 - lib/librarian/chef/extension.rb
 - lib/librarian/chef/integration/knife.rb
-- lib/librarian/chef/manifest.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/local/manifest.rb
 - lib/librarian/chef/source/path.rb
 - lib/librarian/chef/source/site.rb
-- lib/librarian/chef/source/site/manifest.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
@@ -204,9 +204,11 @@ files:
 - spec/unit/dsl_spec.rb
 - spec/unit/environment_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/resolver_spec.rb
+- spec/unit/source/git_spec.rb
 - spec/unit/spec_change_set_spec.rb
 homepage: ''
 licenses: []
@@ -233,3 +235,4 @@ signing_key:
 specification_version: 3
 summary: Librarian
 test_files: []
+has_rdoc: