faastruby 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6c5b8269b49257d206406eb93f408d375f9c6ebdfe50f0fac40ee62a2fd8db3
-  data.tar.gz: b289988fe2d42f3c49062fb19810c664cf4655a3296c6d5726390bad3c77d67b
+  metadata.gz: ac48887a263445c5c0392263683258407df738768d9b293c1462a859b9f5a46f
+  data.tar.gz: afb8800a278e4de5375b7bbdf702c324c1ac9b574a553d2583de437c51543bf3
 SHA512:
-  metadata.gz: c34f895e38b4a72493e252ff84c6f3129a217fe36a7f68fb26775f06da8b129aa85cb262c1896410aae857720667cb35a3a83cae333077e94489e9d55698ff40
-  data.tar.gz: 4c80da8ed9e3a45bd319d6ad726ebd8ab1f1dd7fb99f25db70adb58806544bbe5336046df3d1b48da8980238abc3a840431e904329d8f855d5b8fe412f9c2deb
+  metadata.gz: a57cad672290c2c46058e1f3e34787ecca9e04f320e1a1ca10a05d9ad7c22dd07e688a0335e3446c8d6c0c6958fbf87e5092768e3302916f3ecf87eb9361f632
+  data.tar.gz: b16c8c0d450d37cafa76b486b2c42276f68b68f1f01db532f75c1f0e5b554e15158a3cc5523f6253ee61c613d283917b76e7dc15192e4f34694a9aa5c28e6aa5

data/CHANGELOG.md

@@ -1,7 +1,15 @@
 # Changelog
 
+## 0.5.7 - Mar 11 2019
+- Refactor API class
+- Bump faastruby-rpc dependency to 0.2.2
+- Better API error handling
+- Display alert when new gem version is available
+- Add command `faastruby update`
+- Quit server when FaaStRuby Local fails to start
+
 ## 0.5.6 - Mar 10 2019
-- Fix bug preventing require libraries. Thanks to
+- Fix bug preventing require libraries. Thanks to @jbonney for spotting that one!
 - Support for static files with space in their names
 - Cleanup comments code
 - Limit the size of static files to 5MB

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    faastruby (0.5.5)
+    faastruby (0.5.6)
       colorize (~> 0.8)
       faastruby-rpc (~> 0.2)
       listen (~> 3.1)

data/faastruby.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'sinatra', '~> 2.0'
   spec.add_runtime_dependency 'sinatra-contrib', '~> 2.0'
   spec.add_runtime_dependency 'puma', '~> 3.12'
-  spec.add_runtime_dependency 'faastruby-rpc', '~> 0.2'
+  spec.add_runtime_dependency 'faastruby-rpc', '~> 0.2.2'
   spec.add_runtime_dependency 'tmuxinator', '~> 0.15'
   spec.add_runtime_dependency 'rouge', '~> 3.3'
   spec.add_runtime_dependency 'listen', '~> 3.1'

data/lib/faastruby/api.rb

@@ -13,43 +13,44 @@ module FaaStRuby
       @timeout = nil # disable request timeouts
     end
 
+    def execute_request
+      begin
+        yield
+      rescue SocketError, Errno::ENETUNREACH => e
+        FaaStRuby::CLI.error("\nCould not contact the server.\n#{e.message}") if defined?(FaaStRuby::CLI)
+        raise e
+      rescue RestClient::ExceptionWithResponse => err
+        case err.http_code
+        when 301, 302, 307
+          err.response.follow_redirection
+        else
+          parse err.response
+        end
+      end
+    end
+
     def create_workspace(workspace_name:, email: nil, provider: nil)
       url = "#{@api_url}/workspaces"
       payload = {'name' => workspace_name}
       payload['email'] = email if email
       payload['provider'] = provider if provider
-      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
+      execute_request do
+        parse RestClient::Request.execute(method: :post, timeout: @timeout, url: url, payload: Oj.dump(payload), headers: @headers)
       end
     end
 
     def destroy_workspace(workspace_name)
       url = "#{@api_url}/workspaces/#{workspace_name}"
-      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
+      execute_request do
+        parse RestClient::Request.execute(method: :delete, timeout: @timeout, url: url, headers: @headers)
       end
     end
 
     def update_runners(workspace_name:, runners_max:)
       url = "#{@api_url}/workspaces/#{workspace_name}/runners"
       payload = {'runners_max' => runners_max}
-      parse RestClient::Request.execute(method: :patch, timeout: @timeout, url: url, headers: @headers, payload: Oj.dump(payload))
-    rescue RestClient::ExceptionWithResponse => err
-      case err.http_code
-      when 301, 302, 307
-        err.response.follow_redirection
-      else
-        parse err.response
+      execute_request do
+        parse RestClient::Request.execute(method: :patch, timeout: @timeout, url: url, headers: @headers, payload: Oj.dump(payload))
       end
     end
 
@@ -59,13 +60,8 @@ module FaaStRuby
         'email' => email,
         'password' => password
       }
-      parse RestClient::Request.execute(method: :post, timeout: @timeout, url: url, headers: @base_headers, payload: Oj.dump(payload))
-    rescue RestClient::ExceptionWithResponse => err
-      case err.http_code
-      when 301, 302, 307
-        err.response.follow_redirection
-      else
-        parse err.response
+      execute_request do
+        parse RestClient::Request.execute(method: :post, timeout: @timeout, url: url, headers: @base_headers, payload: Oj.dump(payload))
       end
     end
 
@@ -74,13 +70,8 @@ module FaaStRuby
       payload = {
         'email' => email
       }
-      parse RestClient::Request.execute(method: :patch, timeout: @timeout, url: url, headers: @base_headers, payload: Oj.dump(payload))
-    rescue RestClient::ExceptionWithResponse => err
-      case err.http_code
-      when 301, 302, 307
-        err.response.follow_redirection
-      else
-        parse err.response
+      execute_request do
+        parse RestClient::Request.execute(method: :patch, timeout: @timeout, url: url, headers: @base_headers, payload: Oj.dump(payload))
       end
     end
 
@@ -89,13 +80,8 @@ module FaaStRuby
       payload = {
         'code' => confirmation_token
       }
-      parse RestClient::Request.execute(method: :post, timeout: @timeout, url: url, headers: @base_headers, payload: Oj.dump(payload))
-    rescue RestClient::ExceptionWithResponse => err
-      case err.http_code
-      when 301, 302, 307
-        err.response.follow_redirection
-      else
-        parse err.response
+      execute_request do
+        parse RestClient::Request.execute(method: :post, timeout: @timeout, url: url, headers: @base_headers, payload: Oj.dump(payload))
       end
     end
 
@@ -105,13 +91,8 @@ module FaaStRuby
       payload = {
         'all' => all
       }
-      parse RestClient::Request.execute(method: :delete, timeout: @timeout, url: url, headers: headers, payload: Oj.dump(payload))
-    rescue RestClient::ExceptionWithResponse => err
-      case err.http_code
-      when 301, 302, 307
-        err.response.follow_redirection
-      else
-        parse err.response
+      execute_request do
+        parse RestClient::Request.execute(method: :delete, timeout: @timeout, url: url, headers: headers, payload: Oj.dump(payload))
       end
     end
 
@@ -121,13 +102,8 @@ module FaaStRuby
         'email' => email,
         'password' => password
       }
-      parse RestClient::Request.execute(method: :post, timeout: @timeout, url: url, headers: @base_headers, payload: Oj.dump(payload))
-    rescue RestClient::ExceptionWithResponse => err
-      case err.http_code
-      when 301, 302, 307
-        err.response.follow_redirection
-      else
-        parse err.response
+      execute_request do
+        parse RestClient::Request.execute(method: :post, timeout: @timeout, url: url, headers: @base_headers, payload: Oj.dump(payload))
       end
     end
 
@@ -137,25 +113,15 @@ module FaaStRuby
         'api_key' => api_key,
         'api_secret' => api_secret
       }
-      parse RestClient::Request.execute(method: :post, timeout: @timeout, url: url, headers: @headers, payload: Oj.dump(payload))
-    rescue RestClient::ExceptionWithResponse => err
-      case err.http_code
-      when 301, 302, 307
-        err.response.follow_redirection
-      else
-        parse err.response
+      execute_request do
+        parse RestClient::Request.execute(method: :post, timeout: @timeout, url: url, headers: @headers, payload: Oj.dump(payload))
       end
     end
 
     def get_static_metadata(workspace_name)
       url = "#{@api_url}/workspaces/#{workspace_name}/static/metadata"
-      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
+      execute_request do
+        parse RestClient::Request.execute(method: :get, timeout: @timeout, url: url, headers: @headers)
       end
     end
 
@@ -163,13 +129,8 @@ module FaaStRuby
       url = "#{@api_url}/workspaces/#{workspace_name}/static/sync"
       payload = {package: File.new(package, 'rb')}
       payload[:relative_path] = relative_path
-      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
+      execute_request do
+        parse RestClient::Request.execute(method: :post, timeout: @timeout, url: url, payload: payload, headers: @credentials)
       end
     end
 
@@ -178,39 +139,24 @@ module FaaStRuby
       payload = {
          relative_path: relative_path
       }
-      parse RestClient::Request.execute(method: :delete, timeout: @timeout, url: url, headers: @credentials, payload: payload)
-    rescue RestClient::ExceptionWithResponse => err
-      case err.http_code
-      when 301, 302, 307
-        err.response.follow_redirection
-      else
-        parse err.response
+      execute_request do
+        parse RestClient::Request.execute(method: :delete, timeout: @timeout, url: url, headers: @credentials, payload: payload)
       end
     end
 
 
     def get_workspace_info(workspace_name)
       url = "#{@api_url}/workspaces/#{workspace_name}"
-      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
+      execute_request do
+        parse RestClient::Request.execute(method: :get, timeout: @timeout, url: url, headers: @headers)
       end
     end
 
     def refresh_credentials(workspace_name)
       url = "#{@api_url}/workspaces/#{workspace_name}/credentials"
       payload = {}
-      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
+      execute_request do
+        parse RestClient::Request.execute(method: :put, timeout: @timeout, url: url, payload: payload, headers: @credentials)
       end
     end
 
@@ -220,13 +166,8 @@ module FaaStRuby
       payload[:root_to] = root_to if root_to
       payload[:catch_all] = catch_all if catch_all
       payload[:context] = context if context
-      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
+      execute_request do
+        parse RestClient::Request.execute(method: :post, timeout: @timeout, url: url, payload: payload, headers: @credentials)
       end
     end
 
@@ -242,46 +183,38 @@ module FaaStRuby
       end
     end
 
-    # def list_workspace_functions(workspace_name)
-    #   url = "#{@api_url}/workspaces/#{workspace_name}/functions"
-    #   parse RestClient.get(url, @headers){|response, request, result| response }
-    # end
-
     def run(function_name:, workspace_name:, payload:, method:, headers: {}, time: false, query: nil)
       url = "#{FaaStRuby.api_host}/#{workspace_name}/#{function_name}#{query}"
       headers['Benchmark'] = true if time
-      if method == 'get'
-        RestClient::Request.execute(method: :get, timeout: @timeout, url: url, headers: headers)
-      else
-        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
+      execute_request do
+        if method == 'get'
+          RestClient::Request.execute(method: :get, timeout: @timeout, url: url, headers: headers)
+        else
+          RestClient::Request.execute(method: method.to_sym, timeout: @timeout, url: url, payload: payload, headers: headers)
+        end
       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::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
+      execute_request do
+        parse RestClient::Request.execute(method: :patch, timeout: @timeout, url: url, payload: Oj.dump(payload), headers: @headers)
       end
     end
 
     def parse(response)
+      if latest_version = response.headers[:x_update_available]
+        puts "########### FaaStRuby Update Available ###########"
+        puts "# Latest version: #{latest_version}                          #"
+        puts "# Please run 'faastruby update'                  #"
+        puts "##################################################"
+      end
+
       begin
         body = Oj.load(response.body) unless [500, 408].include?(response.code)
       rescue Oj::ParseError => e
+        FaaStRuby::CLI.error("\nThe server has returned an invalid response. Status code: #{response.code}") if defined?(FaaStRuby::CLI)
         puts response.body
         raise e
       end

data/lib/faastruby/cli/commands.rb

@@ -1,7 +1,7 @@
 module FaaStRuby
   module Command
     require 'faastruby/cli/base_command'
-    # require 'faastruby/cli/credentials'
+
     COMMANDS = {
       'new' => Proc.new do
         require 'faastruby/cli/commands/function/new'
@@ -122,7 +122,30 @@ module FaaStRuby
       'migrate-workspaces' => Proc.new do
         require 'faastruby/cli/commands/workspace/migrate'
         FaaStRuby::Command::Workspace::Migrate
+      end,
+      'update' => Proc.new do
+        FaaStRuby::Command::Update
       end
     }
+
+    class Update < BaseCommand
+      def initialize(args)
+        @args = args
+        help
+      end
+
+      def run
+        exec "gem update faastruby"
+      end
+
+      def self.help
+        "update"
+      end
+
+      def usage
+        puts "\n# Update FaaStRuby CLI to the latest version."
+        puts "\nUsage: faastruby #{self.class.help}\n\n"
+      end
+    end
   end
 end

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

@@ -10,7 +10,9 @@ module FaaStRuby
         puts "FaaStRuby CLI - Manage workspaces and functions hosted at faastruby.io"
         puts "Version: #{FaaStRuby::VERSION}"
         puts
-        puts "Usage: faastruby [OPTIONS] COMMAND [--help | -h] [ARGS]"
+        puts "Usage: faastruby [update] [OPTIONS] COMMAND [--help | -h] [ARGS]"
+        puts
+        puts "To update to the latest version, run: faastruby update"
         puts
         puts "OPTIONS:"
         puts 'help, -h, --help     # Displays this help'

data/lib/faastruby/server/local.rb

@@ -15,7 +15,9 @@ module FaaStRuby
           system(cmd.join(" "))
           sleep 1
         end
-        puts "FaaStRuby Local exited. Please press CTRL+C."
+        puts "FaaStRuby Local exited due to an error."
+        puts "If you think this shouldn't have happened, open an issue here: https://github.com/FaaStRuby/faastruby-cli/issues/new"
+        exit 1
       end
     end
   end

data/lib/faastruby/version.rb

@@ -1,3 +1,3 @@
 module FaaStRuby
-  VERSION = '0.5.6'
+  VERSION = '0.5.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faastruby
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Paulo Arruda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-10 00:00:00.000000000 Z
+date: 2019-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: tmuxinator
   requirement: !ruby/object:Gem::Requirement