faastruby 0.4.18 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45aba1191c45d93ec188ef15d6c7ee7b029d17aa22c04a83037998b8bf9120f1
-  data.tar.gz: 37c5af350995b96d8d299980865ad06688a70b74acafa24a591ca2b50711d8e2
+  metadata.gz: 8e947223f9a44c7019dab288b430f625aa030004c574f77be0a1702e29d7582e
+  data.tar.gz: ab438317e8aca46fd893cf29160d1537dd9421085b6c457cb50b9cb2eb2a1c20
 SHA512:
-  metadata.gz: 9c933a8f74157af31f8295034c7b81c081eb9bec68ad7295bb1365095a7b24c1f49fad9c8963c4a50fbdc53779b4baab8924cde5d9f4576cd3eefa645aa9184f
-  data.tar.gz: 4fd99240f8ab2065f5cdeeaa22ec886d5a3d9513a16ee81d5df3c9f4e92ea8a1355af9be9407e34ba50753ea4ffbf79a2d9b41886c1123366737a9f3e3c80c94
+  metadata.gz: 6830c604ae0693f66f5583ced3695d5c7fc49cb117dab05dc9770dfaecc21fbfc97d0c5080cffb35bf700c84c7ea122be56e1480cd7d5362bcf15f663ccdb11d
+  data.tar.gz: 80183f91c9e2c2f07f50e86f853f1c01a8f917739591e4c8b0323a70d80f0ddbc5eeec056f91e7f22c529733a338cb4371a09c0c8093f354d8fb9394d68422aa

data/CHANGELOG.md

@@ -1,7 +1,10 @@
 # Changelog
 
-## 0.4.19 - Unreleased
+## 0.5.0 - Mar 8 2019
+- Introduces FaaStRuby Local
+- Introduce user accounts and a migration tool to move the legacy workspace credentials into your account.
 - New key on faastruby.yml - `before_build` allows you to specify commands to run locally before building and uploading the function package.
+- New command: `update-workspace WORKSPACE_NAME --runners INT` - set the number of runners for a workspace.
 
 ## 0.4.18 - Feb 6 2019
 - Bumps runtime crystal:0.27.1 to crystal:0.27.2
@@ -26,7 +29,7 @@
 - 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. 
+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.
 
 ## 0.4.12 - Jan 26 2019
 Special thanks to [Sean Earle](https://github.com/HellRok) for fixing those bugs!
@@ -40,7 +43,7 @@ Special thanks to [Sean Earle](https://github.com/HellRok) for fixing those bugs
 - Fix command `faastruby server`
 
 ## 0.4.9 - Jan 13 2019
-- Changes in `faastruby server` 
+- Changes in `faastruby server`
   - Cleaned up code
   - Logs are easier to read
   - Function responses show up in the log

data/Gemfile.lock

@@ -1,15 +1,19 @@
 PATH
   remote: .
   specs:
-    faastruby (0.4.18)
+    faastruby (0.5.0)
       colorize (~> 0.8)
-      faastruby-rpc (~> 0.2.1)
+      faastruby-rpc (~> 0.2)
+      filewatcher (~> 1.1)
+      listen (~> 3.1)
       oj (~> 3.6)
       puma (~> 3.12)
       rest-client (~> 2.0)
+      rouge (~> 3.3)
       rubyzip (~> 1.2)
       sinatra (~> 2.0)
       sinatra-contrib (~> 2.0)
+      tmuxinator (~> 0.15)
       tty-spinner (~> 0.8)
       tty-table (~> 0.10)
 
@@ -18,7 +22,7 @@ GEM
   specs:
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    backports (3.11.4)
+    backports (3.12.0)
     colorize (0.8.1)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -26,11 +30,19 @@ GEM
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     equatable (0.5.0)
+    erubis (2.7.0)
     faastruby-rpc (0.2.1)
       oj (~> 3.6)
+    ffi (1.10.0)
+    filewatcher (1.1.1)
+      optimist (~> 3.0)
     hashdiff (0.3.7)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
@@ -38,7 +50,8 @@ GEM
     mustermann (1.0.3)
     necromancer (0.4.0)
     netrc (0.11.0)
-    oj (3.7.8)
+    oj (3.7.9)
+    optimist (3.0.0)
     pastel (0.7.2)
       equatable (~> 0.5.0)
       tty-color (~> 0.4.0)
@@ -48,10 +61,14 @@ GEM
     rack-protection (2.0.5)
       rack
     rake (10.5.0)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
     rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
+    rouge (3.3.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -65,6 +82,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
+    ruby_dep (1.5.0)
     rubyzip (1.2.2)
     safe_yaml (1.0.4)
     sinatra (2.0.5)
@@ -84,7 +102,12 @@ GEM
       unicode-display_width (~> 1.4.0)
       unicode_utils (~> 1.4.0)
     strings-ansi (0.1.0)
+    thor (0.20.3)
     tilt (2.0.9)
+    tmuxinator (0.15.0)
+      erubis (~> 2.6)
+      thor (~> 0.19, >= 0.15.0)
+      xdg (~> 2.2, >= 2.2.3)
     tty-color (0.4.3)
     tty-cursor (0.6.0)
     tty-screen (0.6.5)
@@ -105,6 +128,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
+    xdg (2.2.3)
 
 PLATFORMS
   ruby

data/README.md

@@ -10,23 +10,81 @@
 CLI tool for managing workspaces and functions hosted at [FaaStRuby](https://faastruby.io).
 
 ## What is FaaStRuby?
-FaaStRuby is a serverless platform built for Ruby developers.
+FaaStRuby is a Serverless Software Development Platform for Ruby and Crystal.
 
 * [Tutorial](https://faastruby.io/getting-started)
 
 ## Try it
 
-1. Install the gem:
+Getting up and running is quick and easy:
+
+![Getting up and running](https://s3.amazonaws.com/faastruby/public/create-project.mp4)
+
+1. Install the gem so `faastruby` is available in your terminal
 
 ```
 ~$ gem install faastruby
 ```
 
-2. Create a function and deploy it to a workspace:
+2. Create a new FaaStRuby project
+
+```
+~$ faastruby new-project hello-world
++ d ./hello-world
++ f ./hello-world/project.yml
++ f ./hello-world/secrets.yml
++ d ./hello-world/functions/root
++ f ./hello-world/functions/root/index.html.erb
++ f ./hello-world/functions/root/template.rb
++ f ./hello-world/functions/root/handler.rb
++ f ./hello-world/functions/root/faastruby.yml
++ d ./hello-world/functions/catch-all
++ f ./hello-world/functions/catch-all/404.html
++ f ./hello-world/functions/catch-all/handler.rb
++ f ./hello-world/functions/catch-all/faastruby.yml
++ f ./hello-world/public/faastruby.yml
++ f ./hello-world/.gitignore
+Initialized empty Git repository in /Users/mf/OpenSource/faastruby/hello-world/.git/
+Project 'hello-world' initialized.
+Now run:
+$ cd hello-world
+$ faastruby local
+```
+
+3. Fire up the local development environment for your new project
 
 ```
-~$ faastruby new hello-world
 ~$ cd hello-world
+~/hello-world$ faastruby local
+Puma starting in single mode...
+* Version 3.12.0 (ruby 2.5.3-p105), codename: Llamas in Pajamas
+* Min threads: 0, max threads: 32
+* Environment: production
+sh: crystal: command not found
+2019-02-27 23:36:03 +0800 (EventHub) Channel subscriptions: {}
+---
+2019-02-27 23:36:03 +0800 (EventHub) Please restart the server if you modify channel subscriptions in 'faastruby.yml' for any function.
+---
+2019-02-27 23:36:03 +0800 (EventHub) Events thread started.
+---
+2019-02-27 23:36:03 +0800 (Sentinel) Ruby functions: ["root", "catch-all"]
+---
+2019-02-27 23:36:03 +0800 (Sentinel) Watching for new Ruby functions...
+```
+
+As you can see, this runs with Ruby only. If you want to run Crystal as well (similar to Ruby, but with types and compiled to run very fast), simply [install Crystal](https://crystal-lang.org/reference/installation/) and start `faastruby local` again.
+
+
+`faastruby local` is very powerful. When you add a new folder with a `handler.rb` or `handler.cr`, it will automatically be detected. FaaStRuby will automatically add the configuration for the function so you can jump straight in:
+
+![How to add a new folder and file](https://s3.amazonaws.com/faastruby/public/new-paths.mp4)
+
+Changes to the code will automatically be detected and immediately refreshed for you, making local development easy and comfortable:
+[!How to edit files and refresh them in the browser](https://s3.amazonaws.com/faastruby/public/local-file-refresh.mp4)
+
+4. Deploy it to a workspace:
+
+```
 ~/hello-world$ faastruby deploy-to awesome-prod
 ◐ Running tests... Passed!
 ...
@@ -50,4 +108,4 @@ Build lots of functions and share them with fellow Ruby devs!
 
 ## FaaStRuby + Hyperstack = fullstack Ruby apps!
 
-Do you think JavaScript is your only option for the front-end? Think again. [Hyperstack](https://hyperstack.org) is a Ruby DSL, compiled by Opal, bundled by Webpack, powered by React.
+Do you think JavaScript is your only option for the front-end? Think again. [Hyperstack](https://hyperstack.org) is a Ruby DSL, compiled by Opal, bundled by Webpack, powered by React.

data/faastruby.gemspec

@@ -20,7 +20,11 @@ Gem::Specification.new do |spec|
   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.2.1'
+  spec.add_runtime_dependency 'faastruby-rpc', '~> 0.2'
+  spec.add_runtime_dependency 'tmuxinator', '~> 0.15'
+  spec.add_runtime_dependency 'rouge', '~> 3.3'
+  spec.add_runtime_dependency 'listen', '~> 3.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.rb

@@ -4,3 +4,4 @@ require 'faastruby/base'
 require 'faastruby/api'
 require 'faastruby/function'
 require 'faastruby/workspace'
+require 'faastruby/user'

data/lib/faastruby/api.rb

@@ -7,7 +7,8 @@ module FaaStRuby
     def initialize
       @api_url = "#{FaaStRuby.api_host}/#{@@api_version}"
       @credentials = {'API-KEY' => FaaStRuby.api_key, 'API-SECRET' => FaaStRuby.api_secret}
-      @headers = {content_type: 'application/json', accept: 'application/json'}.merge(@credentials)
+      @base_headers = {client_version: FaaStRuby::VERSION, content_type: 'application/json', accept: 'application/json'}
+      @headers = @base_headers.merge(@credentials)
       @struct = Struct.new(:response, :body, :errors, :code)
       @timeout = nil # disable request timeouts
     end
@@ -39,10 +40,154 @@ module FaaStRuby
       end
     end
 
-    # def update_workspace(workspace_name, payload)
-    #   url = "#{@api_url}/workspaces/#{workspace_name}"
-    #   parse RestClient.patch(url, Oj.dump(payload), @headers)
-    # end
+    def update_runners(workspace_name:, runners_max:)
+      url = "#{@api_url}/workspaces/#{workspace_name}/runners"
+      payload = {'runners_max' => runners_max}
+      parse RestClient::Request.execute(method: :patch, timeout: @timeout, url: url, headers: @headers, payload: Oj.dump(payload))
+    rescue RestClient::ExceptionWithResponse => err
+      case err.http_code
+      when 301, 302, 307
+        err.response.follow_redirection
+      else
+        parse err.response
+      end
+    end
+
+    def signup(email:, password:)
+      url = "#{@api_url}/users/signup"
+      payload = {
+        'email' => email,
+        'password' => password
+      }
+      parse RestClient::Request.execute(method: :post, timeout: @timeout, url: url, headers: @base_headers, payload: Oj.dump(payload))
+    rescue RestClient::ExceptionWithResponse => err
+      case err.http_code
+      when 301, 302, 307
+        err.response.follow_redirection
+      else
+        parse err.response
+      end
+    end
+
+    def send_confirmation_code(email)
+      url = "#{@api_url}/users/confirm"
+      payload = {
+        'email' => email
+      }
+      parse RestClient::Request.execute(method: :patch, timeout: @timeout, url: url, headers: @base_headers, payload: Oj.dump(payload))
+    rescue RestClient::ExceptionWithResponse => err
+      case err.http_code
+      when 301, 302, 307
+        err.response.follow_redirection
+      else
+        parse err.response
+      end
+    end
+
+    def confirm_account(confirmation_token)
+      url = "#{@api_url}/users/confirm"
+      payload = {
+        'code' => confirmation_token
+      }
+      parse RestClient::Request.execute(method: :post, timeout: @timeout, url: url, headers: @base_headers, payload: Oj.dump(payload))
+    rescue RestClient::ExceptionWithResponse => err
+      case err.http_code
+      when 301, 302, 307
+        err.response.follow_redirection
+      else
+        parse err.response
+      end
+    end
+
+    def logout(api_key:, api_secret:, all: false)
+      url = "#{@api_url}/users/logout"
+      headers = @base_headers.merge({'API-KEY' => api_key, 'API-SECRET' => api_secret})
+      payload = {
+        'all' => all
+      }
+      parse RestClient::Request.execute(method: :delete, timeout: @timeout, url: url, headers: headers, payload: Oj.dump(payload))
+    rescue RestClient::ExceptionWithResponse => err
+      case err.http_code
+      when 301, 302, 307
+        err.response.follow_redirection
+      else
+        parse err.response
+      end
+    end
+
+    def login(email:, password:)
+      url = "#{@api_url}/users/login"
+      payload = {
+        'email' => email,
+        'password' => password
+      }
+      parse RestClient::Request.execute(method: :post, timeout: @timeout, url: url, headers: @base_headers, payload: Oj.dump(payload))
+    rescue RestClient::ExceptionWithResponse => err
+      case err.http_code
+      when 301, 302, 307
+        err.response.follow_redirection
+      else
+        parse err.response
+      end
+    end
+
+    def migrate_to_account(workspace_name:, api_key:, api_secret:)
+      url = "#{@api_url}/workspaces/#{workspace_name}/migrate"
+      payload = {
+        'api_key' => api_key,
+        'api_secret' => api_secret
+      }
+      parse RestClient::Request.execute(method: :post, timeout: @timeout, url: url, headers: @headers, payload: Oj.dump(payload))
+    rescue RestClient::ExceptionWithResponse => err
+      case err.http_code
+      when 301, 302, 307
+        err.response.follow_redirection
+      else
+        parse err.response
+      end
+    end
+
+    def get_static_metadata(workspace_name)
+      url = "#{@api_url}/workspaces/#{workspace_name}/static/metadata"
+      parse RestClient::Request.execute(method: :get, timeout: @timeout, url: url, headers: @headers)
+    rescue RestClient::ExceptionWithResponse => err
+      case err.http_code
+      when 301, 302, 307
+        err.response.follow_redirection
+      else
+        parse err.response
+      end
+    end
+
+    def upload_file(workspace_name:, relative_path:, package:)
+      url = "#{@api_url}/workspaces/#{workspace_name}/static/sync"
+      payload = {package: File.new(package, 'rb')}
+      payload[:relative_path] = relative_path
+      parse RestClient::Request.execute(method: :post, timeout: @timeout, url: url, payload: payload, headers: @credentials)
+    rescue RestClient::ExceptionWithResponse => err
+      case err.http_code
+      when 301, 302, 307
+        err.response.follow_redirection
+      else
+        parse err.response
+      end
+    end
+
+    def delele_file(workspace_name:, relative_path:)
+      url = "#{@api_url}/workspaces/#{workspace_name}/static/sync"
+      payload = {
+         relative_path: relative_path
+      }
+      parse RestClient::Request.execute(method: :delete, timeout: @timeout, url: url, headers: @credentials, payload: payload)
+    rescue RestClient::ExceptionWithResponse => err
+      case err.http_code
+      when 301, 302, 307
+        err.response.follow_redirection
+      else
+        parse err.response
+      end
+    end
+
 
     def get_workspace_info(workspace_name)
       url = "#{@api_url}/workspaces/#{workspace_name}"
@@ -69,9 +214,12 @@ module FaaStRuby
       end
     end
 
-    def deploy(workspace_name:, package:)
+    def deploy(workspace_name:, package:, root_to: nil, catch_all: nil, context: nil)
       url = "#{@api_url}/workspaces/#{workspace_name}/deploy"
       payload = {package: File.new(package, 'rb')}
+      payload[:root_to] = root_to if root_to
+      payload[:catch_all] = catch_all if catch_all
+      payload[:context] = context if context
       parse RestClient::Request.execute(method: :post, timeout: @timeout, url: url, payload: payload, headers: @credentials)
     rescue RestClient::ExceptionWithResponse => err
       case err.http_code

data/lib/faastruby/base.rb

@@ -1,5 +1,6 @@
 module FaaStRuby
   ROOT_DOMAIN = ENV['FAASTRUBY_ROOT_DOMAIN'] || 'faastruby.io'
+  WORKSPACE_BASE_HOST = ENV['FAASTRUBY_WORKSPACE_BASE_HOST'] || 'faast.cloud'
   DEFAULT_REGION = 'tor1'
   REGIONS = [
     'tor1'
@@ -35,15 +36,8 @@ module FaaStRuby
     ENV['FAASTRUBY_HOST'] || "https://api.#{region}.#{ROOT_DOMAIN}"
   end
 
-  def self.credentials_file
-    return File.expand_path(ENV['FAASTRUBY_CREDENTIALS']) if ENV['FAASTRUBY_CREDENTIALS']
-    if region == DEFAULT_REGION && File.file?(File.expand_path('~/.faastruby'))
-      return File.expand_path('~/.faastruby')
-    elsif region == DEFAULT_REGION
-      return File.expand_path("~/.faastruby.#{region}")
-    else
-      return File.expand_path("~/.faastruby.#{region}")
-    end
+  def self.workspace_host_for(workspace_name)
+    "https://#{workspace_name}.#{region}.#{WORKSPACE_BASE_HOST}"
   end
 
   class Configuration