faastruby 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93b8ffe62b7276bfd5a04730fc3d4643b43eb9be2bebced9d9c13a984af3405c
-  data.tar.gz: d38f0c66d2d392916870ec2db8d651b887b1281deb0ee5a88e94e6fafae0c92e
+  metadata.gz: 6923262dc376ee5d45aecf773ab79effc56ac3c41be86f32e543a088d4482301
+  data.tar.gz: f5fdbb23a2b0b40392d520ef46adb0849949d622145f2fc0e4f05b822acb24d5
 SHA512:
-  metadata.gz: 2b9e4b1cbb7abc709dbbe25c385aa40b881a0d14217fc6c56276de115f2b97653230e18dc8668255b8f33ad1b92711d3eb5c001b1c3dd9751084e0b69d30dd11
-  data.tar.gz: 1ed5d7c3d34154aa334f570b2e8825bf76efd00bdd687f6dd57ab7d9118f9897a0d7434b75cd64d4fd708addf96e7cabef19fb29e2a86f9d21af63b36fdfcd14
+  metadata.gz: 32b98888ae961eade9329627bafb2ddfd834966b6a0676316735a2619d06faa5942c1c5016c0e395315d70e6ca211ed7a0d481b4b009805f37ec5f857bf3495f
+  data.tar.gz: 8fbda1fd86bb74e58fb34f7a22789b28f78061174fbb5ff769dd3a64c3a15fc20fac89d48d7c5d707b14add1116c9634624be7688f3e605ec2c0594acb37beae

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 
-## 0.2.3 - Unreleased
+## 0.2.5 - Nov 18 2018
+- Support for multiple regions with `faastruby --region [REGION] ...`
+
+## 0.2.4 - Skipped
+
+## 0.2.3 - Oct 20 2018
 - Added #status_code to Workspace class to hold the API response code after a request
 - Added refresh_credentials endpoint
 - Fix the request headers
@@ -25,4 +30,4 @@ Run `faastruby help` for usage details.
 - Functions can have tests and they can be configured to run before each deploy, aborting if a failure happens.
 - Added option to print or save the workspace credentials into a different file upon creation, instead of saving it to ~/.faastruby
 - Read a different credentials file via FAASTRUBY_CREDENTIALS environment variable.
-- Read credentials via environment variables: FAASTRUBY_API_KEY and FAASTRUBY_API_SECRET.
+- Read credentials via environment variables: FAASTRUBY_API_KEY and FAASTRUBY_API_SECRET.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    faastruby (0.2.3)
+    faastruby (0.2.4)
       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.6.12)
+    oj (3.7.0)
     pastel (0.7.2)
       equatable (~> 0.5.0)
       tty-color (~> 0.4.0)

data/README.md

@@ -6,7 +6,7 @@
 CLI tool for managing workspaces and functions hosted at [FaaStRuby](https://faastruby.io).
 
 ## What is FaaStRuby?
-Fast, lightweight and scalable serverless platform built for Ruby developers.
+FaaStRuby is a serverless platform built for Ruby developers.
 
 * [Tutorial](https://faastruby.io/tutorial.html)
 
@@ -58,4 +58,4 @@ Build lots of functions and share them with fellow Ruby devs!
 
 ## FaaStRuby + Hyperstack = fullstack Ruby apps!
 
-Do you think JavaScript is your only option for the front-end? Think again. [Hyperstack](https://hyperstack.org) is a Ruby DSL, compiled by Opal, bundled by Webpack, powered by React.
+Do you think JavaScript is your only option for the front-end? Think again. [Hyperstack](https://hyperstack.org) is a Ruby DSL, compiled by Opal, bundled by Webpack, powered by React.

data/exe/faastruby

@@ -1,5 +1,9 @@
 #!/usr/bin/env ruby
 require 'faastruby'
 require 'faastruby/cli'
+if ARGV[0] == '--region'
+  ARGV.shift
+  ENV['FAASTRUBY_REGION'] = ARGV.shift
+end
 command = ARGV.shift
-FaaStRuby::CLI.run(command, ARGV)
+FaaStRuby::CLI.run(command, ARGV)

data/lib/faastruby/api.rb

@@ -5,7 +5,7 @@ module FaaStRuby
     @@api_version = 'v2'
     attr_reader :api_url, :credentials, :headers
     def initialize
-      @api_url = "#{HOST}/#{@@api_version}"
+      @api_url = "#{FaaStRuby.api_host}/#{@@api_version}"
       @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)
@@ -57,7 +57,7 @@ module FaaStRuby
     # end
 
     def run(function_name:, workspace_name:, payload:, method:, headers: {}, time: false, query: nil)
-      url = "#{HOST}/#{workspace_name}/#{function_name}#{query}"
+      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 }
@@ -95,4 +95,4 @@ module FaaStRuby
       @struct.new(nil, nil, errors, code)
     end
   end
-end
+end

data/lib/faastruby/base.rb

@@ -1,6 +1,10 @@
 module FaaStRuby
-  HOST = ENV['FAASTRUBY_HOST'] || 'https://api.faastruby.io'
-
+  ROOT_DOMAIN = ENV['FAASTRUBY_ROOT_DOMAIN'] || 'faastruby.io'
+  DEFAULT_REGION = 'tor1'
+  REGIONS = [
+    'tor1',
+    'sfo2'
+  ]
   class << self
     attr_accessor :configuration
   end
@@ -22,6 +26,27 @@ module FaaStRuby
     {api_key: api_key, api_secret: api_secret}
   end
 
+  def self.region
+    ENV['FAASTRUBY_REGION'] ||= DEFAULT_REGION
+    raise "No such region: #{ENV['FAASTRUBY_REGION']}" unless FaaStRuby::REGIONS.include?(ENV['FAASTRUBY_REGION'])
+    ENV['FAASTRUBY_REGION']
+  end
+
+  def self.api_host
+    ENV['FAASTRUBY_HOST'] || "https://api.#{region}.#{ROOT_DOMAIN}"
+  end
+
+  def self.credentials_file
+    return File.expand_path(ENV['FAASTRUBY_CREDENTIALS']) if ENV['FAASTRUBY_CREDENTIALS']
+    if region == DEFAULT_REGION && File.file?(File.expand_path('~/.faastruby'))
+      return File.expand_path('~/.faastruby')
+    elsif region == DEFAULT_REGION
+      return File.expand_path("~/.faastruby.#{region}")
+    else
+      return File.expand_path("~/.faastruby.#{region}")
+    end
+  end
+
   class Configuration
     attr_accessor :api_key, :api_secret
   end
@@ -50,4 +75,4 @@ module FaaStRuby
       end
     end
   end
-end
+end

data/lib/faastruby/cli.rb

@@ -8,9 +8,7 @@ require 'faastruby/cli/package'
 
 module FaaStRuby
   FAASTRUBY_YAML = 'faastruby.yml'
-  FAASTRUBY_CREDENTIALS = File.expand_path(ENV['FAASTRUBY_CREDENTIALS'] || '~/.faastruby')
   SPINNER_FORMAT = :spin_2
-
   class CLI
     def self.error(message, color: :red)
       message.each {|m| STDERR.puts m.colorize(color)} if message.is_a?(Array)
@@ -24,6 +22,7 @@ module FaaStRuby
         return
       end
       check_version
+      check_region
       error("Unknown command: #{command}") unless FaaStRuby::Command::COMMANDS.has_key?(command)
       FaaStRuby::Command::COMMANDS[command].new(args).run
     end
@@ -38,5 +37,10 @@ module FaaStRuby
         ], color: nil)
       end
     end
+
+    def self.check_region
+      ENV['FAASTRUBY_REGION'] ||= DEFAULT_REGION
+      error(["No such region: #{ENV['FAASTRUBY_REGION']}".red, "Valid regions are:  #{FaaStRuby::REGIONS.join(' | ')}"], color: nil) unless FaaStRuby::REGIONS.include?(ENV['FAASTRUBY_REGION'])
+    end
   end
 end

data/lib/faastruby/cli/commands.rb

@@ -61,4 +61,4 @@ module FaaStRuby
       '-v' => FaaStRuby::Command::Version
     }
   end
-end
+end

data/lib/faastruby/cli/commands/credentials/add.rb

@@ -7,7 +7,7 @@ module FaaStRuby
           @workspace_name = @args.shift
           FaaStRuby::CLI.error(['Missing argument: WORKSPACE_NAME'.red, usage], color: nil) if @workspace_name.nil? || @workspace_name =~ /^-.*/
           parse_options
-          @options['credentials_file'] ||= FAASTRUBY_CREDENTIALS
+          @options['credentials_file'] ||= FaaStRuby.credentials_file
           @missing_args = []
           FaaStRuby::CLI.error(@missing_args, color: nil) if missing_args.any?
         end

data/lib/faastruby/cli/commands/credentials/list.rb

@@ -5,7 +5,7 @@ module FaaStRuby
         def initialize(args)
           @args = args
           parse_options
-          @options['credentials_file'] ||= FAASTRUBY_CREDENTIALS
+          @options['credentials_file'] ||= FaaStRuby.credentials_file
         end
 
         def run

data/lib/faastruby/cli/commands/function/run.rb

@@ -26,7 +26,7 @@ module FaaStRuby
           command << "-X #{@options['method'].upcase}" if @options['method']
           @options['headers']&.each {|h,v| command << "-H '#{h}: #{v}'"}
           command << "-d '#{@options['body']}'" if @options['body']
-          command << "'#{HOST}/#{@options['workspace_name']}/#{@function_name}#{@options['query']}'"
+          command << "'#{FaaStRuby.api_host}/#{@options['workspace_name']}/#{@function_name}#{@options['query']}'"
           puts command.join(" ")
         end
 

data/lib/faastruby/cli/commands/workspace/create.rb

@@ -8,7 +8,7 @@ module FaaStRuby
           FaaStRuby::CLI.error(@missing_args, color: nil) if missing_args.any?
           @workspace_name = @args.shift
           parse_options
-          @options['credentials_file'] ||= FAASTRUBY_CREDENTIALS
+          @options['credentials_file'] ||= FaaStRuby.credentials_file
         end
 
         def run
@@ -67,4 +67,4 @@ module FaaStRuby
       end
     end
   end
-end
+end

data/lib/faastruby/cli/commands/workspace/destroy.rb

@@ -9,7 +9,7 @@ module FaaStRuby
           @workspace_name = @args.shift
           parse_options
           FaaStRuby::Credentials.load_for(@workspace_name)
-          @options['credentials_file'] ||= FAASTRUBY_CREDENTIALS
+          @options['credentials_file'] ||= FaaStRuby.credentials_file
         end
 
         def run
@@ -63,4 +63,4 @@ module FaaStRuby
       end
     end
   end
-end
+end

data/lib/faastruby/cli/commands/workspace/list.rb

@@ -19,7 +19,7 @@ module FaaStRuby
         def print_functions_table(functions)
           no_functions unless functions.any?
           rows = functions.map do |function_name|
-            [function_name, "#{HOST}/#{@workspace_name}/#{function_name}"]
+            [function_name, "#{FaaStRuby.api_host}/#{@workspace_name}/#{function_name}"]
           end
           table = TTY::Table.new(['FUNCTION','ENDPOINT'], rows)
           puts table.render(:basic)
@@ -51,4 +51,4 @@ module FaaStRuby
       end
     end
   end
-end
+end

data/lib/faastruby/cli/credentials.rb

@@ -1,6 +1,6 @@
 module FaaStRuby
   class Credentials # TODO: change it to YAML?
-    def self.load_credentials_file(credentials_file = FAASTRUBY_CREDENTIALS)
+    def self.load_credentials_file(credentials_file = FaaStRuby.credentials_file)
       if File.file?(credentials_file)
         creds = Oj.load(File.read(credentials_file))
         return creds if creds.is_a?(Hash)
@@ -34,7 +34,7 @@ module FaaStRuby
       puts "#{symbol} f #{credentials_file}".colorize(color)
     end
 
-    def self.load_for(workspace_name, cred_file = FAASTRUBY_CREDENTIALS)
+    def self.load_for(workspace_name, cred_file = FaaStRuby.credentials_file)
       credentials = load_from_env(workspace_name) || load_credentials_file(cred_file)
       FaaStRuby::CLI.error("Could not find credentials for '#{workspace_name}' in '#{cred_file}'") unless credentials.has_key?(workspace_name)
       FaaStRuby.configure do |config|
@@ -49,4 +49,4 @@ module FaaStRuby
       {workspace_name => {'api_key' => ENV['FAASTRUBY_API_KEY'], 'api_secret' => ENV['FAASTRUBY_API_SECRET']}}
     end
   end
-end
+end

data/lib/faastruby/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faastruby
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Paulo Arruda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-26 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client