faastruby 0.4.12 → 0.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6368a1d3dad4d02f5e3a24262adaff96cdc7767bbf825691d4e49d65fbcea21b
-  data.tar.gz: 02e19e2cb7afb3c0bd3b91ba885a6fae26995ad15445b3e015224bc6344d7e21
+  metadata.gz: f33bd1f4ef4018f6d54b1a7f3ea894cd85d0484b2eb9f340f5997c0986b79499
+  data.tar.gz: e368bf8bb7eae9eee54270f8cf350bc605b1e8b3c8c20f346f1ff9cdd9fc335c
 SHA512:
-  metadata.gz: 2df07aeae193658b8d1466a84dfb571452e136c706ec0edade1ac8278b9868b9ea41eb60c2bf10266c46eb67196a981005e25d3dda6d9e9570e76b714c38a52f
-  data.tar.gz: dadf343fa1946f4750903c37626d81bae076a25098551574a9138327139a814f56a12372432b152c2b92c1133bd5384138c4fb915102bd2ce14c6bd4a90ba6d7
+  metadata.gz: ff4b5f5104900ed7001cea0c79a48a00c943a325ea4c34e5bb54b34f1f775bea42bb0fee87e05faeeba130101c2aa1227858ac95c438a514c6e3c4c2d195bcb9
+  data.tar.gz: f24468bc7302059f788d6133dbbf2f39a2b68686e14b0b29711ad8b26143e58d3c1f37af968f397a9335adec42343189341aa624c4e57a6a1a1460faf303f386

data/.gitignore

@@ -7,3 +7,4 @@
 /spec/reports/
 /tmp/
 /*.gem
+/archive

data/CHANGELOG.md

@@ -1,10 +1,21 @@
 # Changelog
 
-## 0.4.12 - Jan 26 2019
-Special thanks to @HellRok for fixing those bugs!
+## 0.4.14 - Feb 1 2019
+- Ruby functions now use a spec helper from `faastruby` gem.
+- Crystal functions now use the shard `faastruby-spec-helper` to assist on tests.
+- Mock `publish` method on tests.
+- Wrap functions in anonymous module to avoid concurrency problems.
+- Read all STDIN when updating context with --stdin [PR-5](https://github.com/FaaStRuby/faastruby-cli/pull/5) | Thanks [Justin](https://github.com/presidentbeef)!
+- `shards install` runs when building crystal function before deploy
+- Better message when updating the function context
+- Fixed output when creating a function with `faastruby new`
+
+A new version of the platform API was released in tandem to address the issue that would erase contexts when a function is redeployed. Thanks [Justin](https://github.com/presidentbeef) again for pointing that out. 
 
-- FaaStRuby Server: Respond with css content type (#4) 
-- Setup the server to respond to HEAD requests (#3)
+## 0.4.12 - Jan 26 2019
+Special thanks to [Sean Earle](https://github.com/HellRok) for fixing those bugs!
+- FaaStRuby Server: Respond with css content type [PR-4](https://github.com/FaaStRuby/faastruby-cli/pull/4)
+- Setup the server to respond to HEAD requests [PR-3](https://github.com/FaaStRuby/faastruby-cli/pull/3)
 
 ## 0.4.11 - Jan 19 2019
 - Fix wrong working directory when running functions locally with `faastruby server`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    faastruby (0.4.11)
+    faastruby (0.4.13)
       colorize (~> 0.8)
       faastruby-rpc (~> 0.2.1)
       oj (~> 3.6)
@@ -38,7 +38,7 @@ GEM
     mustermann (1.0.3)
     necromancer (0.4.0)
     netrc (0.11.0)
-    oj (3.7.7)
+    oj (3.7.8)
     pastel (0.7.2)
       equatable (~> 0.5.0)
       tty-color (~> 0.4.0)

data/README.md

@@ -1,6 +1,8 @@
 [![Gem Version](https://badge.fury.io/rb/faastruby.svg)](https://badge.fury.io/rb/faastruby)
 [![Build Status](https://travis-ci.org/FaaStRuby/faastruby-cli.svg?branch=master)](https://travis-ci.org/FaaStRuby/faastruby-cli)
 
+[Changelog](https://github.com/FaaStRuby/faastruby-cli/blob/master/CHANGELOG.md)
+
 # faastruby-cli
 
 CLI tool for managing workspaces and functions hosted at [FaaStRuby](https://faastruby.io).

data/exe/faastruby-server

@@ -7,6 +7,7 @@ require 'faastruby/server'
 require 'sinatra'
 require 'sinatra/multi_route'
 require 'colorize'
+
 FaaStRuby::EventHub.listen_for_events!
 
 set :port, 3000
@@ -22,6 +23,7 @@ set :show_exceptions, true
 set :run, true
 
 register Sinatra::MultiRoute
+
 route :head, :get, :post, :put, :patch, :delete, '/:workspace_name/:function_name' do
   path = "#{params[:workspace_name]}/#{params[:function_name]}"
   headers = env.select { |key, value| key.include?('HTTP_') || ['CONTENT_TYPE', 'CONTENT_LENGTH', 'REMOTE_ADDR', 'REQUEST_METHOD', 'QUERY_STRING'].include?(key) }
@@ -34,7 +36,7 @@ route :head, :get, :post, :put, :patch, :delete, '/:workspace_name/:function_nam
   end
   query_params = parse_query(request.query_string)
   context = set_context(params[:workspace_name], params[:function_name])
-  event = FaaStRuby::Event.new(body, query_params, headers, context)
+  event = FaaStRuby::Event.new(body: body, query_params: query_params, headers: headers, context: context)
   response = FaaStRuby::Runner.new.call(params[:workspace_name], params[:function_name], event, rpc_args)
   status response.status
   headers response.headers
@@ -44,7 +46,7 @@ route :head, :get, :post, :put, :patch, :delete, '/:workspace_name/:function_nam
     response_body = response.body
   end
   puts "[#{path}] #=> status=#{response.status} body=#{response_body.inspect} headers=#{Oj.dump response.headers}".light_blue
-  body response_body
+  body response_body  
 end
 
 def parse_body(body, content_type, method)

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

@@ -20,8 +20,21 @@ module FaaStRuby
           @options['output_file'] ||= "#{@function_name}.zip"
         end
 
+        def ruby_runtime?
+          @yaml_config['runtime'].nil? || @yaml_config['runtime'].match(/^ruby/)
+        end
+
+        def crystal_runtime?
+          @yaml_config['runtime'].match(/^crystal/)
+        end
+
         def run
-          FaaStRuby::CLI.error('Please fix the problems above and try again') unless bundle_install
+          if ruby_runtime?
+            FaaStRuby::CLI.error('Please fix the problems above and try again') unless bundle_install
+          end
+          if crystal_runtime?
+            FaaStRuby::CLI.error('Please fix the problems above and try again') unless shards_install
+          end
           tests_passed = run_tests
           FaaStRuby::CLI.error("Build aborted because tests failed and you have 'abort_build_when_tests_fail: true' in 'faastruby.yml'") unless tests_passed || !@abort_when_tests_fail
           puts "Warning: Ignoring failed tests because you have 'abort_build_when_tests_fail: false' in 'faastruby.yml'".yellow if !tests_passed && !@abort_when_tests_fail
@@ -42,6 +55,12 @@ module FaaStRuby
           self.class.build(source, output_file)
         end
 
+        def shards_install
+          puts '[build] Verifying dependencies'
+          return true unless File.file?('shard.yml')
+          system('shards check') || system('shards install')
+        end
+
         def bundle_install
           puts '[build] Verifying dependencies'
           return true unless File.file?('Gemfile')

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

@@ -13,9 +13,22 @@ module FaaStRuby
           load_credentials(exit_on_error: false)
         end
 
+        def ruby_runtime?
+          @yaml_config['runtime'].nil? || @yaml_config['runtime'].match(/^ruby/)
+        end
+
+        def crystal_runtime?
+          @yaml_config['runtime'].match(/^crystal/)
+        end
+
         def run
           create_or_use_workspace
-          FaaStRuby::CLI.error('Please fix the problems above and try again') unless bundle_install
+          if ruby_runtime?
+            FaaStRuby::CLI.error('Please fix the problems above and try again') unless bundle_install
+          end
+          if crystal_runtime?
+            FaaStRuby::CLI.error('Please fix the problems above and try again') unless shards_install
+          end
           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
           puts "Warning: Ignoring failed tests because you have 'abort_deploy_when_tests_fail: false' in 'faastruby.yml'".yellow if !tests_passed && !@abort_when_tests_fail
@@ -59,6 +72,12 @@ module FaaStRuby
           end
         end
 
+        def shards_install
+          puts '[build] Verifying dependencies'
+          return true unless File.file?('shard.yml')
+          system('shards check') || system('shards install')
+        end
+
         def bundle_install
           puts '[build] Verifying dependencies'
           return true unless File.file?('Gemfile')

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

@@ -82,8 +82,6 @@ EOS
           when 'ruby'
             puts "+ d #{@base_dir}".green
             puts "+ d #{@base_dir}/spec".green
-            puts "+ d #{@base_dir}/spec/helpers".green
-            puts "+ f #{@base_dir}/spec/helpers/faastruby.rb".green
             puts "+ f #{@base_dir}/spec/handler_spec.rb".green
             puts "+ f #{@base_dir}/spec/spec_helper.rb".green
             puts "+ f #{@base_dir}/Gemfile".green
@@ -91,8 +89,6 @@ EOS
           when 'crystal'
             puts "+ d #{@base_dir}".green
             puts "+ d #{@base_dir}/spec".green
-            puts "+ d #{@base_dir}/spec/helpers".green
-            puts "+ f #{@base_dir}/spec/helpers/faastruby.cr".green
             puts "+ f #{@base_dir}/spec/handler_spec.cr".green
             puts "+ f #{@base_dir}/spec/spec_helper.cr".green
             puts "+ d #{@base_dir}/src".green
@@ -149,6 +145,12 @@ EOS
               @function_name => {
                 'main' => 'src/handler.cr'
               }
+            },
+            'development_dependencies' => {
+              'faastruby-spec-helper' => {
+                'github' => 'faastruby/faastruby-spec-helper.cr',
+                'version' => '~> 0.1.0'
+              }
             }
           }.to_yaml
           write_file("#{@base_dir}/shard.yml", shards)

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

@@ -14,7 +14,7 @@ module FaaStRuby
         end
 
         def run
-          spinner = spin("Uploading context data to '#{@workspace_name}'...")
+          spinner = spin("Uploading context data for function '#{@function_name}' to workspace '#{@workspace_name}'...")
           workspace = FaaStRuby::Workspace.new(name: @workspace_name)
           function = FaaStRuby::Function.new(name: @function_name, workspace: workspace)
           function.update(new_context: @options['data'])
@@ -52,7 +52,7 @@ module FaaStRuby
             when '-d', '--data'
               @options['data'] = @args.shift
             when '--stdin'
-              @options['data'] = STDIN.gets.chomp
+              @options['data'] = STDIN.read
             else
               FaaStRuby::CLI.error("Unknown argument: #{option}")
             end

data/lib/faastruby/server.rb

@@ -1,236 +1,13 @@
 module FaaStRuby
   PROJECT_ROOT = Dir.pwd
-  class DoubleRenderError < StandardError; end
-  class EventChannel
-    @@channels = {}
-    def self.channels
-      @@channels
-    end
-    attr_accessor :name
-    def initialize(channel)
-      @name = channel
-      @@channels[channel] ||= []
-    end
-    def subscribe(function_path)
-      @@channels[@name] << function_path
-    end
-    def subscribers
-      @@channels[@name] || []
-    end
-  end
-  class Subscriber
-    attr_accessor :path
-    def initialize(path)
-      @path = path
-      @workspace_name, @function_name = @path.split("/")
-    end
-
-    def call(encoded_data)
-      data = Base64.urlsafe_decode64(encoded_data)
-      headers = {'X-Origin' => 'event_hub', 'Content-Transfer-Encoding' => 'base64'}
-      event = Event.new(data, {}, headers, nil)
-      Runner.new.call(@workspace_name, @function_name, event, [])
-    end
-  end
-
-  class EventHub
-    @@queue = Queue.new
-    def self.queue
-      @@queue
-    end
-
-    def self.push(payload)
-      @@queue << payload
-    end
-
-    def self.thread
-      @@thread
-    end
-
-    def self.load_subscribers
-      Dir.glob('*/*/faastruby.yml').each do |file|
-        workspace_name, function_name, _ = file.split('/') 
-        path = "#{workspace_name}/#{function_name}"
-        config = YAML.load(File.read(file))
-        next unless config['channels'].is_a?(Array)
-        config['channels'].compact!
-        config['channels'].each do |c|
-          channel = EventChannel.new(c)
-          channel.subscribe(path)
-        end
-      end
-      puts "[EventHub] Channel subscriptions: #{EventChannel.channels}".yellow
-      puts "[EventHub] If you modify 'faastruby.yml' in any function, you will need to restart the server to apply the changes.".yellow 
-    end
-
-    def self.listen_for_events!
-      load_subscribers
-      @@thread = Thread.new do
-        loop do
-          encoded_channel, encoded_data = @@queue.pop.split(',')
-          channel = EventChannel.new(Base64.urlsafe_decode64(encoded_channel))
-          puts "[EventHub] Event channel=#{channel.name.inspect}".yellow
-          channel.subscribers.each do |s|
-            subscriber = Subscriber.new(s)
-            puts "[EventHub] Trigger function=#{subscriber.path.inspect} base64_payload=#{encoded_data.inspect}".yellow
-            response = subscriber.call(encoded_data)
-            puts "[#{subscriber.path}] #=> status=#{response.status} body=#{response.body.inspect} headers=#{Oj.dump response.headers}".light_blue
-          end
-        end
-      end
-      puts "[EventHub] Events thread started.".yellow
-    end
-  end
-
-  class Runner
-    def initialize
-      @rendered = false
-    end
-
-    def path
-      @path
-    end
-
-    def call(workspace_name, function_name, event, args)
-      @path = "#{FaaStRuby::PROJECT_ROOT}/#{workspace_name}/#{function_name}"
-      begin
-        load "#{@path}/handler.rb"
-        Dir.chdir(@path)
-        response = handler(event, *args)
-        return response if response.is_a?(FaaStRuby::Response)
-        body = {
-          'error' => "Please use the helpers 'render' or 'respond_with' as your function return value."
-        }
-        FaaStRuby::Response.new(body: Oj.dump(body), status: 500, headers: {'Content-Type' => 'application/json'})
-      rescue Exception => e
-        body = {
-          'error' => e.message,
-          'location' => e.backtrace&.first,
-        }
-        FaaStRuby::Response.new(body: Oj.dump(body), status: 500, headers: {'Content-Type' => 'application/json'})
-      end
-    end
-
-    def rendered!
-      @rendered = true
-    end
-    def rendered?
-      @rendered
-    end
-
-    def respond_with(body, status: 200, headers: {}, binary: false)
-      raise FaaStRuby::DoubleRenderError.new("You called 'render' or 'respond_with' twice in your handler method") if rendered?
-      response = FaaStRuby::Response.new(body: body, status: status, headers: headers, binary: binary)
-      rendered!
-      response
-    end
-
-    def render(
-        js: nil,
-        css: nil,
-        body: nil,
-        inline: nil,
-        html: nil,
-        json: nil,
-        yaml: nil,
-        text: nil,
-        data: nil,
-        png: nil,
-        svg: nil,
-        jpeg: nil,
-        gif: nil,
-        icon: nil,
-        status: 200, headers: {}, content_type: nil, binary: false
-      )
-      headers["Content-Type"] = content_type if content_type
-      bin = false
-      case
-      when json
-        headers["Content-Type"] ||= "application/json"
-        resp_body = json.is_a?(String) ? json : Oj.dump(json)
-      when html, inline
-        headers["Content-Type"] ||= "text/html"
-        resp_body = html
-      when text
-        headers["Content-Type"] ||= "text/plain"
-        resp_body = text
-      when yaml
-        headers["Content-Type"] ||= "application/yaml"
-        resp_body = yaml.is_a?(String) ? yaml : YAML.load(yaml)
-      when body
-        headers["Content-Type"] ||= "application/octet-stream"
-        bin = binary
-        resp_body = bin ? Base64.urlsafe_encode64(body) : body
-      when data
-        headers["Content-Type"] ||= "application/octet-stream"
-        resp_body = Base64.urlsafe_encode64(data)
-        bin = true
-      when js
-        headers["Content-Type"] ||= "text/javascript"
-        resp_body = js
-      when css
-        headers["Content-Type"] ||= "text/css"
-        resp_body = css
-      when png
-        headers["Content-Type"] ||= "image/png"
-        resp_body = Base64.urlsafe_encode64(png)
-        bin = true
-      when svg
-        headers["Content-Type"] ||= "image/svg+xml"
-        resp_body = svg
-      when jpeg
-        headers["Content-Type"] ||= "image/jpeg"
-        resp_body = Base64.urlsafe_encode64(jpeg)
-        bin = true
-      when gif
-        headers["Content-Type"] ||= "image/gif"
-        resp_body = Base64.urlsafe_encode64(gif)
-        bin = true
-      when icon
-        headers["Content-Type"] ||= "image/x-icon"
-        resp_body = Base64.urlsafe_encode64(icon)
-        bin = true
-      end
-      respond_with(resp_body, status: status, headers: headers, binary: bin)
-    end
-
-    def puts(msg)
-      super "[#{@path}] #{msg}".green
-    end
-
-    def publish(channel, data: nil)
-      begin
-        encoded_data = data ? Base64.urlsafe_encode64(data, padding: false) : ""
-        payload = %(#{Base64.urlsafe_encode64(channel, padding: false)},#{encoded_data})
-        EventHub.queue.push payload
-        true
-      rescue
-        false
-      end
-    end
-  end
-
-  class Event
-    attr_accessor :body, :query_params, :headers, :context
-    def initialize(body, query_params, headers, context)
-      @body = body
-      @query_params = query_params
-      @headers = headers
-      @context = context
-    end
-  end
-
-  class Response
-    attr_accessor :body, :status, :headers, :binary
-    def initialize(body:, status: 200, headers: {}, binary: false)
-      @body = body
-      @status = status
-      @headers = headers
-      @binary = binary
-    end
-
-    def binary?
-      @binary
-    end
-  end
+  require 'faastruby/server/concurrency_controller'
+  require 'faastruby/server/errors'
+  require 'faastruby/server/event_channel'
+  require 'faastruby/server/subscriber'
+  require 'faastruby/server/event_hub'
+  require 'faastruby/server/runner_methods'
+  require 'faastruby/server/function_object'
+  require 'faastruby/server/runner'
+  require 'faastruby/server/event'
+  require 'faastruby/server/response'
 end