rack-rscript 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0929ad598b28b90a80b39b3d406e7b3c3d054ef8e8009740272e0c4efa871a0f'
-  data.tar.gz: 4d61e887c6c4c1d1630f282beec390f4f6cb2e7489bd94d6ffabe0d1e7afe623
+  metadata.gz: b513cf10fc9f799000b67f9bca747cd132f117a87e771efd9dffd4abccfd836e
+  data.tar.gz: '089507f8dc242466e97ceeda2ebbd9b6f22e4729bc055a520152c4b41e963369'
 SHA512:
-  metadata.gz: 206d6635be3d06be5c51a3d8ca93e15d2dea9cbcd3c52b1f62ce3600a4e23be54f93559384a47381a1c208ba051b35f01a2f3b75d3f16b965d6f270bf259ebec
-  data.tar.gz: 4c05d931033a0c8b8f6fa45a3662c7aa59a73a78f470100eabba4ef00e5b5edfb284c965879a571a6ff64c8619ee9e29876a662dd8e12dcaa45727883dc317b4
+  metadata.gz: c9baabf7e1d645efbbf0ea953e5a31abd5452a3b8a2275d2e03c3da27ccd0d8a2269be22819fe0bd3b60c50e9e24d13adc6c5ddb872bda3b776c398e66a3be95
+  data.tar.gz: 6833909c6c7d7bc3e30f08ab0b4b0b4514f33fdfa9344b6e6b11043435729978927c5434b5b59f55745a901374cd42ce77d03be1f5cfca7d40ec153edd007557

data/lib/rack-rscript.rb

@@ -29,10 +29,11 @@ end
 class RackRscript
   include AppRoutes
   include RXFHelperModule
+  using ColouredText
   
   def initialize(log: nil, pkg_src: '', cache: 5, rsc_host: 'rse', 
                  rsc_package_src: nil, pxlinks: nil, debug: false,
-                 root: 'www', static: {})
+                 root: '', static: {})
 
     @log, @debug, @static = log, debug, static
     
@@ -182,13 +183,13 @@ class RackRscript
     
     get '/do/:package/:job/*' do |package, job|
       raw_args = params[:splat]
-      args = raw_args.first[1..-1][/.\S*/].split('/')
+      args = raw_args.first[/[^\s\?]+/].to_s.split('/')[1..-1]
       run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params, args)
     end
 
     post '/do/:package/:job/*' do |package, job|
       raw_args = params[:splat]
-      args = raw_args.first[1..-1][/.\S*/].split('/')
+      args = raw_args.first[/[^\s\?]+/].to_s.split('/')[1..-1]
       run_job("%s%s.rsf" % [@url_base, package], "//job:" + job, params, args)
     end
 
@@ -267,8 +268,13 @@ class RackRscript
 
     get /^\/$/ do
 
-      file = File.join(@root, 'index.html')
-      File.read file
+      if @root.length > 0 then
+        file = File.join(@root, 'index.html')
+        File.read file
+      else
+        Time.now.inspect
+      end
+      
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-rscript
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   lDqRilVLi+NZf/R9vR/vaL53GOmDC+VoywL5frfWXVSK1Zs1fF7RAMZDJeYF0A8W
   arbgkVprfDCrZHsF1ZnCIvNO
   -----END CERTIFICATE-----
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2019-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -143,20 +143,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rexslt
   requirement: !ruby/object:Gem::Requirement