faastruby 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00a0d314576c48b1a2ab8e49ab18e9942f4487a0dd87bdf2aaaf62185fe186e3
-  data.tar.gz: 03116a1bf3e3d6278c90624747c76111c4cc986fc4491a7edc446c525ac26674
+  metadata.gz: 4086556ca79303b6f5648d703b26a0a7f5170baa4f9736027d9aa728afe1bf47
+  data.tar.gz: 5f8ed48b70913ecd61208b08315ef199492d8f1c02cf7cf7d42101a32313b0ba
 SHA512:
-  metadata.gz: 9160436ef41eb8b737bc09627106511e6cf4d57ce6f50f4e77330309519838a60c67d91c8bb7e00c8221342da2c4efc1b0d5cde47aed52a069d3c0c9d796bae9
-  data.tar.gz: 12d532248a6b80d544c8d3ebeb301ffd8679234cdc82ca3f957b04a8a0bc9c6873f03a6ec115abb84877c3d7980b0be47d91196329c5030d52eb4840087e6bee
+  metadata.gz: af818d48b8e17d6d56290f4181b6aadb026a8734bc7ee51d84ce5536dabf52ca728e9c15de7c8c8096e7ea06aff8e8bba2503cd6e44a0dd3b00386ae6bc0c473
+  data.tar.gz: 7f6e33b947949e7d825930e2f5a0d87daf85c0ae2cce858ed01b58da52a39d592b093e52efa9332af4341e9a04b185d4f5d7d849f4d6a09df124de4107177dcd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    faastruby (0.3.4)
+    faastruby (0.3.5)
       colorize (~> 0.8)
       faastruby-rpc (~> 0.1.3)
       oj (~> 3.6)

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

@@ -8,29 +8,29 @@ module FaaStRuby
           FaaStRuby::CLI.error(@missing_args, color: nil) if missing_args.any?
           @function_name = @args.shift
           @base_dir = "./#{@function_name}"
-          @yaml_content = {
-            'name' => @function_name,
-            'test_command' => 'rspec',
-            'abort_build_when_tests_fail' => true,
-            'abort_deploy_when_tests_fail' => true
-          }
           parse_options
+          @options['template_path'] ||= 'templates/ruby'
           @options['template'] ||= 'example'
+          @options['runtime_name'] ||= 'ruby'
+          @options['runtime_version'] ||= '2.5.3'
+          @yaml_content = yaml_for(@options['runtime_name'])
         end
 
         def run
           dir_exists? unless @options['force']
           copy_template
           write_yaml
-          bundle_install
+          post_tasks(@options['runtime_name'])
         end
 
         def self.help
-          "new".blue + " FUNCTION_NAME [--blank] [--force]" +
+          "new".blue + " FUNCTION_NAME [--blank] [--force] [--runtime]" +
           <<-EOS
 
     --blank              # Create a blank function
     --force              # Continue if directory already exists and overwrite files
+    --runtime            # Choose the runtime. Options are: crystal:0.27.0,
+                         # ruby:2.5.3 (default) and ruby:2.6.0
 EOS
         end
 
@@ -45,6 +45,10 @@ EOS
           while @args.any?
             option = @args.shift
             case option
+            when '--runtime'
+              @options['runtime'] = @args.shift
+              @options['runtime_name'], @options['runtime_version'] = @options['runtime'].split(':')
+              @options['template_path'] = "templates/#{@options['runtime_name']}"
             when '-f', '--force'
               @options['force'] = true
             when '--blank'
@@ -71,28 +75,90 @@ EOS
         end
 
         def copy_template
-          source = "#{Gem::Specification.find_by_name("faastruby").gem_dir}/#{@options['template']}"
+          source = "#{Gem::Specification.find_by_name("faastruby").gem_dir}/#{@options['template_path']}/#{@options['template']}"
           FileUtils.mkdir_p(@base_dir)
           FileUtils.cp_r("#{source}/.", "#{@base_dir}/")
-          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
-          puts "+ f #{@base_dir}/handler.rb".green
+          case @options['runtime_name']
+          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
+            puts "+ f #{@base_dir}/handler.rb".green
+          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
+            puts "+ f #{@base_dir}/src/handler.cr".green
+          end
+        end
+
+        def yaml_for(runtime_name)
+          case runtime_name
+          when 'crystal'
+            test_command = 'crystal spec --no-color'
+          when 'ruby'
+            test_command = 'rspec'
+          else
+            test_command = 'rspec'
+          end
+          {
+            'name' => @function_name,
+            'runtime' => @options['runtime'],
+            'test_command' => test_command,
+            'abort_build_when_tests_fail' => true,
+            'abort_deploy_when_tests_fail' => true
+          }
         end
 
         def write_yaml
           write_file("#{@base_dir}/faastruby.yml", @yaml_content.to_yaml)
         end
 
+        def post_tasks(runtime_name)
+          case runtime_name
+          when 'ruby'
+            bundle_install
+          when 'crystal'
+            write_shards_file
+            shards_install
+          else
+            bundle_install
+          end
+        end
+
         def bundle_install
           spinner = spin("Installing gems...")
           system("bundle install --gemfile=#{@base_dir}/Gemfile > /dev/null")
           spinner.stop('Done!')
         end
+
+        def write_shards_file
+          shards = {
+            'name' => @function_name,
+            'version' => '0.1.0',
+            'crystal' => @options['runtime_version'],
+            'targets' => {
+              @function_name => {
+                'main' => 'src/handler.cr'
+              }
+            }
+          }.to_yaml
+          write_file("#{@base_dir}/shard.yml", shards)
+        end
+
+        def shards_install
+          spinner = spin("Installing shards...")
+          system("cd #{@base_dir} && shards install > /dev/null")
+          spinner.stop('Done!')
+        end
       end
     end
   end

data/lib/faastruby/version.rb

@@ -1,3 +1,3 @@
 module FaaStRuby
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

data/templates/crystal/example-blank/spec/handler_spec.cr

@@ -0,0 +1,8 @@
+require "./spec_helper"
+
+describe "handler(event)" do
+  # TODO: Write some tests!
+  it "sample test" do
+    true.should eq(true)
+  end
+end

data/templates/crystal/example-blank/spec/helpers/faastruby.cr

@@ -0,0 +1,77 @@
+require "yaml"
+require "json"
+require "base64"
+
+module FaaStRuby
+  class Event
+    JSON.mapping(
+      body: String?,
+      headers: Hash(String, String),
+      context: String?,
+      query_params: Hash(String, String)
+    )
+  end
+  class Response
+    @@rendered = false
+    property "body"
+    property "status"
+    property "headers"
+    property "io"
+    def initialize(@body : String?, @status : Int32, @headers : Hash(String, String))
+      @io = nil
+    end
+
+    def initialize(@io : Bytes, @status : Int32, @headers : Hash(String, String))
+    end
+
+    def payload
+      if io
+        hash = {
+          "response" => Base64.encode(io.not_nil!),
+          "status" => status,
+          "headers" => headers
+        }
+      else
+        hash = {
+          "response" => body,
+          "status" => status,
+          "headers" => headers
+        }
+      end
+      hash
+    end
+  end
+
+  def respond_with(body : String? = nil, status : Int32 = 200, headers : Hash(String, String) = {} of String => String)
+    Response.new(body: body, status: status, headers: headers)
+  end
+
+  def respond_with(io : Bytes, status : Int32 = 200, headers : Hash(String, String) = {} of String => String)
+    Response.new(io: io, status: status, headers: headers)
+  end
+
+  def render(io : Bytes? = 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)
+    headers["Content-Type"] = content_type if content_type
+    case
+    when json
+      headers["Content-Type"] ||= "application/json"
+      resp_body = 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"] ||= "text/yaml"
+      resp_body = yaml
+    when js
+      headers["Content-Type"] ||= "text/javascript"
+      resp_body = js
+    when io
+      headers["Content-Type"] ||= "application/octet-stream"
+      return respond_with(io: io, status: status, headers: headers)
+    end
+    respond_with(body: resp_body, status: status, headers: headers)
+  end
+end

data/templates/crystal/example-blank/spec/spec_helper.cr

@@ -0,0 +1,4 @@
+require "spec"
+require "./helpers/faastruby"
+require "../src/handler"
+include FaaStRuby

data/templates/crystal/example-blank/src/handler.cr

@@ -0,0 +1,25 @@
+# To deploy this function, cd into its folder and run:
+# faastruby deploy-to WORKSPACE_NAME
+def handler(event : FaaStRuby::Event) : FaaStRuby::Response
+  # event.body : String | Nil
+  # event.headers : Hash(String, String)
+  # event.context : String | Nil
+  # query_params : Hash(String, String)
+
+  # FUNCTION RESPONSE
+  #
+  # You can render text, json, yaml, html or js. Example:
+  # render html: "<p>Hello World!</p>"
+  # render yaml: {"hello" => "world!"}
+  #
+  # Status:
+  # The default status is 200. You can set a custom status like this:
+  # render json: {"error" => "Could not perform the action"}, status: 422
+  #
+  # Headers:
+  # The 'Content-Type' header is automatically set when you use 'render'.
+  # You can set custom headers using a Hash(String, String). Example:
+  # render text: "It Works!", headers: {"TransactionId" => 23928}
+
+  # TODO: Write code here!
+end

data/templates/crystal/example/spec/handler_spec.cr

@@ -0,0 +1,27 @@
+require "./spec_helper"
+
+describe "handler(event)" do
+  body = {"name" => "Ruby"}.to_json
+  event_hash = {
+    "body" => body,
+    "context" => nil,
+    "headers" => {"Content-Type" => "application/json"},
+    "query_params" => {} of String => String
+  }
+  event = Event.from_json(event_hash.to_json)
+
+  it "should return Hash, String or Array" do
+    body = handler(event).body
+    body.class.should eq(String)
+  end
+  it "should add the name to the response string" do
+    body = handler(event).body
+    body.should eq("Hello, Ruby!\n")
+  end
+  it "should say Hello, World! when name is not present" do
+    event_hash["body"] = nil
+    event = Event.from_json(event_hash.to_json)
+    body = handler(event).body
+    body.should eq("Hello, World!\n")
+  end
+end

data/templates/crystal/example/spec/helpers/faastruby.cr

@@ -0,0 +1,77 @@
+require "yaml"
+require "json"
+require "base64"
+
+module FaaStRuby
+  class Event
+    JSON.mapping(
+      body: String?,
+      headers: Hash(String, String),
+      context: String?,
+      query_params: Hash(String, String)
+    )
+  end
+  class Response
+    @@rendered = false
+    property "body"
+    property "status"
+    property "headers"
+    property "io"
+    def initialize(@body : String?, @status : Int32, @headers : Hash(String, String))
+      @io = nil
+    end
+
+    def initialize(@io : Bytes, @status : Int32, @headers : Hash(String, String))
+    end
+
+    def payload
+      if io
+        hash = {
+          "response" => Base64.encode(io.not_nil!),
+          "status" => status,
+          "headers" => headers
+        }
+      else
+        hash = {
+          "response" => body,
+          "status" => status,
+          "headers" => headers
+        }
+      end
+      hash
+    end
+  end
+
+  def respond_with(body : String? = nil, status : Int32 = 200, headers : Hash(String, String) = {} of String => String)
+    Response.new(body: body, status: status, headers: headers)
+  end
+
+  def respond_with(io : Bytes, status : Int32 = 200, headers : Hash(String, String) = {} of String => String)
+    Response.new(io: io, status: status, headers: headers)
+  end
+
+  def render(io : Bytes? = 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)
+    headers["Content-Type"] = content_type if content_type
+    case
+    when json
+      headers["Content-Type"] ||= "application/json"
+      resp_body = 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"] ||= "text/yaml"
+      resp_body = yaml
+    when js
+      headers["Content-Type"] ||= "text/javascript"
+      resp_body = js
+    when io
+      headers["Content-Type"] ||= "application/octet-stream"
+      return respond_with(io: io, status: status, headers: headers)
+    end
+    respond_with(body: resp_body, status: status, headers: headers)
+  end
+end

data/templates/crystal/example/spec/spec_helper.cr

@@ -0,0 +1,4 @@
+require "spec"
+require "./helpers/faastruby"
+require "../src/handler"
+include FaaStRuby

data/templates/crystal/example/src/handler.cr

@@ -0,0 +1,27 @@
+# require "cool-shard"
+require "json"
+
+# To deploy this function, cd into its folder and run:
+# faastruby deploy-to WORKSPACE_NAME
+def handler(event : FaaStRuby::Event) : FaaStRuby::Response
+  # event.body : String | Nil
+  # event.headers : Hash(String, String)
+  # event.context : String | Nil
+  # query_params : Hash(String, String)
+  data = JSON.parse(event.body.not_nil!) rescue {} of String => String
+  # FUNCTION RESPONSE
+  #
+  # You can render text, json, yaml, html or js. Example:
+  # render html: "<p>Hello World!</p>"
+  # render yaml: {"hello" => "world!"}
+  #
+  # Status:
+  # The default status is 200. You can set a custom status like this:
+  # render json: {"error" => "Could not perform the action"}, status: 422
+  #
+  # Headers:
+  # The 'Content-Type' header is automatically set when you use 'render'.
+  # You can set custom headers using a Hash(String, String). Example:
+  # render text: "It Works!", headers: {"TransactionId" => 23928}
+  render text: "Hello, #{data["name"]? || "World"}!\n"
+end

data/{example-blank → templates/ruby/example-blank}/handler.rb

@@ -1,3 +1,5 @@
+# To deploy this function, cd into its folder and run:
+# faastruby deploy-to WORKSPACE_NAME
 def handler event
   # FUNCTION RESPONSE
   #

data/{example → templates/ruby/example}/handler.rb

@@ -1,9 +1,7 @@
 # require 'cool-gem'
 require 'json'
 
-# 1) If you don't have a workspace, create one by running:
-# faastruby create-workspace WORKSPACE_NAME
-# 2) To deploy this function, cd into its folder and run:
+# To deploy this function, cd into its folder and run:
 # faastruby deploy-to WORKSPACE_NAME
 def handler event
   data = event.body ? JSON.parse(event.body) : {}

data/{example → templates/ruby/example}/spec/helpers/faastruby.rb

@@ -15,7 +15,6 @@ module FaaStRuby
       end
     end
     class Response
-      # @@response = Struct.new(:body, :status, :headers)
       attr_accessor :body, :status, :headers
       @@rendered = false
       def initialize(body, status, headers)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faastruby
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Paulo Arruda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-27 00:00:00.000000000 Z
+date: 2018-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -226,16 +226,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- example-blank/Gemfile
-- example-blank/handler.rb
-- example-blank/spec/handler_spec.rb
-- example-blank/spec/helpers/faastruby.rb
-- example-blank/spec/spec_helper.rb
-- example/Gemfile
-- example/handler.rb
-- example/spec/handler_spec.rb
-- example/spec/helpers/faastruby.rb
-- example/spec/spec_helper.rb
 - exe/faastruby
 - exe/faastruby-server
 - faastruby.gemspec
@@ -268,6 +258,24 @@ files:
 - lib/faastruby/function.rb
 - lib/faastruby/version.rb
 - lib/faastruby/workspace.rb
+- templates/crystal/example-blank/spec/handler_spec.cr
+- templates/crystal/example-blank/spec/helpers/faastruby.cr
+- templates/crystal/example-blank/spec/spec_helper.cr
+- templates/crystal/example-blank/src/handler.cr
+- templates/crystal/example/spec/handler_spec.cr
+- templates/crystal/example/spec/helpers/faastruby.cr
+- templates/crystal/example/spec/spec_helper.cr
+- templates/crystal/example/src/handler.cr
+- templates/ruby/example-blank/Gemfile
+- templates/ruby/example-blank/handler.rb
+- templates/ruby/example-blank/spec/handler_spec.rb
+- templates/ruby/example-blank/spec/helpers/faastruby.rb
+- templates/ruby/example-blank/spec/spec_helper.rb
+- templates/ruby/example/Gemfile
+- templates/ruby/example/handler.rb
+- templates/ruby/example/spec/handler_spec.rb
+- templates/ruby/example/spec/helpers/faastruby.rb
+- templates/ruby/example/spec/spec_helper.rb
 homepage: https://faastruby.io
 licenses:
 - MIT