cnvrg 0.0.1580000 → 0.0.1590000

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1728a759a86382f04c4ae6e4365c5438043f09ec
-  data.tar.gz: 8d8db272a2d69de8b72751728b6638cbeb65a1ea
+  metadata.gz: 2f25836d94af8c999a3372dc304469a713573a0d
+  data.tar.gz: 46586b98e20bac8c5d2383affcdc93414af80353
 SHA512:
-  metadata.gz: f939dfccdc1d3cbe9504e1b52d59ba3f9b95c6b454d1adb7156c89b62d61a62657e69fd0991b2ab7bc859f89c2f0b1661fea3a6bbf1fb8aeac11fa18698f0cc0
-  data.tar.gz: 1cb3aeea922b0eb43ba27c10dff946a7c1984182ec98222129bb04f169ce99941df3f1285e16e6a10d051d99c04081db51d0e0bdb82b6b247f92125334be136e
+  metadata.gz: b7e94582a9d8d0c5bad912811fab469a999d4816d9ff8ef9a1b22f437724560ea91e9bbebe2a9fe60a94f946b37117f37e51e65bc7792f406fb56336366e8763
+  data.tar.gz: 27aecbee164da64c0ec32047e21921c7fa1dcaff240a13e143ee514f039ce480a168c2298994cae2df2251ed5a396f933ec449f24ffc559739151efaf80c0889

data/lib/cnvrg/api.rb

@@ -73,10 +73,13 @@ module Cnvrg
                     fr.headers['User-Agent'] = "#{Cnvrg::API::USER_AGENT}"
                     fr.headers["Content-Type"] = "multipart/form-data"
 
+
                     fr.request :multipart
                     fr.request :url_encoded
                     fr.adapter :net_http
                 end
+                conn.options.timeout = 420
+                conn.options.open_timeout =420
 
 
                 # what if windows?
@@ -111,6 +114,9 @@ module Cnvrg
             rescue => e
               puts e
                return nil
+            rescue SignalException
+                return false
+
             end
 
         end

data/lib/cnvrg/cli.rb

@@ -1520,6 +1520,7 @@ module Cnvrg
                   # dir
                   if @files.download_dir(f[0], relative_path, project_home)
                     f
+                    successful_changes << relative_path
                   else
                     log_message("Could not create directory: #{f[0]}", Thor::Shell::Color::RED)
                     raise Parallel::Kill
@@ -1547,10 +1548,15 @@ module Cnvrg
 
 
           end
+          successful_changes = response["result"]["tree"]
+          if !successful_changes.nil?
+            Project.verify_cnvrgignore_exist(project_name)
+            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)
 
-          successful_changes = clone_result
+          end
 
-          log_message("Done.\nDownloaded total of #{successful_changes.size} files", Thor::Shell::Color::GREEN)
         else
 
           log_message("Error: Couldn't create directory: #{project_name}", Thor::Shell::Color::RED)
@@ -1757,7 +1763,7 @@ module Cnvrg
                 absolute_path = "#{@project.local_path}/#{f}"
                 relative_path = f.gsub(/^#{@project.local_path + "/"}/, "")
                 if File.directory?(absolute_path)
-                  log_message("uploading dir: #{f}", Thor::Shell::Color::RED, options["verbose"])
+                  log_message("uploading dir: #{f}", Thor::Shell::Color::BLUE, options["verbose"])
 
                   resDir = @files.create_dir(absolute_path, relative_path, commit_sha1)
                   if resDir
@@ -1772,7 +1778,7 @@ module Cnvrg
                   end
 
                 else
-                  log_message("uploading: #{f}", Thor::Shell::Color::RED, options["verbose"])
+                  log_message("uploading: #{f}", Thor::Shell::Color::BLUE, options["verbose"])
 
                   res = @files.upload_file(absolute_path, relative_path, commit_sha1)
                   if res
@@ -1788,7 +1794,7 @@ module Cnvrg
                   end
                 end
               end
-            rescue Interrupt
+            rescue SignalException
               log_message("Couldn't upload, Rolling Back all changes.", Thor::Shell::Color::RED)
               @files.rollback_commit(commit_sha1)
 
@@ -1799,6 +1805,7 @@ module Cnvrg
 
           successful_updates = upload_result.to_a
 
+
           # delete
 
           deleted = update_deleted(result["deleted"])
@@ -1880,11 +1887,14 @@ module Cnvrg
             if options["verbose"]
               log_message("#{check} Done", Thor::Shell::Color::BLUE)
               if successful_updates.size >0
+                successful_updates.flatten!
                 log_message("Updated:", Thor::Shell::Color::GREEN)
                 suc = successful_updates.map { |x| x=Helpers.checkmark() +" "+x }
                 log_message(suc.join("\n"), Thor::Shell::Color::GREEN)
               end
               if successful_deletions.size >0
+                successful_deletions.flatten!
+
                 log_message("Deleted:", Thor::Shell::Color::GREEN)
                 del = successful_updates.map { |x| x=Helpers.checkmark() +" "+x }
                 log_message(del.join("\n"), Thor::Shell::Color::GREEN)
@@ -1908,13 +1918,12 @@ module Cnvrg
         else
           log_message("Error: uploaded only: #{update_count} / #{update_total}, \n Rolling back", Thor::Shell::Color::RED)
 
-          @files.rollback_commit(commit_sha1)
         end
       rescue => e
 
         log_message("Error occurred, \nAborting", Thor::Shell::Color::RED)
         log_error(e)
-        @files.rollback_commit(commit_sha1)
+        @files.rollback_commit(commit_sha1) unless commit_sha1.nil?
         puts e.message
 
         exit(1)
@@ -1922,7 +1931,7 @@ module Cnvrg
 
         say "\nAborting", Thor::Shell::Color::BLUE
         say "\nRolling back all changes", Thor::Shell::Color::BLUE
-        @files.rollback_commit(commit_sha1)
+        @files.rollback_commit(commit_sha1) unless commit_sha1.nil?
         exit(1)
       end
 
@@ -1957,7 +1966,6 @@ module Cnvrg
           log_message("Couldn't append new ignore files to .cnvrgignore", Thor::Shell::Color::YELLOW)
         end
         new_branch = options["new_branch"] || false
-
         res = @project.compare_idx(new_branch)["result"]
 
         result = res["tree"]
@@ -2014,7 +2022,7 @@ module Cnvrg
             conflicts_result = Parallel.map(result["conflicts"], in_processes: ParallelProcesses, in_thread: ParallelThreads) do |f|
 
               relative_path = f.gsub(/^#{@project.local_path}/, "")
-              log_message("downloading: #{f}.conflict", Thor::Shell::Color::RED, options["verbose"])
+              log_message("downloading: #{f}.conflict", Thor::Shell::Color::BLUE, options["verbose"])
 
               if @files.download_file_s3(f, relative_path, project_home, commit_sha1=nil, conflict=true)
                 f
@@ -2042,12 +2050,12 @@ module Cnvrg
               relative_path = f.gsub(/^#{@project.local_path}/, "")
               if f.end_with? "/"
                 # dir
-                log_message("downloading dir: #{f}", Thor::Shell::Color::RED, options["verbose"])
+                log_message("downloading dir: #{f}", Thor::Shell::Color::BLUE, options["verbose"])
 
                 if @files.download_dir(f, relative_path, project_home)
                   f
                 else
-                  log_message("Couldn't dcreate directory: #{f}", Thor::Shell::Color::RED)
+                  log_message("Couldn't create directory: #{f}", Thor::Shell::Color::RED)
                   raise Parallel::Kill
 
 
@@ -2055,7 +2063,7 @@ module Cnvrg
 
               else
                 # blob
-                log_message("downloading file: #{f}", Thor::Shell::Color::RED, options["verbose"])
+                log_message("downloading file: #{f}", Thor::Shell::Color::BLUE, options["verbose"])
 
                 if @files.download_file_s3(f, relative_path, project_home)
                   f

data/lib/cnvrg/datafiles.rb

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

data/lib/cnvrg/files.rb

@@ -292,8 +292,10 @@ module Cnvrg
         puts e
         puts e.backtrace
         return false
+      rescue SignalException
+        return false
 
-        end
+      end
         return true
 
     end
@@ -444,10 +446,10 @@ module Cnvrg
         begin
           if !conflicted_changes.nil? and !conflicted_changes.empty?
             conflicted_changes.each do |c|
-              FileUtils.rm_rf(c+".conflict")
+              # FileUtils.rm_rf(c+".conflict")
             end
           end
-          FileUtils.rm_rf(downloaded_changes) unless (downloaded_changes.nil? or downloaded_changes.empty?)
+          # FileUtils.rm_rf(downloaded_changes) unless (downloaded_changes.nil? or downloaded_changes.empty?)
         rescue => e
           return false
         end

data/lib/cnvrg/project.rb

@@ -50,6 +50,9 @@ module Cnvrg
 
     def get_ignore_list
       ignore_list = []
+      if !File.exist? self.local_path+"/.cnvrgignore"
+        return ignore_list
+      end
       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?
@@ -87,6 +90,31 @@ module Cnvrg
 
     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
+
     # Create project
 
     def self.create(project_name, clean, with_docker=false)
@@ -141,12 +169,16 @@ module Cnvrg
     end
 
     def self.link(owner, project_name, path=nil, docker=false)
+        ignore_exits = File.exist? ".cnvrgignore"
         list_dirs = [".cnvrg"
         ]
         list_files = [
-            ".cnvrgignore",
             ".cnvrg/config.yml"
         ]
+        if !ignore_exits
+          list_files <<
+              ".cnvrgignore"
+        end
 
         cnvrgreadme = Helpers.readme_content
         cnvrgignore = Helpers.cnvrgignore_content
@@ -162,13 +194,14 @@ module Cnvrg
           FileUtils.mkdir_p list_dirs
           FileUtils.touch list_files
           File.open(".cnvrg/config.yml", "w+") { |f| f.write config.to_yaml }
-          File.open(".cnvrgignore", "w+") { |f| f.write cnvrgignore }
+          File.open(".cnvrgignore", "w+") { |f| f.write cnvrgignore } unless ignore_exits
           if !File.exist? "README" and !File.exist? "README.md"
             FileUtils.touch [ "README.md" ]
             File.open("README.md", "w+") { |f| f.write cnvrgreadme }
           end
 
         rescue => e
+          puts e
           return false
         end
         return true
@@ -182,7 +215,7 @@ module Cnvrg
 
         list_files = [
             project_name + "/.cnvrg/config.yml",
-            project_name+"/.cnvrgignore",
+            # project_name+"/.cnvrgignore",
         ]
         begin
           config = {project_name: project_name,
@@ -190,17 +223,39 @@ module Cnvrg
                     owner: project_owner}
           FileUtils.mkdir_p list_dirs
           FileUtils.touch list_files
-          cnvrgignore = Helpers.cnvrgignore_content
+          # cnvrgignore = Helpers.cnvrgignore_content
 
 
           File.open(project_name + "/.cnvrg/config.yml", "w+") { |f| f.write config.to_yaml }
-          File.open(project_name+"/.cnvrgignore", "w+") { |f| f.write cnvrgignore }
+          # File.open(project_name+"/.cnvrgignore", "w+") { |f| f.write cnvrgignore }
 
         rescue
           return false
         end
         return true
       end
+    def self.verify_cnvrgignore_exist(project_name)
+      ignore_exits = File.exist? "#{project_name}/.cnvrgignore"
+      if !ignore_exits
+        begin
+        list_files = [
+            project_name+"/.cnvrgignore",
+        ]
+        FileUtils.touch list_files
+        cnvrgignore = Helpers.cnvrgignore_content
+        File.open(project_name+"/.cnvrgignore", "w+") { |f| f.write cnvrgignore }
+        rescue => e
+
+        end
+
+
+
+
+
+      end
+
+
+    end
 
       def self.clone_dir_remote(project_slug, project_owner, project_name)
         list_dirs = [
@@ -210,7 +265,7 @@ module Cnvrg
 
         list_files = [
             ".cnvrg/config.yml",
-            ".cnvrgignore",
+            # ".cnvrgignore",
 
         ]
         begin
@@ -219,11 +274,11 @@ module Cnvrg
                     owner: project_owner}
           FileUtils.mkdir_p list_dirs
           FileUtils.touch list_files
-          cnvrgignore = Helpers.cnvrgignore_content
+          # cnvrgignore = Helpers.cnvrgignore_content
 
 
           File.open(".cnvrg/config.yml", "w+") { |f| f.write config.to_yaml }
-          File.open(".cnvrgignore", "w+") { |f| f.write cnvrgignore }
+          # File.open(".cnvrgignore", "w+") { |f| f.write cnvrgignore }
 
         rescue
           return false
@@ -299,7 +354,7 @@ module Cnvrg
       def compare_idx(new_branch, commit=last_local_commit)
 
         local_idx = self.generate_idx
-        ignore_list = self.get_ignore_list()
+        ignore_list = self.send_ignore_list()
         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})
         CLI.is_response_success(response,false)

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-  VERSION = '0.0.1580000'
+  VERSION = '0.0.1590000'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.0.1580000
+  version: 0.0.1590000
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2017-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler