cnvrg 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d95dc585aed3d6033c8e685746d68f8dd14ba17a
-  data.tar.gz: 7dee9ee650bc429aa2b2adbb21f31961c35e866f
+  metadata.gz: bf56dd631c9d7dc157c8f0fd13a3efaa57c172dc
+  data.tar.gz: 0df56325de293a1a26cd39210a29345f38e21b21
 SHA512:
-  metadata.gz: 9224ca5e7961c2f4e279e0709d2e1d6f77ae74ac8951aebbce4e55a747821022378327ec482402de1c3a7b0e34febdbb1f686c56072996af0d3519e0b4c8676b
-  data.tar.gz: 792907e29a0611097387d247f4f01f6a2eea0cf751f68a7fcc981474ec427f4ea6945228e87fd76a76347a121f902cdd068368f4b55dc6337876583f05e032e2
+  metadata.gz: b42ccdcd5d4775778c6009a4bd50acdf2ce730d25d62f0a8a28fc6900e34665877cb71fffcb306bc398a685a21f675c31da845cae4caaa8f01362e42bc347953
+  data.tar.gz: 6f3dc0c94c7fee54dd34aeb3e2e1affa618aff50e74dfb84a01fde238c7c43c1149a9edcf71c35def78501248a53e8eac96cc8f8a285ca0fd0f617e9a6f6f389

data/lib/cnvrg/cli.rb

@@ -1730,10 +1730,6 @@ module Cnvrg
             clone_resp = Project.clone_dir(slug, owner, project_name,git)
 
           end
-
-          # idx_status = Project.new(project_home).generate_idx
-          # log_message("Cloned project #{project_name} successfully", Thor::Shell::Color::GREEN)
-
         else
           if (Dir.exists? project_name)
             # project_name = "#{project_name}_#{rand(1 .. 5000000000)}"
@@ -2420,40 +2416,13 @@ module Cnvrg
         log_start(__method__, args, options)
         project_home = get_project_home
         @project = Project.new(project_home)
-        @files = Cnvrg::Files.new(@project.owner, @project.slug)
-        res = @project.git_download_commit(commit_sha1)
-        files =  res.try(:fetch, "result").try(:fetch, "files")
-        if files.blank?
-          log_message("No files to download", Thor::Shell::Color::RED)
-          return
-        end
-
-        begin
-          if files["keys"].blank?
-            log_message("No New files to download", Thor::Shell::Color::GREEN)
-            return
-          end
-          progressbar = ProgressBar.create(:title => "Download Progress",
-                                         :progress_mark => '=',
-                                         :format => "%b>>%i| %p%% %t",
-                                         :starting_at => 0,
-                                         :total => files['keys'].size,
-                                         :autofinish => true)
-          download_result = @files.download_multpile_files_s3(files, project_home, progress: progressbar)
-          if download_result
-            progressbar.finish
-            log_message("Done.\nDownloaded  finished successfully", Thor::Shell::Color::GREEN)
-          else
-            log_message("Error while trying to download\n", Thor::Shell::Color::RED)
-
-          end
-
-            rescue => e
+        @files = Cnvrg::Files.new(@project.owner, @project.slug, project: @project, cli: self, options: options)
+        commit_sha1 = commit_sha1.try(:first) if commit_sha1.is_a? Array
+        @files.download_commit(commit_sha1)
+      rescue => e
           log_error(e)
           log_message("Error while trying to download ", Thor::Shell::Color::RED)
           return
-        end
-
       end
     end
 

data/lib/cnvrg/files.rb

@@ -12,11 +12,33 @@ module Cnvrg
 
     attr_reader :base_resource
 
-    def initialize(owner, project_slug, project_home: '')
+    def initialize(owner, project_slug, project_home: '', project: nil, progressbar: nil, cli: nil, options: {})
       @project_slug = project_slug
       @owner = owner
       @base_resource = "users/#{owner}/projects/#{project_slug}/"
       @project_home = project_home.presence || Cnvrg::CLI.get_project_home
+      @project = project
+      @progressbar = progressbar
+      @custom_progess = false
+      @cli = cli
+      @options = options
+    end
+
+
+    def download_commit(sha1)
+      response = @project.clone(false, sha1)
+      log_error("Cant download commit #{sha1}") unless Cnvrg::CLI.is_response_success response, false
+      commit_sha1 = response["result"]["commit"]
+      files = response["result"]["tree"].keys
+      log_progress("Downloading #{files.size} Files")
+      idx = {commit: commit_sha1, tree: response["result"]["tree"]}
+      @progressbar ||= create_progressbar(files.size, "Clone Progress")
+      download_files(files, commit_sha1, progress: @progressbar)
+      @progressbar.finish if @custom_progess
+      Project.verify_cnvrgignore_exist(@project_slug, false)
+      @project.set_idx(idx)
+      log("Done")
+      log("Downloaded #{files.size} files")
     end
 
     def get_upload_options(number_of_items: 0, progress: false)
@@ -649,12 +671,14 @@ module Cnvrg
       end
 
     def create_progressbar(length = 10, title = 'Progress')
-      ProgressBar.create(:title => title,
+      @progressbar = ProgressBar.create(:title => title,
                          :progress_mark => '=',
                          :format => "%b>>%i| %p%% %t",
                          :starting_at => 0,
                          :total => length,
                          :autofinish => true)
+      @custom_progess = true
+      @progressbar
     end
 
     def download_files(files, commit, postfix: '', progress: nil)
@@ -954,5 +978,25 @@ module Cnvrg
         response = Cnvrg::API.request("#{base_resource}/commit/rollback", 'POST', {commit_sha1: commit_sha1})
         Cnvrg::CLI.is_response_success(response, false)
       end
+    private
+    def log(msgs, type: Thor::Shell::Color::GREEN)
+      return false if @cli.blank?
+      msgs = [msgs].flatten
+      msgs.each do |msg|
+        @cli.log_message(msg, type)
+      end
     end
+
+
+    def log_error(msgs)
+      @cli.log_error(msgs) if @cli.present?
+      log(msgs, type: Thor::Shell::Color::RED)
+    end
+
+    def log_progress(msgs)
+      log(msgs, type: Thor::Shell::Color::BLUE)
+    end
+  end
+
+
   end

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-  VERSION = '0.9.6'
+  VERSION = '0.9.7'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-13 00:00:00.000000000 Z
+date: 2018-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler