cnvrg 1.11.28 → 2.0.6

data/lib/cnvrg/job_ssh.rb

@@ -5,14 +5,18 @@ module Cnvrg
     method_option :port, :type => :numeric, :aliases => ["-p", "--port"], :desc => "Port to bind into", :default => 2222
     method_option :username, :type => :string, :aliases => ["-u", "--username"], :desc => "Job container user name", :default => nil
     method_option :password, :type => :string, :aliases => ["--password"], :desc =>"Job Conatainer user name, will be set by cnvrg", :default => nil
+    method_option :no_auth, :type => :boolean, :aliases => ["--no-auth"], :default => false
+    method_option :internal_port, :type => :numeric, :aliases => ["--internal-port"], :desc =>"Internal port in the pod for the ssh", :default => 22
     method_option :kubeconfig, :type => :string, :aliases => ["--kubeconfig"], :desc => "Path to kubeconfig, if blank default config will be used", :default => nil
     def start(job_id)
+      no_auth = options["no_auth"]
       Cnvrg::CLI.new.log_start(__method__, args, options)
       @job_ssh = ConnectJobSsh.new(job_id)
-      @job_ssh.start(options['username'], options['password'])
+      @job_ssh.start(options['username'], options['password'], no_auth, port: options['internal_port'])
       pod_name = nil
       namespace = "cnvrg"
       ssh_ready = false
+      internal_port = options['internal_port']
       while not ssh_ready
         resp = @job_ssh.status()
         status = resp["ssh_status"]
@@ -26,13 +30,14 @@ module Cnvrg
             username = resp["username"]
             pod_name = resp["pod_name"]
             namespace = resp["namespace"]
+            internal_port = resp["port"] || internal_port
             ssh_ready = true
         else
           puts("Failed to start ssh")
           break
         end 
       end
-      if pod_name.blank? or password.blank? or username.blank?
+      if pod_name.blank? or (password.blank? and !no_auth) or username.blank?
         puts("Failed to get required params")
         return
       end
@@ -41,8 +46,8 @@ module Cnvrg
       puts("host: 127.0.0.1")
       puts("port: #{options["port"]}")
       puts("username: #{username}")
-      puts("password: #{password}")
-      @job_ssh.run_portforward_command(pod_name, options["port"], options["kubeconfig"], namespace)
+      puts("password: #{password}") unless no_auth
+      @job_ssh.run_portforward_command(pod_name, options["port"], options["kubeconfig"], namespace, internal_port)
     end
   end
 end

data/lib/cnvrg/project.rb

@@ -328,15 +328,21 @@ module Cnvrg
     end
 
     def get_storage_client
-      response = Cnvrg::API.request("users/#{@owner}/projects/#{@slug}/client", 'GET')
-      if Cnvrg::CLI.is_response_success(response, false)
-
+      client_params = nil
+      i = 0
+      begin
+        response = Cnvrg::API.request("users/#{@owner}/projects/#{@slug}/client", 'GET')
+        unless Cnvrg::CLI.is_response_success(response, false)
+          raise StandardError.new("Can't find project credentials")
+        end
         client_params = response['client']
-      else
-
+      rescue StandardError
+        i += 1
+        sleep(5 * i)
+        retry if i < 10
         client_params = get_storage_client_fallback
       end
-
+      raise StandardError.new("Can't find project credentials") unless client_params
       Cnvrg::Downloader::Client.factory(client_params)
     end
 
@@ -378,14 +384,18 @@ module Cnvrg
       []
     end
 
-    def generate_output_dir(output_dir)
+    def generate_output_dir(output_dir, local: false)
       Cnvrg::Logger.log_info("Generating output dir for #{output_dir}")
       upload_list = []
+      list = []
       list = Dir.glob("/cnvrg/#{output_dir}/**/*", File::FNM_DOTMATCH)
+      if local
+        list += Dir.glob("#{output_dir}/**/*", File::FNM_DOTMATCH)
+      end
+      list.uniq!
       Parallel.map(list, in_threads: IDXParallelThreads) do |e|
         next if e.end_with? "/."
         if File.directory? e
-
           upload_list << e + "/"
         else
           upload_list << e
@@ -447,6 +457,10 @@ module Cnvrg
         if list_ignore_new.include? label
           next
         end
+        if File.symlink?(e)
+          Cnvrg::Logger.log_info("Skipping symlink #{e}")
+          next
+        end
         if File.directory? e
           dir_name = (label.ends_with? "/") ? label : (label + "/")
           tree_idx[dir_name] = nil
@@ -699,8 +713,11 @@ module Cnvrg
       res = JSON.parse(resp['result']) rescue nil
       return if res.blank?
       config = self.get_config
-      config[:is_git] = res['git']
       config[:project_name] = res['title']
+      config[:project_slug] = @slug
+      config[:owner] = @owner
+      config[:git] = res['git'] || false
+      config[:is_git] = res['git'] || false
       self.set_config(config)
     end
 

data/lib/cnvrg/version.rb

@@ -1,3 +1,3 @@
 module Cnvrg
-  VERSION = '1.11.28'
-end
+  VERSION = '2.0.6'
+end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 1.11.28
+  version: 2.0.6
 platform: ruby
 authors:
 - Yochay Ettun
 - Leah Kolben
 - Omer Shacham
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,6 +96,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.10
 - !ruby/object:Gem::Dependency
   name: mimemagic
   requirement: !ruby/object:Gem::Requirement
@@ -105,7 +125,7 @@ dependencies:
         version: 0.3.1
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -115,7 +135,7 @@ dependencies:
         version: 0.3.1
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.7
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -302,6 +322,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: filewatch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -394,6 +428,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- Readme.md
 - bin/cnvrg
 - cnvrg.gemspec
 - lib/cnvrg.rb
@@ -438,7 +473,7 @@ files:
 homepage: https://cnvrg.io
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -453,8 +488,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.2.22
+signing_key: 
 specification_version: 4
 summary: A CLI tool for interacting with cnvrg.io.
 test_files: []