cnvrg 1.0 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12febac69e1c9f8c035af8af4f971130b94de970
-  data.tar.gz: 30935d7322d87135629f944f3d5588bc4f3c9a80
+  metadata.gz: c521807a89abc0d51041110af1d5af2b4a2c6248
+  data.tar.gz: 7643390b264154d01393199803d10496695e8589
 SHA512:
-  metadata.gz: 6b0447676f52c0dc2ff437a3d2ce67aee5326485a4ac5dcf81814706713d2ffffcc16ca1520372080d895b73a87ca8fe3a27277870ec7f0ea05a6db27ded7ac8
-  data.tar.gz: c687e4ec459d503675171b0711a56c2cc048675833dbf1db97821b7f456eb05d5eca0772ab0ac89d60534e9d1e2c4db951b0b87b23748f5ddce8e08d5cbb985b
+  metadata.gz: f3a1e4275786314861824511a4baccb864e17a14990950743a0ddf1c686b09cc7b801bf6851a758feb0ff99b8331171d201ac137ac6d35746101895c13e14065
+  data.tar.gz: b272efe2c50d66423320b378ef6bb7a7cfd1394d2dfa6231c4aec68872051f26b4407a1c00024460ac0e0933fe9af758760972615b5453643fd9b0c43400da34

data/lib/cnvrg/cli.rb

@@ -655,6 +655,7 @@ module Cnvrg
     method_option :sync, :type => :boolean, :aliases => ["-s"], :default => false
     method_option :docker_image, :type => :string, :aliases => ["-d"], :default => ""
     method_option :git, :type => :boolean, :aliases => ["-g","--git"], :default => false
+    method_option :title, :type => :string, :aliases => ["-t","--title"], :default => nil
 
     def link
       begin
@@ -669,8 +670,8 @@ module Cnvrg
 
         sync = options["sync"]
         git = options["git"] ||  false
-
-        project_name = File.basename(Dir.getwd)
+        project_name = options['title']
+        project_name ||= File.basename(Dir.getwd)
         log_message("Linking #{project_name}", Thor::Shell::Color::BLUE)
         if File.directory?(Dir.getwd + "/.cnvrg")
           config = YAML.load_file("#{Dir.getwd}/.cnvrg/config.yml")
@@ -679,11 +680,11 @@ module Cnvrg
         end
         working_dir = Dir.getwd
         owner = CLI.get_owner
-        if Project.link(owner, project_name, docker = docker,git = git)
+        if Project.link(owner, project_name, docker,git)
           path = Dir.pwd
           @project = Project.new(path)
-          @project.generate_idx()
           if sync
+            @project.generate_idx() #DEV-741
             log_message("Syncing project", Thor::Shell::Color::BLUE)
             upload(true)
           end
@@ -2135,7 +2136,7 @@ module Cnvrg
           commit_msg = ""
         end
         return_id = options["return_id"]
-        @files = Cnvrg::Files.new(@project.owner, @project.slug, project_home: get_project_home)
+        @files = Cnvrg::Files.new(@project.owner, @project.slug, project_home: get_project_home, project: @project)
         ignore = options[:ignore] || ""
         force = options[:force] || force || false
         spec_files_to_upload = options["files"]
@@ -3040,7 +3041,7 @@ module Cnvrg
                                real: real_time
                     }
                     if print_log
-                      puts cur_log
+                      puts line
                     end
                     log << cur_log
                     if log.size >= 5
@@ -5592,12 +5593,20 @@ module Cnvrg
           end
         end
         if is_cnvrg
+          self.update_project_config(current_dir)
           return current_dir
         else
           return false
         end
       end
 
+
+
+      def update_project_config(current_dir)
+        @project = Cnvrg::Project.new(current_dir)
+        @project.fetch_project
+      end
+
       def data_dir_include()
         all_dirs = Dir.glob("**/*/", File::FNM_DOTMATCH)
         all_dirs.flatten!

data/lib/cnvrg/project.rb

@@ -317,8 +317,21 @@ module Cnvrg
         return config[:new_branch]
       rescue => e
         return false
+      end
+    end
 
+    def get_config
+      YAML.load_file(@working_dir + "/.cnvrg/config.yml") rescue {}
+    end
+
+    def set_config(config)
+      slug = config[:project_slug] rescue nil
+      owner = config[:owner] rescue nil
+      name = config[:project_name] rescue nil
+      if slug.blank? or owner.blank? or name.blank?
+        raise StandardError.new("Cant change config without mendatory values")
       end
+      File.open(@working_dir + "/.cnvrg/config.yml", "w+") {|f| f.write config.to_yaml}
     end
 
     def remove_new_branch
@@ -382,10 +395,10 @@ module Cnvrg
         list_ignore.flatten!
       end
 
+
       Parallel.map(list, in_threads: IDXParallelThreads) do |e|
         label = e.gsub(self.local_path + "/", "")
-        ignore_label = label.gsub("/", "//")
-        if list_ignore.include? ignore_label
+        if list_ignore.include? label
           next
         end
         if File.directory? e
@@ -404,7 +417,6 @@ module Cnvrg
       end
 
       old_idx[:tree] = tree_idx
-
       File.open("#{self.local_path}/.cnvrg/idx.yml", 'w') {|f| f.write old_idx.to_yaml}
       return YAML.load_file("#{self.local_path}/.cnvrg/idx.yml")
     end
@@ -607,5 +619,16 @@ module Cnvrg
     end
 
 
+    def fetch_project
+      resp = Cnvrg::API.request("users/#{@owner}/projects/#{@slug}/get_project", "GET")
+      res = JSON.parse(resp['result']) rescue nil
+      raise SignalException.new("Cant Find project in the server") if res.blank?
+      config = self.get_config
+      config[:is_git] = res['git']
+      config[:project_name] = res['title']
+      self.set_config(config)
+    end
+
+
   end
 end

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-  VERSION = '1.0'
+  VERSION = '1.2'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.2'
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-13 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler