cnvrg 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6d6742b8d329e83b4eba3acbc60dc05bd2a881d
-  data.tar.gz: a20f65edcc1666973f12d7d8f24c4e7837cea0ae
+  metadata.gz: 080cd87745b468971f39517ad0f5ba066ab41b00
+  data.tar.gz: 7fa5794bb717f1899827784ed952c38ee400e2dd
 SHA512:
-  metadata.gz: b1eb7c4e30a407596bbce0c8e86094a76ad417a7f8bc4003c1d4f72d6eb03c4ae8bc5bb7bb1f9baf88b2a2f31d4971a90afa67b73ee2a91e7190549805664ad0
-  data.tar.gz: 74415b8949fc00dd752add66aa441359716e23004ad4decb3fff796e994ef309a1028a0cedd7b073fa0616f307a917344433185df9f4a7828ce233867fc17f85
+  metadata.gz: 3983ba01e3b2e1c8848083be9329b4ec96dacea91863e263e7acf647952bf38425cf4daf153daf6852e7a51d31b45ae293d07a89c4f301196666c6737a35531f
+  data.tar.gz: a8abe5f77854e51f90eee110fdc419fd4c2efd2d2e4b572fda2ae2086d489c1790d4e3ea19db4ee06ad3dbcaeba5c34b8a969b2a60a2100155e31a40d13672c7

data/cnvrg.gemspec

@@ -33,7 +33,6 @@ Gem::Specification.new do |spec|
     spec.add_runtime_dependency 'thor', '~> 0.19.0','>=0.19.1'
     spec.add_runtime_dependency 'aws-sdk'
     spec.add_runtime_dependency 'urlcrypt', '~> 0.1.1'
-    spec.add_runtime_dependency 'terminal-table'
     
 end
 

data/lib/cnvrg/api.rb

@@ -11,8 +11,18 @@ module Cnvrg
 
         def self.get_api
             home_dir = File.expand_path('~')
-            config = YAML.load_file(home_dir+"/.cnvrg/config.yml")
-            if config.empty? or config.to_h[:api].nil?
+            config = ""
+            begin
+                if File.exist? home_dir+"/.cnvrg/config.yml"
+                    config = YAML.load_file(home_dir+"/.cnvrg/config.yml")
+                else
+                    return "https://cnvrg.io/api"
+                end
+
+            rescue
+                return "https://cnvrg.io/api"
+            end
+            if !config or config.empty? or config.to_h[:api].nil?
                 return "https://cnvrg.io/api"
             else
               return config.to_h[:api]

data/lib/cnvrg/cli.rb

@@ -138,7 +138,8 @@ module Cnvrg
           if set_owner(choose_owner, result["username"])
             say "Setting default owner: #{choose_owner}", Thor::Shell::Color::GREEN
           else
-            say "Setting default owenr has failed, try to run cnvrg --config-default-owner", Thor::Shell::Color::RED
+            say "Setting default owenr has failed, logging out", Thor::Shell::Color::RED
+            return logout()
           end
 
         else
@@ -871,9 +872,9 @@ module Cnvrg
 
           container_id = get_container_id
           owner = Cnvrg::CLI.get_owner()
-          say "Commiting notebook changes to a: #{owner}/#{notebook_image_name}", Thor::Shell::Color::BLUE
+          say "Commiting notebook changes to: #{notebook_image_name}", Thor::Shell::Color::BLUE
 
-          commit_res = system("#{docker_path} commit #{container_id} #{owner}/#{notebook_image_name}")
+          commit_res = system("#{docker_path} commit #{container_id} #{notebook_image_name}")
           if commit_res
             checker = Helpers.checkmark()
             say "#{checker} Done.", Thor::Shell::Color::GREEN
@@ -893,17 +894,16 @@ module Cnvrg
         docker_path = verify_software_installed("docker")
         owner = Cnvrg::CLI.get_owner()
         # verify image exist
-        # owner = "cnvrgio"
-        images = `#{docker_path} images |grep #{owner}/#{image_name}`
+        images = `#{docker_path} images |grep #{image_name}`
         if images.empty?
-          say "Couldn't find any images named: #{owner}/#{image_name}", Thor::Shell::Color::RED
+          say "Couldn't find any images named: #{image_name}", Thor::Shell::Color::RED
           exit(1)
         end
         path = File.expand_path('~')+"/.cnvrg/#{owner}_#{image_name}.tar"
         begin
           say "Creating image file to upload", Thor::Shell::Color::BLUE
           if !(File.exist? path or File.exist? path+"gz")
-            saveRes = system("#{docker_path} save #{owner}/#{image_name}>#{path}")
+            saveRes = system("#{docker_path} save #{image_name}>#{path}")
             if !saveRes
               say "Couldn't create tar file from image", Thor::Shell::Color::RED
               exit(1)
@@ -930,11 +930,11 @@ module Cnvrg
               say "Couldn't upload image", Thor::Shell::Color::RED
             end
           else
-            say "Couldn't create image file for: #{owner}/#{image_name}", Thor::Shell::Color::RED
+            say "Couldn't create image file for: #{image_name}", Thor::Shell::Color::RED
             exit(1)
           end
         rescue SignalException
-          say "Couldn't upload image file for: #{owner}/#{image_name}", Thor::Shell::Color::RED
+          say "Couldn't upload image file for: #{image_name}", Thor::Shell::Color::RED
           exit(1)
         end
 
@@ -1066,7 +1066,7 @@ module Cnvrg
               FileUtils.touch [home_dir+"/.cnvrg/config.yml"]
             end
             config = YAML.load_file(home_dir+"/.cnvrg/config.yml")
-            if config.empty?
+            if !config or config.empty?
               config = {owner: owner, username: username, version_last_check: get_start_day(), api: "https://cnvrg.io/api"}
             else
               config = {owner: owner, username: username, version_last_check: get_start_day(), api: config.to_h[:api]}

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-    VERSION = '0.0.6'
+    VERSION = '0.0.7'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Yochay Ettun
@@ -231,20 +231,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: terminal-table
-  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