librarian 0.0.24 → 0.0.25

data/spec/support/with_env_macro.rb

@@ -0,0 +1,20 @@
+module WithEnvMacro
+
+  module ClassMethods
+
+    def with_env(new)
+      old = Hash[new.map{|k, v| [k, ENV[k]]}]
+
+      before { ENV.update(new) }
+      after  { ENV.update(old) }
+    end
+
+  end
+
+  private
+
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
+
+end

data/spec/unit/config/database_spec.rb

@@ -10,8 +10,8 @@ describe Librarian::Config::Database do
   include FakeFS::SpecHelpers
 
   def write_yaml!(path, *yamlables)
-    dir = File.dirname(path)
-    FileUtils.mkpath(dir) unless File.directory?(dir)
+    path = Pathname(path)
+    path.dirname.mkpath unless path.dirname.directory?
     File.open(path, "wb"){|f| yamlables.each{|y| YAML.dump(y, f)}}
   end
 

data/spec/unit/dependency_spec.rb

@@ -25,6 +25,12 @@ describe Librarian::Dependency do
       end
     end
 
+    context "when the name is a single character" do
+      it "passes" do
+        described_class.new("R", [], nil)
+      end
+    end
+
   end
 
 end

data/spec/unit/dsl_spec.rb

@@ -19,27 +19,6 @@ module Librarian
         end
       end
 
-      context "a single dependency but no applicable source" do
-
-        it "should not run without any sources" do
-          expect do
-            env.dsl do
-              dep 'dependency-1'
-            end
-          end.to raise_error(Dsl::Error)
-        end
-
-        it "should not run when a block source is defined but the dependency is outside the block" do
-          expect do
-            env.dsl do
-              src 'source-1' do end
-              dep 'dependency-1'
-            end
-          end.to raise_error(Dsl::Error)
-        end
-
-      end
-
       context "a simple specfile - a single source, a single dependency, no transitive dependencies" do
 
         it "should run with a hash source" do
@@ -50,7 +29,7 @@ module Librarian
           spec.dependencies.should_not be_empty
           spec.dependencies.first.name.should == 'dependency-1'
           spec.dependencies.first.source.name.should == 'source-1'
-          spec.source.should be_nil
+          spec.sources.should be_empty
         end
 
         it "should run with a shortcut source" do
@@ -61,7 +40,7 @@ module Librarian
           spec.dependencies.should_not be_empty
           spec.dependencies.first.name.should == 'dependency-1'
           spec.dependencies.first.source.name.should == 'source-a'
-          spec.source.should be_nil
+          spec.sources.should be_empty
         end
 
         it "should run with a block hash source" do
@@ -73,7 +52,7 @@ module Librarian
           spec.dependencies.should_not be_empty
           spec.dependencies.first.name.should == 'dependency-1'
           spec.dependencies.first.source.name.should == 'source-1'
-          spec.source.should be_nil
+          spec.sources.should be_empty
         end
 
         it "should run with a block named source" do
@@ -85,7 +64,7 @@ module Librarian
           spec.dependencies.should_not be_empty
           spec.dependencies.first.name.should == 'dependency-1'
           spec.dependencies.first.source.name.should == 'source-1'
-          spec.source.should be_nil
+          spec.sources.should be_empty
         end
 
         it "should run with a default hash source" do
@@ -96,8 +75,8 @@ module Librarian
           spec.dependencies.should_not be_empty
           spec.dependencies.first.name.should == 'dependency-1'
           spec.dependencies.first.source.name.should == 'source-1'
-          spec.source.should_not be_nil
-          spec.dependencies.first.source.should == spec.source
+          spec.sources.should_not be_empty
+          spec.dependencies.first.source.should == spec.sources.first
         end
 
         it "should run with a default named source" do
@@ -108,8 +87,8 @@ module Librarian
           spec.dependencies.should_not be_empty
           spec.dependencies.first.name.should == 'dependency-1'
           spec.dependencies.first.source.name.should == 'source-1'
-          spec.source.should_not be_nil
-          spec.dependencies.first.source.should == spec.source
+          spec.sources.should_not be_empty
+          spec.dependencies.first.source.should == spec.sources.first
         end
 
         it "should run with a default shortcut source" do
@@ -120,8 +99,8 @@ module Librarian
           spec.dependencies.should_not be_empty
           spec.dependencies.first.name.should == 'dependency-1'
           spec.dependencies.first.source.name.should == 'source-a'
-          spec.source.should_not be_nil
-          spec.dependencies.first.source.should == spec.source
+          spec.sources.should_not be_empty
+          spec.dependencies.first.source.should == spec.sources.first
         end
 
         it "should run with a shortcut source hash definition" do
@@ -132,7 +111,7 @@ module Librarian
           spec.dependencies.should_not be_empty
           spec.dependencies.first.name.should == 'dependency-1'
           spec.dependencies.first.source.name.should == 'source-b'
-          spec.source.should be_nil
+          spec.sources.should be_empty
         end
 
         it "should run with a shortcut source block definition" do
@@ -143,7 +122,7 @@ module Librarian
           spec.dependencies.should_not be_empty
           spec.dependencies.first.name.should == 'dependency-1'
           spec.dependencies.first.source.name.should == 'source-b'
-          spec.source.should be_nil
+          spec.sources.should be_empty
         end
 
         it "should run with a default shortcut source hash definition" do
@@ -155,8 +134,8 @@ module Librarian
           spec.dependencies.should_not be_empty
           spec.dependencies.first.name.should == 'dependency-1'
           spec.dependencies.first.source.name.should == 'source-b'
-          spec.source.should_not be_nil
-          spec.source.name.should == 'source-b'
+          spec.sources.should_not be_empty
+          spec.sources.first.name.should == 'source-b'
         end
 
         it "should run with a default shortcut source block definition" do
@@ -168,8 +147,8 @@ module Librarian
           spec.dependencies.should_not be_empty
           spec.dependencies.first.name.should == 'dependency-1'
           spec.dependencies.first.source.name.should == 'source-b'
-          spec.source.should_not be_nil
-          spec.source.name.should == 'source-b'
+          spec.sources.should_not be_empty
+          spec.sources.first.name.should == 'source-b'
         end
 
       end

data/spec/unit/environment_spec.rb

@@ -1,9 +1,104 @@
 require "librarian/environment"
 
+require "support/with_env_macro"
+
 module Librarian
   describe Environment do
+    include WithEnvMacro
 
     let(:env) { described_class.new }
 
+    describe "#http_proxy_uri" do
+
+      context "sanity" do
+        with_env  "http_proxy" => nil
+
+        it "should have a nil http proxy uri" do
+          env.http_proxy_uri.should be_nil
+        end
+      end
+
+      context "with a complex proxy" do
+        with_env  "http_proxy" => "admin:secret@example.com"
+
+        it "should have the expcted http proxy uri" do
+          env.http_proxy_uri.should == URI("http://admin:secret@example.com")
+        end
+
+        it "should have the expected host" do
+          env.http_proxy_uri.host.should == "example.com"
+        end
+
+        it "should have the expected user" do
+          env.http_proxy_uri.user.should == "admin"
+        end
+
+        it "should have the expected password" do
+          env.http_proxy_uri.password.should == "secret"
+        end
+      end
+
+      context "with a split proxy" do
+        with_env  "http_proxy" => "example.com",
+                  "http_proxy_user" => "admin",
+                  "http_proxy_pass" => "secret"
+
+        it "should have the expcted http proxy uri" do
+          env.http_proxy_uri.should == URI("http://admin:secret@example.com")
+        end
+      end
+
+    end
+
+    describe "#net_http_class" do
+
+      context "sanity" do
+        with_env  "http_proxy" => nil
+
+        it "should have the normal class" do
+          env.net_http_class.should be Net::HTTP
+        end
+
+        it "should not be marked as a proxy class" do
+          env.net_http_class.should_not be_proxy_class
+        end
+      end
+
+      context "with a complex proxy" do
+        with_env  "http_proxy" => "admin:secret@example.com"
+
+        it "should not have the normal class" do
+          env.net_http_class.should_not be Net::HTTP
+        end
+
+        it "should have a subclass the normal class" do
+          env.net_http_class.should < Net::HTTP
+        end
+
+        it "should be marked as a proxy class" do
+          env.net_http_class.should be_proxy_class
+        end
+
+        it "should have the expected proxy attributes" do
+          http = env.net_http_class.new("www.kernel.org")
+          expected_attributes = {
+            "host" => env.http_proxy_uri.host,
+            "port" => env.http_proxy_uri.port,
+            "user" => env.http_proxy_uri.user,
+            "pass" => env.http_proxy_uri.password
+          }
+          actual_attributes = {
+            "host" => http.proxy_address,
+            "port" => http.proxy_port,
+            "user" => http.proxy_user,
+            "pass" => http.proxy_pass,
+          }
+
+          actual_attributes.should == expected_attributes
+        end
+      end
+
+    end
+
   end
 end

data/spec/unit/manifest_spec.rb

@@ -25,6 +25,12 @@ describe Librarian::Manifest do
       end
     end
 
+    context "when the name is a single character" do
+      it "passes" do
+        described_class.new(nil, "R")
+      end
+    end
+
   end
 
 end

data/spec/unit/resolver_spec.rb

@@ -61,6 +61,47 @@ module Librarian
 
     end
 
+    context "a specfile with a dep in multiple sources" do
+
+      before do
+        env.registry :clear => true do
+          source 'source-1' do
+            spec 'butter', '1.0'
+            spec 'butter', '1.1'
+          end
+          source 'source-2' do
+            spec 'butter', '1.0'
+            spec 'butter', '1.1'
+          end
+          source 'source-3' do
+            spec 'butter', '1.0'
+          end
+        end
+      end
+
+      let(:spec) do
+        env.dsl do
+          src 'source-1'
+          src 'source-2'
+          dep 'butter', '>= 1.1'
+        end
+      end
+
+      it "should have the expected number of sources" do
+        spec.should have(2).sources
+      end
+
+      let(:resolution) { resolver.resolve(spec) }
+
+      specify { resolution.should 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"
+      end
+
+    end
+
     context "a specfile with a dep depending on a nonexistent dep" do
 
       before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-23 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -59,38 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  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
@@ -190,12 +158,6 @@ files:
 - Rakefile
 - bin/librarian-chef
 - bin/librarian-mock
-- 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
 - lib/librarian/action.rb
 - lib/librarian/action/base.rb
@@ -231,10 +193,10 @@ files:
 - lib/librarian/environment.rb
 - lib/librarian/error.rb
 - lib/librarian/helpers.rb
-- lib/librarian/helpers/debug.rb
 - lib/librarian/lockfile.rb
 - lib/librarian/lockfile/compiler.rb
 - lib/librarian/lockfile/parser.rb
+- lib/librarian/logger.rb
 - lib/librarian/manifest.rb
 - lib/librarian/manifest_set.rb
 - lib/librarian/mock.rb
@@ -260,9 +222,12 @@ files:
 - lib/librarian/ui.rb
 - 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/support/cli_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
@@ -293,7 +258,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1740169763066753251
+      hash: 3137632899221484598
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: