librarian 0.0.24 → 0.0.25

data/lib/librarian/dependency.rb

@@ -1,7 +1,5 @@
 require 'rubygems'
 
-require 'librarian/helpers/debug'
-
 module Librarian
   class Dependency
 
@@ -42,8 +40,6 @@ module Librarian
       end
     end
 
-    include Helpers::Debug
-
     attr_accessor :name, :requirement, :source
     private :name=, :requirement=, :source=
 
@@ -83,12 +79,8 @@ module Librarian
 
   private
 
-    def environment
-      source.environment
-    end
-
     def assert_name_valid!(name)
-      raise ArgumentError, "name (#{name.inspect}) must be sensible" unless name =~ /^\S.*\S$/
+      raise ArgumentError, "name (#{name.inspect}) must be sensible" unless name =~ /\A\S(?:.*\S)?\z/
     end
 
   end

data/lib/librarian/dsl.rb

@@ -1,13 +1,10 @@
 require 'librarian/dependency'
 require 'librarian/dsl/receiver'
 require 'librarian/dsl/target'
-require 'librarian/helpers/debug'
 
 module Librarian
   class Dsl
 
-    include Helpers::Debug
-
     class Error < Exception
     end
 
@@ -101,5 +98,11 @@ module Librarian
       end
     end
 
+  private
+
+    def debug(*args, &block)
+      environment.logger.debug(*args, &block)
+    end
+
   end
 end

data/lib/librarian/dsl/receiver.rb

@@ -23,19 +23,17 @@ module Librarian
       end
 
       def run(specfile = nil)
-        if block_given?
-          instance_eval(&Proc.new)
+        specfile = Proc.new if block_given?
+
+        case specfile
+        when Specfile
+          eval(specfile.path.read, instance_binding, specfile.path.to_s, 1)
+        when String
+          eval(specfile, instance_binding)
+        when Proc
+          instance_eval(&specfile)
         else
-          case specfile
-          when Specfile
-            eval(specfile.path.read, instance_binding, specfile.path.to_s, 1)
-          when String
-            eval(specfile, instance_binding)
-          when Proc
-            instance_eval(&specfile)
-          else
-            raise ArgumentError, "specfile must be a #{Specfile}, #{String}, or #{Proc} if no block is given (it was #{specfile.inspect})"
-          end
+          raise ArgumentError, "specfile must be a #{Specfile}, #{String}, or #{Proc} if no block is given (it was #{specfile.inspect})"
         end
       end
 

data/lib/librarian/dsl/target.rb

@@ -1,13 +1,9 @@
-require 'librarian/helpers/debug'
-
 require 'librarian/spec'
 
 module Librarian
   class Dsl
     class Target
 
-      include Helpers::Debug
-
       class SourceShortcutDefinitionReceiver
         def initialize(target)
           singleton_class = class << self; self end
@@ -26,7 +22,7 @@ module Librarian
         end
       end
 
-      SCOPABLES = [:sources]
+      SCOPABLES = [:source, :sources]
 
       attr_accessor :dsl
       private :dsl=
@@ -55,15 +51,12 @@ module Librarian
       end
 
       def to_spec
-        Spec.new(@sources.first, @dependencies)
+        Spec.new(@sources, @dependencies)
       end
 
       def dependency(name, *args)
         options = args.last.is_a?(Hash) ? args.pop : {}
-        source = source_from_options(options) || @sources.last
-        unless source
-          raise Error, "#{dependency_name} #{name} is specified without a source!"
-        end
+        source = source_from_options(options) || @source
         dep = dependency_type.new(name, args, source)
         @dependencies << dep
       end
@@ -74,12 +67,14 @@ module Librarian
         elsif !(Hash === name) && !param && !options
           source = source_shortcuts[name]
           scope_or_directive(block) do
+            @source = source
             @sources = @sources.dup << source
           end
         else
           name, param, options = *normalize_source_options(name, param, options || {})
           source = source_from_params(name, param, options)
           scope_or_directive(block) do
+            @source = source
             @sources = @sources.dup << source
           end
         end

data/lib/librarian/environment.rb

@@ -1,11 +1,13 @@
 require "pathname"
+require 'net/http'
+require "uri"
 
-require "librarian/helpers/debug"
 require "librarian/support/abstract_method"
 
 require "librarian/error"
 require "librarian/config"
 require "librarian/lockfile"
+require "librarian/logger"
 require "librarian/specfile"
 require "librarian/resolver"
 require "librarian/dsl"
@@ -15,7 +17,6 @@ module Librarian
   class Environment
 
     include Support::AbstractMethod
-    include Helpers::Debug
 
     attr_accessor :ui
 
@@ -29,6 +30,10 @@ module Librarian
       @specfile_name = options[:specfile_name]
     end
 
+    def logger
+      @logger ||= Logger.new(self)
+    end
+
     def config_db
       @config_db ||= begin
         Config::Database.new(adapter_name,
@@ -116,11 +121,45 @@ module Librarian
       self.class.name.split("::")[0 ... -1].inject(Object, &:const_get)::Dsl
     end
 
+    def version
+      VERSION
+    end
+
     def config_keys
       %[
       ]
     end
 
+    # The HTTP proxy specified in the environment variables:
+    # * HTTP_PROXY
+    # * HTTP_PROXY_USER
+    # * HTTP_PROXY_PASS
+    # Adapted from:
+    #   https://github.com/rubygems/rubygems/blob/v1.8.24/lib/rubygems/remote_fetcher.rb#L276-293
+    def http_proxy_uri
+      @http_proxy_uri ||= begin
+        keys = %w( HTTP_PROXY HTTP_PROXY_USER HTTP_PROXY_PASS )
+        env = Hash[ENV.
+          map{|k, v| [k.upcase, v]}.
+          select{|k, v| keys.include?(k)}.
+          reject{|k, v| v.nil? || v.empty?}]
+
+        uri = env["HTTP_PROXY"] or return
+        uri = "http://#{uri}" unless uri =~ /^(https?|ftp|file):/
+        uri = URI.parse(uri)
+        uri.user ||= env["HTTP_PROXY_USER"]
+        uri.password ||= env["HTTP_PROXY_PASS"]
+        uri
+      end
+    end
+
+    def net_http_class
+      @net_http_class ||= begin
+        p = http_proxy_uri
+        p ? Net::HTTP::Proxy(p.host, p.port, p.user, p.password) : Net::HTTP
+      end
+    end
+
   private
 
     def environment

data/lib/librarian/lockfile.rb

@@ -1,13 +1,9 @@
-require 'librarian/helpers/debug'
-
 require 'librarian/lockfile/compiler'
 require 'librarian/lockfile/parser'
 
 module Librarian
   class Lockfile
 
-    include Helpers::Debug
-
     attr_accessor :environment
     private :environment=
     attr_reader :path

data/lib/librarian/lockfile/compiler.rb

@@ -1,11 +1,7 @@
-require 'librarian/helpers/debug'
-
 module Librarian
   class Lockfile
     class Compiler
 
-      include Helpers::Debug
-
       attr_accessor :environment
       private :environment=
 

data/lib/librarian/lockfile/parser.rb

@@ -1,5 +1,3 @@
-require 'librarian/helpers/debug'
-
 require 'librarian/manifest'
 require 'librarian/dependency'
 require 'librarian/manifest_set'
@@ -15,8 +13,6 @@ module Librarian
         end
       end
 
-      include Helpers::Debug
-
       attr_accessor :environment
       private :environment=
 

data/lib/librarian/logger.rb

@@ -0,0 +1,46 @@
+module Librarian
+  class Logger
+
+    librarian_path = Pathname(__FILE__)
+    librarian_path = librarian_path.dirname until librarian_path.join("lib").directory?
+    LIBRARIAN_PATH = librarian_path
+
+    attr_accessor :environment
+    private :environment=
+
+    def initialize(environment)
+      self.environment = environment
+    end
+
+    def info(string = nil, &block)
+      return unless ui
+
+      ui.info(string || yield)
+    end
+
+    def debug(string = nil, &block)
+      return unless ui
+
+      if ui.respond_to?(:debug_line_numbers) && ui.debug_line_numbers
+        loc = caller.find{|l| !(l =~ /in `debug'$/)}
+        if loc =~ /^(.+):(\d+):in `(.+)'$/
+          loc = "#{Pathname.new($1).relative_path_from(LIBRARIAN_PATH)}:#{$2}:in `#{$3}'"
+        end
+        ui.debug { "[Librarian] #{string || yield} [#{loc}]" }
+      else
+        ui.debug { "[Librarian] #{string || yield}" }
+      end
+    end
+
+    def relative_path_to(path)
+      environment.project_relative_path_to(path)
+    end
+
+    private
+
+    def ui
+      environment.ui
+    end
+
+  end
+end

data/lib/librarian/manifest.rb

@@ -1,8 +1,5 @@
 require 'rubygems'
 
-require 'librarian/helpers/debug'
-require 'librarian/support/abstract_method'
-
 module Librarian
   class Manifest
 
@@ -39,14 +36,9 @@ module Librarian
       attr_accessor :backing
     end
 
-    include Support::AbstractMethod
-    include Helpers::Debug
-
     attr_accessor :source, :name, :extra
     private :source=, :name=, :extra=
 
-    abstract_method :fetch_version!, :fetch_dependencies!
-
     def initialize(source, name, extra = nil)
       assert_name_valid! name
 
@@ -133,7 +125,7 @@ module Librarian
     end
 
     def assert_name_valid!(name)
-      raise ArgumentError, "name (#{name.inspect}) must be sensible" unless name =~ /^\S.*\S$/
+      raise ArgumentError, "name (#{name.inspect}) must be sensible" unless name =~ /\A\S(?:.*\S)?\z/
     end
 
   end

data/lib/librarian/resolution.rb

@@ -11,11 +11,13 @@ module Librarian
   # the serialization-deserialization process is just the identity function.
   #
   class Resolution
-    attr_reader :dependencies, :manifests, :manifests_index
+    attr_accessor :dependencies, :manifests, :manifests_index
+    private :dependencies=, :manifests=, :manifests_index=
 
     def initialize(dependencies, manifests)
-      @dependencies, @manifests = dependencies, manifests
-      @manifests_index = build_manifests_index(manifests)
+      self.dependencies = dependencies
+      self.manifests = manifests
+      self.manifests_index = build_manifests_index(manifests)
     end
 
     def correct?

data/lib/librarian/resolver.rb

@@ -4,7 +4,6 @@ require 'librarian/resolution'
 
 module Librarian
   class Resolver
-    include Helpers::Debug
 
     attr_accessor :environment
     private :environment=
@@ -69,5 +68,11 @@ module Librarian
       ManifestSet.sort(manifests)
     end
 
+  private
+
+    def debug(*args, &block)
+      environment.logger.debug(*args, &block)
+    end
+
   end
 end

data/lib/librarian/resolver/implementation.rb

@@ -1,18 +1,24 @@
-require 'librarian/helpers/debug'
-
 require 'librarian/dependency'
 
 module Librarian
   class Resolver
     class Implementation
 
-      include Helpers::Debug
+      class MultiSource
+        attr_accessor :sources
+        def initialize(sources)
+          self.sources = sources
+        end
+        def manifests(name)
+          sources.reverse.map{|source| source.manifests(name)}.flatten(1)
+        end
+      end
 
-      attr_reader :resolver, :source, :dependency_source_map
+      attr_reader :resolver, :spec, :dependency_source_map
 
       def initialize(resolver, spec)
         @resolver = resolver
-        @source = spec.source
+        @spec = spec
         @dependency_source_map = Hash[spec.dependencies.map{|d| [d.name, d.source]}]
         @level = 0
       end
@@ -25,11 +31,15 @@ module Librarian
         resolution ? resolution[1] : nil
       end
 
+      def default_source
+        MultiSource.new(spec.sources)
+      end
+
       def sourced_dependency_for(dependency)
         return dependency if dependency.source
 
-        s = dependency_source_map[dependency.name] || source
-        Dependency.new(dependency.name, dependency.requirement, s)
+        source = dependency_source_map[dependency.name] || default_source
+        Dependency.new(dependency.name, dependency.requirement, source)
       end
 
       def recursive_resolve(dependencies, manifests, queue)
@@ -110,7 +120,7 @@ module Librarian
       end
 
       def debug
-        super { '  ' * @level + yield }
+        environment.logger.debug { '  ' * @level + yield }
       end
 
       def environment

data/lib/librarian/source/git.rb

@@ -52,6 +52,8 @@ module Librarian
 
         @repository = nil
         @repository_cache_path = nil
+
+        ref.kind_of?(String) or raise TypeError, "ref must be a String"
       end
 
       def to_s