cnvrg 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5356c9b6d15b9420d34a2de292ff4f4603cba459
-  data.tar.gz: 3551dd77cb7f4a530be06e362d4775abf9f68ede
+  metadata.gz: 745fd9b806d9e5d46b4ba24212e06f5a426447f3
+  data.tar.gz: c950e20258da5c1243765572b6b7f4c93d0cad1a
 SHA512:
-  metadata.gz: a151a8e04c64d7e5950ac3b2673deb0a1c4785b2742831ab676865988cddf88a94d9c115c73206ee37151652d1687bb3edb217d4eed1c5c55c217931fdbc4aad
-  data.tar.gz: b96a3fba90aece28aef6b494db1624e5ffd2f4dc934657f19fb38c9f14e470c4b1f4a50c5948e8131c65fcabb66550a60d223ce59af7e6cfb417bd96f1a76652
+  metadata.gz: f60cd3a8cbb4d9bb6c53beac4faf0b76d5db9db469e4474dabe36787985b7d601a07d0029dcb797b7ede238ec2fa3e96beaaa56497b39fc05380dd05f54981fb
+  data.tar.gz: 6587fe66cf021518dc9249a3c0eb936ccfb126b51b6b6cc605d1e44b09cbee30b55bb590cc7420bec05951077d63f452bb9a88a7466a78bd1281d51ccd334b1f

data/lib/cnvrg/cli.rb

@@ -235,7 +235,14 @@ module Cnvrg
           # docker_image_local = local_images.map{|x| x.info["RepoTags"]}.select{|y| y[0].include? docker_image}.flatten
           # if docker_image_local.size == 0
           #   if yes? "Image wasn't found locally, pull image from cnvrg repository?"
-          #     pull_image(docker_image)
+          #     image = pull_image(docker_image)
+          #     if image
+          #       say "downloaded image: #{docker_image_local[0]}, creating a container.."
+          #       @container = Docker::Container.create('Image' => '#{docker_image_local[0]}')
+          #       if @container.nil?
+          #         say "could not create container with image #{docker_image_local[0]}"
+          #       end
+          #     end
           #   else
           #     say "Could not create a new project with docker, image was not found", Thor::Shell::Color::RED
           #     exit(1)
@@ -243,14 +250,12 @@ module Cnvrg
           #   end
           # elsif docker_image_local.size == 1
           #   say "found image: #{docker_image_local[0]}, creating a container.."
-          #   container = Docker::Container.create('Image' => '#{docker_image_local[0]}')
-          #
-          #
-          #
-          #
+          #   @container = Docker::Container.create('Image' => '#{docker_image_local[0]}')
+          #   if @container.nil?
+          #     say "could not create container with image #{docker_image_local[0]}"
+          #   end
           #
           # end
-          pull_image(docker_image)
         end
         say "Creating #{project_name}", Thor::Shell::Color::BLUE
         if Dir.exists? project_name or File.exists? project_name
@@ -281,7 +286,7 @@ module Cnvrg
         exit(1)
       end
     end
-    
+
 
 
       desc 'link', 'Link current directory to a cnvrg project'
@@ -1158,22 +1163,23 @@ module Cnvrg
 
             end
           end
-          path = Dir.pwd+"/#{owner}_#{image_name}.tar.gz"
+          path = Dir.pwd+"/#{image_name}.tar.gz"
           @files = Cnvrg::Files.new(owner, "")
 
           say "Downloading image file", Thor::Shell::Color::BLUE
           begin
-            res = @files.download_image(path, image_id, owner)
-            if res
-              checks = Helpers.checkmark()
-              say "#{checks} Done", Thor::Shell::Color::GREEN
-              log_end(0)
-              return true
-            else
-              say "Couldn't download image #{image_name}", Thor::Shell::Color::RED
-              log_end(1,"can't download image")
-              return false
-            end
+            image_path = @files.download_image(path, image_id, owner)
+            return image_path
+            # if res
+            #   checks = Helpers.checkmark()
+            #   say "#{checks} Done", Thor::Shell::Color::GREEN
+            #   log_end(0)
+            #   return true
+            # else
+            #   say "Couldn't download image #{image_name}", Thor::Shell::Color::RED
+            #   log_end(1,"can't download image")
+            #   return false
+            # end
           rescue Interrupt
             log_end(-1)
             say "The user has exited to process, aborting", Thor::Shell::Color::BLUE
@@ -1224,15 +1230,16 @@ module Cnvrg
           verify_logged_in(false)
           log_start(__method__,args,options)
 
-          if download_image(image_name)
-            path = Dir.pwd+"/#{owner}_#{image_name}.tar.gz"
-            loadRes = system("docker load < #{path}")
-            if loadRes.include? "Loaded image"
-              say loadRes, Thor::Shell::Color::GREEN
+          path = download_image(image_name)
+          if path
+            image = Docker::Image.import(path)
+            if not image.nil?
+              return image
               log_end(0)
             else
-              say loadRes, Thor::Shell::Color::RED
+              say "Could not download image", Thor::Shell::Color::RED
               log_end(1,loadRes)
+              retunr false
             end
 
           end

data/lib/cnvrg/files.rb

@@ -86,15 +86,15 @@ module Cnvrg
       path = download_resp["result"]["path"]
 
       if Cnvrg::CLI.is_response_success(download_resp, false)
-        begin
-          open(file_path_to_store, 'wb') do |file|
-            file << open(path).read
-          end
-        rescue
-          return false
-        end
-
-        return true
+        # begin
+        #   open(file_path_to_store, 'wb') do |file|
+        #     file << open(path).read
+        #   end
+        # rescue
+        #   return false
+        # end
+
+        return path
       else
         return false
       end

data/lib/cnvrg/job.rb

@@ -1,7 +1,6 @@
 require 'mimemagic'
 require 'aws-sdk'
 require 'URLcrypt'
-require 'pry'
 
 require 'sucker_punch'
 module Cnvrg

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-    VERSION = '0.0.10'
+    VERSION = '0.0.11'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Yochay Ettun