flickrup 1.0.1 → 1.1.0

data/lib/flickrup/logging.rb

@@ -1,5 +1,20 @@
 module Logging
+
+  def self.pre_init(level, logdev = STDOUT)
+    @level = level
+    @logdev = logdev
+  end
+
   def logger
-    @logger ||= Logger.new(STDOUT)
+    Logging.logger
+  end
+
+  def self.logger
+    unless @logger
+      @logger = Logger.new(@logdev)
+      @logger.level = @level
+    end
+
+    @logger
   end
 end

data/lib/flickrup.rb

@@ -24,12 +24,13 @@ module Flickrup
         opt :once, "Run single pass" # flag --once, default false
         opt :nowait, "Upload immediately on change, no delay"
         opt :loglevel, "Logging level", :type => :string, :default => "INFO"
+        opt :logfile, "Log file (-- for STDOUT)", :type => :string, :default => "--"
         opt :config, "Configuration file", :type => :string, :default => './flickrup.yml'
         opt :timeout, "Timeout/Wait for file modification", :default => 5*60
         opt :dryrun, "Dry run, don't move or upload (useful for debugging)"
       end
 
-      logger.level = Logger::Severity.const_get(opts.loglevel)
+      Logging.pre_init(Logger::Severity.const_get(opts.loglevel), opts.logfile == "--" ? STDOUT : opts.logfile)
 
       #load config, symbolise, merge with command line config
       config = YAML::load(File.open(opts.config, "r")).inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}.merge opts

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flickrup
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jonathan Gilbert