faastruby 0.5.19 → 0.5.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 046d0271b8826abfd5121470bc44e9c3a6c3b38917a49790a4f3d79175195277
-  data.tar.gz: 00a4f44e6ac51175db2aeac4dccc510fa11631733a6e497850cc731870fc67ef
+  metadata.gz: c3e04a1ad4fa50f8e90c8affd5c16628da87e002a09ffeb3e169cb2bad891c72
+  data.tar.gz: e3dbcb01e86e5b67845790375cd1456c95dea6d095e0aff580f670a687a0cbf9
 SHA512:
-  metadata.gz: 1549dfe56b23b4c6572bfd11fcde694db2be9aa95e00b753e5b0f6d83810d4d72d0ae7658df35fa5a6a45a46bb7a739da83ef0a9f97efec90b344b1bc95cdba7
-  data.tar.gz: 3b4a8780e15665f3e26db87f2650e5b35ac09170c74d504cfd20de8924e1518950a2ffb1e79b7e714f05a9da2961a6a9180aa9cb45794532662dfd8c5ee40de3
+  metadata.gz: 94ddb8c515d614fe73ce7f8ba1b4f05d4025ec4116e57dc9adb04a3fbee2f8711ba04f74d3398d276196f8d8efed27f11ffcd3cffc53d9af971337d58b9b81a7
+  data.tar.gz: 21dce789bdc3540b9a99175bd6dde42f2a11dd61e8c4d7f959023aa625028d320cf2a6f29783e2d1d8678532a74cc46f5cb5dd9f4ce19a16837c2a317a785cc5

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.5.20 - Mar 24 2019
+- Improved email regex.
+- Display the correct error message when confirmation token is invalid
+- Add option `--skip-dependencies` to the commands `deploy-to` and `deploy` to allow skipping of `bundle install` and `shards install`.
+- Change Ruby runtimes to `2.5` and `2.6` and use the pessimistic version operator to compare Ruby versions and maintain backwards compatibility.
+- Fix error message on `deploy-to` when workspace credentials are missing
+
 ## 0.5.19 - Mar 20 2019
 - Fix bug preventing `faastruby deploy` from working when secrets are nil
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    faastruby (0.5.19)
+    faastruby (0.5.20)
       colorize (~> 0.8)
       faastruby-rpc (~> 0.2.6)
       listen (~> 3.1)
@@ -47,7 +47,7 @@ GEM
     mustermann (1.0.3)
     necromancer (0.4.0)
     netrc (0.11.0)
-    oj (3.7.10)
+    oj (3.7.11)
     pastel (0.7.2)
       equatable (~> 0.5.0)
       tty-color (~> 0.4.0)

data/lib/faastruby/cli.rb

@@ -46,7 +46,12 @@ module FaaStRuby
 
     def self.check_ruby_version
       require 'faastruby/supported_runtimes'
-      error("Unsupported Ruby version: #{RUBY_VERSION}\nSupported Ruby versions are: #{SUPPORTED_RUBY.join(", ")}") unless SUPPORTED_RUBY.include?(RUBY_VERSION)
+      error("Unsupported Ruby version: #{RUBY_VERSION}\nSupported Ruby versions are: #{SUPPORTED_RUBY.join(", ")}") unless version_match?(SUPPORTED_RUBY, RUBY_VERSION)
+    end
+
+    def self.version_match?(supported, current)
+      supported.each {|supported_version| return true if Gem::Dependency.new('', supported_version).match?('', current)}
+      return false
     end
 
     def self.check_region

data/lib/faastruby/cli/base_command.rb

@@ -2,6 +2,7 @@ require 'tty-spinner'
 require 'yaml'
 module FaaStRuby
   module Command
+    DEFAULT_RUBY_RUNTIME = "ruby:#{CURRENT_MINOR_RUBY}".freeze
     class BaseCommand
       def self.spin(message=nil)
         s = ":spinner"

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

@@ -1,6 +1,8 @@
 module FaaStRuby
   module Command
     module Account
+      PASSWORD_REGEX = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,50}$/
+      EMAIL_REGEX = /\A[a-z0-9\-\.+]+@[a-z\d\-]+(\.[a-z]+)*\.[a-z]+\z/i
       require 'faastruby/user'
       require 'faastruby/cli/new_credentials'
       class AccountBaseCommand < BaseCommand

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

@@ -22,7 +22,10 @@ module FaaStRuby
           user.confirmation_token = STDIN.gets.chomp
           spinner = spin("Confirming your account...")
           user.confirm_account!
-          FaaStRuby::CLI.error(user.errors) if user.errors.any?
+          if user.errors.any?
+            spinner.error
+            FaaStRuby::CLI.error(user.errors)
+          end
           spinner.success
           user.save_credentials
           puts "Login successful!"

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

@@ -1,8 +1,6 @@
 module FaaStRuby
   module Command
     module Account
-      PASSWORD_REGEX = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,50}$/
-      EMAIL_REGEX = /\A([\w+\-].?)+@[a-z\d\-]+(\.[a-z]+)*\.[a-z]+\z/i
       require 'faastruby/cli/commands/account/base_command'
       require 'io/console'
       class Signup < AccountBaseCommand

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

@@ -99,6 +99,8 @@ module FaaStRuby
 --set-root                         # Set the function as the root route for the workspace.
 --set-catch-all                    # Set the function as the catch-all route for the workspace.
 --dont-create-workspace            # Don't try to create the workspace if it doesn't exist.
+--skip-dependencies                # Don't try to install Gems or Shards before creating
+                                   #  the deployment package
           )
         end
 
@@ -120,7 +122,7 @@ module FaaStRuby
         end
 
         def shards_install
-          return true unless File.file?('shard.yml')
+          return true unless File.file?('shard.yml') && @options['skip_dependencies'].nil?
           # puts "[#{@function_name}] Verifying dependencies" unless @options["quiet"]
           system('shards check > /dev/null') || system('shards install')
         rescue Errno::EPIPE
@@ -128,7 +130,7 @@ module FaaStRuby
         end
 
         def bundle_install
-          return true unless File.file?('Gemfile')
+          return true unless File.file?('Gemfile') && @options['skip_dependencies'].nil?
           # puts "* [#{@function_name}] Verifying dependencies" unless @options["quiet"]
           system('bundle check >/dev/null') || system('bundle install')
         rescue Errno::EPIPE
@@ -185,6 +187,8 @@ module FaaStRuby
               @options['is_catch_all'] = true
             when '--dont-create-workspace'
               @options['dont_create_workspace'] = true
+            when '--skip-dependencies'
+              @options['skip_dependencies'] = true
             else
               FaaStRuby::CLI.error("Unknown argument: #{option}")
             end

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

@@ -17,7 +17,7 @@ module FaaStRuby
           parse_options
           @base_dir ||= @function_name
           @options['runtime_name'] ||= 'ruby'
-          @options['runtime_version'] ||= '2.5.3'
+          @options['runtime_version'] ||= CURRENT_MINOR_RUBY
           if @options['blank_template']
             @options['template'] = FaaStRuby::Template.new(type: 'local', source: Template.gem_template_path_for('example-blank', runtime: @options['runtime_name'] || 'ruby'))
           else
@@ -34,7 +34,7 @@ module FaaStRuby
             @yaml_content['name'] = @function_name
             @options['runtime_name'], @options['runtime_version'] = @yaml_content['runtime']&.split(':')
             @options['runtime_name'] ||= 'ruby'
-            @options['runtime_version'] ||= '2.5.3'
+            @options['runtime_version'] ||= CURRENT_MINOR_RUBY
           else
             @yaml_content = yaml_for(@options['runtime_name'])
           end
@@ -143,14 +143,14 @@ module FaaStRuby
             {
               'cli_version' => FaaStRuby::VERSION,
               'name' => @function_name,
-              'runtime' => @options['runtime'] || 'ruby:2.5.3'
+              'runtime' => @options['runtime'] || DEFAULT_RUBY_RUNTIME
             }
           else
             {
               'cli_version' => FaaStRuby::VERSION,
               'name' => @function_name,
               'before_build' => [],
-              'runtime' => @options['runtime'] || 'ruby:2.5.3',
+              'runtime' => @options['runtime'] || DEFAULT_RUBY_RUNTIME,
               'test_command' => test_command
             }
           end

data/lib/faastruby/cli/commands/project/deploy.rb

@@ -48,12 +48,12 @@ module FaaStRuby
             jobs << Thread.new do
               function_config = YAML.load(File.read("#{function_path}/faastruby.yml"))
               function_name = function_config['name']
-              msg = function_name == 'public' ? "Uploading static assets in '#{function_name}'" : "Deploying function '#{function_path}'"
+              msg = function_name == 'public' ? "Uploading static assets in '#{function_name}'" : "Deploying function from '#{function_path}'"
               spinner = @spinners.register "[:spinner] #{msg}"
               spinner.auto_spin
               # puts "[#{function_path}] Entering folder '#{function_path}'"
               # Dir.chdir function_path
-              cmd = "cd #{function_path} && faastruby deploy-to #{@workspace} --quiet --dont-create-workspace"
+              cmd = "cd #{function_path} && faastruby deploy-to #{@workspace} --quiet --dont-create-workspace #{'--skip-dependencies' if @options['skip_dependencies']}"
               cmd += " --set-root" if @root_to == function_name
               cmd += " --set-catch-all" if @catch_all == function_name
               secrets = secrets_for(function_name)
@@ -100,7 +100,7 @@ module FaaStRuby
           continue = has_credentials || try_to_create.call
           unless continue
             connect_spinner.error
-            FaaStRuby::CLI.error("Unable to deploy project to workspace '#{workspace}'. Make sure you have the credentials, or try a different environment name.\nExample: faastruby deploy --deploy-env #{@options['environment']}-#{(rand * 100).to_i}")
+            FaaStRuby::CLI.error("Unable to deploy project to workspace '#{workspace}'. Make sure you have the credentials, or try a different environment name.\nExample: faastruby deploy --env #{@options['environment']}-#{(rand * 100).to_i}")
           end
           connect_spinner.success
           true
@@ -122,9 +122,11 @@ module FaaStRuby
           puts "Usage: faastruby #{self.class.help}"
           puts %(
 -f,--function FUNCTION_PATH    # Specify the path to the function directory in your local machine.
-                               # This argument can be repeated many times for multiple functions. Example:
-                               # -f path/to/function1 -f path/to/function2
+                               #  This argument can be repeated many times for multiple functions.
+                               #  Example: -f path/to/function1 -f path/to/function2
 -e,--env ENVIRONMENT           # ENVIRONMENT is added to the project's name to compose the workspace name.
+--skip-dependencies            # Don't try to install Gems or Shards before creating
+                               #  the deployment package
           )
         end
 
@@ -133,6 +135,8 @@ module FaaStRuby
           while @args.any?
             option = @args.shift
             case option
+            when '--skip-dependencies'
+              @options['skip_dependencies'] = true
             when '--skip-create-workspace'
               @options['skip_create_workspace'] = true
             when '--function', '-f'

data/lib/faastruby/local.rb

@@ -26,12 +26,17 @@ module FaaStRuby
 
     def self.crystal_present_and_supported?
       debug "self.crystal_present_and_supported?"
-      system("which crystal >/dev/null") && SUPPORTED_CRYSTAL.include?(get_crystal_version)
+      system("which crystal >/dev/null") && version_match?(SUPPORTED_CRYSTAL, get_crystal_version)
     end
 
     def self.ruby_present_and_supported?
       debug "self.ruby_present_and_supported?"
-      system("which ruby >/dev/null") && SUPPORTED_RUBY.include?(RUBY_VERSION)
+      system("which ruby >/dev/null") && version_match?(SUPPORTED_RUBY, RUBY_VERSION)
+    end
+
+    def self.version_match?(supported, current)
+      supported.each {|supported_version| return true if Gem::Dependency.new('', supported_version).match?('', current)}
+      return false
     end
 
     def self.check_if_logged_in
@@ -52,7 +57,7 @@ module FaaStRuby
     RUBY_ENABLED = ruby_present_and_supported?
     unless RUBY_ENABLED || CRYSTAL_ENABLED
       puts "\n[ERROR] You need to have one of the following 'language:version' pairs in order to use FaaStRuby Local."
-      puts SUPPORTED_RUNTIMES.join(', ') + "\n"*2
+      puts SUPPORTED_RUNTIMES.join(', ') + "\n\n"
       exit 1
     end
     SERVER_ROOT = Dir.pwd
@@ -62,10 +67,11 @@ module FaaStRuby
     SYNC_ENABLED = ENV['SYNC'] && check_if_logged_in
     CRYSTAL_VERSION = get_crystal_version.freeze
     DEFAULT_CRYSTAL_RUNTIME = "crystal:#{CRYSTAL_VERSION}".freeze
-    DEFAULT_RUBY_RUNTIME = "ruby:#{RUBY_VERSION}".freeze
+    DEFAULT_RUBY_RUNTIME = "ruby:#{CURRENT_MINOR_RUBY}".freeze
     FUNCTIONS_EVENT_QUEUE = Queue.new
     PUBLIC_EVENT_QUEUE = Queue.new
-
+    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
       debug "self.workspace"
       return "#{project_config['name']}-#{DEPLOY_ENVIRONMENT}-#{project_config['identifier']}" if project_config['identifier']

data/lib/faastruby/server.rb

@@ -9,18 +9,23 @@ module FaaStRuby
   end
 
   def self.crystal_present_and_supported?
-    system("which crystal >/dev/null") && SUPPORTED_CRYSTAL.include?(get_crystal_version)
+    system("which crystal >/dev/null") && version_match?(SUPPORTED_CRYSTAL, get_crystal_version)
   end
 
   def self.ruby_present_and_supported?
-    system("which ruby >/dev/null") && SUPPORTED_RUBY.include?(RUBY_VERSION)
+    system("which ruby >/dev/null") && version_match?(SUPPORTED_RUBY, RUBY_VERSION)
+  end
+
+  def self.version_match?(supported, current)
+    supported.each {|supported_version| return true if Gem::Dependency.new('', supported_version).match?('', current)}
+    return false
   end
 
   CRYSTAL_ENABLED = crystal_present_and_supported?
   RUBY_ENABLED = ruby_present_and_supported?
   unless RUBY_ENABLED || CRYSTAL_ENABLED
     puts "\n[ERROR] You need to have one of the following language:version pairs in order to use FaaStRuby Local."
-    puts SUPPORTED_RUNTIMES.join(', ') + "\n"*2
+    puts SUPPORTED_RUNTIMES.join(', ') + "\n\n"
     exit 1
   end
   SERVER_ROOT = Dir.pwd
@@ -39,7 +44,7 @@ module FaaStRuby
   CHDIR_MUTEX = Mutex.new
   CRYSTAL_VERSION = get_crystal_version.freeze
   DEFAULT_CRYSTAL_RUNTIME = "crystal:#{CRYSTAL_VERSION}".freeze
-  DEFAULT_RUBY_RUNTIME = "ruby:#{RUBY_VERSION}".freeze
+  DEFAULT_RUBY_RUNTIME = "ruby:#{CURRENT_MINOR_RUBY}".freeze
   require 'faastruby/server/logger'
   require 'faastruby/server/project_config'
   require 'faastruby/server/local'

data/lib/faastruby/supported_runtimes.rb

@@ -1,8 +1,9 @@
 module FaaStRuby
   # It is important that they are sorted in version order!
-  SUPPORTED_RUBY = ['2.5.3', '2.6.0', '2.6.1']
+  SUPPORTED_RUBY = ['~> 2.5.0', '~> 2.6.0']
   SUPPORTED_CRYSTAL = ['0.27.0', '0.27.2']
   CRYSTAL_LATEST = SUPPORTED_CRYSTAL.last
   RUBY_LATEST = SUPPORTED_RUBY.last
-  SUPPORTED_RUNTIMES = SUPPORTED_RUBY.map{|version| "ruby:#{version}"} + SUPPORTED_CRYSTAL.map{|version| "crystal:#{version}"}
+  SUPPORTED_RUNTIMES = ['ruby:2.5', 'ruby:2.6'] + SUPPORTED_CRYSTAL.map{|version| "crystal:#{version}"}
+  CURRENT_MINOR_RUBY = RUBY_VERSION.split('.')[0..1].join('.')
 end

data/lib/faastruby/version.rb

@@ -1,3 +1,3 @@
 module FaaStRuby
-  VERSION = '0.5.19'
+  VERSION = '0.5.20'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faastruby
 version: !ruby/object:Gem::Version
-  version: 0.5.19
+  version: 0.5.20
 platform: ruby
 authors:
 - Paulo Arruda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-20 00:00:00.000000000 Z
+date: 2019-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client