cnvrg 0.0.141 → 0.0.142

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 926f82dfe1bfcf71e51c1218b90c197dcd9ee717
-  data.tar.gz: 87668443ad37a85c376c92c38599a23b2475e036
+  metadata.gz: 7f3ba812e5bf66ccca1986f737c625b53c75d5b0
+  data.tar.gz: 7c1b005345d57ba58963a4876f00ff8c696a7a56
 SHA512:
-  metadata.gz: c7996005a060813f1b2405a60b020bcc6ea56cc97ea8f165e903958a588a2de4178f7588ac64bbc4a5a2dbde43deeccd49fe959b065905e85171cef8a2d0cd51
-  data.tar.gz: c9ce755b4f9e3ed0a2d400c3d7bbe3a14f318a1b8fed87b9fd31d8facda64cca78e28d75de923d7d23cb97b465afb620b95463570a98354aa0f03887ee137d25
+  metadata.gz: ce33216128fd56fc342b100a7f5f9d63028281114c9f8fd933f1244250a57cdeff3ae98481a5e13e81a25d986f4ec04de8a21f684ca4c2b9eaa074c36f7d2a94
+  data.tar.gz: d3bba3d2a25768d00b8e5cdeb09d25cf935367a38368e0164f5fd7cfe76370b7bfd3cbd45cb967684eb6e5c5ab2c0bd3af54e6e3bca2785b6ad71c26d2d4af65

data/lib/cnvrg/cli.rb

@@ -738,7 +738,7 @@ module Cnvrg
     method_option :ignore, :type => :array, :aliases => ["-i", "--i"], :desc => "ignore following files"
     method_option :new_branch, :type => :boolean, :aliases => ["-nb", "--nb"], :desc => "create new branch of commits"
     method_option :verbose, :type => :boolean, :aliases => ["--v"], :default => false
-    method_option :sync, :type => :boolean, :aliases => ["--v"], :default => false
+    method_option :sync, :type => :boolean, :aliases => ["--s"], :default => false
 
     def upload(link=false, sync=false)
 
@@ -755,6 +755,12 @@ module Cnvrg
         end
         new_branch = options["new_branch"] || false
 
+        if options["sync"] or sync
+          new_branch_exp = @project.get_new_branch
+          if new_branch_exp
+            new_branch = new_branch_exp
+          end
+        end
         result = @project.compare_idx(new_branch)
         commit = result["result"]["commit"]
         if !link
@@ -770,7 +776,7 @@ module Cnvrg
         result = result["result"]["tree"]
         if result["added"].empty? and result["updated_on_local"].empty? and result["deleted"].empty?
           log_end(0)
-          say "Project is up to date", Thor::Shell::Color::GREEN unless options["sync"]
+          say "Project is up to date", Thor::Shell::Color::GREEN unless (options["sync"] or sync)
           return true
         end
         update_count = 0
@@ -784,7 +790,7 @@ module Cnvrg
             say "Updating #{update_total} files", Thor::Shell::Color::BLUE
           end
         else
-          say "Syncing files", Thor::Shell::Color::BLUE unless options["sync"]
+          say "Syncing files", Thor::Shell::Color::BLUE unless (options["sync"] or sync)
 
         end
 
@@ -880,7 +886,7 @@ module Cnvrg
               end
               say "Total of #{update_count} / #{update_total} files.", Thor::Shell::Color::GREEN
             else
-              say "#{check} Changes were updated successfully", Thor::Shell::Color::GREEN unless options["sync"]
+              say "#{check} Changes were updated successfully", Thor::Shell::Color::GREEN unless (options["sync"] or sync)
 
             end
 
@@ -915,7 +921,7 @@ module Cnvrg
     desc 'download', 'Download updated files'
     method_option :new_branch, :type => :boolean, :aliases => ["-nb", "--nb"], :desc => "create new branch of commits"
     method_option :verbose, :type => :boolean, :aliases => ["--v"], :default => false
-    method_option :sync, :type => :boolean, :aliases => ["--v"], :default => false
+    method_option :sync, :type => :boolean, :aliases => ["--s"], :default => false
 
     def download
       begin
@@ -1326,12 +1332,10 @@ module Cnvrg
                 end
                 if sync_after
                   # Sync after run
-                  if !commit.nil?
-                    invoke :sync, [], :new_branch => true
 
-                  else
-                    invoke :sync, [], :new_branch => false
-                  end
+                  download()
+                  upload(link=false, sync=true)
+
                 end
                 end_commit = @project.last_local_commit
 
@@ -1341,6 +1345,7 @@ module Cnvrg
                 log_end(0)
               end
             rescue => e
+              puts e
               log_end(-1, e.message)
               if container
                 container.stop()

data/lib/cnvrg/project.rb

@@ -1,7 +1,7 @@
 require 'fileutils'
 module Cnvrg
   class Project
-    attr_reader :slug, :owner, :title, :local_path
+    attr_reader :slug, :owner, :title, :local_path, :working_dir
 
     RemoteURL ||= "https://cnvrg.io"
 
@@ -12,6 +12,7 @@ module Cnvrg
         @title = config[:project_name]
         @slug = config[:project_slug]
         @owner = config[:owner]
+        @working_dir = project_home
       rescue => e
       end
 
@@ -205,6 +206,26 @@ module Cnvrg
         end
         return true
       end
+    def update_is_new_branch(new_branch)
+      config = YAML.load_file(@working_dir+"/.cnvrg/config.yml")
+      config[:new_branch] = new_branch
+      File.open(@working_dir+"/.cnvrg/config.yml", "w+") { |f| f.write config.to_yaml }
+    end
+    def get_new_branch
+      begin
+      config = YAML.load_file(@working_dir+"/.cnvrg/config.yml")
+      return config[:new_branch]
+      rescue =>e
+        return false
+
+      end
+    end
+
+    def remove_new_branch
+      config = YAML.load_file(@working_dir+"/.cnvrg/config.yml")
+      new_config = config.except(:new_branch)
+      File.open(@working_dir+"/.cnvrg/config.yml", "w+") { |f| f.write new_config.to_yaml }
+    end
 
       def generate_idx
         if File.exists? "#{self.local_path}/.cnvrg/idx.yml"
@@ -268,6 +289,7 @@ module Cnvrg
         end
         response = Cnvrg::API.request("users/#{self.owner}/projects/#{self.slug}/commit/compare", 'POST', {current_commit: commit})
         CLI.is_response_success(response)
+        update_is_new_branch(response["result"]["new_branch"])
         return response["result"]["new_branch"]
       end
 

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-    VERSION = '0.0.141'
+    VERSION = '0.0.142'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.0.141
+  version: 0.0.142
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-25 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler