faastruby 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6923262dc376ee5d45aecf773ab79effc56ac3c41be86f32e543a088d4482301
-  data.tar.gz: f5fdbb23a2b0b40392d520ef46adb0849949d622145f2fc0e4f05b822acb24d5
+  metadata.gz: 7fd64fdf16d7eaccea051a5d101f1376c7276285b8ae68f31320dc9dafe4d348
+  data.tar.gz: 3277f48a6095471b033ce8b730532255c092935437b30d72a9a851ccd1a0be21
 SHA512:
-  metadata.gz: 32b98888ae961eade9329627bafb2ddfd834966b6a0676316735a2619d06faa5942c1c5016c0e395315d70e6ca211ed7a0d481b4b009805f37ec5f857bf3495f
-  data.tar.gz: 8fbda1fd86bb74e58fb34f7a22789b28f78061174fbb5ff769dd3a64c3a15fc20fac89d48d7c5d707b14add1116c9634624be7688f3e605ec2c0594acb37beae
+  metadata.gz: 4342ed171a03f6dd3ad3bb1d9ee6b0f0d5cbb81de042a64e2e6fa884bf52c6f7ebf0146b4d25d5c8338b88ebf2126b15774c92aa904a5c677a8bcb8a3cf6689b
+  data.tar.gz: 6a4ed4b25c093aac6f968c82932a1194ef0f6d2d172b99b7cc96a1072d77bd29f3ee1351d5439948ea362bcfcda15ee8c4d5d961c78f9c1c14a6e08b861b31ed

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.2.6 - Nov 20 2018
+- Change Ruby minimum version to 2.5.0
+- Disable timeout on HTTP requests.
+- Handle CTRL+C interruptions gracefully
+- Add `--region` to help
+
 ## 0.2.5 - Nov 18 2018
 - Support for multiple regions with `faastruby --region [REGION] ...`
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    faastruby (0.2.4)
+    faastruby (0.2.6)
       colorize (~> 0.8)
       oj (~> 3.6)
       rest-client (~> 2.0)
@@ -29,7 +29,7 @@ GEM
     mime-types-data (3.2018.0812)
     necromancer (0.4.0)
     netrc (0.11.0)
-    oj (3.7.0)
+    oj (3.7.1)
     pastel (0.7.2)
       equatable (~> 0.5.0)
       tty-color (~> 0.4.0)

data/exe/faastruby

@@ -1,6 +1,10 @@
 #!/usr/bin/env ruby
 require 'faastruby'
 require 'faastruby/cli'
+trap "SIGINT" do
+  puts "Exiting"
+  exit 130
+end
 if ARGV[0] == '--region'
   ARGV.shift
   ENV['FAASTRUBY_REGION'] = ARGV.shift

data/faastruby.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.version       = FaaStRuby::VERSION
   spec.authors       = ["Paulo Arruda"]
   spec.email         = ["parrudaj@gmail.com"]
-  spec.required_ruby_version = '>= 2.4.0'
+  spec.required_ruby_version = '>= 2.5.0'
   spec.summary       = %q{FaaStRuby CLI - Manage workspaces and functions hosted at faastruby.io.}
   spec.homepage      = "https://faastruby.io"
   spec.license       = "MIT"

data/lib/faastruby/api.rb

@@ -9,6 +9,7 @@ module FaaStRuby
       @credentials = {'API-KEY' => FaaStRuby.api_key, 'API-SECRET' => FaaStRuby.api_secret}
       @headers = {content_type: 'application/json', accept: 'application/json'}.merge(@credentials)
       @struct = Struct.new(:response, :body, :errors, :code)
+      @timeout = nil # disable request timeouts
     end
 
     def create_workspace(workspace_name:, email: nil, provider: nil)
@@ -16,12 +17,26 @@ module FaaStRuby
       payload = {'name' => workspace_name}
       payload['email'] = email if email
       payload['provider'] = provider if provider
-      parse RestClient.post(url, Oj.dump(payload), @headers){|response, request, result| response }
+      parse RestClient::Request.execute(method: :post, timeout: @timeout, url: url, payload: Oj.dump(payload), headers: @headers)
+    rescue RestClient::ExceptionWithResponse => err
+      case err.http_code
+      when 301, 302, 307
+        err.response.follow_redirection
+      else
+        parse err.response
+      end
     end
 
     def destroy_workspace(workspace_name)
       url = "#{@api_url}/workspaces/#{workspace_name}"
-      parse RestClient.delete(url, @headers){|response, request, result| response }
+      parse RestClient::Request.execute(method: :delete, timeout: @timeout, url: url, headers: @headers)
+    rescue RestClient::ExceptionWithResponse => err
+      case err.http_code
+      when 301, 302, 307
+        err.response.follow_redirection
+      else
+        parse err.response
+      end
     end
 
     # def update_workspace(workspace_name, payload)
@@ -31,24 +46,52 @@ module FaaStRuby
 
     def get_workspace_info(workspace_name)
       url = "#{@api_url}/workspaces/#{workspace_name}"
-      parse RestClient.get(url, @headers){|response, request, result| response }
+      parse RestClient::Request.execute(method: :get, timeout: @timeout, url: url, headers: @headers)
+    rescue RestClient::ExceptionWithResponse => err
+      case err.http_code
+      when 301, 302, 307
+        err.response.follow_redirection
+      else
+        parse err.response
+      end
     end
 
     def refresh_credentials(workspace_name)
       url = "#{@api_url}/workspaces/#{workspace_name}/credentials"
       payload = {}
-      parse RestClient.put(url, payload, @credentials){|response, request, result| response }
+      parse RestClient::Request.execute(method: :put, timeout: @timeout, url: url, payload: payload, headers: @credentials)
+    rescue RestClient::ExceptionWithResponse => err
+      case err.http_code
+      when 301, 302, 307
+        err.response.follow_redirection
+      else
+        parse err.response
+      end
     end
 
     def deploy(workspace_name:, package:)
       url = "#{@api_url}/workspaces/#{workspace_name}/deploy"
       payload = {package: File.new(package, 'rb')}
-      parse RestClient.post(url, payload, @credentials){|response, request, result| response }
+      parse RestClient::Request.execute(method: :post, timeout: @timeout, url: url, payload: payload, headers: @credentials)
+    rescue RestClient::ExceptionWithResponse => err
+      case err.http_code
+      when 301, 302, 307
+        err.response.follow_redirection
+      else
+        parse err.response
+      end
     end
 
     def delete_from_workspace(function_name:, workspace_name:)
       url = "#{@api_url}/workspaces/#{workspace_name}/functions/#{function_name}"
-      parse RestClient.delete(url, @headers){|response, request, result| response }
+      parse RestClient::Request.execute(method: :delete, timeout: @timeout, url: url, headers: @headers)
+    rescue RestClient::ExceptionWithResponse => err
+      case err.http_code
+      when 301, 302, 307
+        err.response.follow_redirection
+      else
+        parse err.response
+      end
     end
 
     # def list_workspace_functions(workspace_name)
@@ -60,16 +103,31 @@ module FaaStRuby
       url = "#{FaaStRuby.api_host}/#{workspace_name}/#{function_name}#{query}"
       headers['Benchmark'] = true if time
       if method == 'get'
-        RestClient.public_send(method, url, headers){|response, request, result| response }
+        RestClient::Request.execute(method: :get, timeout: @timeout, url: url, headers: headers)
       else
-        RestClient.public_send(method, url, payload, headers){|response, request, result| response }
+        RestClient::Request.execute(method: method.to_sym, timeout: @timeout, url: url, payload: payload, headers: headers)
+      end
+    rescue RestClient::ExceptionWithResponse => err
+      case err.http_code
+      when 301, 302, 307
+        err.response.follow_redirection
+      else
+        return err.response
       end
     end
 
     def update_function_context(function_name:, workspace_name:, payload:)
       # payload is a string
       url = "#{@api_url}/workspaces/#{workspace_name}/functions/#{function_name}"
-      parse RestClient.patch(url, Oj.dump(payload), @headers){|response, request, result| response }
+      parse RestClient::Request.execute(method: :patch, timeout: @timeout, url: url, payload: Oj.dump(payload), headers: @headers)
+      # parse RestClient.patch(url, Oj.dump(payload), @headers){|response, request, result| response }
+    rescue RestClient::ExceptionWithResponse => err
+      case err.http_code
+      when 301, 302, 307
+        err.response.follow_redirection
+      else
+        parse err.response
+      end
     end
 
     def parse(response)

data/lib/faastruby/cli/commands/help.rb

@@ -8,8 +8,11 @@ module FaaStRuby
       def run
         puts "FaaStRuby CLI - Manage workspaces and functions hosted at faastruby.io"
         puts
+        puts "Usage: faastruby [--region REGION, -h, -v] COMMAND ARGS"
+        puts
         puts 'help, -h, --help     # Displays this help'
         puts '-v                   # Print version and exit'
+        puts '--region tor1|sfo2   # Specify a region'
         puts
         workspaces = ["Workspaces:"]
         functions = ["Functions:"]
@@ -33,4 +36,4 @@ module FaaStRuby
       end
     end
   end
-end
+end

data/lib/faastruby/version.rb

@@ -1,3 +1,3 @@
 module FaaStRuby
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faastruby
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Paulo Arruda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2018-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -221,7 +221,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="