faastruby 0.5.22 → 0.5.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e08bac2ed5dcabe21891e5945035651d1013743aadba90de392ef7295cd2a95
-  data.tar.gz: ad2984694a429edd97df32d53cbe2594a67282f1158ae3ddc0853a9b51e150de
+  metadata.gz: 4bb0861a4131568e00f7008cea2ad1a83f179b739788ad09d21780e82c9edf41
+  data.tar.gz: be634ded83c995f6a5b86293960d09535a10509c119f49f425825664c0b0567a
 SHA512:
-  metadata.gz: bc3264038b2bff85ad9e5b2f2a52133d0bd0c91b250a931dd6b5d467bfd02e9e9cfeeb64f19a50f4a1915867634d4ce4a5db467ebb73130a051e5eb8e420fbee
-  data.tar.gz: 43e91e8bc235ee6de9147d8085113bc3511668349b1b5a708e7bf971fbfe9a7324bdc80f519da390b7712ed5bfe517488beb3754ac236d86e9a450c6570c1271
+  metadata.gz: 778433fef0a7ad573166042f0c0bc559e9ccb4218fe0ab70b845d1ff64a4e294007f817f1de452ad815574264e04b6cd928ac7a6537aaf51cf09e635ddce8cb1
+  data.tar.gz: 23df4f5fc80cdf5c6216d542ec6065022d605c0ce625b5810560a9a1839d3c6bd5b02852a7eb60a0de416807ebdb507e7c55ae4d51ed099c235bae359b6c50e3

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 
-## 0.5.22 - unreleased
+## 0.5.23 - Apr 7 2019
+- Move regions configuration to a separate file, so it can be shared among different components of the gem
+- Replace hardcoded URLs by the correct variables
+- Fix messy env vars
+- Ensure logout happens even if connection to the API fails
+- Bump faastruby-rpc to 0.2.7
+
+## 0.5.22 - April 1 2019
 - Detect Crystal functions that have `handler.cr` inside `src` directory
 - Exclude Crystal function handler binaries when generating a deployment package
 - Move Crystal Runtime Macro to the top of the file, outside the FaaStRuby module

data/Gemfile.lock

@@ -3,7 +3,7 @@ PATH
   specs:
     faastruby (0.5.22)
       colorize (~> 0.8)
-      faastruby-rpc (~> 0.2.6)
+      faastruby-rpc (~> 0.2.7)
       listen (~> 3.1)
       oj (~> 3.6)
       puma (~> 3.12)
@@ -21,7 +21,7 @@ GEM
   specs:
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    backports (3.12.0)
+    backports (3.13.0)
     colorize (0.8.1)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -30,7 +30,7 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     equatable (0.5.0)
     erubis (2.7.0)
-    faastruby-rpc (0.2.6)
+    faastruby-rpc (0.2.7)
       oj (~> 3.6)
     ffi (1.10.0)
     hashdiff (0.3.7)
@@ -53,7 +53,7 @@ GEM
       tty-color (~> 0.4.0)
     public_suffix (3.0.3)
     puma (3.12.1)
-    rack (2.0.6)
+    rack (2.0.7)
     rack-protection (2.0.5)
       rack
     rake (10.5.0)

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.6'
+  spec.add_runtime_dependency 'faastruby-rpc', '~> 0.2.7'
   spec.add_runtime_dependency 'tmuxinator', '~> 0.15'
   spec.add_runtime_dependency 'rouge', '~> 3.3'
   spec.add_runtime_dependency 'listen', '~> 3.1'

data/lib/faastruby/base.rb

@@ -1,10 +1,8 @@
 module FaaStRuby
+  require "faastruby/regions"
   ROOT_DOMAIN = ENV['FAASTRUBY_ROOT_DOMAIN'] || 'faastruby.io'
   WORKSPACE_BASE_HOST = ENV['FAASTRUBY_WORKSPACE_BASE_HOST'] || 'faast.cloud'
-  DEFAULT_REGION = 'tor1'
-  REGIONS = [
-    'tor1'
-  ]
+  URL_PROTOCOL = ENV['FAASTRUBY_URL_PROTOCOL'] || 'https'
   class << self
     attr_accessor :configuration
   end
@@ -26,18 +24,12 @@ 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}"
+    ENV['FAASTRUBY_HOST'] || "#{URL_PROTOCOL}://api.#{region}.#{ROOT_DOMAIN}"
   end
 
   def self.workspace_host_for(workspace_name)
-    "https://#{workspace_name}.#{region}.#{WORKSPACE_BASE_HOST}"
+    "#{URL_PROTOCOL}://#{workspace_name}.#{region}.#{WORKSPACE_BASE_HOST}"
   end
 
   class Configuration

data/lib/faastruby/cli.rb

@@ -6,6 +6,7 @@ module FaaStRuby
   FAASTRUBY_YAML = 'faastruby.yml'
   SPINNER_FORMAT = :spin_2
   require 'faastruby/supported_runtimes'
+  require 'faastruby/regions'
   class CLI
     def self.error(message, color: :red)
       message.compact.each {|m| STDERR.puts m.colorize(color)} if message.is_a?(Array)

data/lib/faastruby/cli/commands/account/logout.rb

@@ -18,6 +18,7 @@ module FaaStRuby
           end
           user.logout(all: @options['all'])
           FaaStRuby::CLI.error(user.errors) if !@options['force'] && user&.errors.any?
+        ensure
           @credentials_file.clear
           puts "Logout successful."
         end

data/lib/faastruby/local.rb

@@ -9,6 +9,7 @@ module FaaStRuby
     require 'pathname'
     require 'securerandom'
     require 'faastruby/version'
+    require 'faastruby/regions'
     require 'faastruby/supported_runtimes'
     require 'faastruby/local/logger'
     require 'faastruby/local/functions'
@@ -70,6 +71,8 @@ module FaaStRuby
     DEFAULT_RUBY_RUNTIME = "ruby:#{CURRENT_MINOR_RUBY}".freeze
     FUNCTIONS_EVENT_QUEUE = Queue.new
     PUBLIC_EVENT_QUEUE = Queue.new
+    WORKSPACE_BASE_HOST = ENV['FAASTRUBY_WORKSPACE_BASE_HOST'] || 'faast.cloud'
+    URL_PROTOCOL = ENV['FAASTRUBY_URL_PROTOCOL'] || 'https'
     puts "Using '#{DEFAULT_RUBY_RUNTIME}' as default Ruby runtime." if RUBY_ENABLED
     puts "Using '#{DEFAULT_CRYSTAL_RUNTIME}' as default Crystal runtime." if CRYSTAL_ENABLED
     def self.workspace
@@ -139,7 +142,7 @@ module FaaStRuby
       # initial_compile
       puts "Listening for changes."
       puts "faastRuby Local is ready at http://localhost:3000"
-      puts "Your cloud workspace address is https://#{workspace}.tor1.faast.cloud" if SYNC_ENABLED
+      puts "Your cloud workspace address is #{URL_PROTOCOL}://#{workspace}.#{FaaStRuby.region}.#{WORKSPACE_BASE_HOST}" if SYNC_ENABLED
       sleep
     ensure
       puts "Stopping Watchdog..."
@@ -160,7 +163,7 @@ module FaaStRuby
     def self.sync_mode_enabled
       debug __method__
       puts "Sync mode enabled."
-      puts "Your local environment will be synced to https://#{workspace}.tor1.faast.cloud"
+      puts "Your local environment will be synced to #{URL_PROTOCOL}://#{workspace}.#{FaaStRuby.region}.#{WORKSPACE_BASE_HOST}"
       system("faastruby deploy --env #{DEPLOY_ENVIRONMENT}")
       true
     end

data/lib/faastruby/regions.rb

@@ -0,0 +1,12 @@
+module FaaStRuby
+  DEFAULT_REGION = 'tor1'
+  REGIONS = [
+    'tor1'
+  ]
+
+  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
+end

data/lib/faastruby/version.rb

@@ -1,3 +1,3 @@
 module FaaStRuby
-  VERSION = '0.5.22'
+  VERSION = '0.5.23'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faastruby
 version: !ruby/object:Gem::Version
-  version: 0.5.22
+  version: 0.5.23
 platform: ruby
 authors:
 - Paulo Arruda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2019-04-07 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.6
+        version: 0.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.2.7
 - !ruby/object:Gem::Dependency
   name: tmuxinator
   requirement: !ruby/object:Gem::Requirement
@@ -323,6 +323,7 @@ files:
 - lib/faastruby/local/processors/static_file.rb
 - lib/faastruby/local/static_files.rb
 - lib/faastruby/local/static_files/static_file.rb
+- lib/faastruby/regions.rb
 - lib/faastruby/server.rb
 - lib/faastruby/server/app.rb
 - lib/faastruby/server/concurrency_controller.rb