libroute 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bafb0113b18998549c1efe458b3f5b735de3b3c4
-  data.tar.gz: a55703d7e20895ca2d267dee8db8a301eabbc009
+  metadata.gz: ad13a88fd242b832ae6578c0e9d22bf980f88605
+  data.tar.gz: 57737b8b1bcdb6228ef9efdf5fbaf3d64d9baf6a
 SHA512:
-  metadata.gz: ae98d328b4b782f7fdd3e4eabe42d891f98b7bfe47c20e16d69abf4d1c5a905f9e6b5e3f4016ecbae8a98a3746d671e34b0e91d2cc566c94d1a19a00ced560ab
-  data.tar.gz: d8e1ab31186919ad737c0e2b568bb8f8747438740d28333dca1966338fc0f5177248485424a62f7905e4ba468a3172122fd337e62b395a13cee97c648a10c262
+  metadata.gz: 09979b24df53b97125a59dffc306d8a99462bcad70519f5b720028794dc64e5bc9d55f480633ad0f9a7f6e6971c66d6a377ce9863a0cc29cb8ac26b46351bc2d
+  data.tar.gz: a2c7aa88c7e24a2e71959a04f2db41e2451e74d5bb827dbde5c1f7a0187f7d1b8fc2bceb2f65093926ac87c92f66a6317492e82f150a18101cd2908772b12868

data/lib/libroute/librouteexec.rb

@@ -4,12 +4,16 @@ module Libroute
 
   def build(options)
     puts "Building #{options.library} from directory #{options.build}"
-    im = Docker::Image.build_from_dir(options.build) do |v|
-      if (log = JSON.parse(v)) && log.has_key?("stream")
-        puts log["stream"]
+    begin
+      im = Docker::Image.build_from_dir(options.build) do |v|
+        if (log = JSON.parse(v)) && log.has_key?("stream")
+          puts log["stream"]
+        end
       end
+      im.tag('repo' => 'libroute_image-'+options.library)
+    rescue
+      puts "Libroute: An error occurred during the build process.\n\n"
     end
-    im.tag('repo' => 'libroute_image-'+options.library)
   end
 
   def exec(library, params)
@@ -29,7 +33,22 @@ module Libroute
     if c.length == 0
 
       # Launch container from image
-      image = Docker::Image.all.select{|x| x.info['RepoTags'][0].split(':')[0].include?('libroute_image-' + library)}.first
+
+      imagemap = Docker::Image.all.flat_map{|x| x.info['RepoTags'].count == 1 ? [[x.info['RepoTags'][0],x]] : x.info['RepoTags'].map{|y| [y,x]} }
+        # This command splits multiple tags into a flat vector
+        # -> imagemap is a vector of length equal to the number of images
+        # => each elements is a vector of length 2: [tag, image]
+
+      imagesel = imagemap.select{|x| x[0].split(':')[0].include?('libroute_image-' + library)}
+
+      if imagesel.count == 0
+        h = Hash.new
+        h['stderr'] = 'Image not found'
+        return h
+      end
+
+      image = imagesel[0][1]
+
       c = Docker::Container.create('Image' => image.id, 'name' => 'libroute_instance-' + library, 'Tty' => true)
       c.start
 

data/lib/libroute/version.rb

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

metadata

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