cnvrg 0.0.5 → 0.0.6

data/lib/cnvrg/files.rb

@@ -1,116 +1,208 @@
 require 'mimemagic'
+require 'aws-sdk'
+require 'URLcrypt'
+
+
 module Cnvrg
-    class Files
-        
-        attr_reader :base_resource
-
-        def initialize(owner, project_slug)
-            @project_slug = project_slug
-            @owner = owner
-            @base_resource = "users/#{owner}/projects/#{project_slug}/"
-        end
+  class Files
 
-        def upload_file(absolute_path, relative_path, commit_sha1)
-            file_name = File.basename relative_path
-            file_size = File.size(relative_path).to_f
-            mime_type = MimeMagic.by_path(relative_path)
-            content_type =  !mime_type.nil? ?  mime_type.type : "text/plain"
-            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})
-            if Cnvrg::CLI.is_response_success(upload_resp, false)
-                path = upload_resp["result"]["path"]
-                s3_res = upload_s3(path,relative_path,content_type)
-                    if s3_res
-                        Cnvrg::API.request(@base_resource + "update_s3", 'POST', { path:path,commit_id:upload_resp["result"]["commit_id"],
-                                                                                    blob_id:upload_resp["result"]["blob_id"]})
-                        return true
-                    end
-            end
-            return false
-        end
-        def upload_s3(url,file,content_type)
-            url = URI.parse(url)
-
-            file = File.open(file, "rb")
-            body = file.read
-            begin
-                Net::HTTP.start(url.host) do |http|
-                    http.send_request("PUT", url.request_uri, body, {
-                        "content-type" => content_type,
-                    })
-               end
-                return true
-            rescue Interrupt
-                return false
-            rescue => e
-                return false
-            end
-        end
-        def upload_url(file_path)
-            response  = Cnvrg::API.request(@base_resource + "upload_url", 'POST', { file_s3_path: file_path})
-            if Cnvrg::CLI.is_response_success(response, false)
-                return response
-            else
-              return nil
-            end
+    LARGE_FILE=1024*1024*100
+    attr_reader :base_resource
 
-        end
-        def delete_file(absolute_path, relative_path, commit_sha1)
-            response = Cnvrg::API.request(@base_resource + "delete_file", 'DELETE',{ absolute_path: absolute_path, relative_path: relative_path, commit_sha1: commit_sha1 })
-            return Cnvrg::CLI.is_response_success(response, false)
-        end
+    def initialize(owner, project_slug)
+      @project_slug = project_slug
+      @owner = owner
+      @base_resource = "users/#{owner}/projects/#{project_slug}/"
+    end
 
-        def delete_dir(absolute_path, relative_path, commit_sha1)
-            response = Cnvrg::API.request(@base_resource + "delete_dir", 'DELETE', { absolute_path: absolute_path, relative_path: relative_path, commit_sha1: commit_sha1 })
-            return Cnvrg::CLI.is_response_success(response, false)
+    def upload_file(absolute_path, relative_path, commit_sha1)
+      file_name = File.basename relative_path
+      file_size = File.size(relative_path).to_f
+      mime_type = MimeMagic.by_path(relative_path)
+      content_type = !(mime_type.nil? or mime_type.text?) ? mime_type.type : "text/plain"
+      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})
+      if Cnvrg::CLI.is_response_success(upload_resp, false)
+        if file_size.to_f>= Cnvrg::Files::LARGE_FILE.to_f
+          s3_res = upload_large_files_s3(upload_resp, relative_path)
+        else
+          path = upload_resp["result"]["path"]
+          s3_res = upload_small_files_s3(path, relative_path, content_type)
         end
 
-        def create_dir(absolute_path, relative_path, commit_sha1)
-            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)
+        if s3_res
+          Cnvrg::API.request(@base_resource + "update_s3", 'POST', {path: path, commit_id: upload_resp["result"]["commit_id"],
+                                                                    blob_id: upload_resp["result"]["id"]})
+          return true
         end
+      end
+      return false
+    end
+
+    def upload_image(absolute_path, image_name, owner)
+      file_name = File.basename absolute_path
+      file_size = File.size(absolute_path).to_f
+      content_type = "application/gzip"
 
-        def download_file(absolute_path, relative_path, project_home, conflict=false)
-            res = Cnvrg::API.request(@base_resource + "download_file", 'POST', { absolute_path: absolute_path, relative_path: relative_path })
-            Cnvrg::CLI.is_response_success(res, false)
-            if res["result"]
-                res = res["result"]
-                return false if res["link"].empty? or res["filename"].empty?
-                filename = res["filename"]
-                file_location = absolute_path.gsub(/#{filename}\/?$/, "")
-
-                FileUtils.mkdir_p project_home + "/" + file_location
-                filename += ".conflict" if conflict
-
-                File.open("#{project_home}/#{file_location}/#{filename}", "wb") do |file|
-                  file.write open(res["link"]).read
-                end
-            else
-                return false
-            end
+      upload_resp = Cnvrg::API.request("users/#{owner}/images/" + "upload", 'POST_FILE', {relative_path: absolute_path,
+                                                                                   file_name: file_name, image_name: image_name,
+                                                                                   file_size: file_size, file_content_type: content_type})
+      # puts upload_resp
+      if Cnvrg::CLI.is_response_success(upload_resp, false)
+        s3_res = upload_large_files_s3(upload_resp, absolute_path)
+        if s3_res
+          commit_resp = Cnvrg::API.request("users/#{owner}/images/#{upload_resp["result"]["id"]}/" + "commit", 'GET')
+          if Cnvrg::CLI.is_response_success(commit_resp, false)
             return true
+          else
+            return false
+          end
+
         end
+      end
+      return false
+    end
+
+    def download_image(file_path_to_store, image_slug, owner)
 
-        def download_dir(absolute_path, relative_path, project_home)
-            FileUtils.mkdir_p("#{project_home}/#{absolute_path}")
+
+      download_resp = Cnvrg::API.request("users/#{owner}/images/#{image_slug}/" + "download", 'GET')
+      path = download_resp["result"]["path"]
+
+      if Cnvrg::CLI.is_response_success(download_resp, false)
+        begin
+          open(file_path_to_store, 'wb') do |file|
+            file << open(path).read
+          end
+        rescue
+          return false
         end
 
-        def start_commit
+        return true
+      else
+        return false
+      end
+
 
-            response = Cnvrg::API.request("#{base_resource}/commit/start", 'POST', { project_slug: @project_slug,
-                                                              username: @owner} )
-            Cnvrg::CLI.is_response_success(response)
-          return response
+    end
+
+    def upload_large_files_s3(upload_resp, file_path)
+      begin
+        sts_path = upload_resp["result"]["path_sts"]
+        uri = URI.parse(sts_path)
+        http_object = Net::HTTP.new(uri.host, uri.port)
+        http_object.use_ssl = true if uri.scheme == 'https'
+        request = Net::HTTP::Get.new(sts_path)
+        body = ""
+        http_object.start do |http|
+          response = http.request request
+          body = response.read_body
         end
+        URLcrypt::key = [body].pack('H*')
+
+        s3 = Aws::S3::Resource.new(
+            :access_key_id => URLcrypt.decrypt(upload_resp["result"]["sts_a"]),
+            :secret_access_key => URLcrypt.decrypt(upload_resp["result"]["sts_s"]),
+            :session_token => URLcrypt.decrypt(upload_resp["result"]["sts_st"]),
+            :region => URLcrypt.decrypt(upload_resp["result"]["region"]))
 
-        def end_commit(commit_sha1)
-            response = Cnvrg::API.request("#{base_resource}/commit/end", 'POST', { commit_sha1: commit_sha1 } )
-            return response
+        resp = s3.bucket(URLcrypt.decrypt(upload_resp["result"]["bucket"])).object(File.basename(file_path)).upload_file(file_path)
+        return resp
+      rescue => e
+        puts e
+        return false
+
+      end
+      return true
+
+    end
+
+    def upload_small_files_s3(url, file, content_type)
+      url = URI.parse(url)
+      file = File.open(file, "rb")
+      body = file.read
+      begin
+        Net::HTTP.start(url.host) do |http|
+          http.send_request("PUT", url.request_uri, body, {
+              "content-type" => content_type,
+          })
         end
-        def rollback_commit(commit_sha1)
-            response = Cnvrg::API.request("#{base_resource}/commit/rollback", 'POST', { commit_sha1: commit_sha1 } )
-            Cnvrg::CLI.is_response_success(response, false)
+        return true
+      rescue Interrupt
+        return false
+      rescue => e
+        puts e
+        return false
+      end
+    end
+
+    def upload_url(file_path)
+      response = Cnvrg::API.request(@base_resource + "upload_url", 'POST', {file_s3_path: file_path})
+      if Cnvrg::CLI.is_response_success(response, false)
+        return response
+      else
+        return nil
+      end
+
+    end
+
+    def delete_file(absolute_path, relative_path, commit_sha1)
+      response = Cnvrg::API.request(@base_resource + "delete_file", 'DELETE', {absolute_path: absolute_path, relative_path: relative_path, commit_sha1: commit_sha1})
+      return Cnvrg::CLI.is_response_success(response, false)
+    end
+
+    def delete_dir(absolute_path, relative_path, commit_sha1)
+      response = Cnvrg::API.request(@base_resource + "delete_dir", 'DELETE', {absolute_path: absolute_path, relative_path: relative_path, commit_sha1: commit_sha1})
+      return Cnvrg::CLI.is_response_success(response, false)
+    end
+
+    def create_dir(absolute_path, relative_path, commit_sha1)
+      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(absolute_path, relative_path, project_home, conflict=false)
+      res = Cnvrg::API.request(@base_resource + "download_file", 'POST', {absolute_path: absolute_path, relative_path: relative_path})
+      Cnvrg::CLI.is_response_success(res, false)
+      if res["result"]
+        res = res["result"]
+        return false if res["link"].empty? or res["filename"].empty?
+        filename = res["filename"]
+        file_location = absolute_path.gsub(/#{filename}\/?$/, "")
+
+        FileUtils.mkdir_p project_home + "/" + file_location
+        filename += ".conflict" if conflict
+
+        File.open("#{project_home}/#{file_location}/#{filename}", "wb") do |file|
+          file.write open(res["link"]).read
         end
+      else
+        return false
+      end
+      return true
+    end
+
+    def download_dir(absolute_path, relative_path, project_home)
+      FileUtils.mkdir_p("#{project_home}/#{absolute_path}")
+    end
+
+    def start_commit
+
+      response = Cnvrg::API.request("#{base_resource}/commit/start", 'POST', {project_slug: @project_slug,
+                                                                              username: @owner})
+      Cnvrg::CLI.is_response_success(response)
+      return response
+    end
+
+    def end_commit(commit_sha1)
+      response = Cnvrg::API.request("#{base_resource}/commit/end", 'POST', {commit_sha1: commit_sha1})
+      return response
+    end
+
+    def rollback_commit(commit_sha1)
+      response = Cnvrg::API.request("#{base_resource}/commit/rollback", 'POST', {commit_sha1: commit_sha1})
+      Cnvrg::CLI.is_response_success(response, false)
     end
+  end
 end

data/lib/cnvrg/helpers.rb

@@ -7,6 +7,13 @@ module Cnvrg
       return checkmark.encode('utf-8')
       end
 
+      def internet_connection?
+        begin
+          true if open("http://www.google.com/")
+        rescue
+          false
+        end
+      end
     def remote_url
         "https://cnvrg.io"
     end
@@ -22,7 +29,10 @@ module Cnvrg
     def linux?
       not mac? and not windows?
     end
-
+    def ubuntu?
+      unix = `cat /etc/lsb-release`.downcase!
+      return unix.include? "ubuntu"
+    end
     def cnvrgignore_content
       %{
                # cnvrg ignore: Ignore the following directories and files

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-    VERSION = '0.0.5'
+    VERSION = '0.0.6'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mimemagic
   requirement: !ruby/object:Gem::Requirement
@@ -189,6 +203,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.1
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  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'
+- !ruby/object:Gem::Dependency
+  name: urlcrypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  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