faastruby 0.5.9 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad8d16f69c2faa2730dde9c389f3d2485bbbba81b348ae20bd5f4e6074cd4477
-  data.tar.gz: 0b156a957b0cb34b436353cf0e89f192232b8f01239ec4f41c5ef9e3bb52c97d
+  metadata.gz: 8708963b2799676a36e2a8e78424656d9cb415c90d1b94efc75142f7976f7c6a
+  data.tar.gz: 47f5c687fc019a1a124a975a697b76c461dc9f31b141b30c710c20e6d3e17011
 SHA512:
-  metadata.gz: 3292a49454d2a445d032653569ef201f2365c676ffa7b82c907ba4e3edda2e62043c58e2b2493c0747c96131df94eef1a2d58ae0acbff791c2abdd77881cb981
-  data.tar.gz: b78fdfb6a57e1666579f8ab0330bb4c2cce3872dd18ec1ff41ee69e9f43c09c3ecfe936151bacd15eecae42293c21fca3b03f1c60056b140d2b64a818c617dbe
+  metadata.gz: 83dfa0ec0f1fed55fe7cdfe894cce2d78dba942668d279f7d83e86e1303204dd695517e1f752fe61fd96e612ab1149e2db788d02aff3c92e2cdcb80453bebd93
+  data.tar.gz: d234ef49f82abee9162b26bb99c5c78099d5b6ff18afe22422de39287316f3af74b478d950fa7c5af3cb4be1cf5f3a10a7386481fbe1fd22cfcaa009724ea64d

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.5.10 - unreleased
+- Fix Watchdog message when a function is removed from the project.
+- Add method render_nothing to ruby and crystal functions, to make it clear how to send an empty response body
+- Empty functions will render an empty body
+- Ensure Watchdog listeners stop when exiting
+- Fix bug preventing `--create-local-dir` from creating a folder when `create-workspace` is used
+- Change message confirmation when destroying a workspace
+- Update YAML template comments with mention to `test_command`
+- FaaStRuby Local won't start unless it can find `project.yml` in current directory.
+- Fix command `faastruby deploy`
+- Fix bug when response headers are empty
+
 ## 0.5.9 - Mar 11 2019
 - Add Gemfile support to Watchdog. When a `Gemfile` is added to a function, Watchdog will initialize it if the file is empty and run `bundle install` every time you modify it.
 - Watchdog will stream the output of commands instead of printing everything once it's done.

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    faastruby (0.5.7)
+    faastruby (0.5.10)
       colorize (~> 0.8)
-      faastruby-rpc (~> 0.2.2)
+      faastruby-rpc (~> 0.2.3)
       listen (~> 3.1)
       oj (~> 3.6)
       puma (~> 3.12)
@@ -30,7 +30,7 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     equatable (0.5.0)
     erubis (2.7.0)
-    faastruby-rpc (0.2.2)
+    faastruby-rpc (0.2.3)
       oj (~> 3.6)
     ffi (1.10.0)
     hashdiff (0.3.7)

data/lib/faastruby/api.rb

@@ -204,7 +204,7 @@ module FaaStRuby
     end
 
     def parse(response)
-      if latest_version = response.headers[:x_update_available]
+      if response.headers && latest_version = response.headers[:x_update_available]
         puts "########### FaaStRuby Update Available ###########"
         puts "# Latest version: #{latest_version}                          #"
         puts "# Please run 'faastruby update'                  #"

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

@@ -106,6 +106,10 @@ module FaaStRuby
 
         def yaml_comments
           [
+            '## To run tests before each deploy, uncomment the line below',
+            '## and change the command if you are not using Rspec.',
+            '# test_command: rspec',
+            '',
             '## You can add commands to run locally before building the deployment package.',
             "## Some use cases are:",
             "## * minifying Javascript/CSS",

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

@@ -3,11 +3,7 @@ module FaaStRuby
     module Project
       PROJECT_YAML_FILE = 'project.yml'
       PROJECT_SECRETS_FILE = 'secrets.yml'
-      PROJECT_CREDENTIALS_FILE = '.credentials.yml'
       class ProjectBaseCommand < BaseCommand
-        def read_credentials_file
-          File.file?(PROJECT_CREDENTIALS_FILE)
-        end
       end
     end
   end

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

@@ -1,3 +1,4 @@
+STDOUT.sync
 require 'open3'
 module FaaStRuby
   module Command
@@ -16,9 +17,9 @@ module FaaStRuby
           @options['environment'] ||= 'stage'
           @project_yaml = YAML.load(File.read(PROJECT_YAML_FILE))['project'] rescue FaaStRuby::CLI.error("Could not find file 'project.yml'. Are you running this command from the project's folder?")
           @project_name = @project_yaml['name']
+          @root_to = @project_yaml['root_to'] || 'root'
+          @catch_all = @project_yaml['catch_all'] || 'catch-all'
           @project_identifier = "-#{@project_yaml['identifier']}" if @project_yaml['identifier']
-          @options['root_to'] ||= @project_yaml['root_to']
-          @options['catch_all'] ||= @project_yaml['catch_all']
         end
 
         def puts(msg)
@@ -33,17 +34,18 @@ module FaaStRuby
           root_folder = Dir.pwd
           jobs = []
           workspace = "#{@project_name}-#{@options['environment']}#{@project_identifier}"
+          spinner = spin "Deploying project '#{@project_name}' to workspace #{workspace}..."
           try_workspace(workspace)
-          spinner = spin("Deploying project '#{@project_name}'...")
           @options['functions'].each do |function_path|
             jobs << Thread.new do
               # puts "[#{function_path}] Entering folder '#{function_path}'"
               # Dir.chdir function_path
               function_config = YAML.load(File.read("#{function_path}/faastruby.yml"))
               function_name = function_config['name']
-              cmd = "cd #{function_path} && faastruby deploy-to #{workspace} --quiet"
-              cmd += " --set-root" if @options['root_to'] == function_name
-              cmd += " --set-catch-all" if @options['catch_all'] == function_name
+
+              cmd = "cd #{function_path} && faastruby deploy-to #{workspace} --quiet --dont-create-workspace"
+              cmd += " --set-root" if @root_to == function_name
+              cmd += " --set-catch-all" if @catch_all == function_name
               Open3.popen2(cmd) do |stdin, stdout, status_thread|
                 stdout.each_line do |line|
                   puts line
@@ -53,7 +55,6 @@ module FaaStRuby
             end
           end
           jobs.each{|thr| thr.join}
-          spinner.stop(" Done!")
           puts "* Project URL: #{FaaStRuby.workspace_host_for(workspace)}\n\n".green
         end
 
@@ -94,10 +95,6 @@ module FaaStRuby
           while @args.any?
             option = @args.shift
             case option
-            when '--root-to'
-              @options['root_to'] = @args.shift
-            when '--catch-all'
-              @options['catch_all'] = @args.shift
             when '--function', '-f'
               @options['functions'] << @args.shift
             when '--env', '-e'

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

@@ -26,7 +26,6 @@ module FaaStRuby
           FaaStRuby::CLI.error("The project name must have between 3 and 15 characters, and can only have letters, numbers and dashes.") unless name_valid?
           @base_dir = "./#{@project_name}"
           parse_options
-          @options['credentials_file'] ||= PROJECT_CREDENTIALS_FILE
           @options['project_type'] ||= 'web'
         end
 

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

@@ -77,7 +77,7 @@ module FaaStRuby
           while @args.any?
             option = @args.shift
             case option
-            when '--create-local-dir',
+            when '--create-local-dir'
               @options['create_local_dir'] = true
             when '--local-only'
               @options['create_local_dir'] = true

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

@@ -25,14 +25,14 @@ module FaaStRuby
             FaaStRuby::CLI.error(workspace.errors)
           end
           spinner.stop("Done!")
-          puts "Workspace '#{@workspace_name}' was deleted from the server"
+          puts "Workspace '#{@workspace_name}' was deleted from the cloud platform."
         end
 
         private
 
         def warning
           print "WARNING: ".red
-          puts "This action will permanently remove the workspace '#{@workspace_name}' and all its functions from the server."
+          puts "This action will permanently remove the workspace '#{@workspace_name}' and all its functions from the cloud platform."
           print "Are you sure? [y/N] "
           @options['force'] = STDIN.gets.chomp
         end

data/lib/faastruby/local.rb

@@ -101,16 +101,6 @@ module FaaStRuby
       @@functions ||= []
     end
 
-    def self.functions_listener
-      debug "self.functions_listener"
-      @@functions_listener
-    end
-
-    def self.public_listener
-      debug "self.public_listener"
-      @@public_listener
-    end
-
     def self.secrets_for_function(function_name)
       debug "self.secrets_for_function(#{function_name.inspect})"
       deploy_environment_secrets[function_name] || {}
@@ -143,6 +133,10 @@ module FaaStRuby
       FunctionProcessor.new(FUNCTIONS_EVENT_QUEUE).start
       StaticFileProcessor.new(PUBLIC_EVENT_QUEUE).start if SYNC_ENABLED
       sleep
+    ensure
+      puts "Stopping Watchdog..."
+      Local::Listener.functions_listener.each(&:stop)
+      Local::Listener.public_listener.each(&:stop)
     end
 
     def self.initial_compile_and_deploy(crystal_functions)
@@ -175,15 +169,17 @@ module FaaStRuby
     def self.listen_on_functions_dir
       debug "self.listen_on_functions_dir"
       debug "Listening for changes in '#{functions_dir}'"
-      @@functions_listener = Listener.new(directory: functions_dir, queue: FUNCTIONS_EVENT_QUEUE)
-      @@functions_listener.start
+      listener = Listener.new(directory: functions_dir, queue: FUNCTIONS_EVENT_QUEUE)
+      listener.start
+      Local::Listener.functions_listener << listener
     end
 
     def self.listen_on_public_dir
       debug "self.listen_on_public_dir"
       debug "Listening for changes in '#{public_dir}'"
-      @@public_listener = Listener.new(directory: public_dir, queue: PUBLIC_EVENT_QUEUE)
-      @@public_listener.start
+      listener = Listener.new(directory: public_dir, queue: PUBLIC_EVENT_QUEUE)
+      listener.start
+      Local::Listener.public_listener << listener
     end
   end
 end

data/lib/faastruby/local/crystal_runtime.cr

@@ -123,6 +123,10 @@ def render(icon : String? = nil, jpeg : String? = nil, gif : String? = nil, png
   FaaStRuby::Response.new(body: resp_body, status: status, headers: headers, binary: bin)
 end
 
+def render_nothing(status : Int32 = 200, headers : Hash(String, String) = {} of String => String)
+  FaaStRuby::Response.new(body: nil, status: status, headers: headers, binary: false)
+end
+
 def redirect_to(function : String, status : Int32 = 303)
   headers = {"Location" => function}
   FaaStRuby::Response.new(body: nil, status: status, headers: headers)
@@ -160,7 +164,7 @@ rescue e
   exit 1
 end
 spawn do
-  response = FaaStRuby::Function.run(event: payload.event)
+  response = FaaStRuby::Function.run(event: payload.event) || render_nothing
   puts "R,#{Base64.urlsafe_encode(response.payload.to_json)}"
   exit 0
 end

data/lib/faastruby/local/functions/function.rb

@@ -148,6 +148,10 @@ module FaaStRuby
 
       def yaml_comments
         [
+          '## To run tests before each deploy, uncomment the line test_command below',
+          '## and change the command if you are not using Rspec.',
+          '# test_command: rspec',
+          '',
           '## You can add commands to run locally before building the deployment package.',
           "## Some use cases are:",
           "## * minifying Javascript/CSS",

data/lib/faastruby/local/listeners/listener.rb

@@ -1,6 +1,12 @@
 module FaaStRuby
   module Local
     class Listener
+      def self.functions_listener
+        @@functions_listener ||= []
+      end
+      def self.public_listener
+        @@public_listener ||= []
+      end
       include Local::Logger
       attr_accessor :listener, :directory, :queue
       def initialize(directory:, queue:)

data/lib/faastruby/local/processors/function.rb

@@ -60,7 +60,7 @@ module FaaStRuby
         # - Remove from workspace
         if event.file_is_a_function_config?
           debug "removed: the file is a function_config"
-          function_name = event.relative_path
+          function_name = event.relative_path_dirname
           puts "Function '#{function_name}' was removed."
           return remove_from_workspace(event)
         end

data/lib/faastruby/server.rb

@@ -24,7 +24,13 @@ module FaaStRuby
     exit 1
   end
   SERVER_ROOT = Dir.pwd
-  PROJECT_YAML_FILE = ENV['FAASTRUBY_PROJECT_CONFIG_FILE'] || "#{SERVER_ROOT}/project.yml"
+  PROJECT_YAML_FILE = "#{SERVER_ROOT}/project.yml"
+  unless File.file?(PROJECT_YAML_FILE)
+    puts "\nERROR: Project configuration file not in current directory."
+    puts "You can only run 'faastruby local' inside a Project directory."
+    puts "To create a project, run 'faastruby new-project project-name'.\n\n"
+    exit 1
+  end
   SECRETS_FILE = ENV['FAASTRUBY_PROJECT_SECRETS_FILE'] || "#{SERVER_ROOT}/secrets.yml"
   PROJECT_NAME = YAML.load(File.read(PROJECT_YAML_FILE))['project']['name']
   SYNC_ENABLED = ENV['FAASTRUBY_PROJECT_SYNC_ENABLED']

data/lib/faastruby/server/response.rb

@@ -25,7 +25,7 @@ module FaaStRuby
     end
 
     def self.invalid_response
-      body = {'error' => "Your function must render a response. For example, render text: \"Hello World!\""}
+      body = {'error' => "Your function must render a response. For example, render text: \"Hello World!\". If you want to respond with an empty body, use 'render_nothing'."}
       body = Oj.dump(body)
       new(
         body: body,

data/lib/faastruby/server/runner.rb

@@ -70,7 +70,7 @@ module FaaStRuby
         begin
           function = load_function("#{@function_folder}/handler.rb")
           function_object.extend(function)
-          response = function_object.handler(event, *args)
+          response = function_object.handler(event, *args) || function_object.render_nothing
           response = FaaStRuby::Response.invalid_response unless response.is_a?(FaaStRuby::Response)
         rescue Exception => e
           error = Oj.dump({

data/lib/faastruby/server/runner_methods.rb

@@ -84,6 +84,10 @@ module FaaStRuby
       respond_with(resp_body, status: status, headers: headers, binary: bin)
     end
 
+    def render_nothing(status: 200, headers: {})
+      respond_with(nil, status: status, headers: headers, binary: false)
+    end
+
     def redirect_to(function: nil, url: nil, status: 303)
       headers = {"Location" => function || url}
       respond_with(nil, status: status, headers: headers, binary: false)

data/lib/faastruby/version.rb

@@ -1,3 +1,3 @@
 module FaaStRuby
-  VERSION = '0.5.9'
+  VERSION = '0.5.10'
 end

metadata

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