libroute 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad13a88fd242b832ae6578c0e9d22bf980f88605
-  data.tar.gz: 57737b8b1bcdb6228ef9efdf5fbaf3d64d9baf6a
+  metadata.gz: d4a0c471f132928b944fdd4066cc1028b6ba253a
+  data.tar.gz: c117ec64d1ad11b257b7c3e83161957928143f27
 SHA512:
-  metadata.gz: 09979b24df53b97125a59dffc306d8a99462bcad70519f5b720028794dc64e5bc9d55f480633ad0f9a7f6e6971c66d6a377ce9863a0cc29cb8ac26b46351bc2d
-  data.tar.gz: a2c7aa88c7e24a2e71959a04f2db41e2451e74d5bb827dbde5c1f7a0187f7d1b8fc2bceb2f65093926ac87c92f66a6317492e82f150a18101cd2908772b12868
+  metadata.gz: cad0517a721dd489df5ec509b614a17d3c82b60cf169f185cad39e268b468c50fdf07e0abbfb6223f0402df8ddd0fc11e448fbcac85517c4c6bd73d7e365efaf
+  data.tar.gz: 9721df9a9e336b25357941f2f4ac1f368f73420ccc39e963dcf6867c3de1d31c4db52fc3db287e9b1dceaecb6b7a5f059b3c5ca053e2a4ee86d0695049bcb230

data/exe/libroute

@@ -18,28 +18,40 @@ require 'bson'
 
   # Populate params
   paramshash = Hash.new
-  if !options.params.empty?
-    params = options.params.split(",")
-    params.each do |p|
+  if !options.param.empty?
+    options.param.each do |p|
       key,val = p.split("=",2)
       paramshash[key]=val
     end
   end
 
-  # Populate stdin
-  if !$stdin.tty?
-    data = $stdin.read
-    if !data.nil?
-      paramshash['stdin'] = BSON::Binary.new(data)
+  # Populate files
+  if !options.file.empty?
+      options.file.each do |p|
+      key,val = p.split("=",2)
+      if val.eql?('-')
+        fileval = $stdin.read
+      else
+        begin
+          fileval = File.read(val)
+        rescue
+          fileval = nil
+        end
+      end
+      if fileval.nil?
+        puts "Failed to read file: #{val}"
+        exit 1
+      end
+      paramshash[key] = BSON::Binary.new(fileval)
     end
   end
 
   result = Libroute.exec(options.library, paramshash)
-  if !result['stdout'].nil?
-    if result['stdout'].is_a?(String)
-      puts result['stdout']
+  if !result['output'].nil?
+    if result['output'].is_a?(String)
+      puts result['output']
     else
-      bb = result['stdout'].data
+      bb = result['output'].data
       puts bb.to_s
     end
   else

data/lib/libroute/librouteexec.rb

@@ -16,7 +16,7 @@ module Libroute
     end
   end
 
-  def exec(library, params)
+  def exec(library, params, opts={})
 
     # Check if existing container running
     c = Docker::Container.all(all: true).select{|c| c.info['Names'][0].eql?('/libroute_instance-' + library)}
@@ -49,7 +49,7 @@ module Libroute
 
       image = imagesel[0][1]
 
-      c = Docker::Container.create('Image' => image.id, 'name' => 'libroute_instance-' + library, 'Tty' => true)
+      c = Docker::Container.create({'Image' => image.id, 'name' => 'libroute_instance-' + library, 'Tty' => true}.merge(opts))
       c.start
 
       # Wait for container to start

data/lib/libroute/librouteparse.rb

@@ -14,7 +14,8 @@ module Libroute
     options = OpenStruct.new
     options.library = []
     options.build = []
-    options.params = []
+    options.param = []
+    options.file = []
     options.showhelp = false
 
     opt_parser = OptionParser.new do |opts|
@@ -40,8 +41,12 @@ module Libroute
         options.build = o
       end
 
-      opts.on("-p","--params PARAMETERS","Parameters","Comma separated list of parameters") do |p|
-        options.params = p
+      opts.on("-p","--param PARAMETER","Specify parameter in the form -p param=value") do |p|
+        options.param.push p
+      end
+
+      opts.on("-f","--file FILE","Specify parameter in the form -f param=file","  Use - for file to read from stdin") do |f|
+        options.file.push f
       end
 
       opts.on_tail("-h", "--help", "Show command options","Show library options (-l LIBRARY)") do |h|

data/lib/libroute/version.rb

@@ -1,3 +1,3 @@
 module Libroute
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libroute
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - David Lisk (XS Research Ltd)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-04 00:00:00.000000000 Z
+date: 2016-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api