faastruby 0.2.6 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fd64fdf16d7eaccea051a5d101f1376c7276285b8ae68f31320dc9dafe4d348
-  data.tar.gz: 3277f48a6095471b033ce8b730532255c092935437b30d72a9a851ccd1a0be21
+  metadata.gz: ca9d4cec0bdbdaefb83ad63a578a211a5fb186f118f2e9c7f4bb8f81f4b2ac08
+  data.tar.gz: 5857b9257bafe182fb38f89a6a1290d3a7fc148e75bc405e48a9cd51e6acbb80
 SHA512:
-  metadata.gz: 4342ed171a03f6dd3ad3bb1d9ee6b0f0d5cbb81de042a64e2e6fa884bf52c6f7ebf0146b4d25d5c8338b88ebf2126b15774c92aa904a5c677a8bcb8a3cf6689b
-  data.tar.gz: 6a4ed4b25c093aac6f968c82932a1194ef0f6d2d172b99b7cc96a1072d77bd29f3ee1351d5439948ea362bcfcda15ee8c4d5d961c78f9c1c14a6e08b861b31ed
+  metadata.gz: f6fdbc0c311dc686ef5f1aa2f8310d4cef9fdf7c77d304bb42edc8069da4603b30d033df29d2b4743e5891f1ef90a34460ffb49cebcf927bbbad02c6860b8eff
+  data.tar.gz: 8aeb14ace46c50277eff7a9a9f29d7dda88f302674a96a5d5ece6930072698a3eff8a3816984f91944d39f359594b643caf0c1605e8ec8e2f1c6c02e515d4062

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.3.1 - Dec 9 2018
+- Add faastruby-rpc to Gemfile template and runtime dependencies
+
+## 0.3.0 - Dec 9 2018
+- Add spinner feedback when destroying workspace
+- Better error handling when response is not JSON
+- New command `faastruby server` will start a development environment.
+
 ## 0.2.6 - Nov 20 2018
 - Change Ruby minimum version to 2.5.0
 - Disable timeout on HTTP requests.

data/Gemfile.lock

@@ -1,39 +1,61 @@
 PATH
   remote: .
   specs:
-    faastruby (0.2.6)
+    faastruby (0.3.0)
       colorize (~> 0.8)
+      faastruby-rpc (~> 0.1)
       oj (~> 3.6)
+      puma (~> 3.12)
       rest-client (~> 2.0)
       rubyzip (~> 1.2)
+      sinatra (~> 2.0)
+      sinatra-contrib (~> 2.0)
       tty-spinner (~> 0.8)
       tty-table (~> 0.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (5.2.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
+    backports (3.11.4)
     colorize (0.8.1)
+    concurrent-ruby (1.1.3)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     equatable (0.5.0)
+    faastruby-rpc (0.1.1)
+      oj (~> 3.6)
     hashdiff (0.3.7)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
+    i18n (1.1.1)
+      concurrent-ruby (~> 1.0)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
+    minitest (5.11.3)
+    multi_json (1.13.1)
+    mustermann (1.0.3)
     necromancer (0.4.0)
     netrc (0.11.0)
-    oj (3.7.1)
+    oj (3.7.4)
     pastel (0.7.2)
       equatable (~> 0.5.0)
       tty-color (~> 0.4.0)
     public_suffix (3.0.3)
+    puma (3.12.0)
+    rack (2.0.6)
+    rack-protection (2.0.4)
+      rack
     rake (10.5.0)
     rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
@@ -54,22 +76,39 @@ GEM
     rspec-support (3.8.0)
     rubyzip (1.2.2)
     safe_yaml (1.0.4)
+    sinatra (2.0.4)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.4)
+      tilt (~> 2.0)
+    sinatra-contrib (2.0.4)
+      activesupport (>= 4.0.0)
+      backports (>= 2.8.2)
+      multi_json
+      mustermann (~> 1.0)
+      rack-protection (= 2.0.4)
+      sinatra (= 2.0.4)
+      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-ansi (0.1.0)
+    thread_safe (0.3.6)
+    tilt (2.0.9)
     tty-color (0.4.3)
     tty-cursor (0.6.0)
     tty-screen (0.6.5)
-    tty-spinner (0.8.0)
-      tty-cursor (>= 0.5.0)
+    tty-spinner (0.9.0)
+      tty-cursor (~> 0.6.0)
     tty-table (0.10.0)
       equatable (~> 0.5.0)
       necromancer (~> 0.4.0)
       pastel (~> 0.7.2)
       strings (~> 0.1.0)
       tty-screen (~> 0.6.4)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)

data/example-blank/Gemfile

@@ -2,4 +2,5 @@ source 'https://rubygems.org'
 
 group :test do
   gem 'rspec'
+  gem 'faastruby-rpc'
 end

data/example-blank/spec/spec_helper.rb

@@ -1,2 +1,3 @@
+require 'faastruby-rpc'
 require 'helpers/faastruby'
 include FaaStRuby

data/example/Gemfile

@@ -2,4 +2,5 @@ source 'https://rubygems.org'
 
 group :test do
   gem 'rspec'
+  gem 'faastruby-rpc'
 end

data/example/spec/spec_helper.rb

@@ -1,2 +1,3 @@
+require 'faastruby-rpc'
 require 'helpers/faastruby'
 include FaaStRuby

data/exe/faastruby-server

@@ -0,0 +1,123 @@
+#!/usr/bin/env ruby
+
+require 'sinatra'
+require 'sinatra/multi_route'
+require 'yaml'
+require 'oj'
+require 'faastruby-rpc'
+
+module FaaStRubyFunction
+  def self.call(workspace_name, function_name, event, args)
+    begin
+      load "./#{workspace_name}/#{function_name}/handler.rb"
+      response = handler(event, *args)
+      return response if response.is_a?(FaaStRubyFunction::Response)
+      body = {
+        'error' => "Please use the helpers 'render' or 'respond_with' as your function return value."
+      }
+      respond_with(Oj.dump(body), status: 500, headers: {'Content-Type' => 'application/json'})
+    rescue Exception => e
+      body = {
+        'error' => e.message,
+        'location' => e.backtrace&.first,
+      }
+      respond_with(Oj.dump(body), status: 500, headers: {'Content-Type' => 'application/json'})
+    end
+  end
+  def self.respond_with(body, status: 200, headers: {})
+    r = FaaStRubyFunction::Response.new(:body, :status, :headers)
+    r.new(body, status, headers)
+  end
+
+  def self.render(js: nil, body: nil, inline: nil, html: nil, json: nil, yaml: nil, text: nil, status: 200, headers: {}, content_type: nil)
+    headers["Content-Type"] = content_type if content_type
+    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.to_yaml
+    when body
+      headers["Content-Type"] ||= "application/octet-stream"
+      resp_body = raw
+    when js
+      headers["Content-Type"] ||= "text/javascript"
+      resp_body = js
+    end
+    respond_with(resp_body, status: status, headers: headers)
+  end
+  class Event < Struct
+  end
+
+  class Response < Struct
+  end
+end
+
+class FaaStRubyServer < Sinatra::Application
+  set :port, 3000
+  set :bind, '0.0.0.0'
+  case ARGV.shift
+  when '-p'
+    set :port, ARGV.shift
+  when '-b'
+    set :bind, ARGV.shift
+  end
+  set :server, %w[puma]
+  set :run, false
+  set :show_exceptions, false
+
+  register Sinatra::MultiRoute
+  route :get, :post, :put, :patch, :delete, '/:workspace_name/:function_name' do
+    e = FaaStRubyFunction::Event.new(:body, :query_params, :headers, :context)
+    headers = env.select { |key, value| key.include?('HTTP_') || ['CONTENT_TYPE', 'CONTENT_LENGTH', 'REMOTE_ADDR', 'REQUEST_METHOD', 'QUERY_STRING'].include?(key) }
+    if headers.has_key?("HTTP_FAASTRUBY_RPC")
+      body = nil
+      rpc_args = parse_body(request.body.read, headers['CONTENT_TYPE'], request.request_method) || []
+    else
+      body = parse_body(request.body.read, headers['CONTENT_TYPE'], request.request_method)
+      rpc_args = []
+    end
+    query_params = parse_query(request.query_string)
+    context = set_context(params[:workspace_name], params[:function_name])
+    event = e.new(body, query_params, headers, context)
+    response = FaaStRubyFunction.call(params[:workspace_name], params[:function_name], event, rpc_args)
+    status response.status
+    headers response.headers
+    body response.body
+  end
+
+  def parse_body(body, content_type, method)
+    return nil if method == 'GET'
+    return {} if body.nil? && method != 'GET'
+    return Oj.load(body) if content_type == 'application/json'
+    return body
+  end
+
+  def set_context(workspace_name, function_name)
+    return nil unless File.file?('context.yml')
+    yaml = YAML.load(File.read('context.yml'))
+    return nil unless yaml.has_key?(workspace_name)
+    yaml[workspace_name][function_name]
+  end
+
+  def parse_query(query_string)
+    hash = {}
+    query_string.split('&').each do |param|
+      key, value = params.split('=')
+      hash[key] = value
+    end
+    hash
+  end
+  def self.run?
+    true
+  end
+end
+
+FaaStRubyServer.run! rescue nil # this will suppress some of the errors messages

data/faastruby.gemspec

@@ -17,6 +17,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'tty-table', '~> 0.10'
   spec.add_runtime_dependency 'rubyzip', '~> 1.2'
   spec.add_runtime_dependency 'colorize', '~> 0.8'
+  spec.add_runtime_dependency 'sinatra', '~> 2.0'
+  spec.add_runtime_dependency 'sinatra-contrib', '~> 2.0'
+  spec.add_runtime_dependency 'puma', '~> 3.12'
+  spec.add_runtime_dependency 'faastruby-rpc', '~> 0.1'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.

data/lib/faastruby/api.rb

@@ -131,7 +131,12 @@ module FaaStRuby
     end
 
     def parse(response)
-      body = Oj.load(response.body) unless [500, 408].include?(response.code)
+      begin
+        body = Oj.load(response.body) unless [500, 408].include?(response.code)
+      rescue Oj::ParseError => e
+        puts response.body
+        raise e
+      end
       case response.code
       when 401 then return error(["(401) Unauthorized - #{body['error']}"], 401)
       when 404 then return error(["(404) Not Found - #{body['error']}"], 404)

data/lib/faastruby/cli.rb

@@ -21,6 +21,7 @@ module FaaStRuby
         FaaStRuby::Command::Help.new(args).run
         return
       end
+      start_server(args) if command == 'server'
       check_version
       check_region
       error("Unknown command: #{command}") unless FaaStRuby::Command::COMMANDS.has_key?(command)
@@ -42,5 +43,9 @@ module FaaStRuby
       ENV['FAASTRUBY_REGION'] ||= DEFAULT_REGION
       error(["No such region: #{ENV['FAASTRUBY_REGION']}".red, "Valid regions are:  #{FaaStRuby::REGIONS.join(' | ')}"], color: nil) unless FaaStRuby::REGIONS.include?(ENV['FAASTRUBY_REGION'])
     end
+
+    def self.start_server(args)
+      exec("faastruby-server #{args.join(' ')}")
+    end
   end
 end

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

@@ -57,7 +57,7 @@ EOS
 
         def dir_exists?
           return unless File.directory?(@base_dir)
-          print "The directory '#{@function_name}' already exists. Overwrite files? [y/N] "
+          print "The folder '#{@function_name}' already exists. Overwrite files? [y/N] "
           response = STDIN.gets.chomp
           FaaStRuby::CLI.error("Cancelled", color: nil) unless response == 'y'
         end
@@ -96,4 +96,4 @@ EOS
       end
     end
   end
-end
+end

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

@@ -7,11 +7,13 @@ module FaaStRuby
           @missing_args = []
           FaaStRuby::CLI.error(@missing_args, color: nil) if missing_args.any?
           @workspace_name = @args.shift
+          @base_dir = "./#{@workspace_name}"
           parse_options
           @options['credentials_file'] ||= FaaStRuby.credentials_file
         end
 
         def run
+          dir_exists? || FileUtils.mkdir_p(@base_dir)
           spinner = spin("Requesting credentials...")
           workspace = FaaStRuby::Workspace.create(name: @workspace_name, email: @options['email'])
           spinner.stop("Done!")
@@ -37,6 +39,12 @@ module FaaStRuby
 
         private
 
+        def dir_exists?
+          return false unless File.directory?(@base_dir)
+          puts "Local folder '#{@workspace_name}' already exists."
+          true
+        end
+
         def missing_args
           if @args.empty?
             @missing_args << "Missing argument: WORKSPACE_NAME".red

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

@@ -16,8 +16,10 @@ module FaaStRuby
           warning unless @options['force']
           FaaStRuby::CLI.error("Cancelled") unless @options['force'] == 'y'
           workspace = FaaStRuby::Workspace.new(name: @workspace_name)
+          spinner = spin("Destroying...")
           workspace.destroy
           FaaStRuby::CLI.error(workspace.errors) if workspace.errors.any?
+          spinner.stop("Done!")
           FaaStRuby::Credentials.remove(@workspace_name, @options['credentials_file'])
           puts "Workspace '#{@workspace_name}' was deleted from the server"
         end

data/lib/faastruby/version.rb

@@ -1,3 +1,3 @@
 module FaaStRuby
-  VERSION = '0.2.6'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faastruby
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.1
 platform: ruby
 authors:
 - Paulo Arruda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -94,6 +94,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: faastruby-rpc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +211,7 @@ email:
 - parrudaj@gmail.com
 executables:
 - faastruby
+- faastruby-server
 extensions: []
 extra_rdoc_files: []
 files:
@@ -180,6 +237,7 @@ files:
 - example/spec/helpers/faastruby.rb
 - example/spec/spec_helper.rb
 - exe/faastruby
+- exe/faastruby-server
 - faastruby.gemspec
 - lib/faastruby.rb
 - lib/faastruby/api.rb