cnvrg 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f68e73ce51d096ab10bae5dd5ba07b6444c4d898
-  data.tar.gz: a50d1f1e96a4e21d9a408d7c5c5e915888480ec2
+  metadata.gz: 496681d6eef33bf3a628234cce27bc4ad7ad8ade
+  data.tar.gz: 3b63e71e5cbe3f12e8754ca8ed0c243c9a8e11df
 SHA512:
-  metadata.gz: e1d21cda34620db5df089a2e4db43b730c0a3eb5265d423101cd91d5e5c606e56b15be8df027bc7e4b0ff35eb1de9eddcb7ea6f4e735792fb3992e7d4f5f10b8
-  data.tar.gz: 9e8094bb8658f213aa7af9c943e3015e38fbb7d244176da607186cefb8fd64b5221d3a7d4ce27427aba45dfe8f33fed031f5e044a165e17a7625b34dcb106084
+  metadata.gz: ea24653cfa006ea02c2702cf24219e99669e4db48c423b116f67003b00379d1ded3f2bf0badc95d74978e270129cf64fc176b3d83b88c8c72451cf035a8fe63c
+  data.tar.gz: 950a88a8e3bb820ac1c4bb66f81eeeb142e231a51c504d82c19ceb540835c01b2061e56536c334f8beb87ed8ec50b271934cd8fc996924ee74a98fdaf9ef2d92

data/cnvrg.gemspec

@@ -32,7 +32,9 @@ Gem::Specification.new do |spec|
     spec.add_runtime_dependency 'highline', '~> 1.7', '>= 1.7.8'
     spec.add_runtime_dependency 'thor', '~> 0.19.0','>=0.19.1'
     spec.add_runtime_dependency 'aws-sdk'
+    spec.add_runtime_dependency 'sucker_punch', '~> 2.0'
     spec.add_runtime_dependency 'urlcrypt', '~> 0.1.1'
+    spec.add_runtime_dependency 'logstash-logger'
     
 end
 

data/lib/cnvrg/api.rb

@@ -32,7 +32,6 @@ module Cnvrg
             begin
                 n = Netrc.read
             rescue => e
-                puts e.message
             end
 
             # Make sure there is an entry for the Acquia API before generating the

data/lib/cnvrg/cli.rb

@@ -18,6 +18,9 @@ require 'cnvrg/project'
 require 'cnvrg/files'
 require 'cnvrg/experiment'
 require 'etc'
+require 'logstash-logger'
+require 'cnvrg/job'
+require 'pry'
 
 
 # DEV VERSION
@@ -27,13 +30,12 @@ module Cnvrg
 
     INSTALLATION_URLS = {docker: "https://docs.docker.com/engine/installation/", jupyter: "http://jupyter.readthedocs.io/en/latest/install.html"}
 
+
     desc 'version', 'Prints cnvrg current version'
 
     def version
-
       puts Cnvrg::VERSION
     end
-
     map %w(-v --version) => :version
 
     desc 'set api url', 'set api url'
@@ -132,22 +134,37 @@ module Cnvrg
           if owners.empty?
           else
             owners << choose_owner
+            chosen = false
+            while !chosen
             choose_owner = ask("Choose default owner:\n"+owners.join("\n")+"\n")
+            owners_lower = owners.map{|o| o.downcase}
+            if !owners_lower.include? choose_owner.downcase
+              say "Could not find owner named #{choose_owner}", Thor::Shell::Color::RED
+            else
+              chosen = true
+            end
+            end
+
 
           end
           if set_owner(choose_owner, result["username"])
             say "Setting default owner: #{choose_owner}", Thor::Shell::Color::GREEN
+
           else
             say "Setting default owenr has failed, logging out", Thor::Shell::Color::RED
+
             return logout()
           end
 
         else
           say "Failed to authenticate, wrong email/password", Thor::Shell::Color::RED
-          exit false
+
+          exit(1)
         end
       rescue SignalException
+
         say "/nAborting"
+        logout()
         exit(1)
       end
     end
@@ -168,18 +185,25 @@ module Cnvrg
 
     end
 
+
     desc 'me', 'Prints the current logged in user email'
 
-    def me
+    def me()
       begin
-        verify_logged_in()
+
+        verify_logged_in(false)
+        log_start(__method__,args,options)
         auth = Cnvrg::Auth.new
         if (email = auth.get_email)
           say "Logged in as: #{email}", Thor::Shell::Color::GREEN
         else
           say "You're not logged in.", Thor::Shell::Color::RED
         end
+
+        log_end(0)
       rescue SignalException
+        log_end(-1)
+
         say "/nAborting"
         exit(1)
       end
@@ -193,7 +217,8 @@ module Cnvrg
 
     def new(project_name)
       begin
-        verify_logged_in()
+        verify_logged_in(false)
+        log_start(__method__,args,options)
         clean = options["clean"]
         docker_image = options["docker_image"]
         if !docker_image.nil? and !docker_image.empty?
@@ -202,6 +227,7 @@ module Cnvrg
         say "Creating #{project_name}", Thor::Shell::Color::BLUE
         if Dir.exists? project_name or File.exists? project_name
           say "Conflict with dir/file #{project_name}", Thor::Shell::Color::RED
+          log_end(1,"conflict with dir/file #{project_name}")
           exit(1)
         end
 
@@ -211,13 +237,18 @@ module Cnvrg
           @project.generate_idx
         else
           say "Error creating project, please contact support.", Thor::Shell::Color::RED
+          log_end(1,"can't create project #{project_name}")
+
           exit(0)
         end
 
         say "created\t\tproject's tree", Thor::Shell::Color::GREEN
         say "created\t\tproject's config", Thor::Shell::Color::GREEN
         say "Linked directory to\t#{@project.url}", Thor::Shell::Color::GREEN
+
       rescue SignalException
+        log_end(-1)
+
         say "/nAborting"
         exit(1)
       end
@@ -229,13 +260,16 @@ module Cnvrg
 
       def link
         begin
-          verify_logged_in()
+          verify_logged_in(false)
+          log_start(__method__,args,options)
+
           sync = options["sync"]
           project_name =File.basename(Dir.getwd)
           say "Linking #{project_name}", Thor::Shell::Color::BLUE
           if File.directory?(Dir.getwd+"/.cnvrg")
             config = YAML.load_file("#{Dir.getwd}/.cnvrg/config.yml")
             say "Directory is already linked to #{config[:project_slug]}", Thor::Shell::Color::RED
+
             exit(0)
           end
           if Project.link(project_name)
@@ -248,11 +282,16 @@ module Cnvrg
 
             url = @project.url
             say "#{project_name}'s location is: #{url}\n", Thor::Shell::Color::BLUE
+            log_end(0)
+
           else
+            log_end(1,"can't link project")
             say "Error linking project, please contact support.", Thor::Shell::Color::RED
             exit(0)
           end
         rescue SignalException
+          log_end(-1)
+
           say "/nAborting"
           exit(1)
         end
@@ -262,7 +301,8 @@ module Cnvrg
 
       def clone(project_url)
         begin
-          verify_logged_in()
+          verify_logged_in(false)
+          log_start(__method__,args,options)
           url_parts = project_url.split("/")
           project_index = Cnvrg::Helpers.look_for_in_path(project_url, "projects")
           slug = url_parts[project_index+1]
@@ -273,6 +313,8 @@ module Cnvrg
           project_name = response["title"]
           say "Cloning #{project_name}", Thor::Shell::Color::BLUE
           if Dir.exists? project_name or File.exists? project_name
+            log_end(1,"conflict with dir/file #{project_name}")
+
             say "Error: Conflict with dir/file #{project_name}", Thor::Shell::Color::RED
             exit(1)
           end
@@ -302,11 +344,15 @@ module Cnvrg
               end
             end
             say "Done.\nDownloaded total of #{successful_changes.size} files", Thor::Shell::Color::GREEN
+            log_end(0)
           else
+            log_end(1,"can't create directory")
+
             say "Error: Couldn't create directory: #{project_name}", Thor::Shell::Color::RED
             exit(1)
           end
         rescue SignalException
+          log_end(-1)
           say "/nAborting"
           exit(1)
         end
@@ -317,6 +363,7 @@ module Cnvrg
       def status
         begin
           verify_logged_in()
+          log_start(__method__,args,options)
           @project = Project.new(get_project_home)
           result = @project.compare_idx["result"]
           commit = result["commit"]
@@ -324,6 +371,7 @@ module Cnvrg
           say "Comparing local changes with remote version:", Thor::Shell::Color::BLUE
           if result["added"].empty? and result["updated_on_local"].empty? and result["updated_on_server"].empty? and result["deleted"].empty? and result["conflicts"].empty?
             say "Project is up to date", Thor::Shell::Color::GREEN
+            log_end(0)
             return true
           end
           if result["added"].size > 0
@@ -359,7 +407,9 @@ module Cnvrg
               say "\t\tC:\t#{a}", Thor::Shell::Color::RED
             end
           end
+          log_end(0)
         rescue SignalException
+          log_end(-1)
           say "/nAborting"
           exit(1)
         end
@@ -373,6 +423,8 @@ module Cnvrg
 
         begin
           verify_logged_in()
+          log_start(__method__,args,options)
+
           @project = Project.new(get_project_home)
 
           @files = Cnvrg::Files.new(@project.owner, @project.slug)
@@ -384,6 +436,8 @@ module Cnvrg
           commit = result["result"]["commit"]
           if !link
             if commit != @project.last_local_commit and !@project.last_local_commit.nil? and !result["result"]["tree"]["updated_on_server"].empty?
+              log_end(0)
+
               say "Remote server has an updated version, please run `cnvrg download` first, or alternatively: `cnvrg sync`", Thor::Shell::Color::YELLOW
               exit(1)
             end
@@ -391,6 +445,7 @@ module Cnvrg
           end
           result = result["result"]["tree"]
           if result["added"].empty? and result["updated_on_local"].empty? and result["deleted"].empty?
+            log_end(0)
             say "Project is up to date", Thor::Shell::Color::GREEN
             return true
           end
@@ -427,6 +482,7 @@ module Cnvrg
                   successful_updates<< relative_path
                 else
                   @files.rollback_commit(commit_sha1)
+                  log_end(1,"can't upload, Rolling Back all changes")
                   say "Couldn't upload, Rolling Back all changes.", Thor::Shell::Color::RED
                   exit(0)
                 end
@@ -448,13 +504,15 @@ module Cnvrg
                 end
               end
             end
+            log_end(0)
 
           rescue SignalException
+            log_end(-1)
             @files.rollback_commit(commit_sha1)
             say "User aborted, Rolling Back all changes.", Thor::Shell::Color::RED
             exit(0)
           rescue => e
-            puts e
+            log_end(1,e.message)
             @files.rollback_commit(commit_sha1)
             say "Exception while trying to upload, Rolling back", Thor::Shell::Color::RED
             exit(0)
@@ -467,7 +525,8 @@ module Cnvrg
                 @project.update_idx_with_files_commits!((successful_deletions+successful_updates), res["result"]["commit_time"])
 
                 @project.update_idx_with_commit!(commit_sha1)
-              rescue
+              rescue => e
+                log_end(1,e.message)
                 @files.rollback_commit(commit_sha1)
                 say "Couldn't commit updates, Rolling Back all changes.", Thor::Shell::Color::RED
                 exit(1)
@@ -486,14 +545,20 @@ module Cnvrg
                 say del.join("\n"), Thor::Shell::Color::GREEN
               end
               say "Total of #{update_count} / #{update_total} files.", Thor::Shell::Color::GREEN
+              log_end(0)
             else
               @files.rollback_commit(commit_sha1)
+              log_end(1, "error. Rolling Back all changes")
               say "Error. Rolling Back all changes.", Thor::Shell::Color::RED
             end
           else
+            log_end(1, "error. Rolling Back all changes")
+
             @files.rollback_commit(commit_sha1)
           end
         rescue SignalException
+          log_end(-1)
+
           say "\nAborting",Thor::Shell::Color::BLUE
           say "\nRolling back all changes",Thor::Shell::Color::BLUE
           @files.rollback_commit(commit_sha1)
@@ -507,6 +572,7 @@ module Cnvrg
       def download
         begin
           verify_logged_in()
+          log_start(__method__,args,options)
           project_home = get_project_home
           @project = Project.new(project_home)
           @files = Cnvrg::Files.new(@project.owner, @project.slug)
@@ -516,6 +582,7 @@ module Cnvrg
           commit = res["commit"]
           if result["updated_on_server"].empty? and result["conflicts"] and result["deleted"].empty?
             say "Project is up to date", Thor::Shell::Color::GREEN
+            log_end(0)
             return true
           end
           update_count = 0
@@ -555,11 +622,14 @@ module Cnvrg
           if update_total == successful_changes.size
             # update idx with latest commit
             @project.update_idx_with_commit!(commit)
+
             say "Done. Downloaded:", Thor::Shell::Color::GREEN
             say successful_changes.join("\n"), Thor::Shell::Color::GREEN
             say "Total of #{successful_changes.size} / #{update_total} files.", Thor::Shell::Color::GREEN
+            log_end(0)
           end
         rescue SignalException
+          log_end(-1)
           say "\nAborting", Thor::Shell::Color::BLUE
           if successful_changes.nil?
             exit(1)
@@ -624,11 +694,13 @@ module Cnvrg
       method_option :upload_output, :type => :string, :aliases => ["--uo", "-uo"], :default => ""
 
       def exec(*cmd)
+        # LogJob.perform_async(cmd,options)
+        #
           log = []
           cpu_average =0
           memory_average = 0
           verify_logged_in()
-
+          log_start(__method__,args,options)
           project_home = get_project_home
           @project = Project.new(project_home)
           sync_before = options["sync_before"]
@@ -638,6 +710,7 @@ module Cnvrg
           email_notification = options["email_notification"]
           upload_output = options["upload_output"]
           time_to_upload = calc_output_time(upload_output)
+
         begin
           if sync_before
             # Sync before run
@@ -714,23 +787,23 @@ module Cnvrg
                       stderr.each do |err|
 
                         log << {time: Time.now, message: err, type: "stderr"}
-                        puts err
                       end
                     end
 
                   rescue Errno::EIO => e
                     break
                   rescue Errno::ENOENT
+                    log_end(1, "command #{cmd} isn't valid")
 
                     exp_success = false
 
                     say "command \"#{cmd}\" couldn't be executed, verify command is valid", Thor::Shell::Color::RED
                   rescue PTY::ChildExited
-
+                    log_end(1, "proccess exited")
                     exp_success = false
                     say "The process exited!", Thor::Shell::Color::RED
                   rescue => e
-
+                    log_end(1,e.message)
                   end
                   ::Process.wait pid
                   cpu_average = cpu_total.inject(0) { |sum, el| sum + el }.to_f / cpu_total.size
@@ -749,6 +822,7 @@ module Cnvrg
                         exit_status = 0
                       else
                         say "Experiment has failed, your'e computer is offline", Thor::Shell::Color::RED
+                        log_end(1,"experiment has failed,computer is offline")
                         exit(0)
                       end
                     else
@@ -756,6 +830,7 @@ module Cnvrg
                     end_commit = @project.last_local_commit
                     res = @exp.end(log, exit_status, end_commit, cpu_average, memory_average)
                     say "Experiment has failed, look at the log for more details or run cnvrg exec --log", Thor::Shell::Color::RED
+                    log_end(1,"experiment has failed")
                     exit(0)
                     end
 
@@ -772,9 +847,10 @@ module Cnvrg
                   res = @exp.end(log, exit_status, end_commit, cpu_average, memory_average)
                   check = Helpers.checkmark()
                   say "#{check} Done. Experiment's result: #{Cnvrg::Helpers.remote_url}/#{@project.owner}/projects/#{@project.slug}/experiments/#{@exp.slug}", Thor::Shell::Color::GREEN
+                  log_end(0)
                 end
-              rescue
-
+              rescue =>e
+                log_end(1,e.message)
                 say "Couldn't run #{cmd}, check your input parameters", Thor::Shell::Color::RED
                 exit(1)
               end
@@ -785,6 +861,7 @@ module Cnvrg
           end
         rescue SignalException
           exit_status =  -1
+          log_end(-1)
           end_commit = @project.last_local_commit
 
           res = @exp.end(log, exit_status, end_commit, cpu_average, memory_average)
@@ -800,7 +877,10 @@ module Cnvrg
       method_option :image_name, :type => :string, :aliases => ["-i", "--i"], :default => ""
 
       def run_notebook
+
         begin
+          verify_logged_in(false)
+          log_start(__method__,args,options)
           cur_path = Dir.pwd
           notebook_dir = options["notebook_dir"]
           if notebook_dir.empty?
@@ -841,6 +921,7 @@ module Cnvrg
                   try_again= false
                 else
                   say "Couldn't start notebook server", Thor::Shell::Color::RED
+                  log_end(1, "can't start notebook server")
                   exit(1)
                 end
 
@@ -852,16 +933,19 @@ module Cnvrg
                   did_stop = system("#{docker_path} stop #{port_container}")
                   if !did_stop
                     say "Couldn't stop notebook server: #{port_container}", Thor::Shell::Color::RED
+                    log_end(1,"can't stop notebook server")
                     exit(1)
 
                   end
                 else
                   logs = `#{docker_path} logs #{port_container}`
                   url = URI.extract(logs).reject { |x| x if !x.include? "http" }.uniq![0]
-                  say "Okay, you could find the existing server in: #{url}", Thor::Shell::Color::BLUE
+                  say "Done, your notebook server is: #{url}", Thor::Shell::Color::BLUE
+                  log_end(0)
                   exit(1)
                 end
               else
+                log_end(1, "can;t start notebook server")
                 say "Couldn't start notebook server", Thor::Shell::Color::RED
                 exit(1)
 
@@ -875,13 +959,16 @@ module Cnvrg
               check = Helpers.checkmark()
 
               say "#{check} Notebook server started successfully, view notebook in url: #{url}", Thor::Shell::Color::GREEN
+              log_end(0)
             else
               say "Couldn't start notebook server", Thor::Shell::Color::RED
+              log_end(1,"can't start notebook server")
               exit(1)
             end
 
           end
         rescue SignalException
+          log_end(-1)
           say "Aborting"
           exit(1)
         end
@@ -894,6 +981,8 @@ module Cnvrg
 
       def install_notebook_libraries
         begin
+          verify_logged_in(false)
+          log_start(__method__,args,options)
           docker_path = verify_software_installed("docker")
           container_id = get_container_id
           say "Opening shell in notebook server\nYou can run pip install [library] to install more tools\ntype exit to finish", Thor::Shell::Color::BLUE
@@ -903,6 +992,7 @@ module Cnvrg
             return commit_notebook(commit_name)
           end
         rescue SignalException
+          log_End(-1)
           say "/nAborting"
           exit(1)
         end
@@ -912,6 +1002,8 @@ module Cnvrg
       desc 'commit_notebook', 'commit notebook changes to create a new notebook image'
 
       def commit_notebook(notebook_image_name)
+        verify_logged_in(false)
+        log_start(__method__,args,options)
         begin
           docker_path = verify_software_installed("docker")
 
@@ -922,12 +1014,15 @@ module Cnvrg
           commit_res = system("#{docker_path} commit #{container_id} #{notebook_image_name}")
           if commit_res
             checker = Helpers.checkmark()
+            log_end(0)
             say "#{checker} Done.", Thor::Shell::Color::GREEN
           else
+            log_End(1,"can't commit new notebook image")
             say "Couldn't commit new notebook image ", Thor::Shell::Color::RED
 
           end
         rescue SignalException
+          log_end(-1)
           say "/nAborting"
           exit(1)
         end
@@ -936,6 +1031,8 @@ module Cnvrg
       desc 'upload_notebook', 'commit notebook changes to create a new notebook image'
 
       def upload_image(image_name)
+        verify_logged_in(false)
+        log_start(__method__,args,options)
         docker_path = verify_software_installed("docker")
         owner = Cnvrg::CLI.get_owner()
         # verify image exist
@@ -950,11 +1047,14 @@ module Cnvrg
           if !(File.exist? path or File.exist? path+"gz")
             saveRes = system("#{docker_path} save #{image_name}>#{path}")
             if !saveRes
+              log_End(1, "can't create tar file from image")
               say "Couldn't create tar file from image", Thor::Shell::Color::RED
               exit(1)
             end
             gzipRes = system("gzip -f #{path}")
             if !gzipRes
+              log_End(1, "can't create tar file from image")
+
               say "Couldn't create tar file from image", Thor::Shell::Color::RED
               exit(1)
             end
@@ -971,14 +1071,20 @@ module Cnvrg
               File.delete(path)
               checks = Helpers.checkmark()
               say "#{checks} Done", Thor::Shell::Color::GREEN
+              log_end(0)
             else
               say "Couldn't upload image", Thor::Shell::Color::RED
+              log_end(1, "can't create upload imag")
+
             end
           else
             say "Couldn't create image file for: #{image_name}", Thor::Shell::Color::RED
+            log_end(1, "can't create upload imag")
             exit(1)
           end
         rescue SignalException
+          log_end(-1)
+
           say "Couldn't upload image file for: #{image_name}", Thor::Shell::Color::RED
           exit(1)
         end
@@ -990,6 +1096,8 @@ module Cnvrg
 
       def download_image(image_name)
         begin
+          verify_logged_in(false)
+          log_start(__method__,args,options)
           owner = Cnvrg::CLI.get_owner()
 
           notebooks_res = Cnvrg::API.request("users/#{owner}/images/" + "find", 'POST', {image_name: image_name})
@@ -1030,16 +1138,20 @@ module Cnvrg
             if res
               checks = Helpers.checkmark()
               say "#{checks} Done", Thor::Shell::Color::GREEN
+              log_end(0)
               return true
             else
               say "Couldn't download image #{image_name}", Thor::Shell::Color::RED
+              log_end(1,"can't download image")
               return false
             end
           rescue Interrupt
+            log_end(-1)
             say "The user has exited to process, aborting", Thor::Shell::Color::BLUE
             exit(1)
           end
         rescue SignalException
+          log_end(-1)
           say "/nAborting"
           exit(1)
         end
@@ -1049,6 +1161,9 @@ module Cnvrg
       desc 'list_images', 'lists all custom images you can pull'
 
       def list_images
+        begin
+        verify_logged_in(false)
+        log_start(__method__,args,options)
         owner = Cnvrg::CLI.get_owner()
         res = Cnvrg::API.request("users/#{owner}/images/list", 'GET')
         if Cnvrg::CLI.is_response_success(res)
@@ -1062,7 +1177,15 @@ module Cnvrg
             printf "%-20s %-20s %-30s %-20s\n", u["name"], version, update_at, created_by
           end
         end
+        log_end(0)
         return res["result"]["images"]
+        rescue SignalException
+          log_end(-1)
+          say "/nAborting"
+          exit(1)
+        end
+
+
       end
 
 
@@ -1070,19 +1193,24 @@ module Cnvrg
 
       def pull_image(image_name)
         begin
+          verify_logged_in(false)
+          log_start(__method__,args,options)
 
           if download_image(image_name)
             path = Dir.pwd+"/#{owner}_#{image_name}.tar.gz"
             loadRes = system("docker load < #{path}")
             if loadRes.include? "Loaded image"
               say loadRes, Thor::Shell::Color::GREEN
+              log_end(0)
             else
               say loadRes, Thor::Shell::Color::RED
+              log_end(1,loadRes)
             end
 
           end
         rescue SignalException
           say "\nAborting"
+          log_end(-1)
           exit(1)
         end
 
@@ -1157,20 +1285,39 @@ module Cnvrg
           end
 
         end
+        def log_start(command,args="", options={})
+          begin
+            $LOG.info "----"
+            $LOG.info ruby_version: RUBY_VERSION, os: Cnvrg::Helpers.os(), cli_version:Cnvrg::VERSION
+            $LOG.info command:command,args:args,options:options
+          rescue
+          end
+        end
+        def log_end(exit_status=0, error=nil)
+          begin
+            if exit_status==1
+              $LOG.error exit_status:exit_status, error:error
+            else
+              $LOG.info exit_status:exit_status
+            end
+          rescue
+          end
+        end
 
         def self.is_response_success(response, should_exit=true)
           if response.nil?
-            if Cnvrg::Helpers.internet_connection?
+            if !Cnvrg::Helpers.internet_connection?
+              # Cnvrg::CLI.log_end(1,"no internet connection")
                 say("<%= color('Error:You seems to be offline', RED) %>")
             else
               say("<%= color('Error', RED) %>")
             end
           elsif response["status"]!= 200
             error = response['message']
+            # Cnvrg::CLI.log_end(1, error)
             if response["status"] == 500
               say("<%= color('Server Error', RED) %>")
             else
-              puts response
               say("<%= color('Error:#{error}', RED) %>")
             end
 
@@ -1221,8 +1368,39 @@ module Cnvrg
             return false
           end
         end
+        def log_handler
+          begin
+          date = DateTime.now.strftime("%m_%d_%Y")
+          logfile = File.expand_path('~') +"/.cnvrg/log_#{date}.log"
+          if !File.exist? logfile
+            FileUtils.touch([logfile])
+            yesterday = get_start_day-86399
+            date = yesterday.strftime("%m_%d_%Y")
+
+            logfile_old = File.expand_path('~') +"/.cnvrg/log_#{date}.log"
+            count = 0
+            while not File.exist? logfile_old and count <60
+              yesterday = yesterday - 86399
+              date = yesterday.strftime("%m_%d_%Y")
+              logfile_old = File.expand_path('~') +"/.cnvrg/log_#{date}.log"
+              count+=1
+            end
+            @files = Cnvrg::Files.new(Cnvrg::CLI.get_owner, "")
+            @files.upload_log_file(logfile_old,"log_#{date}.log",yesterday)
+            FileUtils.remove logfile_old
+
+
+          end
+            $LOG = LogStashLogger.new(type: :file, path: logfile, sync: true)
+          rescue => e
+            # puts e
+          end
+        end
+
 
-        def verify_logged_in
+
+        def verify_logged_in(in_dir=true)
+          log_handler()
           auth = Cnvrg::Auth.new
           unless auth.is_logged_in?
             say 'You\'re not logged in', Thor::Shell::Color::RED
@@ -1231,7 +1409,7 @@ module Cnvrg
           end
 
           if !Helpers.internet_connection?
-              wait_offline = agree "Seems like you're offline, wait until your'e back online?",limited_to: ['y', 'n'], default: 'n'
+              wait_offline = agree "Seems like you're offline, wait until your'  back online?",limited_to: ['y', 'n'], default: 'n'
               if wait_offline
                 say "Waiting until your'e online..", Thor::Shell::Color::BLUE
                 while !Cnvrg::Helpers.internet_connection?
@@ -1245,13 +1423,21 @@ module Cnvrg
           config = YAML.load_file(File.expand_path('~')+"/.cnvrg/config.yml")
           version_date = config.to_h[:version_last_check]
           next_day = get_start_day+ 86399
-          if (version_date..next_day).cover?(Time.now)
-            return true
-          else
+          if not (version_date..next_day).cover?(Time.now)
             if should_update_version()
               say "There is a new version, run gem update cnvrg", Thor::Shell::Color::BLUE
             end
           end
+        if in_dir
+          current_dir = Dir.pwd
+          if not Dir.exist? current_dir+"/.cnvrg"
+            say "You're not in a cnvrg project directory",Thor::Shell::Color::RED
+            exit(0)
+
+          end
+        end
+
+
 
         end
 

data/lib/cnvrg/files.rb

@@ -2,7 +2,6 @@ require 'mimemagic'
 require 'aws-sdk'
 require 'URLcrypt'
 
-
 module Cnvrg
   class Files
 
@@ -24,13 +23,12 @@ module Cnvrg
                                                                                      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"]
         if file_size.to_f>= Cnvrg::Files::LARGE_FILE.to_f
           s3_res = upload_large_files_s3(upload_resp, absolute_path)
         else
-          path = upload_resp["result"]["path"]
           s3_res = upload_small_files_s3(path, absolute_path, content_type)
         end
-
         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"]})
@@ -39,6 +37,23 @@ module Cnvrg
       end
       return false
     end
+    def upload_log_file(absolute_path, relative_path,log_date)
+      file_name = File.basename relative_path
+      file_size = File.size(absolute_path).to_f
+      content_type = "text/x-log"
+      upload_resp = Cnvrg::API.request("/users/#{@owner}/" + "upload_cli_log", 'POST_FILE', {absolute_path: absolute_path, relative_path: relative_path,
+                                                                                     file_name: file_name,log_date:log_date,
+                                                                                     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_small_files_s3(path, absolute_path,  "text/plain")
+      end
+      if s3_res
+        return true
+      end
+      return false
+
+    end
 
     def upload_image(absolute_path, image_name, owner)
       file_name = File.basename absolute_path
@@ -100,16 +115,16 @@ module Cnvrg
           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"]))
-
-        resp = s3.bucket(URLcrypt.decrypt(upload_resp["result"]["bucket"])).object(File.basename(file_path)).upload_file(file_path)
+        resp = s3.bucket(URLcrypt.decrypt(upload_resp["result"]["bucket"])).
+            object(upload_resp["result"]["path"]+"/"+File.basename(file_path)).
+            upload_file(file_path)
         return resp
-      rescue => e
+      rescue =>e
         puts e
         return false
 
@@ -118,9 +133,9 @@ module Cnvrg
 
     end
 
-    def upload_small_files_s3(url, file, content_type)
-      url = URI.parse(url)
-      file = File.open(file, "rb")
+    def upload_small_files_s3(url_path, file_path, content_type)
+      url = URI.parse(url_path)
+      file = File.open(file_path, "rb")
       body = file.read
       begin
         Net::HTTP.start(url.host) do |http|
@@ -131,8 +146,7 @@ module Cnvrg
         return true
       rescue Interrupt
         return false
-      rescue => e
-        puts e
+      rescue
         return false
       end
     end

data/lib/cnvrg/helpers.rb

@@ -2,18 +2,20 @@ module Cnvrg
   module Helpers
 
     extend self
+
     def checkmark
       checkmark = "\u2713"
       return checkmark.encode('utf-8')
-      end
+    end
 
-      def internet_connection?
-        begin
-          true if open("http://www.google.com/")
-        rescue
-          false
-        end
+    def internet_connection?
+      begin
+        true if open("http://www.google.com/")
+      rescue
+        false
       end
+    end
+
     def remote_url
       home_dir = File.expand_path('~')
       config = ""
@@ -30,7 +32,24 @@ module Cnvrg
       if !config or config.empty? or config.to_h[:api].nil?
         return "https://cnvrg.io"
       else
-        return config.to_h[:api].gsub("/api","")
+        return config.to_h[:api].gsub("/api", "")
+      end
+    end
+
+    def os
+
+      if windows?
+        return "windows"
+      elsif mac?
+        return "mac"
+      elsif ubuntu?
+        return "ubuntu"
+      elsif linux?
+
+        return "linux"
+      else
+
+        return "N/A"
       end
     end
 
@@ -45,10 +64,12 @@ 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/job.rb

@@ -0,0 +1,42 @@
+require 'mimemagic'
+require 'aws-sdk'
+require 'URLcrypt'
+require 'pry'
+
+require 'sucker_punch'
+module Cnvrg
+
+class LogJob
+    include SuckerPunch::Job
+
+    def perform(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"]))
+            resp = s3.bucket(URLcrypt.decrypt(upload_resp["result"]["bucket"])).
+                object(upload_resp["result"]["path"]+"/"+File.basename(file_path)).
+                upload_file(file_path)
+            return resp
+        rescue =>e
+            puts e
+            return false
+
+        end
+        return true
+    end
+end
+end

data/lib/cnvrg/project.rb

@@ -134,8 +134,7 @@ module Cnvrg
                 File.open(".cnvrg/config.yml", "w+") { |f| f.write config.to_yaml }
                 File.open(".cnvrgignore", "w+") { |f| f.write cnvrgignore }
                 File.open("README.md", "w+") { |f| f.write cnvrgreadme }
-            rescue => e
-                puts e
+            rescue
                 return false
             end
             return true

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-    VERSION = '0.0.8'
+    VERSION = '0.0.9'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -217,6 +217,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sucker_punch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: urlcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -231,6 +245,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: logstash-logger
+  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
@@ -248,6 +276,7 @@ files:
 - lib/cnvrg/experiment.rb
 - lib/cnvrg/files.rb
 - lib/cnvrg/helpers.rb
+- lib/cnvrg/job.rb
 - lib/cnvrg/project.rb
 - lib/cnvrg/runner.rb
 - lib/cnvrg/version.rb