cnvrg 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89388312156199c10f60b2495c05305ea4342a54
-  data.tar.gz: 072a8e7f4bfcba47ec648eb48516f8fc53111541
+  metadata.gz: 243d59aeb144ce81e378b909f57d72ff2d95b2b6
+  data.tar.gz: af1c7b5e0b44738cc4de38893db71599b6303c9c
 SHA512:
-  metadata.gz: ed33b00c74cf61f4bfd259fff6656298f6250acd5f7c8668106e0a67974987b101e8d7923d02bd13c98a51d9fd532279f888ce72931abdcb1be336c394a0b1f5
-  data.tar.gz: aeff07a3e9181dbb3a4610206e4852918d9ea24b338ce307a585dea2739bf6260461b9eb64537ec24c4dfac8f1161b8a8b49d5e0376d802152722046f18d5153
+  metadata.gz: b75af796386c9b18d11e013f698eca78167d5c0e911c81156f4680dfb53809a14b45534bc272fe593fb205ba8c07415f60aa3adaec8e892bd608bc4fe95bbf95
+  data.tar.gz: 4685770d2b7bd298a454b6c8936ee40d67e8d8ebeb820d9fcbf455836d26547519d592cefafa777d8c92c01e1f63ec17833b1d7e8bd00518f77ec02e2bc2fcf4

data/lib/cnvrg/cli.rb

@@ -1584,7 +1584,7 @@ module Cnvrg
           end
           successful_changes = response["result"]["tree"]
           if !successful_changes.nil? and is_success
-            Project.verify_cnvrgignore_exist(project_name)
+            Project.verify_cnvrgignore_exist(project_name,remote)
             log_message("Done.\nDownloaded  #{successful_changes.size}/#{response["result"]["tree"].size} files", Thor::Shell::Color::GREEN)
           else
             log_message("Couldn't download some files", Thor::Shell::Color::RED)
@@ -2355,6 +2355,7 @@ module Cnvrg
       method_option :data, :type => :string, :aliases => ["-d", "--data"], :default => ""
       method_option :data_commit, :type => :string, :aliases => ["--data_commit"], :default => ""
       method_option :ignore, :type => :string, :aliases => ["-i", "--ignore"], :desc => "ignore following files", :default => ""
+      method_option :force, :type => :boolean, :aliases => ["-f","--force"], :default => false
 
       def run(*cmd)
         sync_before = options["sync_before"]
@@ -2371,6 +2372,8 @@ module Cnvrg
         data = options["data"]
         data_commit = options["data_commit"]
         ignore = options["ignore"]
+        force = options["force"]
+
         options_hash = Hash[options]
         real_options = []
         options_hash.each do |o|
@@ -2379,7 +2382,7 @@ module Cnvrg
         if local
           invoke :exec, [cmd], :sync_before => sync_before, :sync_after => sync_after, :title => title,
                  :log => log, :email_notification => email_notification, :upload_output => upload_output,
-                 :commit => commit, :image => image, :data => data, :data_commit => data_commit, :ignore => ignore
+                 :commit => commit, :image => image, :data => data, :data_commit => data_commit, :ignore => ignore, :force=>force
           return
         else
           real_options.delete(["local", false])
@@ -2393,7 +2396,7 @@ module Cnvrg
           cmd_to_exec = "#{exec_options} #{cmd.join(" ")}"
           invoke :exec_remote, [cmd], :sync_before => sync_before, :sync_after => sync_after, :title => title, :machine_type => instance_type,
                  :schedule => schedule, :log => log, :email_notification => email_notification, :upload_output => upload_output, :commit => commit,
-                 :image => image, :grid => grid, :data => data, :data_commit => data_commit, :ignore => ignore
+                 :image => image, :grid => grid, :data => data, :data_commit => data_commit, :ignore => ignore, :force=>force
           return
         end
 
@@ -2424,6 +2427,7 @@ module Cnvrg
       method_option :ignore, :type => :string, :aliases => ["-i", "--ignore"], :desc => "ignore following files", :default => ""
       method_option :remote, :type => :boolean, :aliases => ["--remote"], :default => false
       method_option :gpu, :type => :boolean, :aliases => ["--gpu"], :default => false
+      method_option :force, :type => :boolean, :aliases => ["-f","--force"], :default => false
 
       def exec(*cmd)
 
@@ -2444,6 +2448,7 @@ module Cnvrg
         image = options["image"] || nil
         indocker = options["indocker"] || false
         ignore = options[:ignore] || ""
+        force = options[:force]
 
 
         email_notification = options["email_notification"]
@@ -2461,7 +2466,7 @@ module Cnvrg
             if sync_before
               # Sync before run
 
-              invoke :sync, [false], :new_branch => is_new_branch, :ignore => ignore
+              invoke :sync, [false], :new_branch => is_new_branch, :ignore => ignore, :force => force
             end
           end
           #set image for the project
@@ -2890,6 +2895,7 @@ module Cnvrg
       method_option :data, :type => :string, :aliases => ["-d", "--data"], :default => ""
       method_option :data_commit, :type => :string, :aliases => ["--data_commit"], :default => ""
       method_option :ignore, :type => :string, :aliases => ["-i", "--ignore"], :desc => "ignore following files", :default => ""
+      method_option :force, :type => :boolean, :aliases => ["-f","--force"], :default => false
 
       def exec_remote(*cmd)
         verify_logged_in(true)
@@ -2902,6 +2908,7 @@ module Cnvrg
           data = options["data"] || nil
           data_commit = options["data_commit"] || nil
           sync_before = options["sync_before"]
+          force = options["force"]
 
           instance_type = options["machine_type"] || nil
           schedule = options["schedule"] || ""
@@ -2971,7 +2978,7 @@ module Cnvrg
             image_slug = image.image_slug
           end
 
-          invoke :sync, [false], [] if sync_before
+          invoke :sync, [false], :force=>force if sync_before
 
 
           if command.include? "'"

data/lib/cnvrg/project.rb

@@ -234,18 +234,23 @@ module Cnvrg
         end
         return true
       end
-    def self.verify_cnvrgignore_exist(project_name)
-      ignore_exits = File.exist? "#{project_name}/.cnvrgignore"
+    def self.verify_cnvrgignore_exist(project_name,remote)
+      if remote
+        path = ".cnvrgignore"
+      else
+        path = "#{project_name}/.cnvrgignore"
+      end
+      ignore_exits = File.exist? path
       if !ignore_exits
         begin
-        list_files = [
-            project_name+"/.cnvrgignore",
+          list_files = [
+              path
         ]
         FileUtils.touch list_files
         cnvrgignore = Helpers.cnvrgignore_content
-        File.open(project_name+"/.cnvrgignore", "w+") { |f| f.write cnvrgignore }
+        File.open(path, "w+") { |f| f.write cnvrgignore }
         rescue => e
-
+          return false
         end
 
 

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-  VERSION = '0.2.2'
+  VERSION = '0.2.4'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-17 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler