faastruby 0.5.23 → 0.5.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bb0861a4131568e00f7008cea2ad1a83f179b739788ad09d21780e82c9edf41
-  data.tar.gz: be634ded83c995f6a5b86293960d09535a10509c119f49f425825664c0b0567a
+  metadata.gz: b9e8d511a386cfc4cf3ed084c04c10398ad7d93c298a3bd202f2690ae9f72a7d
+  data.tar.gz: 4ce5ed8f21a33e3c648fe60f13f41b3938b31f02122952d1b66765cf7dd861aa
 SHA512:
-  metadata.gz: 778433fef0a7ad573166042f0c0bc559e9ccb4218fe0ab70b845d1ff64a4e294007f817f1de452ad815574264e04b6cd928ac7a6537aaf51cf09e635ddce8cb1
-  data.tar.gz: 23df4f5fc80cdf5c6216d542ec6065022d605c0ce625b5810560a9a1839d3c6bd5b02852a7eb60a0de416807ebdb507e7c55ae4d51ed099c235bae359b6c50e3
+  metadata.gz: dd373b632709eee2ac1283ca11454dc5572258a7ca8e7f2b32376f7e473b3d2fd4640e384ee24051f22f3a67bf91e098b195655ae3b01ed4985c24474468cbd0
+  data.tar.gz: 4999518623a9c3d4409e4a93c963cb9a83860e24fe814b28c1b93593d67134dcf4f06e9c93dfe3108bec2dd1ae2292bb779d635f4ab5315781ee91f878ed6f4a

data/.gitlab-ci.yml

@@ -0,0 +1,35 @@
+# This file is a template, and might need editing before it works on your project.
+# Official docker image.
+image: ruby:2.6
+
+stages:
+  - test
+  - build
+  - deploy
+
+test:
+  stage: test
+  script:
+    - bundle install --with test
+    - bundle exec rspec
+
+build:
+  stage: build
+  script:
+    - gem build faastruby.gemspec
+  only:
+    - tags
+  except:
+    - branches
+    - master
+
+push:
+  stage: deploy
+  when: manual
+  script:
+    - gem push faastruby-*.gem
+  only:
+    - tags
+  except:
+    - branches
+    - master

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.5.24 - Apr 17 2019
+- Add experimental support for Opal
+- Add new project configuration keys: `opal_dir` and `opal_js_destination`
+- Add helper method `render_template` to the Ruby runtime.
+
 ## 0.5.23 - Apr 7 2019
 - Move regions configuration to a separate file, so it can be shared among different components of the gem
 - Replace hardcoded URLs by the correct variables

data/Gemfile.lock

@@ -1,11 +1,13 @@
 PATH
   remote: .
   specs:
-    faastruby (0.5.22)
+    faastruby (0.5.24)
       colorize (~> 0.8)
       faastruby-rpc (~> 0.2.7)
       listen (~> 3.1)
       oj (~> 3.6)
+      opal (~> 0.11.4)
+      opal-jquery (~> 0.4.3)
       puma (~> 3.12)
       rest-client (~> 2.0)
       rouge (~> 3.3)
@@ -21,6 +23,7 @@ GEM
   specs:
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
+    ast (2.4.0)
     backports (3.13.0)
     colorize (0.8.1)
     crack (0.4.3)
@@ -34,6 +37,7 @@ GEM
       oj (~> 3.6)
     ffi (1.10.0)
     hashdiff (0.3.7)
+    hike (1.2.3)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     listen (3.1.5)
@@ -47,7 +51,16 @@ GEM
     mustermann (1.0.3)
     necromancer (0.4.0)
     netrc (0.11.0)
-    oj (3.7.11)
+    oj (3.7.12)
+    opal (0.11.4)
+      ast (>= 2.3.0)
+      hike (~> 1.2)
+      parser (= 2.3.3.1)
+      sourcemap (~> 0.1.0)
+    opal-jquery (0.4.3)
+      opal (>= 0.10.0, < 0.12.0)
+    parser (2.3.3.1)
+      ast (~> 2.2)
     pastel (0.7.2)
       equatable (~> 0.5.0)
       tty-color (~> 0.4.0)
@@ -93,6 +106,7 @@ GEM
       rack-protection (= 2.0.5)
       sinatra (= 2.0.5)
       tilt (>= 1.3, < 3)
+    sourcemap (0.1.1)
     strings (0.1.5)
       strings-ansi (~> 0.1)
       unicode-display_width (~> 1.5)

data/faastruby.gemspec

@@ -24,6 +24,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'tmuxinator', '~> 0.15'
   spec.add_runtime_dependency 'rouge', '~> 3.3'
   spec.add_runtime_dependency 'listen', '~> 3.1'
+  spec.add_runtime_dependency 'opal', '~> 0.11.4'
+  spec.add_runtime_dependency 'opal-jquery', '~> 0.4.3'
 
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'

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

@@ -159,6 +159,16 @@ module FaaStRuby
   ## Defaults to 'functions'.
   # functions_dir: functions
 
+  ## Opal support (experimental)
+  ## You can use Opal to write Ruby code and have it autocompiled to
+  ## Javascript and placed inside the public assets folder.
+  ## If 'opal_dir' is set, folders inside 'opal_dir' that contain
+  ## a file named 'main.rb' will be compiled using opal
+  # opal_dir: opal
+  ## Destination folder for .js files created by Opal.
+  ## Defaults to PUBLIC_DIR/assets/javascripts
+  # opal_js_destination: public/assets/javascripts
+
   ## The name of the function that will respond to requests made
   ## to '/'. Defaults to 'root'
   # root_to: root

data/lib/faastruby/local.rb

@@ -71,6 +71,7 @@ module FaaStRuby
     DEFAULT_RUBY_RUNTIME = "ruby:#{CURRENT_MINOR_RUBY}".freeze
     FUNCTIONS_EVENT_QUEUE = Queue.new
     PUBLIC_EVENT_QUEUE = Queue.new
+    OPAL_EVENT_QUEUE = Queue.new
     WORKSPACE_BASE_HOST = ENV['FAASTRUBY_WORKSPACE_BASE_HOST'] || 'faast.cloud'
     URL_PROTOCOL = ENV['FAASTRUBY_URL_PROTOCOL'] || 'https'
     puts "Using '#{DEFAULT_RUBY_RUNTIME}' as default Ruby runtime." if RUBY_ENABLED
@@ -125,6 +126,18 @@ module FaaStRuby
       YAML.load(File.read(SECRETS_YAML_FILE))['secrets'] || {}
     end
 
+    def self.opal_enabled?
+      !project_config['opal_dir'].nil?
+    end
+
+    def self.opal_dir
+      "#{SERVER_ROOT}/#{project_config['opal_dir']}"
+    end
+
+    def self.opal_js_destination
+      project_config['opal_js_destination'] || "#{public_dir}/assets/javascripts"
+    end
+
     def self.start!
       Listen::Adapter::Linux::DEFAULTS[:events] << :modify
       debug "self.start!"
@@ -135,10 +148,19 @@ module FaaStRuby
       puts "Detecting existing functions."
       puts "Ruby functions: #{ruby_functions.inspect}"
       puts "Crystal functions: #{crystal_functions.inspect}"
+
       listen_on_functions_dir
+      if opal_enabled?
+        puts "Opal Ruby files will be auto-compiled to Javascript and added to '#{opal_js_destination}'."
+        FileUtils.mkdir_p(Local.opal_dir)
+        listen_on_opal_dir
+      end
       listen_on_public_dir if SYNC_ENABLED
+
       FunctionProcessor.new(FUNCTIONS_EVENT_QUEUE).start
+      OpalProcessor.new(OPAL_EVENT_QUEUE).start if opal_enabled?
       StaticFileProcessor.new(PUBLIC_EVENT_QUEUE).start if SYNC_ENABLED
+
       # initial_compile
       puts "Listening for changes."
       puts "faastRuby Local is ready at http://localhost:3000"
@@ -148,6 +170,7 @@ module FaaStRuby
       puts "Stopping Watchdog..."
       Local::Listener.functions_listener.each(&:stop)
       Local::Listener.public_listener.each(&:stop)
+      Local::Listener.opal_listener.each(&:stop)
     end
 
     def self.initial_compile
@@ -176,6 +199,14 @@ module FaaStRuby
       Local::Listener.functions_listener << listener
     end
 
+    def self.listen_on_opal_dir
+      debug "self.listen_on_opal_dir"
+      debug "Listening for changes in '#{opal_dir}'"
+      listener = Listener.new(directory: opal_dir, queue: OPAL_EVENT_QUEUE)
+      listener.start
+      Local::Listener.opal_listener << listener
+    end
+
     def self.listen_on_public_dir
       debug "self.listen_on_public_dir"
       debug "Listening for changes in '#{public_dir}'"

data/lib/faastruby/local/listeners/listener.rb

@@ -7,6 +7,10 @@ module FaaStRuby
       def self.public_listener
         @@public_listener ||= []
       end
+      def self.opal_listener
+        @@opal_listener ||= []
+      end
+
       include Local::Logger
       attr_accessor :listener, :directory, :queue
       def initialize(directory:, queue:)
@@ -103,6 +107,10 @@ module FaaStRuby
         filename == 'faastruby.yml'
       end
 
+      def file_is_opal_main?
+        filename == 'main.rb'
+      end
+
       # def file_was_just_added?
       #   debug __method__
       #   Time.now.to_i - File.ctime(@full_path).to_i <= 1

data/lib/faastruby/local/processors.rb

@@ -3,5 +3,6 @@ module FaaStRuby
     require 'faastruby/local/processors/processor'
     require 'faastruby/local/processors/function'
     require 'faastruby/local/processors/static_file'
+    require 'faastruby/local/processors/opal'
   end
 end

data/lib/faastruby/local/processors/opal.rb

@@ -0,0 +1,92 @@
+module FaaStRuby
+  module Local
+    class OpalProcessor < Processor
+
+      def added(event)
+        debug "added(#{event.inspect})"
+        # does nothing
+        return true
+      end
+
+      def modified(event)
+        debug "modified(#{event.inspect})"
+        # This should trigger
+        # - compile to JS
+        compile(event)
+      end
+
+      def removed(event)
+        debug "removed(#{event.inspect})"
+        # This should trigger
+        # - Remove from workspace
+        if event.file_is_opal_main?
+          remove_from_public(event)
+        else
+          compile(event)
+        end
+      end
+
+      def remove_from_public(event)
+        delete_path = event.relative_path_dirname.sub(/^#{Local.opal_dir}\//, "#{Local.public_dir}/")
+        # return false unless delete_path.match(/^#{Local.public_dir}\//)
+        return false if delete_path.nil? || delete_path.match(/^\s*$/)
+        puts "Deleting: #{Local.opal_js_destination}/#{delete_path}"
+        FileUtils.rm_rf("#{Local.opal_js_destination}/#{delete_path}")
+        dir = "#{Local.opal_js_destination}/#{delete_path}"
+        delete_recursive_folder(dir)
+      end
+
+      def delete_recursive_folder(entry)
+        dirname = File.dirname(entry)
+        return if dirname == Local.opal_js_destination
+        glob = Dir.glob("#{dirname}/*")
+        return if glob.any?
+        puts "Deleting: #{dirname}"
+        FileUtils.rmdir(dirname)
+        delete_recursive_folder(dirname)
+      end
+
+      def compile(event)
+        debug "compile"
+        js_path = event.relative_path_dirname.sub(/^#{Local.opal_dir}\//, "")
+        FileUtils.mkdir_p("#{Local.opal_js_destination}/#{js_path}")
+        compile_cmd = [
+          "opal",
+          "-I",
+          "#{event.dirname}",
+          "--gem",
+          'jquery',
+          "--gem",
+          'opal-jquery',
+          "--compile",
+          "#{event.dirname}/main.rb",
+          ">",
+          "#{Local.opal_js_destination}/#{js_path}/main.js"
+        ]
+        # run it:
+        run(event.dirname, 'compile') {`#{compile_cmd.join(' ')}`; puts "Done"}
+        puts "Running: #{compile_cmd.join(' ')}"
+      end
+
+      def first_parent_of(entry, event_type)
+        debug "first_parent_of(#{entry.inspect})"
+        absolute_folder = get_parent_folder_for(entry)
+        if event_type == :removed
+          name = absolute_folder.dup
+          name.slice!("#{Local.opal_dir}/")
+        end
+        absolute_folder
+      end
+
+      def get_parent_folder_for(entry)
+        return File.dirname(entry) if File.basename(entry) == 'main.rb'
+        debug "get_parent_folder_for(#{entry.inspect})"
+        dirname = File.dirname(entry)
+        raise MissingConfigurationFileError.new("ERROR: Could not determine the parent. Make sure your opal folders a main file 'main.rb'.") if dirname == SERVER_ROOT
+        return dirname if File.file?("#{dirname}/main.rb")
+        get_parent_folder_for(dirname)
+      end
+
+    end
+  end
+end

data/lib/faastruby/server.rb

@@ -55,6 +55,7 @@ module FaaStRuby
   require 'faastruby/server/event_channel'
   require 'faastruby/server/subscriber'
   # require 'faastruby/server/event_hub'
+  require 'faastruby/server/template'
   require 'faastruby/server/runner_methods'
   require 'faastruby/server/function_object'
   require 'faastruby/server/runner'

data/lib/faastruby/server/runner.rb

@@ -73,6 +73,14 @@ module FaaStRuby
           response = function_object.handler(event, *args) || function_object.render_nothing
           response = FaaStRuby::Response.invalid_response unless response.is_a?(FaaStRuby::Response)
         rescue Exception => e
+          if e.class == SyntaxError
+            line, *m = e.message.split(' ')
+            line_no = line.split(':')[1]
+            real_no = line_no.to_i - 13
+            STDOUT.puts "handler.rb:#{real_no}: #{m.join(' ')}"
+          else
+            STDOUT.puts e.full_message
+          end
           error = Oj.dump({
             'error' => e.message,
             'location' => e.backtrace&.first

data/lib/faastruby/server/runner_methods.rb

@@ -88,6 +88,10 @@ module FaaStRuby
       respond_with(nil, status: status, headers: headers, binary: false)
     end
 
+    def render_template(template_path, status: 200, headers: {}, variables: {})
+      render html: FaaStRuby::Template.new(variables: variables).render(template_path), status: status, headers: headers
+    end
+
     def redirect_to(function: nil, url: nil, status: 303)
       headers = {"Location" => function || url}
       respond_with(nil, status: status, headers: headers, binary: false)

data/lib/faastruby/server/template.rb

@@ -0,0 +1,13 @@
+module FaaStRuby
+  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
+end

data/lib/faastruby/version.rb

@@ -1,3 +1,3 @@
 module FaaStRuby
-  VERSION = '0.5.23'
+  VERSION = '0.5.24'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faastruby
 version: !ruby/object:Gem::Version
-  version: 0.5.23
+  version: 0.5.24
 platform: ruby
 authors:
 - Paulo Arruda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-07 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -192,6 +192,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: opal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.4
+- !ruby/object:Gem::Dependency
+  name: opal-jquery
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -257,6 +285,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
@@ -319,6 +348,7 @@ files:
 - lib/faastruby/local/monkey_patch.rb
 - lib/faastruby/local/processors.rb
 - lib/faastruby/local/processors/function.rb
+- lib/faastruby/local/processors/opal.rb
 - lib/faastruby/local/processors/processor.rb
 - lib/faastruby/local/processors/static_file.rb
 - lib/faastruby/local/static_files.rb
@@ -341,6 +371,7 @@ files:
 - lib/faastruby/server/runner.rb
 - lib/faastruby/server/runner_methods.rb
 - lib/faastruby/server/subscriber.rb
+- lib/faastruby/server/template.rb
 - lib/faastruby/spec_helper.rb
 - lib/faastruby/supported_runtimes.rb
 - lib/faastruby/user.rb