rscript-server 0.1.3 → 0.1.5

data/lib/rscript-server.rb

@@ -9,15 +9,16 @@ require 'rexml/document'
 
 class RScriptServer
   include REXML
+  include AppRoutes
 
   def initialize(raw_opts={})
     
     opts = {ip: '0.0.0.0', port: 4446, pkg_src: ''}.merge(raw_opts)
     @ip, @port, @url_base = opts[:ip], opts[:port], opts[:pkg_src]    
     super()
-    params = {}
-    @app = AppRoutes.new(params)
-    application(params)
+
+    #@app = AppRoutes.new(params)
+    routes(@params)
     @rscript = RScript.new()
 
     @content_type = 'text/html'
@@ -34,7 +35,7 @@ class RScriptServer
       request = raw_request[/.[^\s]+(?= HTTP\/1\.\d)/].strip      
       puts "%s %s" % [Time.now,request]
 
-      result = @app.run(request)
+      result = run_route(request)
 
       result ||= "404: page not found"
 
@@ -46,61 +47,76 @@ class RScriptServer
 
   private
 
-  def application(params)
+  def routes(params)
+
+    get '/do/:package/:job' do |package,job|
 
-    @app.routes do
+      jobs = "//job:" + job
+      url = "%s%s.rsf" % [@url_base, package] 
+      run(url, jobs, params)
+    end
 
-      get '/do/:package/:job' do |package,job|
+    get '/do/:package/:job/*' do |package, job|
 
-        jobs = "//job:" + job
-        url = "%s%s.rsf" % [@url_base, package] 
-        run(url, jobs, params)
-      end
+      jobs = "//job:" + job
+      raw_args = params[:splat]
+      args = raw_args.join.split('/')[1..-1]
+      url = "%s%s.rsf" % [@url_base, package] 
+      run(url, jobs, params, args)
+    end
 
-      get '/do/:package/:job/*' do |package, job|
+    get '/source/:package' do |package|
 
-        jobs = "//job:" + job
-        raw_args = params[:splat]
-        args = raw_args.join.split('/')[1..-1]
-        url = "%s%s.rsf" % [@url_base, package] 
-        run(url, jobs, params, args)
-      end
+      url = "%s%s.rsf" % [@url_base, package]
+      @content_type = 'text/plain'
+      open(url, "UserAgent" => 'RscriptServer').read
+    end
 
-      get '/source/:package' do |package|
+    get '/source/:package/:job' do |package, job|
 
-        url = "%s%s.rsf" % [@url_base, package]
-        @content_type = 'text/plain'
-        open(url, "UserAgent" => 'RscriptServer').read
-      end
+      url = "%s%s.rsf" % [@url_base, package]
+      buffer = open(url, "UserAgent" => 'RscriptServer').read            
+      doc = Document.new(buffer)
 
-      get '/source/:package/:job' do |package, job|
+      @content_type = 'text/plain'
+      XPath.first(doc.root, "//job[@id='#{job}']").to_s
+    end
 
-        url = "%s%s.rsf" % [@url_base, package]
-        buffer = open(url, "UserAgent" => 'RscriptServer').read            
-        doc = Document.new(buffer)
+    get '/reset' do |package, job|
 
-        @content_type = 'text/plain'
-        XPath.first(doc.root, "//job[@id='#{job}']").to_s
-      end
+      @rscript.reset
 
+      @content_type = 'text/plain'
+      "reset done"
     end
-  end
 
-  def get(arg,&block)
-    @app.get(arg, &block)
+
   end
 
   def run_rcscript(rsf_url, jobs, raw_args=[])
     @rscript.read([rsf_url, jobs.split(/\s/), raw_args].flatten)
   end
 
-  def run(url, jobs, *qargs)
+  def run(url, jobs, params={}, *qargs)
+    if params[:splat] and params[:splat].length > 0 then
+      h = params[:splat].first[1..-1].split('&').inject({}) do |r,x| 
+        k, v = x.split('=')
+        r.merge(k.to_sym => v)
+      end
+      params.merge! h
+    end
+
     result, args = run_rcscript(url, jobs, qargs)
     
     begin
       eval result
-    rescue
-      "rws error: " + ($!).to_s
+    #rescue
+    #  "rws error: " + ($!).to_s
+    rescue Exception => e  
+
+      err_label = e.message + " :: \n" + e.backtrace.join("\n")      
+      puts err_label      
+      $!
     end
   end
 end

data.tar.gz.sig

@@ -0,0 +1,2 @@
+���:�n����O�^��A���4�0�����{�r��&�Њi�f(�b�L���y�w�o�!�o^F�qz�=&�9�������?;�e{>1 �
��������/�gV�α������׋�h�u��ztm�3�=WI�>�+Z�}|͆;dx(�p䅈�Ó��'�%U6�����S���'�٧5��j)�s��-�Q��8��pPY
+`{��	��8��˫D~�?��)�L>U�7���[�W�P�

metadata

@@ -2,16 +2,36 @@
 name: rscript-server
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
-authors: []
-
+authors: 
+- James Robertson
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDRDCCAiygAwIBAgIBADANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
+  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
+  8ixkARkWAmV1MB4XDTEzMDIwNjIxMDQ0OFoXDTE0MDIwNjIxMDQ0OFowSDESMBAG
+  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
+  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+  ggEBALlQCMk4cjocTaoNBcPxZaptjjIeLoHRCGTJL4yZhjjMJOL9AIcwgwpzF0Xm
+  7PELDjc1G04YF1B+EWwl4p+DxY7zqW3xTRUcHpl7W0lgjChKGwZVSakocb3uD/O1
+  xYy2crwCrfOlTFfvY9/jcvnygvAsvjzyR1T1rX61/JSlTjTFPW+vocaDlM+X1l66
+  JzpX7zoRtvPYFQj2h2BqKAwPE7z1dbKXHasN07PzY02hwD0BsAKDN1AMCxgYejns
+  Q7LMcRzWrfaJuNay9Q3Rp1IRXJFHuDSO5RWhdVS6p0zYUF6LoMEFC8EZbOnbkkDt
+  TyOScM/ATDMxKQBRQCCzYZUVOz0CAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4E
+  FgQUDFdDeQanOsBnwwLGGobD+r1wIigwCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEB
+  BQUAA4IBAQBOQQ9O1N3KyrSVW5ah7HBwX0QTV4RapEeQLYTRRedB2Ow58EoWTahz
+  ztzkADFp7gfmQTTwUfXBEQcjk8hN22+5fj74u0DwYo1+J8qD3/TXoY01nRvZ6SNn
+  dgwkb0BVzSuyJUro/k498eXno0M60XtF/ad9AT1J7C2GJ2JXFeXPuApPmmKaCoJz
+  ah2XuE7UyeVvKFrtN3ljh6lb+9USdfH5G6mCdsc7XOvcPGK3cu1kwhvRNWCfybX4
+  QgYGas6PZ27G/HiJSLLn5lREsGrpTG/7Bm87fwbobAvjai89EpM8vyl1zhGXdCSA
+  FmJWaeq1WTfKnVDXvfgJ4Qb5d4WK6JRl
+  -----END CERTIFICATE-----
 
-date: 2011-03-14 00:00:00 +00:00
-default_executable: 
+date: 2013-02-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rscript
@@ -45,7 +65,6 @@ extra_rdoc_files: []
 
 files: 
 - lib/rscript-server.rb
-has_rdoc: true
 homepage: 
 licenses: []
 
@@ -69,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: rscript-server