cnvrg 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 496681d6eef33bf3a628234cce27bc4ad7ad8ade
-  data.tar.gz: 3b63e71e5cbe3f12e8754ca8ed0c243c9a8e11df
+  metadata.gz: 5356c9b6d15b9420d34a2de292ff4f4603cba459
+  data.tar.gz: 3551dd77cb7f4a530be06e362d4775abf9f68ede
 SHA512:
-  metadata.gz: ea24653cfa006ea02c2702cf24219e99669e4db48c423b116f67003b00379d1ded3f2bf0badc95d74978e270129cf64fc176b3d83b88c8c72451cf035a8fe63c
-  data.tar.gz: 950a88a8e3bb820ac1c4bb66f81eeeb142e231a51c504d82c19ceb540835c01b2061e56536c334f8beb87ed8ec50b271934cd8fc996924ee74a98fdaf9ef2d92
+  metadata.gz: a151a8e04c64d7e5950ac3b2673deb0a1c4785b2742831ab676865988cddf88a94d9c115c73206ee37151652d1687bb3edb217d4eed1c5c55c217931fdbc4aad
+  data.tar.gz: b96a3fba90aece28aef6b494db1624e5ffd2f4dc934657f19fb38c9f14e470c4b1f4a50c5948e8131c65fcabb66550a60d223ce59af7e6cfb417bd96f1a76652

data/cnvrg.gemspec

@@ -35,6 +35,7 @@ Gem::Specification.new do |spec|
     spec.add_runtime_dependency 'sucker_punch', '~> 2.0'
     spec.add_runtime_dependency 'urlcrypt', '~> 0.1.1'
     spec.add_runtime_dependency 'logstash-logger'
+    spec.add_runtime_dependency 'docker-api'
     
 end
 

data/lib/cnvrg/cli.rb

@@ -20,8 +20,7 @@ require 'cnvrg/experiment'
 require 'etc'
 require 'logstash-logger'
 require 'cnvrg/job'
-require 'pry'
-
+require 'docker'
 
 # DEV VERSION
 #
@@ -29,12 +28,22 @@ module Cnvrg
   class CLI < Thor
 
     INSTALLATION_URLS = {docker: "https://docs.docker.com/engine/installation/", jupyter: "http://jupyter.readthedocs.io/en/latest/install.html"}
+    desc 'test', 'Prints cnvrg current version'
+
+    def test
+      verify_software_installed("docker")
+      container =  Docker::Container.create( 'Image' => 'cnvrgio/python2')
+      # container =  Docker::Container.create("1e4e23560813")
+      container.start
+      puts container.exec(['bash'], stdin: StringIO.new("python --version"))
 
+    end
 
     desc 'version', 'Prints cnvrg current version'
 
     def version
       puts Cnvrg::VERSION
+
     end
     map %w(-v --version) => :version
 
@@ -222,6 +231,25 @@ module Cnvrg
         clean = options["clean"]
         docker_image = options["docker_image"]
         if !docker_image.nil? and !docker_image.empty?
+          # local_images = Docker::Image.all
+          # 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)
+          #   else
+          #     say "Could not create a new project with docker, image was not found", Thor::Shell::Color::RED
+          #     exit(1)
+          #
+          #   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]}')
+          #
+          #
+          #
+          #
+          #
+          # end
           pull_image(docker_image)
         end
         say "Creating #{project_name}", Thor::Shell::Color::BLUE
@@ -252,7 +280,8 @@ module Cnvrg
         say "/nAborting"
         exit(1)
       end
-      end
+    end
+    
 
 
       desc 'link', 'Link current directory to a cnvrg project'
@@ -1190,7 +1219,6 @@ module Cnvrg
 
 
       desc 'pull_image', 'downloads and loads a custom image'
-
       def pull_image(image_name)
         begin
           verify_logged_in(false)
@@ -1442,6 +1470,7 @@ module Cnvrg
         end
 
         def verify_software_installed(software)
+          begin
           install_url = Cnvrg::CLI::INSTALLATION_URLS[software.to_sym]
           installed = `which #{software}`
           if installed.empty? or installed.nil?
@@ -1451,18 +1480,24 @@ module Cnvrg
           installed.strip!
           case software
             when "docker"
-              is_running = `#{installed} images`
-              if is_running.include? "Cannot connect to the Docker daemon"
+              is_running = system("#{installed} images>/dev/null 2>&1")
+              if not is_running
                 if Helpers.mac?
-                  system("open -a Docker")
-                else
-                  #is linux
-
-
-                end
+                  say "docker isn't running. run:\ndocker-machine start default 2>/dev/null & eval `docker-machine env default`", Thor::Shell::Color::BLUE
+                  exit(1)
+                elsif Helpers.ubuntu?
+                  #TODO: change here
+                  say "docker isn't running. run:\ndocker-machine start default 2>/dev/null & eval `docker-machine env default`", Thor::Shell::Color::BLUE
+                  exit(1)
+              end
               end
           end
+
           return installed
+          rescue
+            exit(1)
+          end
+
         end
 
         def get_local_time(time_to_update)
@@ -1476,7 +1511,7 @@ module Cnvrg
 
       end
     end
-  end
 
 
 
+end

data/lib/cnvrg/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -259,6 +259,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: docker-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A CLI tool for interacting with cnvrg.io.
 email:
 - info@cnvrg.io