r10k 0.0.1 → 0.0.2

data/lib/r10k/action/environment.rb

@@ -27,7 +27,7 @@ module R10K::Action::Environment
     def call(env)
       @env = env
 
-      logger.notice "Deploying environment #{@root.name}"
+      logger.info "Deploying environment #{@root.name}"
       FileUtils.mkdir_p @root.full_path
       @root.sync! :update_cache => @env[:update_cache]
 
@@ -61,10 +61,10 @@ module R10K::Action::Environment
     def call(env)
       @env = env
 
-      stale_directories = R10K::Deployment.instance.collection.stale(@path)
+      stale_directories = R10K::Deployment.collection.stale(@path)
 
       stale_directories.each do |dir|
-        logger.notice "Purging stale environment #{dir.inspect}"
+        logger.info "Purging stale environment #{dir.inspect}"
         FileUtils.rm_rf(dir, :secure => true)
       end
 

data/lib/r10k/action/module.rb

@@ -23,7 +23,7 @@ module R10K::Action::Module
     def call(env)
       @env = env
 
-      logger.notice "Deploying module #{@mod.name}"
+      logger.info "Deploying module #{@mod.name}"
       @mod.sync! :update_cache => @env[:update_cache]
 
       @app.call(@env)

data/lib/r10k/cli.rb

@@ -19,7 +19,7 @@ module R10K::CLI
       end
 
       required :c, :config, 'Specify a configuration file' do |value, cmd|
-        R10K::Deployment.instance.configfile = value
+        R10K::Deployment.config.configfile = value
       end
 
       required :v, :verbose, 'Set verbosity level' do |value, cmd|

data/lib/r10k/config.rb

@@ -0,0 +1,46 @@
+require 'r10k/deployment'
+require 'r10k/config/loader'
+
+class R10K::Config
+
+  attr_accessor :configfile
+
+  def loaded?
+    !(@config.nil?)
+  end
+
+  # Serve up the loaded config if it's already been loaded, otherwise try to
+  # load a config in the current wd.
+  def dump
+    load_config unless @config
+    @config
+  end
+
+  def setting(key)
+    self.dump[key]
+  end
+  alias_method :[], :setting
+
+  # Load and store a config file, and set relevant options
+  #
+  # @param [String] configfile The path to the YAML config file
+  def load_config
+    unless @configfile
+      loader = R10K::Config::Loader.new
+      @configfile = loader.search
+    end
+    File.open(@configfile) { |fh| @config = YAML.load(fh.read) }
+    apply_config_settings
+    @config
+  end
+
+  private
+
+  # Apply config settings to the relevant classes after a config has been loaded.
+  def apply_config_settings
+    if @config[:cachedir]
+      R10K::Synchro::Git.cache_root = @config[:cachedir]
+    end
+    @collection = R10K::Deployment::EnvironmentCollection.new(@config)
+  end
+end

data/lib/r10k/config/loader.rb

@@ -0,0 +1,39 @@
+require 'r10k'
+
+class R10K::Config
+end
+
+class R10K::Config::Loader
+
+  def initialize
+    @loadpath = []
+
+    populate_loadpath
+  end
+
+  # @return [String] The path to the first valid configfile
+  def search
+    first = @loadpath.find {|filename| File.file? filename}
+  end
+
+  private
+
+  def populate_loadpath
+
+    # Scan all parent directories for r10k
+    dir_components = Dir.getwd.split(File::SEPARATOR)
+
+    dir_components.each_with_index do |dirname, index|
+      full_path = [''] # Shim case for root directory
+      full_path << dir_components[0...index]
+      full_path << dirname << 'r10k.yaml'
+
+      @loadpath << File.join(full_path)
+    end
+
+    # Always check /etc/r10k.yaml
+    @loadpath << '/etc/r10k.yaml'
+
+    @loadpath
+  end
+end

data/lib/r10k/deployment.rb

@@ -1,21 +1,37 @@
 require 'r10k'
+require 'r10k/config'
 require 'r10k/synchro/git'
-require 'r10k/deployment/environment_collection'
 require 'yaml'
 
 class R10K::Deployment
   # Model a full installation of module directories and modules.
 
-  def self.instance
-    @myself ||= self.new
+  class << self
+    def instance
+      @myself ||= self.new
+    end
+
+    def config
+      instance.config
+    end
+
+    def collection
+      instance.collection
+    end
   end
 
+  extend Forwardable
+
+  def_delegators :@config, :configfile, :configfile=
+  def_delegators :@config, :setting, :[]
+
   def initialize
-    @configfile   = File.join(Dir.getwd, "config.yaml")
-    @update_cache = true
+    @config = R10K::Config.new
   end
 
-  attr_accessor :configfile
+  def config
+    @config
+  end
 
   # Load up all module roots
   #
@@ -25,39 +41,10 @@ class R10K::Deployment
   end
 
   def collection
-    load_config unless @config
+    @config.load_config unless @config.loaded?
+    @collection ||= R10K::Deployment::EnvironmentCollection.new(@config)
     @collection
   end
-
-  # Serve up the loaded config if it's already been loaded, otherwise try to
-  # load a config in the current wd.
-  def config
-    load_config unless @config
-    @config
-  end
-
-  # @return [Object] A top level key from the config hash
-  def setting(key)
-    self.config[key]
-  end
-  alias_method :[], :setting
-
-  private
-
-  # Load and store a config file, and set relevant options
-  #
-  # @param [String] configfile The path to the YAML config file
-  def load_config
-    File.open(@configfile) { |fh| @config = YAML.load(fh.read) }
-    apply_config_settings
-    @config
-  end
-
-  # Apply config settings to the relevant classes after a config has been loaded.
-  def apply_config_settings
-    if @config[:cachedir]
-      R10K::Synchro::Git.cache_root = @config[:cachedir]
-    end
-    @collection = R10K::EnvironmentCollection.new(@config)
-  end
 end
+
+require 'r10k/deployment/environment_collection'

data/lib/r10k/deployment/environment_collection.rb

@@ -1,6 +1,6 @@
 require 'r10k'
 
-class R10K::EnvironmentCollection
+class R10K::Deployment::EnvironmentCollection
 
   attr_reader :update_cache
 

data/lib/r10k/module/forge.rb

@@ -70,8 +70,14 @@ class R10K::Module::Forge < R10K::Module
 
   def pmt(args)
     cmd = "puppet module --modulepath '#{@path}' #{args.join(' ')}"
+    log_event = "puppet module #{args.join(' ')}, modulepath: #{@path.inspect}"
     logger.debug1 "Execute: #{cmd}"
+
     status, stdout, stderr = systemu(cmd)
+
+    logger.debug2 "[#{log_event}] STDOUT: #{stdout.chomp}" unless stdout.empty?
+    logger.debug2 "[#{log_event}] STDERR: #{stderr.chomp}" unless stderr.empty?
+
     unless status == 0
       e = R10K::ExecutionFailure.new("#{cmd.inspect} returned with non-zero exit value #{status.inspect}")
       e.exit_code = status

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -131,6 +131,8 @@ files:
 - lib/r10k/cli/module.rb
 - lib/r10k/cli/synchronize.rb
 - lib/r10k/cli.rb
+- lib/r10k/config/loader.rb
+- lib/r10k/config.rb
 - lib/r10k/deployment/environment_collection.rb
 - lib/r10k/deployment.rb
 - lib/r10k/errors.rb