cnvrg 0.0.1421 → 0.0.1422

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c6baee53317d2534fda3e2bbe815b9f8ebfe782
-  data.tar.gz: a91b53562b3e431399d3bf20ed6cb0a1f4bda1ad
+  metadata.gz: d00f4715dff9ff27fc5dce8cd6de74e5dc846302
+  data.tar.gz: c3c218341d0d7ecba3f0b7bf0fcd09660bbeadec
 SHA512:
-  metadata.gz: cbaf58967b1170824772cdbc8472394ca430d6e6272256c868005b70a492a40196ee8af7dc4fd37b03ebfc6f757ba29ba54854c33c1e73f185a0a005a9a8ef94
-  data.tar.gz: 3817f79efeca681e9eca2d17b9a38c87807f1d1b71c28550327417ac8307d399f647d839177d5dd9791d582383ea99220107f0ae31815d374ef1e174b490d4d6
+  metadata.gz: 9c01d5eb58da2edfedcce2bf7cc6754384aa133fa335e94edc9888688f9fcf20bb5ffc1879495b37661a9a1650cbfdb6ab56813270089e6cd11856ad28ffc2fc
+  data.tar.gz: 2d2554208488d719ae4041a4c5e6dee3eaa588ded0794f06b446482f6e5c5a95d2a0e2013f1fe6e14f79c0c4e1d0a63587d24614f9acc018473afa2778475f18

data/lib/cnvrg/cli.rb

@@ -122,7 +122,7 @@ class Thor
     def is_option (options, p)
       options.each do |o|
         if !o.aliases.nil?
-          if (o.aliases.is_a? Array and o.aliases.include? p) or (!o.aliases.is_a? Array and o.aliases[0].split(",").include? p) or o.switch_name.eql? p
+          if (o.aliases.is_a? Array and o.aliases.include? p) or (o.aliases.is_a? Array and o.aliases.size ==1 and o.aliases[0].split(",").include? p) or o.switch_name.eql? p
             return o
           end
         end
@@ -1330,20 +1330,20 @@ module Cnvrg
 
     end
 
-    # desc 'data commits', 'List all commits for a specific dataset'
-    #
-    # def list_commits()
-    #   verify_logged_in(true)
-    #   log_start(__method__, args, options)
-    #
-    #   dataset_dir = is_cnvrg_dir(Dir.pwd)
-    #   @dataset = Dataset.new(dataset_dir)
-    #   result = @dataset.list_commits()
-    #   list = result["result"]["list"]
-    #
-    #   print_table(list)
-    #
-    # end
+    desc 'commits', 'List all commits for a specific dataset'
+
+    def list_commits()
+      verify_logged_in(true)
+      log_start(__method__, args, options)
+
+      project_dir = is_cnvrg_dir(Dir.pwd)
+      @project = Project.new(project_dir)
+      result = @project.list_commits()
+      list = result["result"]["list"]
+
+      print_table(list)
+
+    end
 
 
     desc 'unlink', 'Unlink a project from current directory'
@@ -1404,6 +1404,7 @@ module Cnvrg
           Cnvrg::CLI.is_response_success response
           working_dir = project_home
           docker_image = response["result"]["image"]
+          current_commit = response["result"]["commit"]
           idx = {commit: response["result"]["commit"], tree: response["result"]["tree"]}
           File.open(working_dir + "/.cnvrg/idx.yml", "w+") { |f| f.write idx.to_yaml }
           if !docker_image.nil? and !docker_image.empty? and !remote
@@ -1445,7 +1446,8 @@ module Cnvrg
                 end
               else
                 # blob
-                if @files.download_file_s3(f[0], relative_path, project_home)
+
+                if @files.download_file_s3(f[0], relative_path, project_home,commit_sha1=current_commit)
                   successful_changes << relative_path
                 end
               end
@@ -1844,7 +1846,7 @@ module Cnvrg
 
         result["conflicts"].each do |f|
           relative_path = f.gsub(/^#{@project.local_path}/, "")
-          if @files.download_file_s3(f, relative_path, project_home, conflict=true)
+          if @files.download_file_s3(f, relative_path, project_home,commit_sha1=nil, conflict=true)
             successful_changes << relative_path
           end
 
@@ -1969,7 +1971,7 @@ module Cnvrg
               end
             else
               # blob
-              if @files.download_file_s3(f[0], relative_path, project_home)
+              if @files.download_file_s3(f[0], relative_path, project_home,commit_sha1=commit_sha1)
                 current_tree.delete(relative_path)
 
                 successful_changes << relative_path
@@ -2061,26 +2063,26 @@ module Cnvrg
 
 
     desc 'run cmd', 'Runs an experiment'
-    method_option :local, :type => :boolean, :aliases => ["-l"], :default => false
+    method_option :local, :type => :boolean, :aliases => ["-l","--local"], :default => false
     method_option :small, :type => :boolean, :aliases => ["-sm", "--small"], :default => false
     method_option :medium, :type => :boolean, :aliases => ["-md", "--medium"], :default => false
     method_option :large, :type => :boolean, :aliases => ["-lg", "--large"], :default => false
     method_option :gpu, :type => :boolean, :aliases => ["--gpu"], :default => false
     method_option :gpuxl, :type => :boolean, :aliases => ["--gpuxl"], :default => false
     method_option :gpuxxl, :type => :boolean, :aliases => ["--gpuxxl"], :default => false
-    method_option :sync_before, :type => :boolean, :aliases => ["-sb"], :default => true
-    method_option :sync_after, :type => :boolean, :aliases => ["-sa"], :default => true
+    method_option :sync_before, :type => :boolean, :aliases => ["-sb","--sync_before"], :default => true
+    method_option :sync_after, :type => :boolean, :aliases => ["-sa","--sync_after"], :default => true
     method_option :title, :type => :string, :aliases => ["-t", "--title"], :default => ""
     method_option :log, :type => :boolean, :aliases => ["--log"], :default => false
-    method_option :email_notification, :type => :boolean, :aliases => ["-en"], :default => false
-    method_option :upload_output, :type => :string, :aliases => ["-uo"], :default => ""
-    method_option :commit, :type => :string, :aliases => ["-c"], :default => ""
-    method_option :schedule, :type => :string, :aliases => ["-s"], :default => ""
-    method_option :image, :type => :string, :aliases => ["-i"], :default => ""
+    method_option :email_notification, :type => :boolean, :aliases => ["-en","--email_notification"], :default => false
+    method_option :upload_output, :type => :string, :aliases => ["-uo","--upload_output"], :default => ""
+    method_option :commit, :type => :string, :aliases => ["-c","--commit"], :default => ""
+    method_option :schedule, :type => :string, :aliases => ["-s","--schedule"], :default => ""
+    method_option :image, :type => :string, :aliases => ["-i","--image"], :default => ""
     method_option :grid, :type => :string, :aliases => ["-g", "--grid"], :default => ""
     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"], :desc => "ignore following files", :default => ""
+    method_option :ignore, :type => :string, :aliases => ["-i","--ignore"], :desc => "ignore following files", :default => ""
 
     def run(*cmd)
       sync_before = options["sync_before"]
@@ -2103,7 +2105,7 @@ module Cnvrg
         real_options << o if (!o[1].eql? "" and !["small", "medium", "large", "gpu", "gpuxl", "gpuxxl"].include? o[0])
       end
       if local
-        invoke :exec, cmd, :sync_before => sync_before, :sync_after => sync_after, :title => title,
+        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
         return
@@ -2139,16 +2141,16 @@ module Cnvrg
     desc '', '', :hide => true
     method_option :sync_before, :type => :boolean, :aliases => ["-sb,--sync_before"], :default => true
     method_option :sync_after, :type => :boolean, :aliases => ["-sa,--sync_after"], :default => true
-    method_option :title, :type => :string, :aliases => ["-t"], :default => ""
-    method_option :log, :type => :boolean, :aliases => ["-l", "--log"], :default => false
+    method_option :title, :type => :string, :aliases => ["-t","--title"], :default => ""
+    method_option :log, :type => :boolean, :aliases => [ "--log"], :default => false
     method_option :email_notification, :type => :boolean, :aliases => ["-en,--email_notification"], :default => false
     method_option :upload_output, :type => :string, :aliases => ["-uo,--upload_output"], :default => ""
-    method_option :commit, :type => :string, :aliases => ["-c"], :default => ""
-    method_option :image, :type => :string, :aliases => ["-i"], :default => ""
+    method_option :commit, :type => :string, :aliases => ["-c","--commit"], :default => ""
+    method_option :image, :type => :string, :aliases => ["-i","--image"], :default => ""
     method_option :indocker, :type => :boolean, :aliases => ["--indocker"], :default => false
     method_option :data, :type => :string, :aliases => ["-d", "--data"], :default => ""
     method_option :data_commit, :type => :string, :aliases => ["-dc", "--data_commit"], :default => ""
-    method_option :ignore, :type => :string, :aliases => ["-i"], :desc => "ignore following files", :default => ""
+    method_option :ignore, :type => :string, :aliases => ["-i","--ignore"], :desc => "ignore following files", :default => ""
 
 
     def exec(*cmd)
@@ -2562,20 +2564,20 @@ module Cnvrg
     end
 
     desc '', '', :hide => true
-    method_option :sync_before, :type => :boolean, :aliases => ["-sb"], :default => true
-    method_option :sync_after, :type => :boolean, :aliases => ["-sa"], :default => true
-    method_option :title, :type => :string, :aliases => ["-t"], :default => ""
-    method_option :log, :type => :boolean, :aliases => ["-l", "--log"], :default => false
-    method_option :email_notification, :type => :boolean, :aliases => ["-en"], :default => false
-    method_option :upload_output, :type => :string, :aliases => ["-uo"], :default => ""
+    method_option :sync_before, :type => :boolean, :aliases => ["-sb","--sync_before"], :default => true
+    method_option :sync_after, :type => :boolean, :aliases => ["-sa","--sync_after"], :default => true
+    method_option :title, :type => :string, :aliases => ["-t","--title"], :default => ""
+    method_option :log, :type => :boolean, :aliases => [ "--log"], :default => false
+    method_option :email_notification, :type => :boolean, :aliases => ["-en","--email_notification"], :default => false
+    method_option :upload_output, :type => :string, :aliases => ["-uo","--upload_output"], :default => ""
     method_option :machine_type, :type => :string, :default => ""
-    method_option :schedule, :type => :string, :aliases => ["-s"], :default => ""
+    method_option :schedule, :type => :string, :aliases => ["-s","--schedule"], :default => ""
     method_option :commit, :type => :string, :aliases => ["-c, --commit"], :default => nil
-    method_option :image, :type => :string, :aliases => ["-i"], :default => ""
+    method_option :image, :type => :string, :aliases => ["-i","--image"], :default => ""
     method_option :grid, :type => :string, :aliases => ["-g", "--grid"], :default => ""
     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"], :desc => "ignore following files", :default => ""
+    method_option :ignore, :type => :string, :aliases => ["-i","--ignore"], :desc => "ignore following files", :default => ""
 
     def exec_remote(*cmd)
       verify_logged_in(true)

data/lib/cnvrg/files.rb

@@ -333,9 +333,9 @@ module Cnvrg
       response = Cnvrg::API.request(@base_resource + "create_dir", 'POST', {absolute_path: absolute_path, relative_path: relative_path, commit_sha1: commit_sha1})
       return Cnvrg::CLI.is_response_success(response, false)
     end
-    def download_file_s3(absolute_path, relative_path, project_home, conflict=false)
+    def download_file_s3(absolute_path, relative_path, project_home,commit_sha1=nil, conflict=false)
       begin
-        res = Cnvrg::API.request(@base_resource + "download_file", 'POST', {absolute_path: absolute_path, relative_path: relative_path})
+        res = Cnvrg::API.request(@base_resource + "download_file", 'POST', {absolute_path: absolute_path, relative_path: relative_path,commit_sha1:commit_sha1})
         Cnvrg::CLI.is_response_success(res, false)
         if res["result"]
           download_resp = res

data/lib/cnvrg/project.rb

@@ -23,6 +23,9 @@ module Cnvrg
       idx = YAML.load_file(@local_path + "/.cnvrg/idx.yml")
       return idx[:commit]
     end
+    def get_last_commit
+
+    end
 
     def url
       url = Cnvrg::Helpers.remote_url
@@ -325,7 +328,12 @@ module Cnvrg
                                                                                             workers:workers,file_input:file_input})
         return response
       end
+    def list_commits
+      response = Cnvrg::API.request("users/#{self.owner}/projects/#{self.slug}/commits/list", 'GET')
+      CLI.is_response_success(response)
+      return response
 
+    end
       def update_idx_with_commit!(commit)
         idx_hash = YAML.load_file("#{self.local_path}/.cnvrg/idx.yml")
         idx_hash[:commit] = commit

data/lib/cnvrg/version.rb

@@ -1,4 +1,5 @@
 module Cnvrg
-    VERSION = '0.0.1421'
+    VERSION = '0.0.1422'
+
 end
 

metadata

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