cnvrg 0.0.1530000 → 0.0.1540000

data/lib/cnvrg/datafiles.rb

@@ -1,7 +1,6 @@
 require 'mimemagic'
 require 'aws-sdk'
 require 'URLcrypt'
-
 module Cnvrg
   class Datafiles
 
@@ -17,6 +16,7 @@ module Cnvrg
     end
 
     def upload_file(absolute_path, relative_path, commit_sha1)
+
       file_name = File.basename relative_path
       file_size = File.size(absolute_path).to_f
       mime_type = MimeMagic.by_path(absolute_path)
@@ -39,6 +39,7 @@ module Cnvrg
         end
       end
       return false
+
     end
 
     def upload_tar_file(absolute_path, relative_path, commit_sha1)
@@ -481,6 +482,7 @@ module Cnvrg
           key = split[0]
           iv = split[1]
 
+
           access =  Cnvrg::Helpers.decrypt(key, iv, download_resp["result"]["sts_a"])
 
           secret =  Cnvrg::Helpers.decrypt(key,iv, download_resp["result"]["sts_s"])
@@ -492,7 +494,6 @@ module Cnvrg
           key =  Cnvrg::Helpers.decrypt(key,iv, download_resp["result"]["key"])
 
 
-
           client = Aws::S3::Client.new(
               :access_key_id =>access,
               :secret_access_key => secret,
@@ -555,6 +556,19 @@ module Cnvrg
         return false
       end
     end
+    def revoke_download(tar_files, extracted_files)
+      begin
+
+        FileUtils.rm_rf(tar_files) unless (tar_files.nil? or tar_files.empty?)
+        FileUtils.rm_rf(extracted_files) unless (extracted_files.nil? or extracted_files.empty?)
+
+      rescue => e
+        return false
+      end
+
+      return true
+
+    end
 
     def start_commit(new_branch)
 

data/lib/cnvrg/files.rb

@@ -23,12 +23,14 @@ module Cnvrg
       mime_type = MimeMagic.by_path(absolute_path)
       content_type = !(mime_type.nil? or mime_type.text?) ? mime_type.type : "text/plain"
       sha1 = Digest::SHA1.file(absolute_path).hexdigest
-
       upload_resp = Cnvrg::API.request(@base_resource + "upload_file", 'POST_FILE', {absolute_path: absolute_path, relative_path: relative_path,
                                                                                      commit_sha1: commit_sha1, file_name: file_name,
                                                                                      file_size: file_size, file_content_type: content_type, sha1: sha1,
                                                                                       new_version:true})
+
+
       if Cnvrg::CLI.is_response_success(upload_resp, false)
+
         path = upload_resp["result"]["path"]
         if file_size.to_f>= Cnvrg::Files::LARGE_FILE.to_f
           s3_res = upload_large_files_s3(upload_resp, absolute_path)
@@ -44,6 +46,7 @@ module Cnvrg
         # return is_suc
       end
       return false
+
     end
 
     def upload_log_file(absolute_path, relative_path, log_date)
@@ -266,8 +269,6 @@ module Cnvrg
 
           bucket =  Cnvrg::Helpers.decrypt(key,iv, upload_resp["result"]["bucket"])
 
-
-
           client = Aws::S3::Client.new(
                 :access_key_id =>access,
                 :secret_access_key => secret,
@@ -306,7 +307,8 @@ module Cnvrg
           return true
         rescue Interrupt
           return false
-        rescue
+        rescue => e
+          puts e
           return false
         end
       end
@@ -371,8 +373,6 @@ module Cnvrg
             bucket =  Cnvrg::Helpers.decrypt(key,iv, download_resp["result"]["bucket"])
             key =  Cnvrg::Helpers.decrypt(key,iv, download_resp["result"]["key"])
 
-
-
             client = Aws::S3::Client.new(
                 :access_key_id =>access,
                 :secret_access_key => secret,
@@ -435,7 +435,32 @@ module Cnvrg
           return false
         end
       end
+      def revoke_download(conflicted_changes,downloaded_changes)
+        begin
+          if !conflicted_changes.nil? and !conflicted_changes.empty?
+            conflicted_changes.each do |c|
+              FileUtils.rm_rf(c+".conflict")
+            end
+          end
+          FileUtils.rm_rf(downloaded_changes) unless (downloaded_changes.nil? or downloaded_changes.empty?)
+        rescue => e
+          return false
+        end
+
+        return true
+
+      end
+    def delete_commit_files_local(deleted)
+      begin
+        FileUtils.rm_rf(deleted) unless (deleted.nil? or deleted.empty?)
+        return true
+      rescue => e
+        return false
+      end
+
+      return true
 
+    end
       def start_commit(new_branch)
 
         response = Cnvrg::API.request("#{base_resource}/commit/start", 'POST', {project_slug: @project_slug, new_branch: new_branch,

data/lib/cnvrg/helpers.rb

@@ -172,6 +172,7 @@ parameters:
     end
 
     def decrypt(key,iv,str)
+      begin
       cipher = OpenSSL::Cipher.new("aes-256-cbc").decrypt
       cipher.key = key
       cipher.iv = Base64.decode64 iv.encode('ascii-8bit')
@@ -181,6 +182,12 @@ parameters:
       result << cipher.final
 
       return result
+      rescue => e
+        puts e
+
+
+      end
+
 
     end
 

data/lib/cnvrg/project.rb

@@ -277,7 +277,6 @@ module Cnvrg
         File.open("#{self.local_path}/.cnvrg/idx.yml", 'w') { |f| f.write idx.to_yaml }
         return YAML.load_file("#{self.local_path}/.cnvrg/idx.yml")
       end
-
       def get_idx
         YAML.load_file("#{self.local_path}/.cnvrg/idx.yml")
       end

data/lib/cnvrg/version.rb

@@ -1,6 +1,4 @@
 module Cnvrg
-    VERSION = '0.0.1530000'
-
-
+  VERSION = '0.0.1540000'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.0.1530000
+  version: 0.0.1540000
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-30 00:00:00.000000000 Z
+date: 2017-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -245,6 +245,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: logstash-logger
   requirement: !ruby/object:Gem::Requirement
@@ -388,8 +402,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A CLI tool for interacting with cnvrg.io.
 test_files: []
+has_rdoc: