cnvrg 2.0.11 → 2.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86857e06a0d107172c161467e8ff8cb04a120d8b230c97843e91ce13c826ccce
-  data.tar.gz: 272fe88e1e390f2887c36c49915cc89f10a6cf9947bb98ab6fd503476ac03820
+  metadata.gz: 0e2e22e961bc723442ec80d457f0dde2b982f1c75beb2e859bb5523e83682fbe
+  data.tar.gz: 645a4add593bcf3a63be4d64b4ccb45000e39447e7e11b9fd674347856e2bf97
 SHA512:
-  metadata.gz: c28ab54953e47843897273f8038f5e0bfc92e101e161d1edae4477250e1334b5730b5020713572ad2482c5b0c305c5c0b2c5725b8796a44c06750eccf2924e9f
-  data.tar.gz: 69be0cd1fc89180ce7b878aaa8e0767b5be9a00cb0c9813c504e62677c1c839831aa6cf4fbf27aeb66aa50b756f7b28f46eb721182e588bcc4b7c65544e6a41b
+  metadata.gz: 2af7a28b7b428f8b4066a1b3f01bada7273eaa93ea847f87badc253aea2123244ad27ab3804cda5f4cdcee91cc2cc0ed7dd168b347839f59a6c183a702438167
+  data.tar.gz: dc151c1ab54d54a86648b9f1341d402d0eb6fb8d578cc0a01f2594a28a34bfb8d97676d07aa389a8b1155fa466845f87be9b1dffbfcc2bcda33376937ecef418

data/Readme.md

@@ -53,4 +53,10 @@
 2021-09-12
 * DEV-10502 - Bug: Periodic sync stuck
 ## Version v2.0.11
-2021-10-21
+2021-10-21
+## Version v2.0.12
+2021-10-25
+* DEV-11544 - Sub-bug: local experiment is failing to run 
+## Version v2.0.13
+2021-10-27
+* DEV-11054 - Task: Create organization and user by default

data/lib/cnvrg/api.rb

@@ -57,6 +57,7 @@ module Cnvrg
                     conn = Faraday.new "#{endpoint_uri}"
                 end
             conn.headers['Auth-Token'] = @pass
+            conn.headers['Authorization'] = "CAPI #{@pass}"
             conn.headers['User-Agent'] = "#{Cnvrg::API::USER_AGENT}"
             conn.options.timeout = 420
                 conn.options.open_timeout=180
@@ -169,6 +170,7 @@ module Cnvrg
             when 'POST_FILE'
                 conn = Faraday.new do |fr|
                     fr.headers['Auth-Token'] = @pass
+                    fr.headers['Authorization'] = "CAPI #{@pass}"
                     fr.headers['User-Agent'] = "#{Cnvrg::API::USER_AGENT}"
                     fr.headers["Content-Type"] = "multipart/form-data"
                     if !Helpers.is_verify_ssl

data/lib/cnvrg/api_v2.rb

@@ -22,6 +22,7 @@ module Cnvrg
 
       conn = Faraday.new endpoint_uri, :ssl => {:verify => !!Helpers.is_verify_ssl}
       conn.headers['Auth-Token'] = pass
+      conn.headers['Authorization'] = "CAPI #{pass}"
       conn.headers['User-Agent'] = Cnvrg::API::USER_AGENT
       conn.headers['Content-Type'] = "application/json"
       conn.options.timeout = 420

data/lib/cnvrg/auth.rb

@@ -44,7 +44,7 @@ module Cnvrg
             end
         end
 
-        def sign_in(email, password)
+        def sign_in(email, password, token: nil)
             url = Cnvrg::API.endpoint_uri()
             url = URI.parse(url+ "/users/sign_in")
             http = Net::HTTP.new(url.host, url.port)
@@ -61,6 +61,9 @@ module Cnvrg
 
             req.add_field("EMAIL", email)
             req.add_field("PASSWORD", password)
+            if token.present?
+                req.add_field("Authorization", "CAPI #{token}")
+            end
 
             response = http.request(req)
 

data/lib/cnvrg/cli.rb

@@ -496,8 +496,10 @@ module Cnvrg
 
 
     desc 'login', 'Authenticate with cnvrg.io platform'
+    method_option :sso, :type => :boolean, :aliases => ["-s", "--sso"], :default => false
 
     def login
+      use_token = options["sso"]
       begin
         log_handler()
         log_start(__method__, args, options)
@@ -515,12 +517,21 @@ module Cnvrg
           exit(0)
         end
         @email = ask("Enter your email:")
-        password = cmd.ask("Enter your password (hidden):") {|q| q.echo = "*"}
-        result = @auth.sign_in(@email, password)
+        if use_token
+          @token = cmd.ask("Enter your token (hidden):") {|q| q.echo = "*"}
+          netrc[Cnvrg::Helpers.netrc_domain] = @email, @token
+          netrc.save
+          password = ""
+        else
+          password = cmd.ask("Enter your password (hidden):") {|q| q.echo = "*"}
+        end
+        result = @auth.sign_in(@email, password, token: @token)
 
         if !result["token"].nil?
-          netrc[Cnvrg::Helpers.netrc_domain] = @email, result["token"]
-          netrc.save
+          unless use_token
+            netrc[Cnvrg::Helpers.netrc_domain] = @email, result["token"]
+            netrc.save
+          end
 
           log_message("Authenticated successfully as #{@email}", Thor::Shell::Color::GREEN)
 
@@ -3327,7 +3338,7 @@ module Cnvrg
               end
 
               if local
-                exec_local(cmd)
+                exec_local(cmd, print_log, start_commit, real, start_time)
                 exit_status = $?.exitstatus
 
               else
@@ -5884,7 +5895,8 @@ module Cnvrg
         end
       end
 
-      def exec_local(cmd)
+      def exec_local(cmd , print_log, start_commit, real, start_time)
+        log = []
         PTY.spawn(@exp.as_env, cmd) do |stdout, stdin, pid, stderr|
           begin
             stdout.each do |line|

data/lib/cnvrg/version.rb

@@ -1,3 +1,3 @@
 module Cnvrg
-  VERSION = '2.0.11'
+  VERSION = '2.0.13'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.0.13
 platform: ruby
 authors:
 - Yochay Ettun
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-21 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler