cnvrg 0.5.0 → 0.5.5

data/lib/cnvrg/helpers.rb

@@ -99,7 +99,7 @@ module Cnvrg
 # for example:
 # some_dir/
 # some_file.txt
-.git/
+.git*
 .gitignore
             }.strip
     end

data/lib/cnvrg/project.rb

@@ -1,7 +1,7 @@
 require 'fileutils'
 module Cnvrg
   class Project
-    attr_reader :slug, :owner, :title, :local_path, :working_dir
+    attr_reader :slug, :owner, :title, :local_path, :working_dir, :is_git
 
     RemoteURL ||= "https://cnvrg.io"
     IDXParallelThreads ||= 15
@@ -9,12 +9,13 @@ module Cnvrg
 
     def initialize(project_home)
       begin
-        config = YAML.load_file(project_home+"/.cnvrg/config.yml")
         @local_path = project_home
+        @working_dir = project_home
+        config = YAML.load_file(project_home+"/.cnvrg/config.yml")
         @title = config[:project_name]
         @slug = config[:project_slug]
         @owner = config[:owner]
-        @working_dir = project_home
+        @is_git = config[:git] || false
       rescue => e
       end
 
@@ -170,7 +171,7 @@ module Cnvrg
       return true
     end
 
-    def self.link(owner, project_name, path=nil, docker=false)
+    def self.link(owner, project_name, docker=false, git = false)
         ignore_exits = File.exist? ".cnvrgignore"
         list_dirs = [".cnvrg"
         ]
@@ -192,7 +193,8 @@ module Cnvrg
 
           config = {project_name: project_name,
                     project_slug: project_slug,
-                    owner: owner}
+                    owner: owner,
+                    git: git}
           FileUtils.mkdir_p list_dirs
           FileUtils.touch list_files
           File.open(".cnvrg/config.yml", "w+") { |f| f.write config.to_yaml }
@@ -209,7 +211,7 @@ module Cnvrg
         return true
       end
 
-      def self.clone_dir(project_slug, project_owner, project_name)
+      def self.clone_dir(project_slug, project_owner, project_name,is_git=false)
         list_dirs = [project_name,
                      project_name + "/.cnvrg"
         ]
@@ -217,19 +219,20 @@ module Cnvrg
 
         list_files = [
             project_name + "/.cnvrg/config.yml",
-            # project_name+"/.cnvrgignore",
+            project_name+"/.cnvrgignore",
         ]
         begin
           config = {project_name: project_name,
                     project_slug: project_slug,
-                    owner: project_owner}
+                    owner: project_owner,
+                    git: is_git}
           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
@@ -257,28 +260,38 @@ module Cnvrg
       end
     end
 
-      def self.clone_dir_remote(project_slug, project_owner, project_name)
+      def self.clone_dir_remote(project_slug, project_owner, project_name,is_git=false)
         list_dirs = [
             ".cnvrg"
         ]
 
 
-        list_files = [
+
+          list_files = [
             ".cnvrg/config.yml",
-            # ".cnvrgignore",
 
         ]
-        begin
+
+
+          begin
           config = {project_name: project_name,
                     project_slug: project_slug,
-                    owner: project_owner}
+                    owner: project_owner,
+                    git: is_git
+          }
           FileUtils.mkdir_p list_dirs
           FileUtils.touch list_files
-          # cnvrgignore = Helpers.cnvrgignore_content
 
 
           File.open(".cnvrg/config.yml", "w+") { |f| f.write config.to_yaml }
-          # File.open(".cnvrgignore", "w+") { |f| f.write cnvrgignore }
+          if !File.exist? ".cnvrgignore"
+            FileUtils.touch ".cnvrgignore"
+            list_files << ".cnvrgignore"
+            cnvrgignore = Helpers.cnvrgignore_content
+            File.open(".cnvrgignore", "w+") { |f| f.write cnvrgignore }
+
+
+          end
 
         rescue
           return false
@@ -310,11 +323,12 @@ module Cnvrg
         if File.exists? "#{self.local_path}/.cnvrg/idx.yml"
           old_idx = YAML.load_file("#{self.local_path}/.cnvrg/idx.yml")
         else
+
           old_idx = nil
         end
 
         tree_idx = Hash.new(0)
-        list = Dir.glob("#{self.local_path}/**/*", File::FNM_DOTMATCH).reject { |x| (x =~ /\/\.{1,2}$/) or (x =~ /^#{self.local_path}\/\.cnvrg\/*/) or (x =~/^#{self.local_path}\/\.cnvrgignore.conflict*/) and not (x =~/^#{self.local_path}\/\.cnvrgignore/) }
+        list = Dir.glob("#{self.local_path}/**/*", File::FNM_DOTMATCH).reject { |x| (x =~ /\/\.{1,2}$/) or (x =~ /^#{self.local_path}\/\.cnvrg\/*/) or (x =~ /^#{self.local_path}\/\.git\/*/) or (x =~/^#{self.local_path}\/\.cnvrgignore.conflict*/) and not (x =~/^#{self.local_path}\/\.cnvrgignore/) }
         list_ignore = self.get_ignore_list()
         if deploy
           list_ignore << ["main.py","main.pyc", "__init__.py", "uwsgi.ini"]
@@ -355,6 +369,11 @@ module Cnvrg
         response = Cnvrg::API.request("users/#{self.owner}/projects/#{self.slug}/clone", 'POST', {project_slug: self.slug, remote: remote, commit: commit})
         return response
       end
+    def git_download_commit(commit)
+      response = Cnvrg::API.request("users/#{self.owner}/projects/#{self.slug}/git_download_commit", 'POST', {commit_sha1: commit})
+      CLI.is_response_success(response,true)
+      return response
+    end
 
       def compare_idx(new_branch, commit:last_local_commit,force:false, deploy: false, in_exp:false, specific_files: [])
         if commit.nil?

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-  VERSION = '0.5.0'
+  VERSION = '0.5.5'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.5
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-02 00:00:00.000000000 Z
+date: 2018-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -121,14 +121,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.15.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.15.2
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
@@ -335,14 +335,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -385,20 +385,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware-request-retry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A CLI tool for interacting with cnvrg.io.
 email:
 - info@cnvrg.io