holistics-cli 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef9b9ce12830adf846878dd595dc9c57a10d8322
-  data.tar.gz: 14026763884c485018035f90a23895c70718061f
+  metadata.gz: 763f03645d0cb884b8ed479c3da2780552671e24
+  data.tar.gz: be1f71741967b9c431afaec34575f2296c464236
 SHA512:
-  metadata.gz: 8154a55fe4ad764e16e1e43116baf633a36798ddc973a670cc74ee2ef600f4de4154b74859e8387682e7aa3cfa809fcf319400763229cb2ab6cd4a8959029e18
-  data.tar.gz: 2588471ece3e5235ee26baa5ca95ae163956d60be5002b6abdea2383ecab9b111c36ebfbc1cddc69e1a756ded98f4a15e6205ca9b9bfe4c7582a9163ffdf36d8
+  metadata.gz: bc2eaea5ddcfeb4aebee7d05ca9d558ee847bddcf87ef005c94e97eb14c5438fb7c1a1e942750dbdcf7ea2a2bbe1ea8a7d1a664ec1f6e2514a287be4858f3c0a
+  data.tar.gz: 7d270cd11e0be8ce7ea3eace4e0d6615a96859c6ef523aaa31a60e26d0633e5b9e580297d4b47a6c3b0dea191dd2d393af463e7bc740eb11ebce06ca7eb84960

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.0, release 2017-09-29
+* Bug fix: unable to config token
+
+* Add `job cancel` command
+
 ## 0.1.2, release 2017-08-17
 * Bug fixes
 

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 TODO: Write your name
+Copyright (c) 2017 pmint93
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,10 +1,10 @@
 # Holistics CLI
 
-[![Gem Version](https://badge.fury.io/rb/holistics-cli.svg)](https://badge.fury.io/rb/holistics-cli)
+[![Gem Version](https://badge.fury.io/rb/holistics-cli.svg)](https://badge.fury.io/rb/holistics-cli) [![Test Coverage](https://codeclimate.com/github/pmint93/holistics-cli/badges/coverage.svg)](https://codeclimate.com/github/pmint93/holistics-cli/coverage) [![Code Climate](https://codeclimate.com/github/pmint93/holistics-cli/badges/gpa.svg)](https://codeclimate.com/github/pmint93/holistics-cli) [![Issue Count](https://codeclimate.com/github/pmint93/holistics-cli/badges/issue_count.svg)](https://codeclimate.com/github/pmint93/holistics-cli)
 
 CommandLine Interface to [Holistics API](https://docs.holistics.io/api/)
 
-> Dislaim: The official Holistics-CLI is quite limit for me, so I made this gem as an alternative
+> Disclaim: The official Holistics-CLI is quite limit for me, so I made this gem as an alternative
 
 :warning: This gem use the same command `holistics` as [Official Holistics-CLI](https://docs.holistics.io/holistics-cli/), so it may confict if both installed.
 
@@ -49,4 +49,4 @@ Everyone interacting in the Holistics-CLI project’s codebases, issue trackers,
 
 ## Related
 
-* [Official Holistics-CLI](https://docs.holistics.io/holistics-cli/)
+* [Official Holistics-CLI](https://docs.holistics.io/holistics-cli/)

data/lib/holistics.rb

@@ -56,7 +56,7 @@ module Holistics
       unless token
         current_config = configured? ? read_config : {}
         current_token = current_config[:token]
-        new_token = ask "Your Holistics token [#{current_token.light_black}]: "
+        new_token = ask "Your Holistics token [#{current_token.to_s.light_black}]: "
         new_token = nil if new_token.blank?
         unless token = new_token || current_token
           STDERR.puts 'Failed to config, empty token provided !'

data/lib/holistics/client.rb

@@ -25,6 +25,19 @@ module Holistics
       [response.status, response.body]
     end
 
+    def put(path, options = {})
+      options[:params] ||= {}
+      options[:headers] ||= {}
+      options[:headers].merge!('Content-Type': 'application/json')
+      response = @conn.put do |req|
+        req.url path
+        req.headers.merge!(options[:headers])
+        req.params['_utoken'] = @token
+        req.body = options[:params].to_s
+      end
+      [response.status, response.body]
+    end
+
     def post(path, options = {})
       options[:params] ||= {}
       options[:headers] ||= {}

data/lib/holistics/imports.rb

@@ -61,9 +61,8 @@ Examples:
     def execute(id)
       puts "`imports execute #{id}` called with options: #{options}" if Holistics.debug?
       result = @this.execute(id)
-      puts 'Job ID: ' + result['job_id'].to_s.yellow
-      puts 'Status: ' + Holistics::Utils.colorize(result['status'])
-      invoke 'holistics:jobs:logs', [result['job_id']], { watch: true }
+      puts 'Job ID: ' + result['job_id'].to_s.yellow + " Submit: " + Holistics::Utils.colorize(result['status'])
+      invoke 'holistics:jobs:logs', [result['job_id']], { follow: true }
     end
     map %w[exec] => :execute
 

data/lib/holistics/jobs.rb

@@ -61,35 +61,49 @@ Examples:
     method_option :number, aliases: '-n', desc: 'Only print number of last lines', type: :numeric
     def logs(id)
       puts "`jobs logs #{id}` called with options: #{options}" if Holistics.debug?
-      if options[:watch]
+      if options[:follow]
         last_id = 0
         loop do
           data = @this.logs(id, { 'last_id': last_id })
-          print_logs(data['logs'])
+          print_logs(id, data['logs'])
           last_id = data['logs'].last['id'] if data['logs'].length > 0
           break unless data['has_more']
           sleep 0.5
         end
       else
         data = @this.logs(id)
-        print_logs(data['logs'], options[:number])
+        print_logs(id, data['logs'], options[:number])
       end
     end
 
-    # desc 'cancel', 'Cancel a running job'
-    # def cancel(id)
-    #   puts "Comming soon".yellow
-    # end
+    desc 'cancel', 'Cancel a running job'
+    def cancel(id)
+      puts "`jobs cancel #{id}` called with options: #{options}" if Holistics.debug?
+      print "Cancelling Job #{id} ...".yellow
+      result = @this.cancel(id)
+      if result['status'].to_s.upcase == 'OK'
+        loop do
+          job_info = @this.find(id)
+          unless job_info['status'] == 'cancelling'
+            puts Holistics::Utils.colorize(job_info['status'])
+            break
+          end
+          sleep 0.5
+        end
+      else
+        puts "Failed to cancel the job #{id}".red
+      end
+    end
 
     private
 
-    def print_logs(log_lines, line_count = 0)
+    def print_logs(job_id, log_lines, line_count = 0)
       line_count ||= 0
       log_lines ||= []
       log_lines[(-[line_count, log_lines.length].min)..-1]
       log_lines.each do |log_line|
         t = log_line['timestamp'] || Time.now.utc
-        puts "#{t}; #{log_line['level']}: #{log_line['message']}"
+        puts "[#{t} ##{job_id}] #{log_line['level']}: #{log_line['message']}"
       end
     end
 

data/lib/holistics/models/job.rb

@@ -5,6 +5,11 @@ module Holistics
         status, body = @client.get("/jobs/#{id}/logs.json", { params: params })
         handle_http_result(status, body)
       end
+
+      def cancel(id, params = {})
+        status, body = @client.put("/jobs/#{id}/cancel.json", { params: params })
+        handle_http_result(status, body)
+      end
     end
   end
 end

data/lib/holistics/transforms.rb

@@ -38,7 +38,7 @@ Examples:
       puts "`transforms execute #{id}` called with options: #{options}" if Holistics.debug?
       result = @this.execute(id)
       puts 'Job ID: ' + result['job_id'].to_s.yellow + " Submit: " + Holistics::Utils.colorize(result['status'])
-      invoke 'holistics:jobs:logs', [result['job_id']], { watch: true }
+      invoke 'holistics:jobs:logs', [result['job_id']], { follow: true }
     end
     map %w[exec] => :execute
 

data/lib/holistics/utils.rb

@@ -4,7 +4,7 @@ module Holistics
       COLORIZE_MAPPING = {
         green: %w{active success ok},
         red: %w{fail failure error cancelled},
-        yellow: %w{new running pending unknown}
+        yellow: %w{new running pending unknown cancelling}
       }
       def colorize(text)
         color = COLORIZE_MAPPING.find { |color, values| values.include?(text) }

data/lib/holistics/version.rb

@@ -1,3 +1,3 @@
 module Holistics
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: holistics-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Thanh Pham Minh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Holistics CommandLine Interface