cnvrg 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9b8198ef7c07b5e104013d85ea8cafab151bd82
-  data.tar.gz: 285b8c2c3213db29c8e01d8e0d0937e465ee5427
+  metadata.gz: 7e4fccd072cdc474ad9026a8e1e5236c46bc8499
+  data.tar.gz: 25b637b549743301d8f585b16e07d0cdcd34c571
 SHA512:
-  metadata.gz: 46dc6ef133915f5db232df9452a05ad0ef7be0a210f9e3d88e8a1b484aed0ddcc30657a1ff172148b1648c11ca7d150fb44387ab8970cb087c35d26cfb2c60d7
-  data.tar.gz: bf4085d68ce2e0b4de724b6208ea9496a11407e14b720bfcec50e909f0a87d8d6575af344d5289f29912770e39b8d92677197bc5c37c1e79d518829c29bd9085
+  metadata.gz: a82144ff4a9fb1dd56e43b49079ec095746e3b9a291a27e88d14b602b6366145a5a1f5d1fcc39628918f16258ef77287659014ed15e05d3c9e1f4745f23e4713
+  data.tar.gz: d306d2f0efba9ddb0221705b97830dd4f4ef9378a032662b83a3dc47022140620217000db1c43ee0d9ae91f937f9a45a44551ffc74c95b15fb7f63c8ea40ed65

data/lib/cnvrg/cli.rb

@@ -1703,6 +1703,7 @@ module Cnvrg
     method_option :verbose, :type => :boolean, :aliases => ["-v"], :default => false
     method_option :sync, :type => :boolean, :aliases => ["-s"], :default => false
     method_option :force, :type => :boolean, :aliases => ["-f","--force"], :default => false
+    method_option :message, :type => :string, :aliases => ["-m", "--message"], :default => ""
 
     def upload(link=false, sync=false, direct=false, ignore_list="")
 
@@ -1711,6 +1712,10 @@ module Cnvrg
         log_start(__method__, args, options)
 
         @project = Project.new(get_project_home)
+        commit_msg = options["message"]
+        if commit_msg.nil? or commit_msg.empty?
+          commit_msg = ""
+        end
 
         @files = Cnvrg::Files.new(@project.owner, @project.slug)
         ignore = options[:ignore] || ""
@@ -1911,7 +1916,7 @@ module Cnvrg
         end
 
         if update_count == update_total
-          res = @files.end_commit(commit_sha1,force:force)
+          res = @files.end_commit(commit_sha1,force:force,message:commit_msg)
           if (Cnvrg::CLI.is_response_success(res, false))
             # save idx
             begin
@@ -2354,6 +2359,7 @@ module Cnvrg
       method_option :verbose, :type => :boolean, :aliases => ["-v"], :default => false
       method_option :ignore, :type => :string, :aliases => ["-i", "--ignore"], :default => ""
       method_option :force, :type => :boolean, :aliases => ["-f","--force"], :default => false
+    method_option :message, :type => :string, :aliases => ["-m", "--message"], :default => ""
 
       def sync(direct=true)
         verify_logged_in(true) if direct
@@ -2366,7 +2372,7 @@ module Cnvrg
 
 
         invoke :upload, [link=false, sync=true, direct=direct], :new_branch => options["new_branch"], :verbose => options["verbose"], :sync => true,
-               :ignore => options[:ignore], :force=> options[:force]
+               :ignore => options[:ignore], :force=> options[:force], :message=>options[:message]
 
 
       end
@@ -3071,7 +3077,7 @@ module Cnvrg
             str = "#{check} Experiment's is on: #{Cnvrg::Helpers.remote_url}/#{project.owner}/projects/#{project.slug}/experiments/#{res["result"]["exp_url"]}"
 
             if res["result"]["grid"]
-              str = "Running grid search. #{Cnvrg::Helpers.remote_url}/#{project.owner}/projects/#{project.slug}/experiments?grid=#{res["result"]["exp_url"]} "
+              str = "Running grid search, follow here: #{Cnvrg::Helpers.remote_url}/#{project.owner}/projects/#{project.slug}/experiments?grid=#{res["result"]["exp_url"]}"
             end
 
             log_message(str, Thor::Shell::Color::GREEN)

data/lib/cnvrg/dataset.rb

@@ -233,11 +233,37 @@ module Cnvrg
       if local_idx.nil?
         local_idx =  self.generate_idx
       end
+      ignore_list = self.send_ignore_list()
 
-      response = Cnvrg::API.request("users/#{self.owner}/datasets/#{self.slug}/status", 'POST', {idx: local_idx, new_branch: new_branch, current_commit: commit})
+      response = Cnvrg::API.request("users/#{self.owner}/datasets/#{self.slug}/status", 'POST', {idx: local_idx, new_branch: new_branch, current_commit: commit, ignore:ignore_list})
       CLI.is_response_success(response,false)
       return response
     end
+    def send_ignore_list()
+      begin
+        ignore_list = []
+        File.open(self.local_path+"/.cnvrgignore", "r").each_line do |line|
+          line = line.strip
+          if line.start_with? "#" or ignore_list.include? line or line.empty?
+            next
+          end
+          if line.end_with? "/"
+            ignore_list << line.gsub("/","")
+            ignore_list << line+"."
+          elsif line.include? "*"
+            line = line.gsub("*",".*")
+            ignore_list << line
+          else
+            ignore_list << line
+          end
+        end
+        return ignore_list.flatten
+      rescue
+        return []
+      end
+
+    end
+
 
 
 

data/lib/cnvrg/files.rb

@@ -567,8 +567,8 @@ module Cnvrg
         return response
       end
 
-    def end_commit(commit_sha1,force:false)
-      response = Cnvrg::API.request("#{base_resource}/commit/end", 'POST', {commit_sha1: commit_sha1,force:force})
+    def end_commit(commit_sha1,force:false,message:"")
+      response = Cnvrg::API.request("#{base_resource}/commit/end", 'POST', {commit_sha1: commit_sha1,force:force,message:message})
       return response
     end
 

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-  VERSION = '0.2.7'
+  VERSION = '0.2.8'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Yochay Ettun
@@ -416,7 +416,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A CLI tool for interacting with cnvrg.io.