pdo 0.0.2 → 0.0.3

data/.gitignore

@@ -5,6 +5,7 @@
 .bundle
 .config
 .rvmrc
+.versions.conf
 .yardoc
 Gemfile.lock
 InstalledFiles

data/bin/pdo

@@ -13,7 +13,7 @@ require 'pdo/pdoopts'
 require 'pdo/task'
 require 'pp'
 
-logger = Logger['main'] || Logger['pdo']
+include Logging
 
 opts = OpenStruct.new
 # setting default values

data/conf/log4r.yaml

@@ -5,14 +5,24 @@ log4r_config:
       level     : INFO
       outputters:
         - stderr
+        - logfile
 
-  # define all outputters (incl. formatters)      
   outputters:
     - type     : StderrOutputter
       name     : stderr 
-      level    : INFO
+      level    : ERROR
       formatter:
         type   : PatternFormatter
         pattern: "%d, %C: %l, %m"
 
+    - type        : DateFileOutputter
+      name        : logfile
+      level       : INFO
+      date_pattern: '%Y%m%d'
+      trunc       : 'false'
+      dirname     : '#{LOGDIR}'
+      formatter   :
+        type      : PatternFormatter
+        pattern   : '%d %l: %m'
+
 # vim: set et ts=2 sts=2 sw=2 si sta:

data/lib/pdo.rb

@@ -1,10 +1,12 @@
 #!/usr/bin/env ruby
 
-include Process
+require 'pdo/logging'
 
 class PDO
+  include Process
+  include Logging
+
   def initialize(tasks, thread_num)
-    @logger = Logger[self.class.to_s] || Logger['pdo']
     @tasks = tasks
     @thread_num = thread_num
   end
@@ -23,14 +25,14 @@ class PDO
     1.upto(n) do
       Thread.new do
         while true do
-          @logger.info "#{Thread.current.object_id} started."
+          logger.info "#{Thread.current.object_id} started."
           begin
             execute(@tasks.next)
             # presumably new data is ready, thus i stop. 
             # main thread will read :output and then wakes me up.
             Thread.stop
           rescue
-            @logger.info "No more task for #{Thread.current.object_id}."
+            logger.info "No more task for #{Thread.current.object_id}."
             break
           end
         end
@@ -44,7 +46,7 @@ class PDO
       Thread.list.each do |t|
         next if t == Thread.main
         if t.key? :output and t.key? :new_data and t[:new_data] then
-          @logger.info "#{t.object_id} finished."
+          logger.info "#{t.object_id} finished."
           puts "=== #{t[:target]} ==="
           t[:output].each {|x| puts x}
           # puts t[:output].join('').gsub("\n", ' | ').chomp(' | ')

data/lib/pdo/host.rb

@@ -1,14 +1,12 @@
 #!/usr/bin/env ruby
 
-require 'log4r'
-include Log4r
-
 require 'pp'
 require 'yaml'
+require_relative 'logging'
 
 module Host
 
-  @@logger = Logger[self.class.to_s] || Logger['pdo']
+  include Logging
 
   @@recursive_level = 9
   def self.recursive_level=(level)
@@ -30,8 +28,8 @@ module Host
       begin
         hosts.update(YAML::load_file(f))
       rescue => ex
-        @@logger.warn { "#{ex.class}: #{ex.message}" }
-        @@logger.debug { ex.backtrace.join "\n" }
+        logger.warn { "#{ex.class}: #{ex.message}" }
+        logger.debug { ex.backtrace.join "\n" }
       end
     end
     return @@host_hash = hosts
@@ -47,7 +45,7 @@ module Host
 
     level += 1
     if level > @@recursive_level then
-      @@logger.warn "circle detected in the host definition file."
+      logger.warn "circle detected in the host definition file."
       return []
     end
 
@@ -64,11 +62,11 @@ module Host
           return [ group ]
         end
       rescue => ex
-        @@logger.warn {
+        logger.warn {
           "failed to get hash value for #{group.inspect}. "\
           'possibly an error in the yaml file.'
         }
-        @@logger.debug { ex.backtrace.join "\n" }
+        logger.debug { ex.backtrace.join "\n" }
         return []
       end
     end
@@ -83,7 +81,7 @@ module Host
     elsif list_of_hosts.is_a? Array then
       list_of_hosts.each do |h|
         if not h.is_a? String then
-          @@logger.warn {
+          logger.warn {
             "invalid host or group format: #{h.inspect}\n"\
             'possibly an error in the yaml file.'
           }
@@ -96,7 +94,7 @@ module Host
         end
       end
     else
-      @@logger.fatal "I don't know how to handle this. "\
+      logger.fatal "I don't know how to handle this. "\
                      'possibly an error in the yaml file.'
       exit 1
     end
@@ -116,7 +114,7 @@ module Host
 
   def stepping(hosts, step)
     unless hosts.is_a? Array or step.is_a? Array then
-      @@logger.warn "both hosts or step should be array."
+      logger.warn "both hosts or step should be array."
       return nil
     end
     
@@ -162,11 +160,11 @@ module Host
           return [ ]
         end
       rescue => ex
-        @@logger.warn {
+        logger.warn {
           "failed to get hash value for #{group.inspect}. "\
           'maybe a wrong key is specifid?'
         }
-        @@logger.debug { ex.backtrace.join "\n" }
+        logger.debug { ex.backtrace.join "\n" }
         return []
       end
     end
@@ -179,13 +177,13 @@ module Host
     elsif pointer.is_a? Array then
       return pointer
     else
-      @@logger.fatal "I don't know how to handle this. "\
+      logger.fatal "I don't know how to handle this. "\
                     'possibly an error in the yaml file.'
       exit 1
     end
     
   end
 
-end
+end # module Host
 
 # vim: set et ts=2 sts=2 sw=2 si sta :

data/lib/pdo/logging.rb

@@ -4,11 +4,28 @@ require 'log4r'
 require 'log4r/yamlconfigurator'
 require 'log4r/outputter/datefileoutputter'
 
-conf_dir = File.expand_path("#{File.dirname(__FILE__)}/../../conf")
+module Logging
 
-[conf_dir, '/etc/pdo', "#{ENV['HOME']}/.pdo"].each { |dir|
-  conf = "#{dir}/log4r.yaml"
-  Log4r::YamlConfigurator.load_yaml_file conf if File.exists? conf
-}
+  include Log4r
+  # set the default log directory
+  Log4r::YamlConfigurator['LOGDIR'] =
+    File.expand_path("#{File.dirname(__FILE__)}/../../log")
+
+  def logger
+
+    return @logger if @logger
+
+    conf_dir = File.expand_path("#{File.dirname(__FILE__)}/../../conf")
+
+    [conf_dir, '/etc/pdo', "#{ENV['HOME']}/.pdo"].each { |dir|
+      conf = "#{dir}/log4r.yaml"
+      Log4r::YamlConfigurator.load_yaml_file conf if File.exists? conf
+    }
+
+    @logger = Logger[self.class.to_s] || Logger['pdo']
+
+  end
+
+end # module Logging
 
 # vim: set et ts=2 sts=2 sw=2 si sta :

data/lib/pdo/task.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-require 'log4r'
-include Log4r
+require_relative 'logging'
 
 class SSHCmd
+  include Logging
+
   def initialize(local, sshopts)
-    @logger = Logger[self.class.to_s] || Logger['pdo']
 
     @defaults = {
       :user => 'root',
@@ -19,7 +19,7 @@ class SSHCmd
     @local = local
     @sshopts = @defaults[:sshopts]
     @sshopts = @defaults[:sshopts].update sshopts if sshopts
-    @logger.debug { @sshopts.inspect }
+    logger.debug { @sshopts.inspect }
   end
   
   def form(host, cmd)
@@ -66,9 +66,9 @@ class SSHCmd
 end
 
 class Task
+  include Logging
 
   def initialize
-    @logger = Logger[self.class.to_s] || Logger['pdo']
     @task_q = Queue.new
   end
 

data/lib/pdo/version.rb

@@ -1,3 +1,3 @@
 module Pdo
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/log/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: pdo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
+  prerelease: 
 platform: ruby
 authors:
 - bqbn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-16 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>'
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>'
       - !ruby/object:Gem::Version
@@ -47,30 +50,32 @@ files:
 - lib/pdo/pdoopts.rb
 - lib/pdo/task.rb
 - lib/pdo/version.rb
+- log/.gitignore
 - pdo.gemspec
 homepage: https://github.com/bqbn/pdo
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: pdo is a wrapper for running commands on or against multiple hosts at the
   same time.
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZGRhYjNlMDBhZWRlMWEzNWRhZWM1OGYwZDQwZjQ4ODVlZjc2NTY0Zg==
-  data.tar.gz: !binary |-
-    NGU5YWQxOGI4NmYwNDgxZmUwMmJhYTdiMTdhNTQyNmRiYThlYmRkNw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MWRmMjczMzIyN2M4ZGYxN2ZjNDg4NjgzYjVkYzIwMTBkZGQ5ZWM2MTk4Zjdk
-    MWM2ZWU1MGI0ZmI0NWZiYmQ5OGVkNjUyNDVhMjM4YzBkYmVhM2JlYjA2NTNk
-    N2NiMTE2MGM1YTk5MzQ4ZDI3OTdiODQ5ZjNhNGIzYTI1YThhNGI=
-  data.tar.gz: !binary |-
-    NDhiOTU5N2U4NTZkY2VjNzNmYmZjNzU3Y2ZhYzA0ZmY1NzRkZDI2ZTVmNzQ4
-    ZDExMTI5YzRiNzk4MThmYmUxNzUxMGFlZmNhMDgyOTBjYjAzOTNiMjNmMzRl
-    YzM3NTdmMmU0ODU0YjM3NjBkNDU4MTNiMjgwZjI4NGQwNGZkYWQ=