librarian 0.0.25 → 0.0.26

data/spec/support/cli_macro.rb

@@ -63,19 +63,11 @@ module CliMacro
   end
 
   def cli!(*args)
-    Dir.chdir(pwd) do
-      described_class.with_environment do |environment|
-        begin
-          @shell = FakeShell.new
-          @exit_status = nil
+    @shell = FakeShell.new
+    @exit_status = Dir.chdir(pwd) do
+      described_class.with_environment do
+        described_class.returning_status do
           described_class.start args, :shell => @shell
-          @exit_status = 0
-        rescue Librarian::Error => e
-          environment.ui.error e.message
-          environment.ui.debug e.backtrace.join("\n")
-          @exit_status = e.respond_to?(:status_code) ? e.status_code : 1
-        rescue Exception => e
-          @exit_status = 1
         end
       end
     end

data/spec/support/method_patch_macro.rb

@@ -0,0 +1,30 @@
+require "securerandom"
+
+module MethodPatchMacro
+
+  def self.included(base)
+    base.extend ClassMethods
+  end
+
+  module ClassMethods
+    def with_module_method(mod, meth, &block)
+      tag = SecureRandom.hex(8)
+      orig_meth = "_#{tag}_#{meth}".to_sym
+      around do |example|
+        mod.module_eval do
+          alias_method orig_meth, meth
+          define_method meth, &block
+        end
+        begin
+          example.run
+        ensure
+          mod.module_eval do
+            alias_method meth, orig_meth
+            remove_method orig_meth
+          end
+        end
+      end
+    end
+  end
+
+end

data/spec/unit/config/database_spec.rb

@@ -4,10 +4,18 @@ require "yaml"
 
 require "fakefs/spec_helpers"
 
+require "support/method_patch_macro"
+
 require "librarian/config/database"
 
 describe Librarian::Config::Database do
   include FakeFS::SpecHelpers
+  include MethodPatchMacro
+
+  # FakeFS seems to need this because Kernel#Pathname was changed in 1.9.3-p286.
+  # It used to indicate the Pathname class by name, but now it references the
+  # Pathname class directly by object. FakeFS relies on the old behavior.
+  with_module_method(Kernel, :Pathname){|s| Pathname.new(s)}
 
   def write_yaml!(path, *yamlables)
     path = Pathname(path)

data/spec/unit/dependency_spec.rb

@@ -33,4 +33,180 @@ describe Librarian::Dependency do
 
   end
 
+  describe "#consistent_with?" do
+    def req(s) described_class::Requirement.new(s) end
+    def self.assert_consistent(a, b)
+      /^(.+):(\d+):in `(.+)'$/ =~ caller.first
+      line = $2.to_i
+
+      title = "is consistent with #{a.inspect} and #{b.inspect}"
+      module_eval <<-CODE, __FILE__, line
+        it #{title.inspect} do
+          a, b = req(#{a.inspect}), req(#{b.inspect})
+          expect(a).to be_consistent_with(b)
+          expect(a).to_not be_inconsistent_with(b)
+          expect(b).to be_consistent_with(a)
+          expect(b).to_not be_inconsistent_with(a)
+        end
+      CODE
+    end
+    def self.refute_consistent(a, b)
+      /^(.+):(\d+):in `(.+)'$/ =~ caller.first
+      line = $2.to_i
+
+      title = "is inconsistent with #{a.inspect} and #{b.inspect}"
+      module_eval <<-CODE, __FILE__, line
+        it #{title.inspect} do
+          a, b = req(#{a.inspect}), req(#{b.inspect})
+          expect(a).to_not be_consistent_with(b)
+          expect(a).to be_inconsistent_with(b)
+          expect(b).to_not be_consistent_with(a)
+          expect(b).to be_inconsistent_with(a)
+        end
+      CODE
+    end
+
+    # = =
+    assert_consistent "3", "3"
+    refute_consistent "3", "4"
+    refute_consistent "3", "0"
+    refute_consistent "0", "3"
+
+    # = !=
+    assert_consistent "3", "!= 4"
+    assert_consistent "3", "!= 0"
+    refute_consistent "3", "!= 3"
+
+    # = >
+    assert_consistent "3", "> 2"
+    refute_consistent "3", "> 3"
+    refute_consistent "3", "> 4"
+
+    # = <
+    assert_consistent "3", "< 4"
+    refute_consistent "3", "< 3"
+    refute_consistent "3", "< 2"
+
+    # = >=
+    assert_consistent "3", ">= 2"
+    assert_consistent "3", ">= 3"
+    refute_consistent "3", ">= 4"
+
+    # = <=
+    assert_consistent "3", "<= 4"
+    assert_consistent "3", "<= 3"
+    refute_consistent "3", "<= 2"
+
+    # = ~>
+    assert_consistent "3.4.1", "~> 3.4.1"
+    assert_consistent "3.4.2", "~> 3.4.1"
+    refute_consistent "3.4",   "~> 3.4.1"
+    refute_consistent "3.5",   "~> 3.4.1"
+
+    # != !=
+    assert_consistent "!= 3", "!= 3"
+    assert_consistent "!= 3", "!= 4"
+
+    # != >
+    assert_consistent "!= 3", "> 2"
+    assert_consistent "!= 3", "> 3"
+    assert_consistent "!= 3", "> 4"
+
+    # != <
+    assert_consistent "!= 3", "< 2"
+    assert_consistent "!= 3", "< 3"
+    assert_consistent "!= 3", "< 4"
+
+    # != >=
+    assert_consistent "!= 3", ">= 2"
+    assert_consistent "!= 3", ">= 3"
+    assert_consistent "!= 3", ">= 4"
+
+    # != <=
+    assert_consistent "!= 3", "<= 2"
+    assert_consistent "!= 3", "<= 3"
+    assert_consistent "!= 3", "<= 4"
+
+    # != ~>
+    assert_consistent "!= 3.4.1", "~> 3.4.1"
+    assert_consistent "!= 3.4.2", "~> 3.4.1"
+    assert_consistent "!= 3.5",   "~> 3.4.1"
+
+    # > >
+    assert_consistent "> 3", "> 2"
+    assert_consistent "> 3", "> 3"
+    assert_consistent "> 3", "> 4"
+
+    # > <
+    assert_consistent "> 3", "< 4"
+    refute_consistent "> 3", "< 3"
+    refute_consistent "> 3", "< 2"
+
+    # > >=
+    assert_consistent "> 3", ">= 2"
+    assert_consistent "> 3", ">= 3"
+    assert_consistent "> 3", ">= 4"
+
+    # > <=
+    assert_consistent "> 3", "<= 4"
+    refute_consistent "> 3", "<= 3"
+    refute_consistent "> 3", "<= 2"
+
+    # > ~>
+    assert_consistent "> 3.3",   "~> 3.4.1"
+    assert_consistent "> 3.4.1", "~> 3.4.1"
+    assert_consistent "> 3.4.2", "~> 3.4.1"
+    refute_consistent "> 3.5",   "~> 3.4.1"
+
+    # < <
+    assert_consistent "< 3", "< 2"
+    assert_consistent "< 3", "< 3"
+    assert_consistent "< 3", "< 4"
+
+    # < >=
+    assert_consistent "< 3", ">= 2"
+    refute_consistent "< 3", ">= 3"
+    refute_consistent "< 3", ">= 4"
+
+    # < <=
+    assert_consistent "< 3", "<= 2"
+    assert_consistent "< 3", "<= 3"
+    assert_consistent "< 3", "<= 4"
+
+    # >= >=
+    assert_consistent ">= 3", ">= 2"
+    assert_consistent ">= 3", ">= 3"
+    assert_consistent ">= 3", ">= 4"
+
+    # >= <=
+    assert_consistent ">= 3", "<= 4"
+    assert_consistent ">= 3", "<= 3"
+    refute_consistent ">= 3", "<= 2"
+
+    # >= ~>
+    assert_consistent ">= 3.3",   "~> 3.4.1"
+    assert_consistent ">= 3.4.1", "~> 3.4.1"
+    assert_consistent ">= 3.4.2", "~> 3.4.1"
+    refute_consistent ">= 3.5",   "~> 3.4.1"
+
+    # <= <=
+    assert_consistent "<= 3", "<= 2"
+    assert_consistent "<= 3", "<= 3"
+    assert_consistent "<= 3", "<= 4"
+
+    # <= ~>
+    assert_consistent "<= 3.5",   "~> 3.4.1"
+    assert_consistent "<= 3.4.1", "~> 3.4.1"
+    assert_consistent "<= 3.4.2", "~> 3.4.1"
+    refute_consistent "<= 3.3",   "~> 3.4.1"
+
+    # ~> ~>
+    assert_consistent "~> 3.4.1", "~> 3.4.1"
+    assert_consistent "~> 3.4.2", "~> 3.4.1"
+    assert_consistent "~> 3.3",   "~> 3.4.1"
+    refute_consistent "~> 3.3.3", "~> 3.4.1"
+    refute_consistent "~> 3.5",   "~> 3.4.1"
+    refute_consistent "~> 3.5.4", "~> 3.4.1"
+  end
+
 end

data/spec/unit/environment_spec.rb

@@ -51,36 +51,39 @@ module Librarian
     end
 
     describe "#net_http_class" do
-
+      let(:proxied_host) { "www.example.com" }
       context "sanity" do
         with_env  "http_proxy" => nil
 
         it "should have the normal class" do
-          env.net_http_class.should be Net::HTTP
+          env.net_http_class(proxied_host).should be Net::HTTP
         end
 
         it "should not be marked as a proxy class" do
-          env.net_http_class.should_not be_proxy_class
+          env.net_http_class(proxied_host).should_not be_proxy_class
         end
       end
 
       context "with a complex proxy" do
         with_env  "http_proxy" => "admin:secret@example.com"
 
+        it "should not by marked as a proxy class for localhost" do
+          env.net_http_class('localhost').should_not be_proxy_class
+        end
         it "should not have the normal class" do
-          env.net_http_class.should_not be Net::HTTP
+          env.net_http_class(proxied_host).should_not be Net::HTTP
         end
 
         it "should have a subclass the normal class" do
-          env.net_http_class.should < Net::HTTP
+          env.net_http_class(proxied_host).should < Net::HTTP
         end
 
         it "should be marked as a proxy class" do
-          env.net_http_class.should be_proxy_class
+          env.net_http_class(proxied_host).should be_proxy_class
         end
 
         it "should have the expected proxy attributes" do
-          http = env.net_http_class.new("www.kernel.org")
+          http = env.net_http_class(proxied_host).new("www.kernel.org")
           expected_attributes = {
             "host" => env.http_proxy_uri.host,
             "port" => env.http_proxy_uri.port,
@@ -96,6 +99,72 @@ module Librarian
 
           actual_attributes.should == expected_attributes
         end
+
+      end
+
+      context "with an excluded host" do
+        with_env  "http_proxy" => "admin:secret@example.com",
+                  "no_proxy" => "no.proxy.com, noproxy.com"
+
+        context "with an exact match" do
+          let(:proxied_host) { "noproxy.com" }
+
+          it "should have the normal class" do
+            env.net_http_class(proxied_host).should be Net::HTTP
+          end
+
+          it "should not be marked as a proxy class" do
+            env.net_http_class(proxied_host).should_not be_proxy_class
+          end
+        end
+
+        context "with a subdomain match" do
+          let(:proxied_host) { "www.noproxy.com" }
+
+          it "should have the normal class" do
+            env.net_http_class(proxied_host).should be Net::HTTP
+          end
+
+          it "should not be marked as a proxy class" do
+            env.net_http_class(proxied_host).should_not be_proxy_class
+          end
+        end
+
+        context "with localhost" do
+          let(:proxied_host) { "localhost" }
+
+          it "should have the normal class" do
+            env.net_http_class(proxied_host).should be Net::HTTP
+          end
+
+          it "should not be marked as a proxy class" do
+            env.net_http_class(proxied_host).should_not be_proxy_class
+          end
+        end
+
+        context "with 127.0.0.1" do
+          let(:proxied_host) { "127.0.0.1" }
+
+          it "should have the normal class" do
+            env.net_http_class(proxied_host).should be Net::HTTP
+          end
+
+          it "should not be marked as a proxy class" do
+            env.net_http_class(proxied_host).should_not be_proxy_class
+          end
+        end
+
+        context "with a mismatch" do
+          let(:proxied_host) { "www.example.com" }
+
+          it "should have a subclass the normal class" do
+            env.net_http_class(proxied_host).should < Net::HTTP
+          end
+
+          it "should be marked as a proxy class" do
+            env.net_http_class(proxied_host).should be_proxy_class
+          end
+        end
       end
 
     end

data/spec/unit/resolver_spec.rb

@@ -123,7 +123,7 @@ module Librarian
 
       let(:resolution) { resolver.resolve(spec) }
 
-      specify { resolution.should_not be_correct }
+      specify { resolution.should be_nil }
 
     end
 
@@ -151,7 +151,7 @@ module Librarian
 
       let(:resolution) { resolver.resolve(spec) }
 
-      specify { resolution.should_not be_correct }
+      specify { resolution.should be_nil }
 
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
   prerelease: 
 platform: ruby
 authors:
@@ -9,136 +9,136 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-12 00:00:00.000000000 Z
+date: 2012-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: thor
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.15'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.15'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+  type: :runtime
+- !ruby/object:Gem::Dependency
   prerelease: false
+  name: rake
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
+- !ruby/object:Gem::Dependency
   prerelease: false
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
+- !ruby/object:Gem::Dependency
   prerelease: false
+  name: webmock
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
+- !ruby/object:Gem::Dependency
   prerelease: false
+  name: fakefs
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  type: :development
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: chef
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.10'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.10'
+    none: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: highline
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: archive-tar-minitar
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.2
+    none: false
+  type: :runtime
 description: Librarian
 email:
 - y_feldblum@yahoo.com
@@ -164,6 +164,7 @@ files:
 - lib/librarian/action/clean.rb
 - lib/librarian/action/ensure.rb
 - lib/librarian/action/install.rb
+- lib/librarian/action/persist_resolution_mixin.rb
 - lib/librarian/action/resolve.rb
 - lib/librarian/action/update.rb
 - lib/librarian/chef.rb
@@ -175,6 +176,7 @@ files:
 - lib/librarian/chef/manifest_reader.rb
 - lib/librarian/chef/source.rb
 - lib/librarian/chef/source/git.rb
+- lib/librarian/chef/source/github.rb
 - lib/librarian/chef/source/local.rb
 - lib/librarian/chef/source/path.rb
 - lib/librarian/chef/source/site.rb
@@ -193,6 +195,7 @@ files:
 - lib/librarian/environment.rb
 - lib/librarian/error.rb
 - lib/librarian/helpers.rb
+- lib/librarian/linter/source_linter.rb
 - lib/librarian/lockfile.rb
 - lib/librarian/lockfile/compiler.rb
 - lib/librarian/lockfile/parser.rb
@@ -211,6 +214,7 @@ files:
 - lib/librarian/resolver.rb
 - lib/librarian/resolver/implementation.rb
 - lib/librarian/source.rb
+- lib/librarian/source/basic_api.rb
 - lib/librarian/source/git.rb
 - lib/librarian/source/git/repository.rb
 - lib/librarian/source/local.rb
@@ -223,10 +227,12 @@ files:
 - lib/librarian/version.rb
 - librarian.gemspec
 - spec/functional/chef/cli_spec.rb
-- spec/functional/chef/source/git_spec.rb
 - spec/functional/chef/source/site_spec.rb
 - spec/functional/source/git/repository_spec.rb
+- spec/integration/chef/source/git_spec.rb
+- spec/integration/chef/source/site_spec.rb
 - spec/support/cli_macro.rb
+- spec/support/method_patch_macro.rb
 - spec/support/with_env_macro.rb
 - spec/unit/action/base_spec.rb
 - spec/unit/action/clean_spec.rb
@@ -251,20 +257,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: 3137632899221484598
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: -1210253581070009250
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: librarian
 rubygems_version: 1.8.24