faastruby 0.5.21 → 0.5.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd84b2b2ee1f246df6e56a22a2f1038af7428ad4c3386e67243b87a425558076
-  data.tar.gz: 14678528dcb82549ebb862df407253102c4254687340260045a365209c3260c7
+  metadata.gz: 3e08bac2ed5dcabe21891e5945035651d1013743aadba90de392ef7295cd2a95
+  data.tar.gz: ad2984694a429edd97df32d53cbe2594a67282f1158ae3ddc0853a9b51e150de
 SHA512:
-  metadata.gz: 492004310d7ee1b901648abb9995da987cf0f7e3525cc66d14a569a5c61004bb9ba1e71ed606e42507972b9da6d1840c6fcb14c988ed8fa41ce99031062c6d3f
-  data.tar.gz: 0a9fa63c25ff725c2e71175f148611ef689f62730b3f7f8bb4f6ab9b4418f834f52425c98d13d5c807005f7efb633478a94ad7ba0fa3b21bdb032a501a8825a3
+  metadata.gz: bc3264038b2bff85ad9e5b2f2a52133d0bd0c91b250a931dd6b5d467bfd02e9e9cfeeb64f19a50f4a1915867634d4ce4a5db467ebb73130a051e5eb8e420fbee
+  data.tar.gz: 43e91e8bc235ee6de9147d8085113bc3511668349b1b5a708e7bf971fbfe9a7324bdc80f519da390b7712ed5bfe517488beb3754ac236d86e9a450c6570c1271

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
-## 0.5.21 - MAr 24 2019
+## 0.5.22 - unreleased
+- 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
+- Fix bug preventing `--sync` from working with any other environment.
+
+## 0.5.21 - Mar 24 2019
 - Require supported_runtimes on every command run.
 
 ## 0.5.20 - Mar 24 2019

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    faastruby (0.5.21)
+    faastruby (0.5.22)
       colorize (~> 0.8)
       faastruby-rpc (~> 0.2.6)
       listen (~> 3.1)
@@ -42,7 +42,7 @@ GEM
       ruby_dep (~> 1.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
+    mime-types-data (3.2019.0331)
     multi_json (1.13.1)
     mustermann (1.0.3)
     necromancer (0.4.0)
@@ -93,10 +93,10 @@ GEM
       rack-protection (= 2.0.5)
       sinatra (= 2.0.5)
       tilt (>= 1.3, < 3)
-    strings (0.1.4)
-      strings-ansi (~> 0.1.0)
-      unicode-display_width (~> 1.4.0)
-      unicode_utils (~> 1.4.0)
+    strings (0.1.5)
+      strings-ansi (~> 0.1)
+      unicode-display_width (~> 1.5)
+      unicode_utils (~> 1.4)
     strings-ansi (0.1.0)
     thor (0.20.3)
     tilt (2.0.9)
@@ -118,7 +118,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    unicode-display_width (1.4.1)
+    unicode-display_width (1.5.0)
     unicode_utils (1.4.0)
     webmock (3.4.2)
       addressable (>= 2.3.6)

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

@@ -4,10 +4,10 @@ module FaaStRuby
       require 'faastruby/cli/commands/function/base_command'
       require 'faastruby/cli/package'
       class Build < FunctionBaseCommand
-        def self.build(source, output_file, function_name, quiet = false)
+        def self.build(source, output_file, function_name, quiet = false, exclude: [])
           # msg = "[#{function_name}] Building package..."
           # quiet ? puts(msg) : spinner = spin(msg)
-          FaaStRuby::Package.new(source, output_file).build
+          FaaStRuby::Package.new(source, output_file, exclude: exclude).build
           # quiet ? puts("[#{function_name}] Package created.") : spinner.stop('Done!')
           puts "+ f #{output_file}".green unless quiet
         end

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

@@ -163,7 +163,8 @@ module FaaStRuby
             spinner&.success
           end
           require 'faastruby/cli/commands/function/build'
-          FaaStRuby::Command::Function::Build.build(source, output_file, @function_name, true)
+          exclude = crystal_runtime? ? ['handler', 'handler.dwarf'] : []
+          FaaStRuby::Command::Function::Build.build(source, output_file, @function_name, true, exclude: exclude)
           @package_file.close
           output_file
         end

data/lib/faastruby/cli/package.rb

@@ -2,15 +2,16 @@ require 'zip'
 module FaaStRuby
   class Package
     # Initialize with the directory to zip and the location of the output archive.
-    def initialize(input_dir, output_file)
+    def initialize(input_dir, output_file, exclude: [])
       @input_dir = input_dir
       @output_file = output_file
+      @exclude = ['.', '..', '.git', @output_file.split('/').last] + exclude
     end
 
     # Zip the input directory.
     def build
       entries = Dir.entries(@input_dir)
-      entries.delete_if {|e| ['.', '..', '.git', @output_file.split('/').last].include?(e)}
+      entries.delete_if {|e| @exclude.include?(e)}
       FileUtils.rm_f(@output_file) # Make sure file doesn't exist
       ::Zip::File.open(@output_file, ::Zip::File::CREATE) do |zipfile|
         write_entries entries, '', zipfile

data/lib/faastruby/local.rb

@@ -161,7 +161,7 @@ module FaaStRuby
       debug __method__
       puts "Sync mode enabled."
       puts "Your local environment will be synced to https://#{workspace}.tor1.faast.cloud"
-      system("faastruby deploy")
+      system("faastruby deploy --env #{DEPLOY_ENVIRONMENT}")
       true
     end
 

data/lib/faastruby/local/crystal_runtime.cr

@@ -2,10 +2,13 @@ require "base64"
 require "json"
 require "yaml"
 
+macro require_handler
+  require {{env("HANDLER_PATH")}}
+end
+
+require_handler
+
 module FaaStRuby
-  macro require_handler
-    require {{env("HANDLER_PATH")}}
-  end
   class Event
     JSON.mapping(
       body: String?,
@@ -68,8 +71,6 @@ module FaaStRuby
   end
 end
 
-FaaStRuby.require_handler
-
 def render(icon : String? = nil, jpeg : String? = nil, gif : String? = nil, png : String? = nil, io : Bytes? = nil, css : String? = nil, svg : String? = nil, js : String? = nil, inline : String? = nil, html : String? = nil, json : String? = nil, yaml : String? = nil, text : String? = nil, status : Int32 = 200, headers : Hash(String, String) = {} of String => String, content_type : String? = nil, binary : Bool = false)
   headers["Content-Type"] = content_type if content_type
   bin = false

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

@@ -8,6 +8,7 @@ module FaaStRuby
         debug "self.find_all_in(#{functions_dir.inspect})"
         Dir.glob(["**/handler.rb", "**/handler.cr"], base: functions_dir).map do |entry|
           function_absolute_folder = "#{functions_dir}/#{File.dirname(entry)}"
+          function_absolute_folder = File.dirname(function_absolute_folder) if File.basename(function_absolute_folder) == "src"
           next unless File.file?("#{function_absolute_folder}/faastruby.yml")
           from_yaml(function_absolute_folder)
         end.compact

data/lib/faastruby/version.rb

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

metadata

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