cnvrg 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74b18bfadd766c4b8acdfe5f1278f2c6e4b3b5b5
-  data.tar.gz: 1a9daaed4ca1086589f464bab99747e0dea46840
+  metadata.gz: f81b4a0cdd83c85f7b0e4d03895590e6c86e08ad
+  data.tar.gz: 5e1d74a7e299a77461ca37eeb6ba2690643690d4
 SHA512:
-  metadata.gz: 1d5ee9a14308730003e766b1b92a4e30ebcd68e1dad8cdde8525a0ab95601b923f7adacbd74641a68cee34899988a571e3ccc9005a09a945612102dccb76a6d4
-  data.tar.gz: 2a14a3a480372e8c038b9cb5d0a6aa865e844501145785d26e2126971eb3493f87dfc9eec93049f1dc4ba58577fa7a7b8a187e17d27c9394c4efc06aadf67777
+  metadata.gz: a8ee34350de93e9f43f2b9eae856bdcccaa3ed1cedfa6ba799aba5d78f16f996b69a22894ade1267eaccb07d97cc6bc0c56f06a028255f4eb34c5014fd1f38c9
+  data.tar.gz: 30ce0dd1da9e56fb644b01434219883aeb12fa1d96736ac7edccc971d3789da6df3aa8196b8735d3f28d5b22cfdce51d5346f19f63b9762dc765fc2a247959f0

data/lib/cnvrg/cli.rb

@@ -288,13 +288,13 @@ module Cnvrg
             resDir = @files.create_dir(f, relative_path, commit_sha1)
             if resDir
               update_count += 1
-              successful_updates<< Helpers.checkmark() + " " + relative_path
+              successful_updates<< relative_path
             end
           else
               res = @files.upload_file(f, relative_path, commit_sha1)
             if res
               update_count += 1
-              successful_updates<< Helpers.checkmark() + " " + relative_path
+              successful_updates<< relative_path
             else
               @files.rollback_commit(commit_sha1)
               say "Couldn't upload, Rolling Back all changes.", Thor::Shell::Color::RED
@@ -309,12 +309,12 @@ module Cnvrg
           if relative_path.end_with?("/")
             if @files.delete_dir(f, relative_path, commit_sha1)
               update_count += 1
-              successful_updates<< Helpers.checkmark() + " " + relative_path
+              successful_updates<< relative_path
             end
           else
             if @files.delete_file(f, relative_path, commit_sha1)
               update_count += 1
-              successful_updates<< Helpers.checkmark() + " " + relative_path
+              successful_updates<< relative_path
             end
           end
         end
@@ -328,17 +328,27 @@ module Cnvrg
         res = @files.end_commit(commit_sha1)
         if (Cnvrg::CLI.is_response_success(res, false))
           # save idx
-          @project.update_idx_with_files_commits!((successful_deletions+successful_updates), res["result"]["commit_time"])
+          begin
+	  @project.update_idx_with_files_commits!((successful_deletions+successful_updates), res["result"]["commit_time"])
 
           @project.update_idx_with_commit!(commit_sha1)
-          say "Done", Thor::Shell::Color::BLUE
+	  rescue 
+	  	@files.rollback_commit(commit_sha1)
+         	 say "Couldn't commit updates, Rolling Back all changes.", Thor::Shell::Color::RED
+		 exit(1)
+
+	  end
+
+	  say "Done", Thor::Shell::Color::BLUE
           if successful_updates.size >0
             say "Updated:", Thor::Shell::Color::GREEN
-            say successful_updates.join("\n"), Thor::Shell::Color::GREEN
+	    suc = successful_updates.map {|x| x=Helpers.checkmark() +" "+x}
+	    say suc.join("\n"), Thor::Shell::Color::GREEN
           end
           if successful_deletions.size >0
             say "Deleted:", Thor::Shell::Color::GREEN
-            say successful_deletions.join("\n"), Thor::Shell::Color::GREEN
+	    del = successful_updates.map {|x| x=Helpers.checkmark() +" "+x}
+	    say del.join("\n"), Thor::Shell::Color::GREEN
           end
           say "Total of #{update_count} / #{update_total} files.", Thor::Shell::Color::GREEN
         else

data/lib/cnvrg/files.rb

@@ -1,5 +1,4 @@
 require 'mimemagic'
-require 'pry'
 module Cnvrg
     class Files
         

data/lib/cnvrg/project.rb

@@ -218,7 +218,7 @@ module Cnvrg
 
             idx_hash = YAML.load_file("#{self.local_path}/.cnvrg/idx.yml")
             files.each do |path|
-                idx_hash[:tree][path][:commit_time] = commit_time
+                idx_hash[:tree].to_h[path].to_h[:commit_time] = commit_time
             end
             File.open("#{self.local_path}/.cnvrg/idx.yml", 'w') { |f| f.write idx_hash.to_yaml }
 

data/lib/cnvrg/version.rb

@@ -1,3 +1,3 @@
 module Cnvrg
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Yochay Ettun
@@ -136,7 +136,6 @@ files:
 - lib/cnvrg/experiment.rb
 - lib/cnvrg/files.rb
 - lib/cnvrg/helpers.rb
-- lib/cnvrg/old_cli.rb
 - lib/cnvrg/project.rb
 - lib/cnvrg/version.rb
 homepage: https://cnvrg.io

data/lib/cnvrg/old_cli.rb

@@ -1,332 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'commander/import'
-require "open4"
-require 'netrc'
-require 'net/http'
-require 'uri'
-require 'json'
-require 'yaml'
-require 'digest' # sha1
-
-# DEV VERSION
-#require 'pry'
-#
-
-
-program :name, 'cnvrg'
-program :version, '0.0.1'
-program :description, 'cnvrg\'s cli for running scripts'
-
-command :idx do |c|
-    c.action do |args,options|
-        generate_idx
-    end
-end
-command :status do |c|
-    c.action do |args,options|
-        status
-    end
-end
-command :run do |c|
-    c.syntax = 'cnvrg run script [options]'
-    c.summary = 'monitor run of script'
-    c.description = 'Runs scripts and sending notification when finished'
-    c.option '--script_args script arguments', String, 'script arguments if exist'
-    c.option '--sms', String, 'set sms if you want to be notify by sms when the run is over'
-    c.option '--email', String, 'set email if you want to be notify by email when the run is over'
-    c.option '--silent', String, 'set silent if you want to run script in non-blocking'
-    c.action do |args, options|
-        is_exist = verify_auth_exist()
-        unless is_exist
-            puts("You have to be logged in to continue. Please login.\n")
-            loged_in = login_process()
-            if !loged_in
-                puts("Error: Couldn't logged you in, please run cnvr login separately")
-            end
-        end
-
-        silent = ''
-        if options.silent
-            silent = '&'
-        end
-        script = args[0]
-        if args.length != 1
-            puts "Error: only one script should be listed to run"
-            found = false
-            args.each do |arg|
-                ans = agree("should I run #{arg}?")
-                if ans
-                    found = true
-                    script = arg
-                    break
-                end
-            end
-            if not found
-                exit(0)
-            end
-        end
-        #check if file exist
-        exist = File.file?(script)
-        if not exist
-            puts "Error: Can't find #{script}, try using the full path"
-            exit(0)
-        end
-        puts "Running #{script} with args: #{options.script_args}"
-        body = {try: 'yay'}.to_json
-        puts run(true,body)
-        pid, stdin, stdout, stderr = Open4::popen4 "sh"
-        stdin.puts "./#{script} #{options.script_args}"
-        stdin.close
-
-        ignored, status = Process::waitpid2 pid
-
-        #try to run
-        if stderr.read.strip.include? "Permission denied"
-            ans = agree("Your script #{script} isn't executable, should I make it executable?")
-            if ans
-                puts "Making #{script} executable"
-                run_result = %x(chmod +x ./#{script} 2>&1)
-                if run_result.include? "Operation not permitted"
-                    puts "Can't make script executable,you should first run sudo chmod +x #{script}"
-                    exit(0)
-                end
-                puts "Running again #{script} with args: #{options.script_args}"
-
-                pid, stdin, stdout, stderr = Open4::popen4 "sh"
-                stdin.puts "./#{script} #{options.script_args}"
-                stdin.close
-                ignored, status = Process::waitpid2 pid
-
-                if !stderr.read.strip.empty?
-                    puts "Error: #{stderr.read.strip}"
-                end
-            end
-        end
-        puts stdout.read.strip
-        # send results to the server
-        puts "Finished running with status #{status.exitstatus}"
-        puts run(false, body)
-
-    end
-end
-
-command :new do |c|
-    c.syntax = "cnvrg new project-name"
-    c.summary = "Create a new data science project"
-
-    c.action do |args, options|
-        is_exist = verify_auth_exist()
-        unless is_exist
-            "You have to login"
-        else
-            if args[0].to_s.size == 0 
-                exit(0)
-            else
-                new(args[0])
-                link_dir(args[0], "")
-            end
-        end
-    end
-end
-
-command :login do |c|
-    c.syntax = 'cnvrg login'
-    c.summary = 'login to cnvrg app'
-    c.description = 'Login to the CNVRG system'
-    c.option '--reset', String, 'set reset if you want to change current login credentials'
-    c.action do |args, options|
-        n = Netrc.read
-        user, pass = n["cnvrg.io"]
-        if user and pass
-            relogin = agree("You are already authenticated with email: #{user}, do you want to login again? (This will delete you're current login credentials")
-            if !relogin
-                exit(0)
-            end
-        end
-        if options.reset
-            n["cnvrg.io"] = "", ""
-
-        end
-        login_process()
-
-
-    end
-end
-
-def login_process()
-    n = Netrc.read
-
-    email = ask("Please enter your email")
-    email_regex = /\A[\w+\-.]+@[a-z\d\-]+(\.[a-z\d\-]+)*\.[a-z]+\z/i
-    is_valid = email_regex.match(email)
-    while !is_valid do
-        email = ask("Please enter a valid email address:")
-        is_valid = email_regex.match(email)
-    end
-
-    password = ask("Please enter your password:  ") { |q| q.echo = false }
-    #send API to login
-    token = sign_in(email, password)
-    count = 0
-    while token.nil? and count<3 do
-        do_retry = agree("Wrong email or password, try again?")
-        if do_retry
-            count +=1
-            email = ask("Please enter your email")
-            password = ask("Please enter your password:  ") { |q| q.echo = false }
-            token = sign_in(email, password)
-        end
-    end
-    if token.nil?
-        puts "Error: Too many sign in retries"
-        exit(0)
-    else
-
-
-        n.new_item_prefix = "# This entry was added automatically by CNVRG\n"
-        n["cnvrg.io"] = email, token
-        n.save
-        puts "Great, you're in."
-        return true
-    end
-end
-
-def sign_in(email, password)
-    url = URI.parse("http://localhost:3000/api/v1/users/sign_in")
-
-    req = Net::HTTP::Post.new(url.path)
-    req.add_field("EMAIL", email)
-    req.add_field("PASSWORD", password)
-
-    response = Net::HTTP.new(url.host, url.port).start do |http|
-        http.request(req)
-    end
-
-    result = JSON.parse(response.body)
-    if result["status"] == 200
-        return result["token"]
-    else
-        return nil
-    end
-end
-
-def verify_auth_exist
-    n = Netrc.read
-    user, pass = n["cnvrg.io"]
-    if user.nil? or pass.nil?
-        puts "Please login first, using \"cnvrg login\" command"
-        return false
-    end
-    return true
-end
-
-def get_logged_token
-    n = Netrc.read
-    user, token = n["cnvrg.io"]
-    return token
-
-end
-def run(is_start, body)
-    token = get_logged_token()
-    if is_start
-        url = URI.parse("http://localhost:3000/api/v1/cli/start_run")
-    else
-        url = URI.parse("http://localhost:3000/api/v1/cli/end_run")
-    end
-
-
-    req = Net::HTTP::Post.new(url.path)
-    req.add_field("AUTH_TOKEN", token)
-    req.body = body
-    response = Net::HTTP.new(url.host, url.port).start do |http|
-        http.request(req)
-    end
-
-    result = JSON.parse(response.body)
-    puts result
-end
-
-def new(project_name)
-    begin
-        `mkdir -p #{project_name} #{project_name}/data #{project_name}/models #{project_name}/notebooks #{project_name}/src #{project_name}/src/data #{project_name}/src/features  #{project_name}/src/models #{project_name}/src/visualizations #{project_name}/.cnvrg`
-        `touch #{project_name}/README.md`
-        `touch #{project_name}/.cnvrgignore`
-    rescue
-        "Error"
-    end
-end
-
-def link_dir(project_name, user, host="cnvrg.io")
-    `touch #{project_name}/.cnvrg/project`
-    `echo "owner: #{user}\nproject_slug: #{project_name}\nhost: #{host}" >> #{project_name}/.cnvrg/project`
-end
-
-def download
-
-    status_output = status
-    downloadables = status_output["updated_on_server"].merge(status_output["deleted"])
-
-
-    downloadables.each do |d|
-        if d[-1] == "/"
-            # make dir
-        else
-            files << #download(d)
-        end
-end
-
-def upload
-
-end
-
-def generate_idx
-
-    idx = Hash.new(0)
-    list = Dir['**/**']
-
-    # remove files that are in CNVRGIGNORE
-    # list.select { |x| ! cnvrgignore.include? x }
-
-    list.each do |e|
-        if File.directory? e
-            idx[e+"/"] = nil
-        else
-            idx[e] = { sha1: Digest::SHA1.hexdigest(File.read(e)), 
-                       commit_time: nil }
-        end
-    end
-
-    File.open("hello/.cnvrg/idx.yml", 'w') { |f| f.write idx.to_yaml }
-
-
-end
-
-def status
-    url = URI.parse("http://localhost:3000/api/v1/users/yochze/projects/porject/status")
-    token = get_logged_token()
-    load_idx = YAML.load(File.read("hello/.cnvrg/idx.yml"))
-    req = Net::HTTP::Get.new(url, 'Content-Type' => 'application/json')
-    req.add_field("AUTH_TOKEN", token)
-    req.body = { snapshot: load_idx }.to_json
-    response = Net::HTTP.new(url.host, url.port).start do |http|
-        http.request(req)
-    end
-
-    result = JSON.parse(response.body)
-
-    result["status"]["added"].each do |a|
-        puts "A:\t#{a}"
-    end
-
-    result["status"]["updated_on_server"].each do |a|
-        puts "M:\t#{a}"
-    end
-    
-    result["status"]["deleted"].each do |a|
-        puts "D:\t#{a}"
-    end
-
-    return result["status"]
-end