faastruby 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d752da5ce5767b5c7b97f6e53e884ab2ba0123f36f713f6a70ba82fc8055acf
-  data.tar.gz: d9c3038e42ca26f6b3de8953c06c7724a046549ae49942040ab8d9c3344536d2
+  metadata.gz: 335fa3ccc2c149a7f7c8f1551bf9e19d20d6195a81020557d252d580e157785c
+  data.tar.gz: ec71694b2713127f156d6424c71594559da5a44f80b434a5a2dc9b87cfbaa8b1
 SHA512:
-  metadata.gz: 60085ed613203a88e39cbcc17aba0de3ed3884d6794255385e887c042097a871af5cb00069f422bcf96d855a969ec0e9253c98baf37c2819cefaf32737b8c6a0
-  data.tar.gz: 2e50627ab43fd3fa0a6eabd702211d9df7759d810fa1691ef57177d390f4fa74730412b2c0c2c40a4429f05b83977520213a9fcac579766bf4c44bb459c61562
+  metadata.gz: 1d28851b29694062dcb7a4a04b35e290629a6f759dda9c244cdc44bef0eea177a37bc2f946042855f9fdd3bd1faa072e3c51d0b6bf9f391ad409fa6392b6dbc6
+  data.tar.gz: 758524d34c9a46aaf105ff92dd0618de98574e44fd0fad5543764b1e4a74b773659aafe8f601d45dd1400c51472556aa67a642f13bb353ade244746e68496e6e

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.3 - Dec 21 2018
+- `deploy-to` will try to create the workspace if it doesn't exist.
+- Changed template to add a carriage return.
+
 ## 0.3.2 - Dec 15 2018
 - Better output for tests
 - `bundle check && bundle install` runs before building a package to make sure Gemfile.lock is updated.

data/example/handler.rb

@@ -21,5 +21,5 @@ def handler event
   # The 'Content-Type' header is automatically set when you use 'render'.
   # You can set custom headers using a hash with string keys. Example:
   # render text: 'It Works!', headers: {'TransactionId' => 23928}
-  render text: "Hello, #{data['name'] || 'World'}!"
+  render text: "Hello, #{data['name'] || 'World'}!\n"
 end

data/example/spec/handler_spec.rb

@@ -10,11 +10,11 @@ describe 'handler(event)' do
   end
   it 'should add the name to the response string' do
     body = handler(event).call.body
-    expect(body).to be == 'Hello, Ruby!'
+    expect(body).to be == "Hello, Ruby!\n"
   end
   it 'should say Hello, World! when name is not present' do
     event = SpecHelper::Event.new(body: nil)
     body = handler(event).call.body
-    expect(body).to be == 'Hello, World!'
+    expect(body).to be == "Hello, World!\n"
   end
 end

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

@@ -10,10 +10,11 @@ module FaaStRuby
           load_yaml
           @function_name = @yaml_config['name']
           @abort_when_tests_fail = @yaml_config['abort_deploy_when_tests_fail']
-          FaaStRuby::Credentials.load_for(@workspace_name)
+          load_credentials(exit_on_error: false)
         end
 
         def run
+          create_or_use_workspace
           FaaStRuby::CLI.error('Please fix the problems above and try again') unless bundle_install
           tests_passed = run_tests
           FaaStRuby::CLI.error("Deploy aborted because tests failed and you have 'abort_deploy_when_tests_fail: true' in 'faastruby.yml'") unless tests_passed || !@abort_when_tests_fail
@@ -26,6 +27,7 @@ module FaaStRuby
             FaaStRuby::CLI.error(workspace.errors)
           end
           spinner.stop('Done!')
+          puts "Endpoint: #{FaaStRuby.api_host}/#{@workspace_name}/#{@function_name}"
           exit 0
         end
 
@@ -39,6 +41,24 @@ module FaaStRuby
 
         private
 
+        def load_credentials(exit_on_error:)
+          @has_credentials = FaaStRuby::Credentials.load_for(@workspace_name, exit_on_error: exit_on_error)
+        end
+
+        def create_or_use_workspace
+          unless @has_credentials
+            puts "Attemping to create workspace '#{@workspace_name}'"
+            cmd = FaaStRuby::Command::Workspace::Create.new([@workspace_name])
+            cmd.run(create_directory: false, exit_on_error: false)
+            load_credentials(exit_on_error: true)
+            # Give a little bit of time after creating the workspace
+            # for consistency. This is temporary until the API gets patched.
+            spinner = spin("Waiting for the new workspace to be ready...")
+            sleep 2
+            spinner.stop("Done!")
+          end
+        end
+
         def bundle_install
           puts '[build] Verifying dependencies'
           return true unless File.file?('Gemfile')

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

@@ -12,11 +12,11 @@ module FaaStRuby
           @options['credentials_file'] ||= FaaStRuby.credentials_file
         end
 
-        def run
+        def run(create_directory: true, exit_on_error: true)
           spinner = spin("Requesting credentials...")
           workspace = FaaStRuby::Workspace.create(name: @workspace_name, email: @options['email'])
           spinner.stop("Done!")
-          FaaStRuby::CLI.error(workspace.errors) if workspace.errors.any?
+          FaaStRuby::CLI.error(workspace.errors) if workspace.errors.any? && exit_on_error
           if @options['stdout']
             puts "IMPORTANT: Please store the credentials below in a safe place. If you lose them you will not be able to manage your workspace.".yellow
             puts "API_KEY: #{workspace.credentials['api_key']}"
@@ -26,7 +26,7 @@ module FaaStRuby
             FaaStRuby::Credentials.add(@workspace_name, workspace.credentials, @options['credentials_file'])
           end
           puts "Workspace '#{@workspace_name}' created"
-          create_dir unless dir_exists?
+          create_dir if create_directory && !dir_exists?
         end
 
         def self.help

data/lib/faastruby/cli/credentials.rb

@@ -34,13 +34,20 @@ module FaaStRuby
       puts "#{symbol} f #{credentials_file}".colorize(color)
     end
 
-    def self.load_for(workspace_name, cred_file = FaaStRuby.credentials_file)
+    def self.load_for(workspace_name, cred_file = FaaStRuby.credentials_file, exit_on_error: true)
       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)
+      error_msg = "Could not find credentials for '#{workspace_name}' in '#{cred_file}'"
+      if exit_on_error && !credentials[workspace_name]
+        FaaStRuby::CLI.error(error_msg)
+      elsif !credentials[workspace_name]
+        puts error_msg
+        return false
+      end
       FaaStRuby.configure do |config|
         config.api_key = credentials[workspace_name]['api_key']
         config.api_secret = credentials[workspace_name]['api_secret']
       end
+      return true
     end
 
     def self.load_from_env(workspace_name)

data/lib/faastruby/version.rb

@@ -1,3 +1,3 @@
 module FaaStRuby
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faastruby
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Paulo Arruda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-16 00:00:00.000000000 Z
+date: 2018-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client