rscript 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 637dfba8b518c286c39e17994ddd96357d84b66b
-  data.tar.gz: 9be617af59c02e2330dc1bf374c19bfaec418c46
+  metadata.gz: d510750d5310ec2a14bb6870768d91c854264c67
+  data.tar.gz: e0209e8f7b96455bfa7d3140283fd266fb3bf109
 SHA512:
-  metadata.gz: 466210623c9c24c3c2cf02f1a78f1b231bd3fde6e0c59dfc93db44501da197a7e681ab20b70fa37d0f0432a9e6ce13a525b25dc5c57c699e9ef572d74eb82f85
-  data.tar.gz: 538f53d3912b7dd65b67b86b18548860beb4319f3789a45606e4d907a1cc286f0ba8039c682be4f104d68162b4fc3e2758024fc73aa13c4760422202837d3c69
+  metadata.gz: 9160525ba3453c07c198aa17b9f5663eef501c11fda60149423c215c6b9695a272c8f00d4428fecdd7e742a5dd2c23a2de7fc40c4f06a79c992b859a8d9b6748
+  data.tar.gz: d0ee8e32c36e235f6f22cb131e0858c4cf6387040f161c6ec6bc5fcfcf4cffcc2f4189ecc8ed76988d50c6667b128a382cec62ac9f705f9b1d34d4bdc946f1e9

data/lib/rscript.rb

@@ -2,11 +2,12 @@
 
 # file: rscript.rb
 
-# created:  1-Jul-2009
-# updated: 24-Dec-2016
+# created: 1-Jul-2009
+# updated: 7-Nov-2017
 
 # modification:
 
+  # 07-Nov-2017: feature: The log object is now passed into initialize()
   # 24-Dec-2016: Bug fix: An argument can now include an integer
   # 12-Dec-2016: The cache size can now be changed from initialize()
   # 21-Jun-2016: Replaced the initialize hash options with inline named params
@@ -41,22 +42,17 @@ require 'rexle'
 
 class RScript < RScriptBase
 
-  def initialize(logfile: '', logrotate: 'daily', pkg_src: '', cache: 5)
+  def initialize(log: nil, pkg_src: '', cache: 5)
     
-    @logger = Logger.new logfile, logrotate unless logfile.nil? or logfile.empty?
+    @log = log
     @cache = cache
     @rsf_cache = HashCache.new({cache: cache}) if cache > 0
     
   end
   
   def read(args=[])
-
-    if @logger then
-      
-      @logger.debug 'inside RScript#read' 
-      @logger.debug 'RScript -> args: ' + args.inspect
       
-    end
+    @log.info 'RScript/read: args: '  + args.inspect if @log
     
     threads = []
     
@@ -83,9 +79,9 @@ class RScript < RScriptBase
       
     else    
       out = read_rsf(args) {|doc| doc.root.xpath('//script').map {|s| read_script(s)}}.join("\n")   
-    end
-    
-    @logger.debug 'RScript -> out: ' + out.inspect[0..250] if @logger
+    end    
+          
+    @log.info 'RScript/read: code: '  + out.inspect if @log
 
     [out, args]
   end
@@ -97,10 +93,7 @@ class RScript < RScriptBase
   # note: run() was copied from the development file rscript-wrapper.rb
   def run(raw_args, params={}, rws=self)
 
-    if @logger then
-      @logger.debug 'inside RScript#run' 
-      @logger.debug 'RScript -> raw_args: ' + raw_args.inspect
-    end
+    @log.info 'RScript/run: raw_args: ' + raw_args.inspect if @log
     
     if params[:splat] then
       params.each do  |k,v|
@@ -117,7 +110,8 @@ class RScript < RScriptBase
     end            
     
     code2, args = self.read raw_args
-    @logger.debug 'RScript -> code2: ' + code2.inspect[0..250] if @logger
+    
+    @log.info 'RScript/run: code2: ' + code2 if @log
     
     begin
       
@@ -177,4 +171,4 @@ if __FILE__ == $0 then
   rs = RScript.new()
   code, args = rs.read(raw_args)
   puts eval(code).join("\n")
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rscript
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -12,26 +12,26 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE2MDExNDIxMzM1N1oXDTE3MDExMzIxMzM1N1owSDESMBAG
+  8ixkARkWAmV1MB4XDTE3MTEwNzExMjQwMVoXDTE4MTEwNzExMjQwMVowSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAM4rXRN2dI2T811f1lUPK/1+4SNjbO37Jfw9z+mPsT0Ffsl40pbT4DL73Ks9
-  ooU92wYkMDCGQ9Ql7j6LkNM4Et7TKhdhuGdMclvYiSWuLegHEF0fjpTkdrgWXwmZ
-  Crdj/vblfq120A0qGOFT5PtG/17W690lFgwA0kFwnTiSPIMfMddCpXT7+Y6n48EB
-  j6lxjVZilY88cba+YUky7wSKp7cfRnf5cEzE7ScNQWlbFBg6D7VIcyeXH3Ob3BVu
-  K1uaOf7J8GCi/AYGmmhUoHZxPKFta5WoLv/dMCPc9M+X4oOiISd/uqmDJ4LhBd2i
-  AjnPtQyXXKb+Lk6IV+bBsurJQ8UCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUzCJ1cguRxKnAD9Icwox5i/VgFmAwJgYDVR0RBB8w
+  ggEBALgKH/MjSfa8qrRYhFDKWD6qDMnQavDaCv9rxzQW0ku0GRDuf4De9ewMZrYg
+  +ENxRKsYQefyfYL6+ddWhD4K9+rNsEhLasMDIScwthXbWeeCuZvLgYCS5gFp1ciV
+  4aL8S7x2QdephSMOaouhYVYV/2N+uxDhCD9rdB2XCfdjWBg+dSCdbJRO/pQ8vr1j
+  tZE2WaCgvZq6XBB4+pqYsC/ekjRaOGXc1TfwBP/WYmjTYCVYmlhN2rJG0vfp9Zxy
+  xAjliP6u2t4NMZY2kBo3W+bCySwPeZPflgI8MAlBln9y9GHPO3zndD14du5fR9Ui
+  Czd6gzEW6Ra3BoZmK+D6UfUYGh8CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUVTzGTFtV6+VIt+oV5ksQmdzKtP4wJgYDVR0RBB8w
   HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAVdfe0gI1
-  uKeSkQHKe0vwnvce9vHVPXAJgDsDTtvh0qPKFK6yjbbyVxKumM5K6h9geeQ43hBX
-  uoGDJ7oHNsBX0LaS9Tb7234YNbKuSty2fLNIoiAuvegboOlQT+BREUmY4HKHmpqQ
-  a9NTgF8PnZYcuD+sl2tTLihBgFLzQ9GMIEck+lHJGF7ml4ZAY8u4683at1t3U32Y
-  LyOfovuK6uJvyL7lh1NOOcMSjGSyEYgA47VfYXNVkgIBCwGpyekoH+51vUiSIEDd
-  iYiOpzs0Jmv4jizUQGqzjOvyRUQTlYG2IDutjigLuyZllxXvxAcdRXKarC+qvESI
-  fb096Gf6Ao7H/w==
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAs93QhCVT
+  FUsRHEhQSWzHXjrz91vttIT2xamtOB/EL6V1pP+lTck8jkuejn0Xh4pv8BrbWsDN
+  XB+0ypuCqjWm6uQfLMaeoCUec0ue+gfyqU6XtosViTyXlIarGr/QSPBaMMamCcFv
+  eApQIEUoxne7bRBHlN9hk+9GDbMhi3gV34pGWwIAEnUzJQgmN/YFy0ix5XJTpfgA
+  xj+tZ4/g/En7EMods00s7POLSpHhvN7LQT8nRttEmIm0AXNeZ7tSfxRZ4n7hgEQM
+  TqGxWMRGelsOt2zNIFH+8d4Yz1dYsNbhK66Q8KRR2vHoT/9T3IJGBPHdsR6Kl6yB
+  e5SlxbsP/R/Leg==
   -----END CERTIFICATE-----
-date: 2016-12-24 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashcache
@@ -59,42 +59,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: rexle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.34
+        version: 1.4.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.34
+        version: 1.4.10
 description: 
-email: james@r0bertson.co.uk
+email: james@jamesrobertson.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -121,9 +121,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
-summary: rscript previously known as rcscript, reads Ruby code which is embedded within
-  an rscript XML file.
+summary: Reads or executes a job contained within a package (XML document), whereby
+  the package is typically read from a URL
 test_files: []