script-runner 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4ccdd0bfb2424e55fe11f826fda04d61d38db04
-  data.tar.gz: 1f030b5880415acaefb2a22f8fc6d6354478d342
+  metadata.gz: 5f8ef2e2d96a56685f79cd9131f37a7b92b3dc80
+  data.tar.gz: e102f786a7ff21e2c37560b6b1eadde8be59b857
 SHA512:
-  metadata.gz: d8e3e16899803cd30a2abcf7e874aa1a7cf0ea6a0e28261669ba887fe14d9185923b84c395f64a0c070740bcc3674502a1a1572e82f82bcbd9940a2089371e0e
-  data.tar.gz: 5e4a3458687747e5e94c435f6d4fde640e21cd8d9730f146fcb0c313ebc86aca52f88e51f1af73c2bf29959b613a1f94a7ad182079dd2f89b6e21fa012e5936d
+  metadata.gz: ef8fa68bfee5b588d5b340090420d75d9cb35786e1ca695f478eb7b736ecd57b8bf2f8f2f32e0297bd30615b9aa6158343162b3f1a4959ae520f7fe13f762daa
+  data.tar.gz: 10fc35385fd1ab864fee4aa4f69a3bef3a506c9ad0179803d984717219e94fa9900f009cdba55de453a380b9306989ff26bbf6e6d65f2467b0669fda1bb5f48c

data/README.md

@@ -46,6 +46,7 @@ Note: for each root_path, all files under are invoked in alphabetical order
 
 
 ### Changelog
+0.0.6 - add your own logger if you want
 0.0.5 - only set env if there are scripts to run
 0.0.4 - fixed dependency on logging
 0.0.3 - Added logging

data/lib/script-runner.rb

@@ -14,18 +14,22 @@ module ScriptRunner
   # -- :log_level - one of :debug, :info, :warn, :errror
   # @block - a block to handle the output of the script if non is given it is sent to the console
   def self.run( paths, env_vars, options = {}, &block)
+    logger = options[:logger] || get_logger(options[:log_level])
+    runner = ScriptRunner::Main.new(logger)
+    error_handler = options[:error_handler]
+    runner.run(paths, env_vars, error_handler, &block)
+  end
 
+  private
+  def get_logger(log_level)
     Logging.appenders.stdout(
       :layout => Logging.layouts.pattern(:pattern => '[%c][%-5l] %m\n'),
       :color_scheme => 'bright')
-
     logger = Logging.logger['script-runner']
     logger.add_appenders(Logging.appenders.stdout)
-    logger.level = options[:log_level] || :warn
-
-    runner = ScriptRunner::Main.new(logger)
-    error_handler = options[:error_handler]
-    runner.run(paths, env_vars, error_handler, &block)
+    logger.level = log_level || :warn
+    logger
   end
 
+
 end

data/lib/script-runner/main.rb

@@ -1,5 +1,3 @@
-require 'logging'
-
 module ScriptRunner
 
   class Main
@@ -29,13 +27,12 @@ module ScriptRunner
 
       non_runnable = all_paths - runnable
 
-      @logger.debug "runnable: #{runnable}"
-
       non_runnable.each{ |nr|
         @logger.warn "#{nr} is not runnable - skipping"
       }
 
       runnable.each{ |p|
+        @logger.info "run => #{p}"
         exec(p, error_handler, &block)
       }
     end
@@ -69,7 +66,7 @@ module ScriptRunner
         File.readlines(p).each do |line|
           if line.include? "="
             key, value = line.split("=")
-            @logger.debug "set: #{key} -> #{value}"
+            @logger.debug "set: #{key.strip} -> #{value.strip}"
             ENV[key.strip] = value.strip
           end
         end

data/lib/script-runner/version.rb

@@ -1,4 +1,4 @@
 module ScriptRunner
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end
 

data/spec/main_spec.rb

@@ -1,4 +1,5 @@
 require 'script-runner'
+require 'logging'
 
 describe ScriptRunner do
 
@@ -55,4 +56,5 @@ describe ScriptRunner do
      p = ScriptRunner.run(scripts("non_runnable"), env("one")) { |output| @all_output << output }
     @error_files.length.should eql 0
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: script-runner
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - ed.eustace