Add logging

lib/linux_admin.rb

@@ -2,6 +2,8 @@
 require 'active_support'
 require 'active_support/core_ext'
 
+require 'linux_admin/logging'
+require 'linux_admin/null_logger'
 
 require 'linux_admin/common'
 require 'linux_admin/exceptions'
@@ -28,5 +30,11 @@
 
 module LinuxAdmin
   extend Common
-  include Common
+  extend self
+
+  attr_writer :logger
+
+  def logger
+    @logger ||= NullLogger.new
+  end
 end

lib/linux_admin/common.rb

@@ -7,10 +7,12 @@ def cmd(cmd)
     end
 
     def run(cmd, options = {})
+      AwesomeSpawn.logger ||= logger
       AwesomeSpawn.run(cmd, options)
     end
 
     def run!(cmd, options = {})
+      AwesomeSpawn.logger ||= logger
       AwesomeSpawn.run!(cmd, options)
     end
   end

lib/linux_admin/logging.rb

@@ -0,0 +1,5 @@
+module LinuxAdmin
+  module Logging
+    delegate :logger, :to => :LinuxAdmin
+  end
+end

lib/linux_admin/null_logger.rb

@@ -0,0 +1,11 @@
+require 'logger'
+
+module LinuxAdmin
+  class NullLogger < Logger
+    def initialize(*_args)
+    end
+
+    def add(*_args, &_block)
+    end
+  end
+end

lib/linux_admin/registration_system.rb

@@ -1,6 +1,7 @@
 module LinuxAdmin
   class RegistrationSystem
     include Common
+    include Logging
 
     def self.registration_type(reload = false)
       return @registration_type if @registration_type && !reload

lib/linux_admin/registration_system/rhn.rb

@@ -44,6 +44,7 @@ def enable_channel(repo, options)
       cmd       = "rhn-channel -a"
       params    = user_pwd(options).merge("--channel=" => repo)
 
+      logger.info("#{self.class.name}##{__method__} Enabling channel: #{repo}")
       run!(cmd, :params => params)
     end
     alias_method :subscribe,    :enable_channel

lib/linux_admin/registration_system/subscription_manager.rb

@@ -83,6 +83,7 @@ def enable_repo(repo, options = nil)
       cmd     = "subscription-manager repos"
       params  = {"--enable=" => repo}
 
+      logger.info("#{self.class.name}##{__method__} Enabling repository: #{repo}")
       run!(cmd, :params => params)
     end
 

lib/linux_admin/rpm.rb

@@ -1,5 +1,7 @@
 module LinuxAdmin
   class Rpm < Package
+    extend Logging
+
     def self.rpm_cmd
       Distros.local.command(:rpm)
     end
@@ -16,8 +18,8 @@ def self.list_installed
     #
     #   Rpm.import_key("/etc/pki/my-gpg-key")
     def self.import_key(file)
-      params = {"--import" => file}
-      run!("rpm", :params => params)
+      logger.info("#{self.class.name}##{__method__} Importing RPM-GPG-KEY: #{file}")
+      run!("rpm", :params => {"--import" => file})
     end
 
     def self.info(pkg)

linux_admin.gemspec

@@ -37,6 +37,6 @@ registration, updates, etc.
   spec.add_dependency "activesupport",        "> 3.2"
   spec.add_dependency "inifile"
   spec.add_dependency "more_core_extensions", "~> 1.1"
-  spec.add_dependency "awesome_spawn",        "~> 1.2"
+  spec.add_dependency "awesome_spawn",        "~> 1.3"
   spec.add_dependency "nokogiri"
 end