gogreen 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77c145cd34f5ee0c82c6254c5a91036cda124369
-  data.tar.gz: f9f3d914a9845948f34e0361b86917032b838424
+  metadata.gz: 3bbea11818b8c2deaa89e65607eaf632937e979d
+  data.tar.gz: e24961c391fc1db925b183895d9b0e81dc8daf33
 SHA512:
-  metadata.gz: 5ae2e31938460505cf6aa17d6ee2a67add89f64cf5797c049a3a378ba63c3671a17af8533d73a659c9811d51ee2d6a0c1091804a4be11645d0a12c13aa341b39
-  data.tar.gz: 4a8ed6f2d4c9cf15b71a4951d3c981882be9e733fcea50fa2126ecb1a786b9e4633f578305460843b5a01ff22a077baf18a868e007d1571855e59872926f9b5e
+  metadata.gz: e777db66865cbecd561438532010d7fda21028685c55a12792beb110751ddb5bbde5efec07142c577770a58eda907b2c475639ae985dd80898a6f4808ab16475
+  data.tar.gz: 67be58a984e9c76afba3f8a3051e18e13e11e611efceb358b83a73b28813f29ffd82912d83b1bad57a8c7880d585edc037cf7967dac8605159959d363da36a57

data/lib/gogreen.rb

@@ -15,8 +15,10 @@ end
 class GoGreen
 
   def initialize(alias_file, site=nil, subdomain=nil, shell_execute: true)
+    super()
 
     @shell_execute = shell_execute
+
     buffer = RXFHelper.read(alias_file).first
     
     name = case buffer
@@ -28,6 +30,7 @@ class GoGreen
       raise GoGreenException, 'alias file ' + alias_file + ' not recognised'
     end
 
+
   end
 
   def execute(alias_name, job_args=[])
@@ -37,15 +40,15 @@ class GoGreen
     
     cmd = alias_found[:body][:command]
     cmd += ' ' + @conf if @conf
-
+    
     if cmd[/^rcscript/] then
 
       a = cmd.sub(/^rcscript /,'').split + job_args.map do |x| 
         x.sub(/^["'](.*)["']$/,'\1') 
       end
-      
-      raw_code, args = RScript.new.read a
 
+      raw_code, args = RScript.new.read a
+    
       begin
 
         if @shell_execute then
@@ -54,7 +57,8 @@ class GoGreen
           a.unshift 'args = ' + args.inspect + "\n\n"
           lastline = a.pop
           a.push('puts ' + lastline)
-          code2 = a.join.gsub('\"','"').gsub('\#','#')
+
+          code2 = "$0 = 'gogreen'\n" + a.join.gsub('\"','"').gsub('\#','#')
           
           file = Tempfile.new('gogreen')        
           file.write(code2)
@@ -67,8 +71,9 @@ class GoGreen
           #pipe.close        
           
         else
-          
-          eval(raw_code)
+
+          result = eval(raw_code)
+
         end
         
       rescue
@@ -102,14 +107,18 @@ class GoGreen
   def pxread(buffer, site, subdomain)
 
     px = Polyrex.new    
+
     px.parse buffer
 
     a = px.rxpath "site[label='#{site}']/subdomain[label='#{subdomain}']"
+
     raise GoGreenException, "site not found " if a.empty?
 
     rec = a.first
 
-    [rec.to_dynarex.records, rec.conf]
+    r = [rec.to_dynarex.records, rec.conf]
+
+    r
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gogreen
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Robertson
@@ -12,26 +12,26 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE1MDExOTE0NTA1N1oXDTE2MDExOTE0NTA1N1owSDESMBAG
+  8ixkARkWAmV1MB4XDTE2MTIwNTEwNDcyOFoXDTE3MTIwNTEwNDcyOFowSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAOUmPZn+uavFxLuOsh++bs2IWsMW8FZKmiXIzwR4Zi0Z58wNwDU9awBLtWDi
-  nvoa3NXHMDv5vGpq9lAYGy0CBAJYsk8FaAz2f66u6DGd+Yo2ok2veATDyLDvA0so
-  l7Ej41AVZBEgLAqX3EOW1SBcCNij0CZ6bpuwElDRHjbt78j3Unp7lcGTS8k2PBW6
-  D3KN15hVV5GzCvq4FucqxKEq6DvkDdXXr6QChxRd0ylbUS+JEfyUXmnYSsfTXLj9
-  VLRQZjkEJzgJ32TgZODlCQ8vLIDiWTkB5JabSwYXx+qbicBIDG8iWxHCFgNwVLWt
-  o0fwsINgkqSwSjxh8pWla70WkYcCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUr9HEP96GfWn6HPcRCpzY7VwNWM4wJgYDVR0RBB8w
+  ggEBAPAVLUAyfgku9UaXLs4EIV8VMTf+pDScK1HMJP0cXA2wIyEpryg0tOnz4uyP
+  fIqxqktHEETyt2/TVdCfC7ElOBS8SHl2ZEaLKo3lGb4/1nPUmRix3+sFc/A5omjh
+  uHBULnrtT9O9lXiKokzRSTbPL7oF9C+VkYWVF4d1bUSHBL+QCe5gqEElhy5daIYt
+  KUQnLEwYedH4v1kExkoS5ZGBjKSzFMOkXh8Dxc0MfoVnAy47uOx9ZbxQc1FTz9Jf
+  pm1+ZZkwUCMl5Asl7iqzZtByDPQ739HXhbtPKJhsnEg0Ozxxd5kFNMdOxbV7jPIt
+  dgHY7yJ7jxzPzP7Bu+TGvDEj8fMCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQU5CPVS5ILT76Uk/I97vgsxthi8fgwJgYDVR0RBB8w
   HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEALqNXgxL8
-  CBXG+VwtL45uA62rgI8EuVj1SyLF7Rdjh1LEhvR8bqb54Z+64YIeseXVV/jheSoZ
-  yP/CKngHWvgTbII4kNpWKSuQQB4bcQ4N/Ti5Mx0G0XILB3kJinI+Od4I4nucwgcO
-  ScRR/L3yBTRUWJsBzKEwYu/pkJm4JF/h+DnhjFsK/Kl/aIJLHen6S8KwgGW2D4yZ
-  5nmxFXbYqZr1wyy0b9HgTP66CO/ifkFlxnMDIlyHcg9ehxLxbo1zS7nCQ4yRQBzc
-  fxGSO2N1hJlOaabiyPprkSP8DNu8AkyuJ0CtzF003LE+iM/x/YbkXZKiN2/VSCII
-  fBUnJw9rwbKnlw==
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAtpAnj8kS
+  kcq77Two34Oz8Tp31ezl11mqAiyvyiwLxAAoLTBYGnp+/0ltL1F1JgrPYHtEJwD9
+  S4yHMzpv/m2YoniBRCID++x6+yVefKy8ySswkoSJD2OLa3tV53gW8DYpPGvQxVsZ
+  0klwbF+HpxJyB7wH3FGowPBs/GvzcvKwzT4hsfUViJTnpMH0dYP3T0wekyV6OIj6
+  irRuSC4ik18C8mI5WNZKwPEGW/NJguuv5zKLVOS47z2Fv597DtLneF5mEpZ0KzLQ
+  oHB/5/Tnij2Ikx4Vr9Gf+Dce0Qm+DaxLyhscOkeBnO7UV68Yl4HCyuAXjxghBpPS
+  9Rhj3K+9atOEmw==
   -----END CERTIFICATE-----
-date: 2015-07-11 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rscript
@@ -39,40 +39,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: dynarex
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.32
+        version: 1.7.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.32
+        version: 1.7.16
 - !ruby/object:Gem::Dependency
   name: acronym
   requirement: !ruby/object:Gem::Requirement
@@ -102,7 +102,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -112,7 +112,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.1.8
 - !ruby/object:Gem::Dependency
   name: optparse-simple
   requirement: !ruby/object:Gem::Requirement
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Run RSF jobs from the command line using a Dynarex flavoured aliases file.