librarian-puppet 0.9.1 → 0.9.2.pre

data/vendor/librarian/lib/librarian/config/file_source.rb

@@ -0,0 +1,47 @@
+require "yaml"
+
+require "librarian/config/source"
+
+module Librarian
+  module Config
+    class FileSource < Source
+
+      attr_accessor :config_path
+      private :config_path=
+
+      def initialize(adapter_name, options = { })
+        super
+
+        self.config_path = options.delete(:config_path) or raise ArgumentError, "must provide config_path"
+      end
+
+      def to_s
+        config_path
+      end
+
+    private
+
+      def load
+        return { } unless File.file?(config_path)
+
+        raw = YAML.load_file(config_path)
+        return { } unless Hash === raw
+
+        translate_raw_to_config(raw)
+      end
+
+      def save(config)
+        raw = translate_config_to_raw(config)
+
+        if config.empty?
+          File.delete(config_path) if File.file?(config_path)
+        else
+          config_dir = File.dirname(config_path)
+          FileUtils.mkpath(config_dir) unless File.directory?(config_dir)
+          File.open(config_path, "wb"){|f| YAML.dump(raw, f)}
+        end
+      end
+
+    end
+  end
+end

data/vendor/librarian/lib/librarian/config/hash_source.rb

@@ -0,0 +1,33 @@
+require "librarian/source"
+
+module Librarian
+  module Config
+    class HashSource < Source
+
+      attr_accessor :name, :raw
+      private :name=, :raw=
+
+      def initialize(adapter_name, options = { })
+        super
+
+        self.name = options.delete(:name) or raise ArgumentError, "must provide name"
+        self.raw = options.delete(:raw) or raise ArgumentError, "must provide raw"
+      end
+
+      def to_s
+        name
+      end
+
+    private
+
+      def load
+        translate_raw_to_config(raw)
+      end
+
+      def save(config)
+        raise Error, "nonsense!"
+      end
+
+    end
+  end
+end

data/vendor/librarian/lib/librarian/config/source.rb

@@ -0,0 +1,149 @@
+require "librarian/error"
+
+module Librarian
+  module Config
+    class Source
+
+      RAW_KEY_SUFFIX_VALIDITY_PATTERN =
+        /\A[A-Z0-9_]+\z/
+      CONFIG_KEY_VALIDITY_PATTERN =
+        /\A[a-z][a-z0-9\-]+(?:\.[a-z0-9\-]+)*\z/
+
+      class << self
+        def raw_key_suffix_validity_pattern
+          RAW_KEY_SUFFIX_VALIDITY_PATTERN
+        end
+        def config_key_validity_pattern
+          CONFIG_KEY_VALIDITY_PATTERN
+        end
+      end
+
+      attr_accessor :adapter_name
+      private :adapter_name=
+
+      def initialize(adapter_name, options = { })
+        self.adapter_name = adapter_name
+
+        self.forbidden_keys = options.delete(:forbidden_keys) || []
+      end
+
+      def [](key)
+        load!
+
+        data[key]
+      end
+
+      def []=(key, value)
+        key_permitted?(key) or raise Error, "key not permitted: #{key.inspect}"
+        value_permitted?(key, value) or raise Error, "value for key #{key.inspect} not permitted: #{value.inspect}"
+
+        load!
+        if value.nil?
+          data.delete(key)
+        else
+          data[key] = value
+        end
+        save(data)
+      end
+
+      def keys
+        load!
+
+        data.keys
+      end
+
+    private
+
+      attr_accessor :data, :forbidden_keys
+
+      def load!
+        self.data = load unless data
+      end
+
+      def key_permitted?(key)
+        String === key &&
+        config_key_validity_pattern === key &&
+        !forbidden_keys.any?{|k| k === key}
+      end
+
+      def value_permitted?(key, value)
+        return true if value.nil?
+
+        String === value
+      end
+
+      def raw_key_valid?(key)
+        return false unless key.start_with?(raw_key_prefix)
+
+        suffix = key[raw_key_prefix.size..-1]
+        raw_key_suffix_validity_pattern =~ suffix
+      end
+
+      def raw_key_suffix_validity_pattern
+        self.class.raw_key_suffix_validity_pattern
+      end
+
+      def config_key_valid?(key)
+        config_key_validity_pattern === key
+      end
+
+      def config_key_validity_pattern
+        self.class.config_key_validity_pattern
+      end
+
+      def raw_key_prefix
+        @key_prefix ||= "LIBRARIAN_#{adapter_name.upcase}_"
+      end
+
+      def assert_raw_keys_valid!(raw)
+        bad_keys = raw.keys.reject{|k| raw_key_valid?(k)}
+        unless bad_keys.empty?
+          config_path_s = config_path.to_s.inspect
+          bad_keys_s = bad_keys.map(&:inspect).join(", ")
+          raise Error, "config #{to_s} has bad keys: #{bad_keys_s}"
+        end
+      end
+
+      def assert_config_keys_valid!(config)
+        bad_keys = config.keys.reject{|k| config_key_valid?(k)}
+        unless bad_keys.empty?
+          bad_keys_s = bad_keys.map(&:inspect).join(", ")
+          raise Error, "config has bad keys: #{bad_keys_s}"
+        end
+      end
+
+      def assert_values_valid!(data)
+        bad_data = data.reject{|k, v| String === v}
+        bad_keys = bad_data.keys
+
+        unless bad_keys.empty?
+          bad_keys_s = bad_keys.map(&:inspect).join(", ")
+          raise Error, "config has bad values for keys: #{bad_keys_s}"
+        end
+      end
+
+      def translate_raw_to_config(raw)
+        assert_raw_keys_valid!(raw)
+        assert_values_valid!(raw)
+
+        Hash[raw.map do |key, value|
+          key = key[raw_key_prefix.size .. -1]
+          key = key.downcase.gsub(/__/, ".").gsub(/_/, "-")
+          [key, value]
+        end]
+      end
+
+      def translate_config_to_raw(config)
+        assert_config_keys_valid!(config)
+        assert_values_valid!(config)
+
+        Hash[config.map do |key, value|
+          key = key.gsub(/\./, "__").gsub(/\-/, "_").upcase
+          key = "#{raw_key_prefix}#{key}"
+          [key, value]
+        end]
+      end
+
+    end
+  end
+end

data/vendor/librarian/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=
 
@@ -88,7 +84,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/vendor/librarian/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/vendor/librarian/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

data/vendor/librarian/lib/librarian/environment.rb

@@ -1,10 +1,11 @@
 require "pathname"
 
-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"
@@ -14,30 +15,33 @@ module Librarian
   class Environment
 
     include Support::AbstractMethod
-    include Helpers::Debug
 
     attr_accessor :ui
 
     abstract_method :specfile_name, :dsl_class, :install_path
 
     def initialize(options = { })
+      @pwd = options.fetch(:pwd) { Dir.pwd }
+      @env = options.fetch(:env) { ENV.to_hash }
+      @home = options.fetch(:home) { File.expand_path("~") }
       @project_path = options[:project_path]
       @specfile_name = options[:specfile_name]
     end
 
-    def project_path
-      @project_path ||= begin
-        root = Pathname.new(Dir.pwd)
-        root = root.dirname until project_path?(root)
-        path = root.join(specfile_name)
-        path.file? ? root : nil
-      end
+    def logger
+      @logger ||= Logger.new(self)
     end
 
-    def project_path?(path)
-      path.join(config_name).directory? ||
-      path.join(specfile_name).file? ||
-      path.dirname == path
+    def config_db
+      @config_db ||= begin
+        Config::Database.new(adapter_name,
+          :pwd => @pwd,
+          :env => @env,
+          :home => @home,
+          :project_path => @project_path,
+          :specfile_name => default_specfile_name
+        )
+      end
     end
 
     def default_specfile_name
@@ -47,12 +51,16 @@ module Librarian
       end
     end
 
+    def project_path
+      config_db.project_path
+    end
+
     def specfile_name
-      @specfile_name ||= default_specfile_name
+      config_db.specfile_name
     end
 
     def specfile_path
-      project_path.join(specfile_name)
+      config_db.specfile_path
     end
 
     def specfile
@@ -63,20 +71,12 @@ module Librarian
       nil
     end
 
-    def config_name
-      File.join(*[config_prefix, adapter_name].compact)
-    end
-
-    def config_prefix
-      ".librarian"
-    end
-
     def lockfile_name
-      "#{specfile_name}.lock"
+      config_db.lockfile_name
     end
 
     def lockfile_path
-      project_path.join(lockfile_name)
+      config_db.lockfile_path
     end
 
     def lockfile
@@ -119,6 +119,11 @@ module Librarian
       self.class.name.split("::")[0 ... -1].inject(Object, &:const_get)::Dsl
     end
 
+    def config_keys
+      %[
+      ]
+    end
+
   private
 
     def environment

data/vendor/librarian/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/vendor/librarian/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/vendor/librarian/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=
 
@@ -35,18 +31,18 @@ module Librarian
           source_type_name = lines.shift
           source[:type] = source_type_names_map[source_type_name]
           options = {}
-          while lines.first =~ /^ {2}([\w\/-]+):\s+(.+)$/
+          while lines.first =~ /^ {2}([\w-]+):\s+(.+)$/
             lines.shift
             options[$1.to_sym] = $2
           end
           source[:options] = options
           lines.shift # specs
           manifests = {}
-          while lines.first =~ /^ {4}([\w\/-]+) \((.*)\)$/
+          while lines.first =~ /^ {4}([\w-]+) \((.*)\)$/
             lines.shift
             name = $1
             manifests[name] = {:version => $2, :dependencies => {}}
-            while lines.first =~ /^ {6}([\w\/-]+) \((.*)\)$/
+            while lines.first =~ /^ {6}([\w-]+) \((.*)\)$/
               lines.shift
               manifests[name][:dependencies][$1] = $2.split(/,\s*/)
             end
@@ -58,7 +54,7 @@ module Librarian
         manifests_index = Hash[manifests.map{|m| [m.name, m]}]
         raise StandardError, "Expected DEPENDENCIES topic!" unless lines.shift == "DEPENDENCIES"
         dependencies = []
-        while lines.first =~ /^ {2}([\w\/-]+)(?: \((.*)\))?$/
+        while lines.first =~ /^ {2}([\w-]+)(?: \((.*)\))?$/
           lines.shift
           name, requirement = $1, $2.split(/,\s*/)
           dependencies << Dependency.new(name, requirement, manifests_index[name].source)