librarian-puppet 0.9.1 → 0.9.2.pre

data/vendor/librarian/lib/librarian/chef/cli.rb

@@ -22,6 +22,27 @@ module Librarian
         copy_file environment.specfile_name
       end
 
+      desc "install", "Resolves and installs all of the dependencies you specify."
+      option "quiet", :type => :boolean, :default => false
+      option "verbose", :type => :boolean, :default => false
+      option "line-numbers", :type => :boolean, :default => false
+      option "clean", :type => :boolean, :default => false
+      option "strip-dot-git", :type => :boolean
+      option "path", :type => :string
+      def install
+        ensure!
+        clean! if options["clean"]
+        if options.include?("strip-dot-git")
+          strip_dot_git_val = options["strip-dot-git"] ? "1" : nil
+          environment.config_db.local["install.strip-dot-git"] = strip_dot_git_val
+        end
+        if options.include?("path")
+          environment.config_db.local["path"] = options["path"]
+        end
+        resolve!
+        install!
+      end
+
     end
   end
 end

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

@@ -11,7 +11,15 @@ module Librarian
       end
 
       def install_path
-        project_path.join("cookbooks")
+        part = config_db["path"] || "cookbooks"
+        project_path.join(part)
+      end
+
+      def config_keys
+        super + %w[
+          install.strip-dot-git
+          path
+        ]
       end
 
     end

data/vendor/librarian/lib/librarian/chef/manifest_reader.rb

@@ -16,8 +16,8 @@ module Librarian
 
       def read_manifest(name, manifest_path)
         case manifest_path.extname
-        when ".json" then JSON.parse(manifest_path.read)
-        when ".yml", ".yaml" then YAML.load(manifest_path.read)
+        when ".json" then JSON.parse(binread(manifest_path))
+        when ".yml", ".yaml" then YAML.load(binread(manifest_path))
         when ".rb" then compile_manifest(name, manifest_path.dirname)
         end
       end
@@ -42,6 +42,18 @@ module Librarian
         manifest["name"] == name
       end
 
+    private
+
+      if IO.respond_to?(:binread)
+        def binread(path)
+          path.binread
+        end
+      else
+        def binread(path)
+          path.read
+        end
+      end
+
     end
   end
 end

data/vendor/librarian/lib/librarian/chef/source/git.rb

@@ -6,6 +6,19 @@ module Librarian
     module Source
       class Git < Librarian::Source::Git
         include Local
+
+      private
+
+        def install_perform_step_copy!(found_path, install_path)
+          debug { "Copying #{relative_path_to(found_path)} to #{relative_path_to(install_path)}" }
+          FileUtils.cp_r(found_path, install_path)
+
+          if environment.config_db["install.strip-dot-git"] == "1"
+            dot_git = install_path.join(".git")
+            dot_git.rmtree if dot_git.directory?
+          end
+        end
+
       end
     end
   end

data/vendor/librarian/lib/librarian/chef/source/local.rb

@@ -8,6 +8,8 @@ module Librarian
         def install!(manifest)
           manifest.source == self or raise ArgumentError
 
+          info { "Installing #{manifest.name} (#{manifest.version})" }
+
           debug { "Installing #{manifest}" }
 
           name, version = manifest.name, manifest.version
@@ -19,8 +21,7 @@ module Librarian
             install_path.rmtree
           end
 
-          debug { "Copying #{relative_path_to(found_path)} to #{relative_path_to(install_path)}" }
-          FileUtils.cp_r(found_path, install_path)
+          install_perform_step_copy!(found_path, install_path)
         end
 
         def fetch_version(name, extra)
@@ -33,6 +34,11 @@ module Librarian
 
       private
 
+        def install_perform_step_copy!(found_path, install_path)
+          debug { "Copying #{relative_path_to(found_path)} to #{relative_path_to(install_path)}" }
+          FileUtils.cp_r(found_path, install_path)
+        end
+
         def manifest_data(name)
           @manifest_data ||= { }
           @manifest_data[name] ||= fetch_manifest_data(name)

data/vendor/librarian/lib/librarian/chef/source/site.rb

@@ -8,8 +8,6 @@ require 'zlib'
 require 'securerandom'
 require 'archive/tar/minitar'
 
-require 'librarian/helpers/debug'
-
 require 'librarian/chef/manifest_reader'
 
 module Librarian
@@ -17,12 +15,8 @@ module Librarian
     module Source
       class Site
 
-        include Helpers::Debug
-
         class Line
 
-          include Helpers::Debug
-
           attr_accessor :source, :name
           private :source=, :name=
 
@@ -313,6 +307,14 @@ module Librarian
             uri
           end
 
+          def debug(*args, &block)
+            environment.logger.debug(*args, &block)
+          end
+
+          def relative_path_to(path)
+            environment.logger.relative_path_to(path)
+          end
+
         end
 
         class << self
@@ -384,6 +386,8 @@ module Librarian
           install_path = install_path(name)
           line = line(name)
 
+          info { "Installing #{manifest.name} (#{manifest.version})" }
+
           debug { "Installing #{manifest}" }
 
           line.install_version! version, install_path
@@ -428,6 +432,14 @@ module Librarian
           @line[name] ||= Line.new(self, name)
         end
 
+        def info(*args, &block)
+          environment.logger.info(*args, &block)
+        end
+
+        def debug(*args, &block)
+          environment.logger.debug(*args, &block)
+        end
+
       end
     end
   end

data/vendor/librarian/lib/librarian/cli.rb

@@ -6,8 +6,6 @@ require 'librarian/error'
 require 'librarian/action'
 require "librarian/ui"
 
-require "librarian/helpers/debug"
-
 module Librarian
   class Cli < Thor
 
@@ -24,8 +22,6 @@ module Librarian
     include Particularity
     extend Particularity
 
-    include Helpers::Debug
-
     class << self
       def bin!
         begin
@@ -46,6 +42,7 @@ module Librarian
       super
       the_shell = (options["no-color"] ? Thor::Shell::Basic.new : shell)
       environment.ui = UI::Shell.new(the_shell)
+      environment.ui.be_quiet! if options["quiet"]
       environment.ui.debug! if options["verbose"]
       environment.ui.debug_line_numbers! if options["verbose"] && options["line-numbers"]
 
@@ -57,28 +54,49 @@ module Librarian
       say "librarian-#{root_module.version}"
     end
 
+    desc "config", "Show or edit the config."
+    option "verbose", :type => :boolean, :default => false
+    option "line-numbers", :type => :boolean, :default => false
+    option "global", :type => :boolean, :default => false
+    option "local", :type => :boolean, :default => false
+    option "delete", :type => :boolean, :default => false
+    def config(key = nil, value = nil)
+      if key
+        raise Error, "cannot set both value and delete" if value && options["delete"]
+        if options["delete"]
+          raise Error, "must set either global or local" unless options["global"] ^ options["local"]
+          scope = options["global"] ? :global : options["local"] ? :local : nil
+          environment.config_db[key, scope] = nil
+        elsif value
+          raise Error, "must set either global or local" unless options["global"] ^ options["local"]
+          scope = options["global"] ? :global : options["local"] ? :local : nil
+          environment.config_db[key, scope] = value
+        else
+          raise Error, "cannot set both global and local" if options["global"] && options["local"]
+          scope = options["global"] ? :global : options["local"] ? :local : nil
+          if value = environment.config_db[key, scope]
+            prefix = scope ? "#{key} (#{scope})" : key
+            say "#{prefix}: #{value}"
+          end
+        end
+      else
+        environment.config_db.keys.each do |key|
+          say "#{key}: #{environment.config_db[key]}"
+        end
+      end
+    end
+
     desc "clean", "Cleans out the cache and install paths."
-    option "verbose"
-    option "line-numbers"
+    option "verbose", :type => :boolean, :default => false
+    option "line-numbers", :type => :boolean, :default => false
     def clean
       ensure!
       clean!
     end
 
-    desc "install", "Resolves and installs all of the dependencies you specify."
-    option "verbose"
-    option "line-numbers"
-    option "clean"
-    def install
-      ensure!
-      clean! if options["clean"]
-      resolve!
-      install!
-    end
-
     desc "update", "Updates and installs the dependencies you specify."
-    option "verbose"
-    option "line-numbers"
+    option "verbose", :type => :boolean, :default => false
+    option "line-numbers", :type => :boolean, :default => false
     def update(*names)
       ensure!
       if names.empty?
@@ -90,8 +108,8 @@ module Librarian
     end
 
     desc "outdated", "Lists outdated dependencies."
-    option "verbose"
-    option "line-numbers"
+    option "verbose", :type => :boolean, :default => false
+    option "line-numbers", :type => :boolean, :default => false
     def outdated
       ensure!
       resolution = environment.lock
@@ -104,12 +122,16 @@ module Librarian
     end
 
     desc "show", "Shows dependencies"
-    option "verbose"
-    option "line-numbers"
+    option "verbose", :type => :boolean, :default => false
+    option "line-numbers", :type => :boolean, :default => false
     option "detailed", :type => :boolean
     def show(*names)
       ensure!
-      manifest_presenter.present(names, :detailed => options["detailed"])
+      if environment.lockfile_path.file?
+        manifest_presenter.present(names, :detailed => options["detailed"])
+      else
+        raise Error, "Be sure to install first!"
+      end
     end
 
     desc "init", "Initializes the current directory."
@@ -171,5 +193,13 @@ module Librarian
       end
     end
 
+    def debug(*args, &block)
+      environment.logger.debug(*args, &block)
+    end
+
+    def relative_path_to(path)
+      environment.logger.relative_path_to(path)
+    end
+
   end
 end

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

@@ -0,0 +1,7 @@
+require "librarian/config/database"
+
+module Librarian
+  module Config
+
+  end
+end

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

@@ -0,0 +1,205 @@
+require "pathname"
+
+require "librarian/config/file_source"
+require "librarian/config/hash_source"
+
+module Librarian
+  module Config
+    class Database
+
+      class << self
+        def library
+          name.split("::").first.downcase
+        end
+      end
+
+      attr_accessor :adapter_name
+      private :adapter_name=
+
+      attr_accessor :root, :assigned_specfile_name
+      private :root=, :assigned_specfile_name=
+
+      attr_accessor :underlying_env, :underlying_pwd, :underlying_home
+      private :underlying_env=, :underlying_pwd=, :underlying_home=
+
+      def initialize(adapter_name, options = { })
+        self.adapter_name = adapter_name or raise ArgumentError, "must provide adapter_name"
+
+        options[:project_path] || options[:pwd] or raise ArgumentError, "must provide project_path or pwd"
+
+        self.root = options[:project_path] && Pathname(options[:project_path])
+        self.assigned_specfile_name = options[:specfile_name]
+        self.underlying_env = options[:env] or raise ArgumentError, "must provide env"
+        self.underlying_pwd = options[:pwd] && Pathname(options[:pwd])
+        self.underlying_home = options[:home] && Pathname(options[:home])
+      end
+
+      def global
+        memo(__method__) { new_file_source(global_config_path) }
+      end
+
+      def env
+        memo(__method__) { HashSource.new(adapter_name, :name => "environment", :raw => env_source_data) }
+      end
+
+      def local
+        memo(__method__) { new_file_source(local_config_path) }
+      end
+
+      def [](key, scope = nil)
+        case scope
+        when "local", :local then local[key]
+        when "env", :env then env[key]
+        when "global", :global then global[key]
+        when nil then local[key] || env[key] || global[key]
+        else raise Error, "bad scope"
+        end
+      end
+
+      def []=(key, scope, value)
+        case scope
+        when "local", :local then local[key] = value
+        when "global", :global then global[key] = value
+        else raise Error, "bad scope"
+        end
+      end
+
+      def keys
+        [local, env, global].inject([]){|a, e| a.concat(e.keys) ; a}.sort.uniq
+      end
+
+      def project_path
+        root || specfile_path.dirname
+      end
+
+      def specfile_path
+        if root
+          root + (assigned_specfile_name || default_specfile_name)
+        else
+          env_specfile_path || default_specfile_path
+        end
+      end
+
+      def specfile_name
+        specfile_path.basename.to_s
+      end
+
+      def lockfile_path
+        project_path + lockfile_name
+      end
+
+      def lockfile_name
+        "#{specfile_name}.lock"
+      end
+
+    private
+
+      def new_file_source(config_path)
+        return unless config_path
+
+        FileSource.new(adapter_name,
+          :config_path => config_path,
+          :forbidden_keys => [config_key, specfile_key]
+        )
+      end
+
+      def global_config_path
+        env_global_config_path || default_global_config_path
+      end
+
+      def env_global_config_path
+        memo(__method__) { env[config_key] }
+      end
+
+      def default_global_config_path
+        underlying_home && underlying_home + config_name
+      end
+
+      def local_config_path
+        root_local_config_path || env_local_config_path || default_local_config_path
+      end
+
+      def root_local_config_path
+        root && root + config_name
+      end
+
+      def env_specfile_path
+        memo(__method__) do
+          path = env[specfile_key]
+          path && Pathname(path)
+        end
+      end
+
+      def default_specfile_path
+        default_project_root_path + (assigned_specfile_name || default_specfile_name)
+      end
+
+      def env_local_config_path
+        return unless env_specfile_path
+
+        env_specfile_path.dirname + config_name
+      end
+
+      def default_local_config_path
+        default_project_root_path + config_name
+      end
+
+      def default_project_root_path
+        if root
+          root
+        else
+          path = underlying_pwd
+          path = path.dirname until project_root_path?(path) || path.dirname == path
+          project_root_path?(path) ? path : underlying_pwd
+        end
+      end
+
+      def project_root_path?(path)
+        File.file?(path + default_specfile_name)
+      end
+
+      def config_key
+        "config"
+      end
+
+      def specfile_key
+        "#{adapter_name}file"
+      end
+
+      def default_specfile_name
+        "#{adapter_name.capitalize}file"
+      end
+
+      def library
+        self.class.library
+      end
+
+      def config_name_prefix
+        ".#{library}"
+      end
+
+      def config_name
+        File.join(*[config_name_prefix, adapter_name, "config"])
+      end
+
+      def raw_key_prefix
+        "#{library.upcase}_#{adapter_name.upcase}_"
+      end
+
+      def env_source_data
+        prefix = raw_key_prefix
+
+        data = underlying_env.dup
+        data.reject!{|k, _| !k.start_with?(prefix) || k.size <= prefix.size}
+        data
+      end
+
+      def memo(key)
+        key = "@#{key}"
+        instance_variable_set(key, yield) unless instance_variable_defined?(key)
+        instance_variable_get(key)
+      end
+
+    end
+  end
+end