r10k 0.0.5 → 0.0.6

data/lib/r10k/cli.rb

@@ -1,5 +1,6 @@
 require 'r10k'
 require 'r10k/logging'
+require 'r10k/cli/ext/logging'
 require 'cri'
 
 module R10K::CLI

data/lib/r10k/cli/cache.rb

@@ -1,6 +1,7 @@
 require 'r10k/cli'
 require 'r10k/synchro/git'
 require 'cri'
+require 'r10k/logging'
 
 module R10K::CLI
   module Cache
@@ -12,7 +13,6 @@ module R10K::CLI
 
         run do |opts, args, cmd|
           sources = R10K::Deployment.instance[:sources]
-
           remotes = Set.new
 
           sources.each_pair do |name, hash|
@@ -20,7 +20,7 @@ module R10K::CLI
           end
 
           remotes.each do |remote|
-            puts "Synchronizing #{remote}"
+            logger.info "Synchronizing #{remote}"
             synchro = R10K::Synchro::Git.new(remote)
             synchro.cache
           end

data/lib/r10k/cli/ext/logging.rb

@@ -0,0 +1,16 @@
+require 'cri/command_dsl'
+require 'r10k/logging'
+
+module Cri
+  class CommandDSL
+    include R10K::Logging
+
+    def logger
+      unless @logger
+        @logger = Log4r::Logger.new(@command.name)
+        @logger.add R10K::Logging.outputter
+      end
+      @logger
+    end
+  end
+end

data/lib/r10k/cli/module/deploy.rb

@@ -1,5 +1,6 @@
 require 'r10k/cli/module'
 require 'r10k/deployment'
+require 'r10k/logging'
 require 'cri'
 
 require 'fileutils'
@@ -33,7 +34,7 @@ module R10K::CLI::Module
             mods = env.modules.select { |mod| mod.name == module_name }
 
             if mods.empty?
-              puts "No modules with name #{module_name} matched in environment #{env.name.inspect}".red
+              logger.warn "No modules with name #{module_name} matched in environment #{env.name.inspect}".red
             end
 
             stack = Middleware::Builder.new

data/lib/r10k/cli/synchronize.rb

@@ -13,8 +13,6 @@ module R10K::CLI
         usage 'synchronize <options>'
         summary 'Fully synchronize all environments'
 
-        flag :u, :update, "Update cache before running"
-
         run do |opts, args, cmd|
           deployment   = R10K::Deployment.instance
           environments = deployment.environments
@@ -31,7 +29,7 @@ module R10K::CLI
           end
 
           stack_env = {
-            :update_cache => opts[:update],
+            :update_cache => true,
             :trace        => opts[:trace],
             :recurse      => true,
           }

data/lib/r10k/root.rb

@@ -1,9 +1,12 @@
 require 'r10k'
 require 'r10k/module'
 require 'r10k/synchro/git'
+require 'r10k/logging'
 
 class R10K::Root
 
+  include R10K::Logging
+
   # @!attribute [r] name
   #   The directory name of this root
   attr_reader :name
@@ -49,7 +52,7 @@ class R10K::Root
       R10K::Module.new(name, "#{full_path}/modules", args)
     end
   rescue Errno::ENOENT
-    puts "#{self}: #{full_path} does not exist, cannot enumerate modules."
+    logger.warn "#{self}: #{full_path} does not exist, cannot enumerate modules."
     []
   end
 

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -126,6 +126,7 @@ files:
 - lib/r10k/cli/environment/list.rb
 - lib/r10k/cli/environment/stale.rb
 - lib/r10k/cli/environment.rb
+- lib/r10k/cli/ext/logging.rb
 - lib/r10k/cli/module/deploy.rb
 - lib/r10k/cli/module/list.rb
 - lib/r10k/cli/module.rb