cnvrg 1.5.8.2 → 1.5.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 479d1e674e61631473ccc70057e2879b7cbe93346357baf8d47b031ac5285336
-  data.tar.gz: e38e6ff7ebc669834b2837dab9e3e87b08cc7f542b2ff7d86122b2d70276e35c
+  metadata.gz: 6e0e5929b113d8ed609a60d8d56decab7b58bea23bffd78464f8f89d866da75f
+  data.tar.gz: ddf90c2a11b51dd815de477b5fce045bcbcd9b82264d7ad58e2d0ebf156b9d87
 SHA512:
-  metadata.gz: c7725b0a115ae85420b6f3dfd1fa4f9956aeca00fe2caaa5bbbd18581ecf349805fee3485e729a971a48d6680b97a930602ce5022908d8ae95fde444527c2822
-  data.tar.gz: c3c18585b5cc2c5f73fce73e772623e93a47b6c6162df29c9519e0456b4dac58438d57e0a543b5fb04f19169609c7da9be1116aa1af1e6235ff471bfedf9e951
+  metadata.gz: 1ab58f71105f545890ac525a4d6b63b4c1f4e13ff98aaf84eece9fc78d7dc64171dc0dda09eae64f763653ec1131b7e15b259f3ac02aa6d630a0b23477dc090d
+  data.tar.gz: 83c31f8335275f8f15aa51eef33e08579234178e8daf31929d01cc3cf73a94c87d82eec1132b64f5a3004e917d48df9d5cee0258f762f9883eec79f0e6a3ddb9

data/lib/cnvrg/cli.rb

@@ -243,7 +243,7 @@ module Cnvrg
     map %w(-v --version) => :version
 
     desc 'api CNVRG_APPLICATION_URL', 'Set api url, e.g cnvrg --api "https://cnvrg.io/api"'
-    method_option :verify_ssl, :type => :boolean, :aliases => ["-s", "--verify_ssl"], :default => true
+    method_option :verify_ssl, :type => :boolean, :aliases => ["-s", "--verify_ssl"], :default => false
 
     def set_api_url(url)
       log_handler()
@@ -255,7 +255,7 @@ module Cnvrg
       if !url.end_with? "/api"
         url = url + "/api"
       end
-      verify_ssl = options["verify_ssl"]
+      verify_ssl = options["verify_ssl"] || false
       begin
         if !File.directory? home_dir + "/.cnvrg"
           FileUtils.mkdir_p([home_dir + "/.cnvrg", home_dir + "/.cnvrg/tmp"])
@@ -271,6 +271,7 @@ module Cnvrg
           end
 
 
+
         rescue
           config = {owner: "", username: "", version_last_check: get_start_day(), api: url, compression_path: compression_path ,verify_ssl: verify_ssl }
         end
@@ -414,7 +415,7 @@ module Cnvrg
 
 
           end
-          if set_owner(choose_owner, result["username"], urls[ow_index])
+          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
@@ -536,17 +537,14 @@ module Cnvrg
           log_message("Authenticated successfully as #{@email}", Thor::Shell::Color::GREEN)
 
           owners = result["owners"]
-          urls = result["urls"]
           choose_owner = result["username"]
-          ow_index = 0
           if owners.empty?
             choose_owner = result["username"]
           else
             choose_owner = owners[0]
           end
 
-
-          if set_owner(choose_owner, result["username"], urls[ow_index])
+          if set_owner(choose_owner, result["username"])
             log_message("Setting default owner: #{choose_owner}", Thor::Shell::Color::GREEN)
 
           else
@@ -5378,7 +5376,7 @@ module Cnvrg
 
       end
 
-      def set_owner(owner, username, url)
+      def set_owner(owner, username, url=nil)
         home_dir = File.expand_path('~')
         begin
           if !File.directory? home_dir + "/.cnvrg"
@@ -5387,10 +5385,15 @@ module Cnvrg
           if !File.exist?(home_dir + "/.cnvrg/config.yml")
             FileUtils.touch [home_dir + "/.cnvrg/config.yml"]
           end
-          if url.nil? or url.empty?
-            url = "https://cnvrg.io/api"
-          end
           config = YAML.load_file(home_dir + "/.cnvrg/config.yml")
+          if config.blank?
+            config = {api: "https://app.cnvrg.io/api" }
+
+          end
+
+          if url.blank?
+             url = config[:api]
+          end
           compression_path = "#{home_dir}/.cnvrg/tmp"
           if config and !config.nil? and !config.empty? and !config.to_h[:compression_path].nil?
             compression_path = config.to_h[:compression_path]

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-  VERSION = '1.5.8.2'
+  VERSION = '1.5.8.3'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 1.5.8.2
+  version: 1.5.8.3
 platform: ruby
 authors:
 - Yochay Ettun
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-25 00:00:00.000000000 Z
+date: 2019-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler