cnvrg 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36eab169fcd963d5ae3eedc372dfd5927cd0517d
-  data.tar.gz: 2f66b6270fa612e4522205174d82e708806ace6a
+  metadata.gz: ad8ca6c9d3a841de5937e2491c0c457456e1c4d3
+  data.tar.gz: 5f1764f5dad22d28863300db640971789cd4b7ce
 SHA512:
-  metadata.gz: 9bad977d68dc97de0c0a3414f7959366858fea20e89d39822df37a33a5ede886dbc113508841558942004eb799eb55128f4fb4c65e169f98509a3235df4d978b
-  data.tar.gz: 27739efd665071781f03621a2bd74b045d378334559d1d171822575e1229647a98c21b1bef9a33cac301b393fe9fbcb0a53b096f4c177d06dd13a3baf82a7fcc
+  metadata.gz: bafe792da2bf576945486186cdd0d15b3773b41262cf34daf5d012d38f0d7c508f759466aad9ede194943c6cfca1db7902f20cd1dd870562d8c4c87d64c1062f
+  data.tar.gz: 13f386cfcfcd8fd006ce846880a7ef5c0bb985034d3e8e1208f6dc213c0b12fe1ddc77f46c2f57620da307dc10157f3c9c45793dd78d989a9d1a498cdccbebe4

data/lib/cnvrg/cli.rb

@@ -206,34 +206,43 @@ module Cnvrg
         if !File.exist?(home_dir+"/.cnvrg/config.yml")
           FileUtils.touch [home_dir+"/.cnvrg/config.yml"]
         end
-        config = YAML.load_file(home_dir+"/.cnvrg/config.yml")
-        owner = config.to_h[:owner]
         compression_path = "#{File.expand_path('~')}/.cnvrg/tmp"
 
+        begin
+          config = YAML.load_file(home_dir+"/.cnvrg/config.yml")
+          if !config
+            config = {owner: "", username: "", version_last_check: get_start_day(), api: url, compression_path: compression_path, }
+
+          end
+        rescue
+          config = {owner: "", username: "", version_last_check: get_start_day(), api: url, compression_path: compression_path  }
+        end
+        owner = config.to_h[:owner]
+
         say "Setting default api to be: #{url}", Thor::Shell::Color::BLUE
         if config.empty?
-          config = {owner: "", username: "", version_last_check: get_start_day(), api: url, compression_path: compression_path}
+          config = {owner: "", username: "", version_last_check: get_start_day(), api: url, compression_path: compression_path }
         else
           if !config.to_h[:compression_path].nil?
             compression_path = config.to_h[:compression_path]
           end
           config = {owner: config.to_h[:owner], username: config.to_h[:username], version_last_check: config.to_h[:version_last_check], api: url, compression_path: compression_path}
         end
-        res = Cnvrg::API.request("/users/#{owner}/custom_api", 'POST', {custom_api: url})
-        if Cnvrg::CLI.is_response_success(res, false)
-
-          checks = Helpers.checkmark
+        # res = Cnvrg::API.request("/users/#{owner}/custom_api", 'POST', {custom_api: url})
+        # if Cnvrg::CLI.is_response_success(res, false)
 
+        checks = Helpers.checkmark
 
-          File.open(home_dir+"/.cnvrg/config.yml", "w+") { |f| f.write config.to_yaml }
-          say "#{checks} Done", Thor::Shell::Color::GREEN
-        else
-          say "Couldn't set default api, contact help@cnvrg.io", Thor::Shell::Color::RED
-          exit(1)
 
-        end
+        File.open(home_dir+"/.cnvrg/config.yml", "w+") { |f| f.write config.to_yaml }
+        say "#{checks} Done", Thor::Shell::Color::GREEN
+          # else
+          #   say "Couldn't set default api, contact help@cnvrg.io", Thor::Shell::Color::RED
+          #   exit(1)
+          #
+          # end
 
-      rescue
+      rescue => e
         say "Couldn't set default api, contact help@cnvrg.io", Thor::Shell::Color::RED
       end
     end
@@ -1733,7 +1742,7 @@ module Cnvrg
         result = @project.compare_idx(new_branch,force:force)
         commit = result["result"]["commit"]
         if !link
-          if commit != @project.last_local_commit and !@project.last_local_commit.nil? and !result["result"]["tree"]["updated_on_server"].empty?
+          if ((commit != @project.last_local_commit and !@project.last_local_commit.nil? and !result["result"]["tree"]["updated_on_server"].empty?) and !force )
 
             log_message("Remote server has an updated version, please run `cnvrg download` first, or alternatively: `cnvrg sync`", Thor::Shell::Color::BLUE)
             exit(1)
@@ -2324,9 +2333,11 @@ module Cnvrg
         log_start(__method__, args, options)
         log_message('Checking for new updates from remote version', Thor::Shell::Color::BLUE, options["verbose"])
         log_message('Syncing project', Thor::Shell::Color::BLUE, !options["verbose"])
+        if !options[:force]
+          invoke :download, [], :new_branch => options["new_branch"], :verbose => options["verbose"], :sync => true
+        end
 
 
-        invoke :download, [], :new_branch => options["new_branch"], :verbose => options["verbose"], :sync => true
         invoke :upload, [link=false, sync=true, direct=direct], :new_branch => options["new_branch"], :verbose => options["verbose"], :sync => true,
                :ignore => options[:ignore], :force=> options[:force]
 

data/lib/cnvrg/project.rb

@@ -359,6 +359,21 @@ module Cnvrg
       def compare_idx(new_branch, commit:last_local_commit,force:false)
         local_idx = self.generate_idx
         ignore_list = self.send_ignore_list()
+        if force
+          added = []
+          if local_idx[:tree]
+            added << local_idx[:tree].keys
+            added.flatten!
+          end
+
+          response ={"result"=> {"commit"=>nil,"tree"=> {"added"=> added,
+                     "updated_on_server"=> [],
+                     "updated_on_local"=> [],
+                     "deleted"=> [],
+                     "conflicts"=> []} } }
+          return response
+
+        end
         response = Cnvrg::API.request("users/#{self.owner}/projects/#{self.slug}/status", 'POST', {idx: local_idx, new_branch: new_branch,
                                                                                                    current_commit: commit,ignore:ignore_list, force:force})
         CLI.is_response_success(response,false)

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-26 00:00:00.000000000 Z
+date: 2017-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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.