faastruby 0.4.18 → 0.5.0

data/lib/faastruby/supported_runtimes.rb

@@ -0,0 +1,8 @@
+module FaaStRuby
+  # It is important that they are sorted in version order!
+  SUPPORTED_RUBY = ['2.5.3', '2.6.0', '2.6.1']
+  SUPPORTED_CRYSTAL = ['0.27.0', '0.27.2']
+  CRYSTAL_LATEST = SUPPORTED_CRYSTAL.last
+  RUBY_LATEST = SUPPORTED_RUBY.last
+  SUPPORTED_RUNTIMES = SUPPORTED_RUBY.map{|version| "ruby:#{version}"} + SUPPORTED_CRYSTAL.map{|version| "crystal:#{version}"}
+end

data/lib/faastruby/user.rb

@@ -0,0 +1,77 @@
+module FaaStRuby
+  class User < BaseObject
+    def self.create(email:, password:)
+      api = API.new
+      user = User.new(email: email)
+      response = api.signup(email: email, password: password)
+      user.status_code = response.code
+      if response.errors.any?
+        user.errors += response.errors
+        return user
+      end
+      case response.code
+      when 422
+        user.errors += ['(422) Unprocessable Entity', response.body]
+      when 200, 201
+        true
+      else
+        user.errors << "(#{response.code}) Error"
+      end
+      return user
+    end
+
+    attr_accessor :email, :password, :status_code, :errors, :api_key, :api_secret, :confirmation_token
+
+    def logout(all: false)
+      response = @api.logout(api_key: @api_key, api_secret: @api_secret, all: all)
+      @status_code = response.code
+      @errors += response.errors if response.errors.any?
+      self
+    end
+
+    def login
+      response = @api.login(email: @email, password: @password)
+      @status_code = response.code
+      if response.errors.any?
+        @errors += response.errors
+        return self
+      end
+      if response.body['credentials']
+        @api_key = response.body['credentials']['api_key']
+        @api_secret = response.body['credentials']['api_secret']
+      end
+      self
+    end
+
+    def has_credentials?
+      @api_key && @api_secret
+    end
+
+    def confirm_account!
+      response = @api.confirm_account(@confirmation_token)
+      @status_code = response.code
+      if response.errors.any?
+        @errors += response.errors
+        return self
+      end
+      if response.body['credentials']
+        @api_key = response.body['credentials']['api_key']
+        @api_secret = response.body['credentials']['api_secret']
+      end
+      self
+    end
+
+    def send_confirmation_code
+      response = @api.send_confirmation_code(@email)
+      @status_code = response.code
+      @errors += response.errors if response.errors.any?
+      self
+    end
+
+    def save_credentials
+      credentials_file = NewCredentials::CredentialsFile.new
+      credentials_file.save(email: @email, api_key: @api_key, api_secret: @api_secret)
+    end
+
+  end
+end

data/lib/faastruby/version.rb

@@ -1,3 +1,3 @@
 module FaaStRuby
-  VERSION = '0.4.18'
+  VERSION = '0.5.0'
 end

data/lib/faastruby/workspace.rb

@@ -18,6 +18,7 @@ module FaaStRuby
         workspace.errors += ['(422) Unprocessable Entity', response.body]
       when 200, 201
         workspace.credentials = response.body['credentials']
+        workspace.runners_max = response.body['runners_max'].to_i if response.body['runners_max']
       else
         workspace.errors << "(#{response.code}) Error"
       end
@@ -26,7 +27,7 @@ module FaaStRuby
     ###################
 
     ##### Instance methods
-    attr_accessor :name, :errors, :functions, :email, :object, :credentials, :updated_at, :created_at, :status_code, :provider
+    attr_accessor :name, :errors, :functions, :email, :object, :credentials, :updated_at, :created_at, :status_code, :provider, :runners_max, :runners_current, :static_metadata
 
     def destroy
       response = @api.destroy_workspace(@name)
@@ -34,8 +35,8 @@ module FaaStRuby
       @errors += response.errors if response.errors.any?
     end
 
-    def deploy(package_file_name)
-      response = @api.deploy(workspace_name: @name, package: package_file_name)
+    def deploy(package_file_name, root_to: false, catch_all: false, context: false)
+      response = @api.deploy(workspace_name: @name, package: package_file_name, root_to: root_to, catch_all: catch_all, context: context)
       @status_code = response.code
       @errors += response.errors if response.errors.any?
       self
@@ -49,6 +50,14 @@ module FaaStRuby
       self
     end
 
+    def update_runners(value)
+      response = @api.update_runners(workspace_name: @name, runners_max: value)
+      @runners_max = response.body['runners_max'].to_i if response.body['runners_max'] rescue nil
+      @status_code = response.code
+      @errors += response.errors if response.errors.any?
+      self
+    end
+
     def fetch
       response = @api.get_workspace_info(@name)
       @status_code = response.code
@@ -60,6 +69,28 @@ module FaaStRuby
       self
     end
 
+    def upload_file(package_file_name, relative_path:)
+      response = @api.upload_file(workspace_name: @name, package: package_file_name, relative_path: relative_path)
+      @status_code = response.code
+      @errors += response.errors if response.errors.any?
+      self
+    end
+
+    def delete_file(relative_path:)
+      response = @api.delele_file(workspace_name: @name, relative_path: relative_path)
+      @status_code = response.code
+      @errors += response.errors if response.errors.any?
+      self
+    end
+
+    def static_metadata
+      response = @api.get_static_metadata(@name)
+      @status_code = response.code
+      @errors += response.errors if response.errors.any?
+      @static_metadata = response.body['metadata']
+      self
+    end
+
     def parse_attributes(attributes)
       @functions = attributes['functions']
       @email = attributes['email']
@@ -67,6 +98,8 @@ module FaaStRuby
       @updated_at = attributes['updated_at']
       @created_at = attributes['created_at']
       @provider = attributes['provider']
+      @runners_max = attributes['runners_max'].to_i if attributes['runners_max'] rescue nil
+      @runners_current = attributes['runners_current'].to_i rescue nil
     end
   end
 end

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

@@ -0,0 +1,3 @@
+def handler(event : FaaStRuby::Event) : FaaStRuby::Response
+  # TODO: Write code here.
+end

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

@@ -1,22 +1,27 @@
 require "./spec_helper"
 
-describe "handler(event)" do
-  event_hash = {
+private def event_hash
+  {
     "body" => nil,
     "context" => nil,
     "headers" => {"Content-Type" => "application/json"},
     "query_params" => {} of String => String
   }
-  event = Event.from_json(event_hash.to_json)
+end
+
+private def event
+  Event.from_json(event_hash.to_json)
+end
 
+describe "handler(event)" do
   it "should return String" do
     body = handler(event).body
-    body.class.should eq(String)
+    body.should be_a String
   end
+
   it "should say Hello, World!" 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
+end

data/templates/public-web/assets/javascripts/main.js

@@ -0,0 +1 @@
+console.log('Welcome to FaaStRuby Local!');

data/templates/public-web/assets/stylesheets/main.css

@@ -0,0 +1,70 @@
+* {
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+html {
+  height: 100%;
+  margin: 0px;
+  background-image: url('/assets/images/background.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+}
+
+body {
+  margin: 0px;
+  padding-left: 30px;
+  padding-right: 30px;
+  font-family: 'Open Sans';
+  color: #ffffff;
+  height: 100%;
+}
+
+h1,h2,h3,h4,h5,h6 {
+  font-family: 'Source Code Pro';
+  letter-spacing: -1px;
+}
+
+.paragraph {
+  font-family: 'Open Sans';
+  letter-spacing: 0px;
+}
+
+.text-center {
+  text-align: center;
+}
+
+.header {
+  height: 60px;
+  width: 100%;
+  display:table;
+  padding: 0px;
+}
+
+.logo-image-div {
+  vertical-align:middle;
+  display:table-cell;
+  width: 60px;
+  padding: 0px;
+}
+
+.logo-image {
+  width: 60px;
+  padding: 0px;
+}
+
+.logo-name-div {
+  vertical-align:middle;
+  display:table-cell;
+  padding-left: 5px;
+  padding-bottom: 6px;
+}
+
+.logo-name {
+  font-size: 45px;
+}
+
+.content {
+  width: 100%;
+  margin: 0px;
+}

data/templates/ruby/api-404/handler.rb

@@ -0,0 +1,6 @@
+def handler event
+  response = {
+    'message' => "Page Not Found. Edit the function 'catch-all' to customize this response."
+  }
+  render json: response, status: 404
+end

data/templates/ruby/api-root/handler.rb

@@ -0,0 +1,6 @@
+def handler event
+  response = {
+    'message' => "Welcome to FaaStRuby Local! Edit the function 'root' to customize this response."
+  }
+  render json: response
+end

data/templates/ruby/example-blank/handler.rb

@@ -1,26 +1,3 @@
-# To deploy this function, cd into its folder and run:
-# faastruby deploy-to WORKSPACE_NAME
 def handler event
-  # The 'event' argument has the following attributes
-  # event.body - The request body
-  # event.context - The execution context
-  # event.headers - The request headers
-  # event.query_params - The query params
-  
-  # 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 with string keys. Example:
-  # render text: 'It Works!', headers: {'TransactionId' => 23928}
-
   # TODO: Write code here
 end

data/templates/ruby/web-404/404.html

@@ -0,0 +1,36 @@
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <meta name="description" content="">
+  <meta name="author" content="">
+
+  <title>Page Not Found - FaaStRuby Local</title>
+
+  <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:400,700" rel="stylesheet">
+  <link href="/assets/stylesheets/main.css" rel="stylesheet">
+
+</head>
+
+<body>
+  <header class="header">
+    <div class="logo-image-div">
+      <img src="/assets/images/ruby.png" class="logo-image">
+    </div>
+    <div class="logo-name-div">
+      <h1 class="logo-name">FaaStRuby</h1>
+    </div>
+  </header>
+  <div class="content">
+    <h1 class="text-center">Page Not Found</h1>
+  <p class="text-center">To customize this page, edit the function 'catch-all'.</p>
+  </div>
+  <!-- JavaScript -->
+  <script src="/assets/javascripts/main.js"></script>
+</body>
+
+</html>

data/templates/ruby/web-404/handler.rb

@@ -0,0 +1,3 @@
+def handler event
+  render html: File.read('404.html')
+end

data/templates/ruby/web-root/handler.rb

@@ -0,0 +1,10 @@
+require './template'
+
+def handler event
+  greeting = "Welcome to FaaStRuby Local!"
+  render html: template('index.html.erb', variables: {greeting: greeting})
+end
+
+def template(file, variables: {})
+  Template.new(variables: variables).render(file)
+end

data/templates/ruby/web-root/index.html.erb

@@ -0,0 +1,37 @@
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <meta name="description" content="">
+  <meta name="author" content="">
+
+  <title>Welcome! - FaaStRuby Local</title>
+
+  <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:400,700" rel="stylesheet">
+  <link href="/assets/stylesheets/main.css" rel="stylesheet">
+
+</head>
+
+<body>
+  <header class="header">
+    <div class="logo-image-div">
+      <img src="/assets/images/ruby.png" class="logo-image">
+    </div>
+    <div class="logo-name-div">
+      <h1 class="logo-name">FaaStRuby</h1>
+    </div>
+  </header>
+  <div class="content">
+    <h1 class="text-center"><%= @greeting %></h1>
+    <p class="text-center">To customize this page, edit the function 'root'.</p>
+  </div>
+
+  <!-- JavaScript -->
+  <script src="/assets/javascripts/main.js"></script>
+</body>
+
+</html>

data/templates/ruby/web-root/template.rb

@@ -0,0 +1,13 @@
+require 'erb'
+
+class Template
+  def initialize(variables: {})
+    variables.each do |var, value|
+      instance_variable_set("@#{var}", value)
+    end
+  end
+
+  def render(file)
+    ERB.new(File.read(file)).result(binding)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faastruby
 version: !ruby/object:Gem::Version
-  version: 0.4.18
+  version: 0.5.0
 platform: ruby
 authors:
 - Paulo Arruda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2019-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -142,14 +142,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: tmuxinator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -211,7 +253,6 @@ email:
 - parrudaj@gmail.com
 executables:
 - faastruby
-- faastruby-server
 extensions: []
 extra_rdoc_files: []
 files:
@@ -227,17 +268,19 @@ files:
 - bin/console
 - bin/setup
 - exe/faastruby
-- exe/faastruby-server
 - faastruby.gemspec
 - lib/faastruby.rb
 - lib/faastruby/api.rb
 - lib/faastruby/base.rb
 - lib/faastruby/cli.rb
+- lib/faastruby/cli/base_command.rb
 - lib/faastruby/cli/commands.rb
-- lib/faastruby/cli/commands/credentials.rb
-- lib/faastruby/cli/commands/credentials/add.rb
-- lib/faastruby/cli/commands/credentials/list.rb
-- lib/faastruby/cli/commands/function.rb
+- lib/faastruby/cli/commands/account/base_command.rb
+- lib/faastruby/cli/commands/account/confirm.rb
+- lib/faastruby/cli/commands/account/login.rb
+- lib/faastruby/cli/commands/account/logout.rb
+- lib/faastruby/cli/commands/account/signup.rb
+- lib/faastruby/cli/commands/function/base_command.rb
 - lib/faastruby/cli/commands/function/build.rb
 - lib/faastruby/cli/commands/function/deploy_to.rb
 - lib/faastruby/cli/commands/function/new.rb
@@ -247,48 +290,85 @@ files:
 - lib/faastruby/cli/commands/function/update_context.rb
 - lib/faastruby/cli/commands/function/upgrade.rb
 - lib/faastruby/cli/commands/help.rb
+- lib/faastruby/cli/commands/project/base_command.rb
+- lib/faastruby/cli/commands/project/deploy.rb
+- lib/faastruby/cli/commands/project/down.rb
+- lib/faastruby/cli/commands/project/new.rb
 - lib/faastruby/cli/commands/version.rb
-- lib/faastruby/cli/commands/workspace.rb
+- lib/faastruby/cli/commands/workspace/cp.rb
 - lib/faastruby/cli/commands/workspace/create.rb
-- lib/faastruby/cli/commands/workspace/deploy.rb
 - lib/faastruby/cli/commands/workspace/destroy.rb
 - lib/faastruby/cli/commands/workspace/list.rb
+- lib/faastruby/cli/commands/workspace/migrate.rb
+- lib/faastruby/cli/commands/workspace/rm.rb
+- lib/faastruby/cli/commands/workspace/update.rb
 - lib/faastruby/cli/credentials.rb
+- lib/faastruby/cli/new_credentials.rb
 - lib/faastruby/cli/package.rb
 - lib/faastruby/cli/template.rb
 - lib/faastruby/function.rb
+- lib/faastruby/local.rb
+- lib/faastruby/local/crystal_runtime.cr
+- lib/faastruby/local/functions.rb
+- lib/faastruby/local/functions/crystal.rb
+- lib/faastruby/local/functions/function.rb
+- lib/faastruby/local/functions/ruby.rb
+- lib/faastruby/local/listeners.rb
+- lib/faastruby/local/listeners/listener.rb
+- lib/faastruby/local/logger.rb
+- lib/faastruby/local/monkey_patch.rb
+- lib/faastruby/local/processors.rb
+- lib/faastruby/local/processors/function.rb
+- lib/faastruby/local/processors/processor.rb
+- lib/faastruby/local/processors/static_file.rb
+- lib/faastruby/local/static_files.rb
+- lib/faastruby/local/static_files/static_file.rb
 - lib/faastruby/server.rb
+- lib/faastruby/server/app.rb
 - lib/faastruby/server/concurrency_controller.rb
+- lib/faastruby/server/config.ru
 - lib/faastruby/server/errors.rb
 - lib/faastruby/server/event.rb
 - lib/faastruby/server/event_channel.rb
 - lib/faastruby/server/event_hub.rb
 - lib/faastruby/server/function_object.rb
+- lib/faastruby/server/local.rb
+- lib/faastruby/server/logger.rb
+- lib/faastruby/server/project_config.rb
+- lib/faastruby/server/puma.rb
 - lib/faastruby/server/response.rb
 - lib/faastruby/server/runner.rb
 - lib/faastruby/server/runner_methods.rb
+- lib/faastruby/server/sentinel.rb
 - lib/faastruby/server/subscriber.rb
 - lib/faastruby/spec_helper.rb
+- lib/faastruby/supported_runtimes.rb
+- lib/faastruby/user.rb
 - lib/faastruby/version.rb
 - lib/faastruby/workspace.rb
-- templates/crystal/example-blank/README.md
-- templates/crystal/example-blank/spec/handler_spec.cr
-- templates/crystal/example-blank/spec/spec_helper.cr
-- templates/crystal/example-blank/src/handler.cr
+- templates/crystal/example-blank/handler.cr
 - templates/crystal/example/README.md
 - templates/crystal/example/spec/handler_spec.cr
 - templates/crystal/example/spec/spec_helper.cr
 - templates/crystal/example/src/handler.cr
-- templates/ruby/example-blank/Gemfile
-- templates/ruby/example-blank/README.md
+- templates/public-web/assets/images/background.png
+- templates/public-web/assets/images/ruby.png
+- templates/public-web/assets/javascripts/main.js
+- templates/public-web/assets/stylesheets/main.css
+- templates/public-web/favicon.ico
+- templates/ruby/api-404/handler.rb
+- templates/ruby/api-root/handler.rb
 - templates/ruby/example-blank/handler.rb
-- templates/ruby/example-blank/spec/handler_spec.rb
-- templates/ruby/example-blank/spec/spec_helper.rb
 - templates/ruby/example/Gemfile
 - templates/ruby/example/README.md
 - templates/ruby/example/handler.rb
 - templates/ruby/example/spec/handler_spec.rb
 - templates/ruby/example/spec/spec_helper.rb
+- templates/ruby/web-404/404.html
+- templates/ruby/web-404/handler.rb
+- templates/ruby/web-root/handler.rb
+- templates/ruby/web-root/index.html.erb
+- templates/ruby/web-root/template.rb
 homepage: https://faastruby.io
 licenses:
 - MIT
@@ -308,7 +388,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: FaaStRuby CLI - Manage workspaces and functions hosted at faastruby.io.