isomorfeus-puppetmaster 0.4.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e39fd34e187e7a7d720f8686a4bddadc81a697f59ab00a73b805cd8a2948f2ea
-  data.tar.gz: 6617fe83dccd1184592ccac1d6f8b562f0e89cfb96670278c8344c4e90c4dfee
+  metadata.gz: 17a526afb0b53cc31f7290cf80be5c698010786ff9210911c9d39e36af67108c
+  data.tar.gz: be017f23bc6e371d739068640f9a684752abe2c48706628f16e1683d6b7ca0c0
 SHA512:
-  metadata.gz: 41a57c902823019014f86898f02cb30fa2c2c153b8839ae54be97e27b79f2dd610cb5949ca61dd624f389ff0e3239aa196faa950465ade8f781b4fca25ca1bd4
-  data.tar.gz: 267dd5d1757a8813f85b800e3e765de64d588dd9d88019f2f8a553e501da102a25700a22f60c2cc0027b8a20fad0ceb8304ed2d78a271c8a640ccceff0ce913f
+  metadata.gz: d679044de354362f4c0898b98139a72f6bbc88e24a53f8402a219e27af635351abdb996c76f9d4d7a3efb775c034a26be3f30d31911cf0f1793aee8982b912fa
+  data.tar.gz: 7217aa2e0b9d5a093d96b48f92ce42abf65bfd1e55f7a21142f6afb092777bbc56c51781e325a8549cdd638c5eacbb40d6d14cf3358f42e70981915525007c72

data/README.md

@@ -19,7 +19,7 @@ In Gemfile:
 
 Also requires the following npm modules with recommended versions:
 
-- [puppeteer 10.1.x](https://github.com/GoogleChrome/puppeteer#readme) - for the chrome driver
+- [puppeteer 10.2.x](https://github.com/GoogleChrome/puppeteer#readme) - for the chrome driver
 
 Simply install them in your projects root. Puppetmaster also depends on isomorfeus-speednode, which will be installed automatically.
 Speednode will pickup the node modules then from the projects root node_modules directory.
@@ -27,24 +27,17 @@ Speednode will pickup the node modules then from the projects root node_modules
 ## Configuration
 
 Puppetmaster provides these drivers:
-- chrome - a real browser, headless, fast
-- chrome_debug - opens a chrome browser window with devtools enabled, useful for debugging tests
+- chromium - a real browser, headless, fast
+- chromium_debug - opens a chromium browser window with devtools enabled, useful for debugging tests
 
 Chrome is the default driver. Selecting another driver, for example firefox:
 ```ruby
-Isomorfeus::Puppetmaster.driver = :chrome_debug
+Isomorfeus::Puppetmaster.driver = :chromium_debug
 ```
 
-Puppetmaster provides support for these rack servers:
-- [agoo](https://github.com/ohler55/agoo)
-- [falcon](https://github.com/socketry/falcon)
+Puppetmaster provides support for this rack server:
 - [iodine](https://github.com/boazsegev/iodine)
-- [puma](https://github.com/puma/puma)
-
-Puma is the default rack server. To assign another rack server:
-```ruby
-Isomorfeus::Puppetmaster.server = :agoo
-```
+Iodine is the default rack server, automatically configured.
 
 Getting the app ready and running:
 1. Assign a rack app

data/lib/isomorfeus/puppetmaster/driver/puppeteer.rb

@@ -39,8 +39,8 @@ module Isomorfeus
           # init ExecJS context
           @app = options.delete(:app)
           @options = options.dup
-          @browser_type = @options.delete(:browser_type) { :chrome }
-          @options[:product] = "'#{@browser_type}'" unless @options.key?(:product)
+          @browser_type = @options.delete(:browser_type) { :chromium }
+          @options[:product] = "'chrome'" unless @options.key?(:product)
           @max_width = @options.delete(:max_width) { VIEWPORT_MAX_WIDTH }
           @max_height = @options.delete(:max_height) { VIEWPORT_MAX_HEIGHT }
           @width = @options.delete(:width) { VIEWPORT_DEFAULT_WIDTH > @max_width ? @max_width : VIEWPORT_DEFAULT_WIDTH }
@@ -51,7 +51,8 @@ module Isomorfeus
           @puppeteer_timeout = @timeout * 1000
           @puppeteer_reaction_timeout = @reaction_timeout * 1000
           @url_blacklist = @options.delete(:url_blacklist) { [] }
-          @context = ExecJS.permissive_compile(puppeteer_launch)
+          Isomorfeus.set_node_paths
+          @context = ExecJS.permissive_compile(puppeteer_launch_script)
           page_handle = await_result
           @default_document = Isomorfeus::Puppetmaster::Document.new(self, page_handle, Isomorfeus::Puppetmaster::Response.new('status' => 200))
           ObjectSpace.define_finalizer(self, self.class.close_browser(self))
@@ -219,12 +220,6 @@ module Isomorfeus
           get_result
         end
 
-        def default_require
-          <<~JAVASCRIPT
-            const MasterPuppeteer = require('puppeteer');
-          JAVASCRIPT
-        end
-
         def determine_error(error)
           message = "#{error['name']}: #{error['message']}"
           exception = if message.include?('net::ERR_CERT_') || message.include?('SEC_ERROR_EXPIRED_CERTIFICATE')
@@ -257,12 +252,12 @@ module Isomorfeus
         def launch_line
           string_options = []
           options = @options.dup
-          string_options << "ignoreHTTPSErrors: #{options.delete(:ignore_https_errors)}" if options.has_key?(:ignore_https_errors)
-          string_options << "executablePath: '#{options.delete(:executable_path)}'" if options.has_key?(:executable_path)
+          string_options << "ignoreHTTPSErrors: #{options.delete(:ignore_https_errors)}" if options.key?(:ignore_https_errors)
+          string_options << "executablePath: '#{options.delete(:executable_path)}'" if options.key?(:executable_path)
           options.each do |option, value|
             string_options << "#{option.to_s.camelize(:lower)}: #{value}"
           end
-          string_options << "userDataDir: '#{Dir.mktmpdir}'" unless @options.has_key?(:user_data_dir)
+          string_options << "userDataDir: '#{Dir.mktmpdir}'" unless @options.key?(:user_data_dir)
           string_options << "defaultViewport: { width: #{@width}, height: #{@height} }"
           string_options << "pipe: true"
           # string_options << "args: ['--disable-popup-blocking']"
@@ -275,16 +270,14 @@ module Isomorfeus
           line << ')'
         end
 
-        def puppeteer_launch
-          # todo target_handle, puppeteer save path
-          puppeteer_require = case @browser_type
-                              when :chrome then default_require
-                              when :chromium then default_require
-                              else
-                                raise "Browser type #{@browser_type} not supported!"
-                              end
+        def puppeteer_launch_script
           <<~JAVASCRIPT
-            #{puppeteer_require}
+            const MasterPuppeteer = require('puppeteer-core');
+            const DefaultRevisions = require('puppeteer-core/lib/cjs/puppeteer/revisions');
+            var default_revision = DefaultRevisions.PUPPETEER_REVISIONS.chromium;
+
+            var BrowserFetcher = MasterPuppeteer.createBrowserFetcher();
+
             var BrowserType = '#{@browser_type.to_s}';
             var LastResult = null;
             var LastErr = null;
@@ -300,6 +293,15 @@ module Isomorfeus
             var ModalText = null;
             var ModalTextMatched = false;
     
+            const EnsureBrowser = async function() {
+              var revisions = await BrowserFetcher.localRevisions();
+              if (!revisions.includes(default_revision)) {
+                console.log("isomorfeus-puppetmaster: Downloading Chromium " + default_revision);
+                await BrowserFetcher.download(default_revision);
+                return true;
+              } else { return false; }
+            }
+
             const GetLastResult = function() {
               if (LastExecutionFinished === true) {
                 var err = LastErr;
@@ -363,6 +365,7 @@ module Isomorfeus
     
             (async () => {
               try {
+                await EnsureBrowser();
                 CurrentBrowser = #{launch_line}
                 var page = (await CurrentBrowser.pages())[0];
                 page.setDefaultTimeout(#{@puppeteer_timeout});

data/lib/isomorfeus/puppetmaster/driver/puppeteer_document.rb

@@ -4,7 +4,7 @@ module Isomorfeus
       module PuppeteerDocument
         def document_accept_alert(document, **options, &block)
           # TODO maybe wrap in mutex
-          text =  options.has_key?(:text) ? "`#{options[:text]}`" : 'null'
+          text =  options.key?(:text) ? "`#{options[:text]}`" : 'null'
           @context.exec <<~JAVASCRIPT
             ModalText = #{text};
             AllPageHandles[#{document.handle}].on('dialog', DialogAcceptHandler);
@@ -19,12 +19,12 @@ module Isomorfeus
             ModalText = null;
             AllPageHandles[#{document.handle}].removeListener('dialog', DialogAcceptHandler);
           JAVASCRIPT
-          raise Isomorfeus::Puppetmaster::NoModalError if options.has_key?(:text) && !matched
+          raise Isomorfeus::Puppetmaster::NoModalError if options.key?(:text) && !matched
         end
 
         def document_accept_confirm(document, **options, &block)
           # TODO maybe wrap in mutex
-          text =  options.has_key?(:text) ? "`#{options[:text]}`" : 'null'
+          text =  options.key?(:text) ? "`#{options[:text]}`" : 'null'
           @context.exec <<~JAVASCRIPT
             ModalText = #{text};
             AllPageHandles[#{document.handle}].on('dialog', DialogAcceptHandler);
@@ -39,12 +39,12 @@ module Isomorfeus
             ModalText = null;
             AllPageHandles[#{document.handle}].removeListener('dialog', DialogAcceptHandler);
           JAVASCRIPT
-          raise Isomorfeus::Puppetmaster::NoModalError if options.has_key?(:text) && !matched
+          raise Isomorfeus::Puppetmaster::NoModalError if options.key?(:text) && !matched
         end
 
         def document_accept_leave_page(document, **options, &block)
           # TODO maybe wrap in mutex
-          text =  options.has_key?(:text) ? "`#{options[:text]}`" : 'null'
+          text =  options.key?(:text) ? "`#{options[:text]}`" : 'null'
           @context.exec <<~JAVASCRIPT
             ModalText = #{text};
             AllPageHandles[#{document.handle}].on('dialog', DialogAcceptHandler);
@@ -59,12 +59,12 @@ module Isomorfeus
             ModalText = null;
             AllPageHandles[#{document.handle}].removeListener('dialog', DialogAcceptHandler);
           JAVASCRIPT
-          raise Isomorfeus::Puppetmaster::NoModalError if options.has_key?(:text) && !matched
+          raise Isomorfeus::Puppetmaster::NoModalError if options.key?(:text) && !matched
         end
 
         def document_accept_prompt(document, **options, &block)
           # TODO maybe wrap in mutex
-          text =  options.has_key?(:text) ? "`#{options[:text]}`" : 'null'
+          text =  options.key?(:text) ? "`#{options[:text]}`" : 'null'
           @context.exec <<~JAVASCRIPT
             ModalText = #{text};
             AllPageHandles[#{document.handle}].on('dialog', DialogAcceptHandler);
@@ -79,7 +79,7 @@ module Isomorfeus
             ModalText = null;
             AllPageHandles[#{document.handle}].removeListener('dialog', DialogAcceptHandler);
           JAVASCRIPT
-          raise Isomorfeus::Puppetmaster::NoModalError if options.has_key?(:text) && !matched
+          raise Isomorfeus::Puppetmaster::NoModalError if options.key?(:text) && !matched
         end
 
         def document_all_text(document)
@@ -197,7 +197,7 @@ module Isomorfeus
 
         def document_dismiss_confirm(document, **options, &block)
           # TODO
-          text =  options.has_key?(:text) ? "`#{options[:text]}`" : 'null'
+          text =  options.key?(:text) ? "`#{options[:text]}`" : 'null'
           @context.exec <<~JAVASCRIPT
             ModalText = #{text};
             AllPageHandles[#{document.handle}].on('dialog', DialogDismissHandler);
@@ -212,12 +212,12 @@ module Isomorfeus
             ModalText = null;
             AllPageHandles[#{document.handle}].removeListener('dialog', DialogDismissHandler);
           JAVASCRIPT
-          raise Isomorfeus::Puppetmaster::ModalNotFound if options.has_key?(:text) && !matched
+          raise Isomorfeus::Puppetmaster::ModalNotFound if options.key?(:text) && !matched
         end
 
         def document_dismiss_leave_page(document, **options, &block)
           # TODO
-          text =  options.has_key?(:text) ? "`#{options[:text]}`" : 'null'
+          text =  options.key?(:text) ? "`#{options[:text]}`" : 'null'
           @context.exec <<~JAVASCRIPT
             ModalText = #{text};
             AllPageHandles[#{document.handle}].on('dialog', DialogDismissHandler);
@@ -232,12 +232,12 @@ module Isomorfeus
             ModalText = null;
             AllPageHandles[#{document.handle}].removeListener('dialog', DialogDismissHandler);
           JAVASCRIPT
-          raise Isomorfeus::Puppetmaster::ModalNotFound if options.has_key?(:text) && !matched
+          raise Isomorfeus::Puppetmaster::ModalNotFound if options.key?(:text) && !matched
         end
 
         def document_dismiss_prompt(document, **options, &block)
           # TODO
-          text =  options.has_key?(:text) ? "`#{options[:text]}`" : 'null'
+          text =  options.key?(:text) ? "`#{options[:text]}`" : 'null'
           @context.exec <<~JAVASCRIPT
             ModalText = #{text};
             AllPageHandles[#{document.handle}].on('dialog', DialogDismissHandler);
@@ -252,7 +252,7 @@ module Isomorfeus
             ModalText = null;
             AllPageHandles[#{document.handle}].removeListener('dialog', DialogDismissHandler);
           JAVASCRIPT
-          raise Isomorfeus::Puppetmaster::ModalNotFound if options.has_key?(:text) && !matched
+          raise Isomorfeus::Puppetmaster::ModalNotFound if options.key?(:text) && !matched
         end
 
         def document_dispatch_event(document, name, event_type = nil, **options)
@@ -649,12 +649,12 @@ module Isomorfeus
           # todo
           # https://pptr.dev/#?product=Puppeteer&version=v1.12.2&show=api-pagescreenshotoptions
           final_options = ["encoding: 'base64'"]
-          if options.has_key?(:format)
+          if options.key?(:format)
             options[:format] = 'jpeg' if options[:format].to_s.downcase == 'jpg'
             final_options << "type: '#{options.delete(:format).to_s.downcase}'"
           end
-          final_options << "quality: #{options.delete(:quality)}" if options.has_key?(:quality)
-          final_options << "fullPage: #{options.delete(:full)}" if options.has_key?(:full)
+          final_options << "quality: #{options.delete(:quality)}" if options.key?(:quality)
+          final_options << "fullPage: #{options.delete(:full)}" if options.key?(:full)
           options.each do |k,v|
             final_options << "#{k.to_s.camelize(:lower)}: #{v}"
           end
@@ -715,12 +715,12 @@ module Isomorfeus
           # https://pptr.dev/#?product=Puppeteer&version=v1.12.2&show=api-pagepdfoptions
           absolute_path = File.absolute_path(path)
           final_options = ["path: '#{absolute_path}'"]
-          final_options << "format: '#{options.delete(:format)}'" if options.has_key?(:format)
-          final_options << "headerTemplate: `#{options.delete(:header_template)}`" if options.has_key?(:header_template)
-          final_options << "footerTemplate: `#{options.delete(:footer_template)}`" if options.has_key?(:footer_template)
-          final_options << "pageRanges: '#{options.delete(:page_ranges)}'" if options.has_key?(:page_ranges)
-          final_options << "width: '#{options.delete(:width)}'" if options.has_key?(:width)
-          final_options << "height: '#{options.delete(:height)}'" if options.has_key?(:height)
+          final_options << "format: '#{options.delete(:format)}'" if options.key?(:format)
+          final_options << "headerTemplate: `#{options.delete(:header_template)}`" if options.key?(:header_template)
+          final_options << "footerTemplate: `#{options.delete(:footer_template)}`" if options.key?(:footer_template)
+          final_options << "pageRanges: '#{options.delete(:page_ranges)}'" if options.key?(:page_ranges)
+          final_options << "width: '#{options.delete(:width)}'" if options.key?(:width)
+          final_options << "height: '#{options.delete(:height)}'" if options.key?(:height)
           options.each do |k,v|
             final_options << "#{k.to_s.camelize(:lower)}: #{v}"
           end
@@ -732,12 +732,12 @@ module Isomorfeus
           # https://pptr.dev/#?product=Puppeteer&version=v1.12.2&show=api-pagescreenshotoptions
           absolute_path = File.absolute_path(path)
           final_options = ["path: '#{absolute_path}'"]
-          if options.has_key?(:format)
+          if options.key?(:format)
             options[:format] = 'jpeg' if options[:format].to_s.downcase == 'jpg'
             final_options << "type: '#{options.delete(:format).to_s.downcase}'"
           end
-          final_options << "quality: #{options.delete(:quality)}" if options.has_key?(:quality)
-          final_options << "fullPage: #{options.delete(:full)}" if options.has_key?(:full)
+          final_options << "quality: #{options.delete(:quality)}" if options.key?(:quality)
+          final_options << "fullPage: #{options.delete(:full)}" if options.key?(:full)
           options.each do |k,v|
             final_options << "#{k.to_s.camelize(:lower)}: #{v}"
           end
@@ -772,10 +772,10 @@ module Isomorfeus
           end
           options[:domain] ||= URI.parse(uri).host
           final_options = []
-          final_options << "expires: #{options.delete(:expires).to_i}" if options.has_key?(:expires)
-          final_options << "httpOnly: #{options.delete(:http_only)}" if options.has_key?(:http_only)
-          final_options << "secure: #{options.delete(:secure)}" if options.has_key?(:secure)
-          final_options << "sameSite: '#{options.delete(:same_site)}'" if options.has_key?(:same_site)
+          final_options << "expires: #{options.delete(:expires).to_i}" if options.key?(:expires)
+          final_options << "httpOnly: #{options.delete(:http_only)}" if options.key?(:http_only)
+          final_options << "secure: #{options.delete(:secure)}" if options.key?(:secure)
+          final_options << "sameSite: '#{options.delete(:same_site)}'" if options.key?(:same_site)
           options.each do |k,v|
             final_options << "#{k}: '#{v}'"
           end

data/lib/isomorfeus/puppetmaster/driver/puppeteer_node.rb

@@ -437,11 +437,11 @@ module Isomorfeus
         def node_render_base64(node, **options)
           # https://pptr.dev/#?product=Puppeteer&version=v1.12.2&show=api-pagescreenshotoptions
           final_options = ["encoding: 'base64'"]
-          if options.has_key?(:format)
+          if options.key?(:format)
             options[:format] = 'jpeg' if options[:format].to_s.downcase == 'jpg'
             final_options << "type: '#{options.delete(:format).to_s.downcase}'"
           end
-          final_options << "quality: #{options.delete(:quality)}" if options.has_key?(:quality)
+          final_options << "quality: #{options.delete(:quality)}" if options.key?(:quality)
           box = await "LastResult = await AllElementHandles[#{node.handle}].boundingBox();"
           final_options << "clip: {x: #{box['x']}, y: #{box['y']}, width: #{box['width']}, height: #{box['height']}}"
           options.each { |k,v| final_options << "#{k.to_s.camelize(:lower)}: #{v}" }
@@ -493,11 +493,11 @@ module Isomorfeus
           # https://pptr.dev/#?product=Puppeteer&version=v1.12.2&show=api-pagescreenshotoptions
           absolute_path = File.absolute_path(path)
           final_options = ["path: '#{absolute_path}'"]
-          if options.has_key?(:format)
+          if options.key?(:format)
             options[:format] = 'jpeg' if options[:format].to_s.downcase == 'jpg'
             final_options << "type: '#{options.delete(:format).to_s.downcase}'"
           end
-          final_options << "quality: #{options.delete(:quality)}" if options.has_key?(:quality)
+          final_options << "quality: #{options.delete(:quality)}" if options.key?(:quality)
           box = await "LastResult = await AllElementHandles[#{node.handle}].boundingBox();"
           final_options << "clip: {x: #{box['x']}, y: #{box['y']}, width: #{box['width']}, height: #{box['height']}}"
           options.each { |k,v| final_options << "#{k.to_s.camelize(:lower)}: #{v}" }

data/lib/isomorfeus/puppetmaster/driver_registration.rb

@@ -1,7 +1,7 @@
-Isomorfeus::Puppetmaster.register_driver(:chrome) do |app|
-  Isomorfeus::Puppetmaster::Driver::Puppeteer.new(browser_type: :chrome, headless: true, app: app)
+Isomorfeus::Puppetmaster.register_driver(:chromium) do |app|
+  Isomorfeus::Puppetmaster::Driver::Puppeteer.new(browser_type: :chromium, headless: true, app: app)
 end
 
-Isomorfeus::Puppetmaster.register_driver(:chrome_debug) do |app|
-  Isomorfeus::Puppetmaster::Driver::Puppeteer.new(browser_type: :chrome, headless: false, app: app)
+Isomorfeus::Puppetmaster.register_driver(:chromium_debug) do |app|
+  Isomorfeus::Puppetmaster::Driver::Puppeteer.new(browser_type: :chromium, headless: false, app: app)
 end

data/lib/isomorfeus/puppetmaster/node.rb

@@ -189,20 +189,20 @@ module Isomorfeus
       def has_css?(selector, **options)
         res = find_all(selector)
         return false unless res
-        return false if options.has_key?(:count) && options[:count] != res.size
+        return false if options.key?(:count) && options[:count] != res.size
         return true
       end
 
       def has_text?(text, **options)
         count = visible_text.scan(/#{text}/).size
-        return false if options.has_key?(:count) && options[:count] != count
+        return false if options.key?(:count) && options[:count] != count
         count > 0
       end
 
       def has_xpath?(query, **options)
         res = find_all_xpath(query)
         return false unless res
-        return false if options.has_key?(:count) && options[:count] != res.size
+        return false if options.key?(:count) && options[:count] != res.size
         return true
       end
 

data/lib/isomorfeus/puppetmaster/server.rb

@@ -74,7 +74,7 @@ module Isomorfeus
                    end
         if response.code == '200'
           result_hash = Oj.load(response.body)
-          if result_hash.has_key?('error')
+          if result_hash.key?('error')
             error = RuntimeError.new(result_hash['error'])
             error.set_backtrace(result_hash['backtrace'])
             raise error

data/lib/isomorfeus/puppetmaster/server_registration.rb

@@ -1,65 +1,13 @@
-Isomorfeus::Puppetmaster.register_server :agoo do |app, port, _host, **options|
-  begin
-    require 'agoo/version'
-    require 'rack/handler/agoo'
-  rescue LoadError
-    raise LoadError, "Unable to load 'agoo' as server."
-  end
-
-  puts 'Puppetmaster starting Agoo...'
-  puts "* Version #{Agoo::VERSION}"
-
-  Rack::Handler::Agoo.run(app, { port: port }.merge(options)).join
-end
-
-Isomorfeus::Puppetmaster.register_server :falcon do |app, port, host, **options|
-  begin
-    require 'falcon/version'
-    require 'rack/handler/falcon'
-  rescue LoadError
-    raise LoadError, "Unable to load 'falcon' as server."
-  end
-
-  puts 'Puppetmaster starting Falcon...'
-  puts "* Version #{Falcon::VERSION}"
-
-  Rack::Handler::Falcon.run(app, { Host: host, Port: port }.merge(options)).join
-end
-
 Isomorfeus::Puppetmaster.register_server :iodine do |app, port, host, **options|
   begin
+    require 'rack'
+    require 'rack/handler'
     require 'iodine'
     require 'iodine/version'
     require 'rack/handler/iodine'
   rescue LoadError
     raise LoadError, "Unable to load 'iodine' as server."
   end
-
+  Iodine.patch_rack
   Iodine::Rack.run(app, { Host: host, Port: port }.merge(options))
 end
-
-Isomorfeus::Puppetmaster.register_server :puma do |app, port, host, **options|
-  begin
-    require 'puma/const'
-    require 'rack/handler/puma'
-  rescue LoadError
-    raise LoadError, "Unable to load 'puma' as server."
-  end
-  # If we just run the Puma Rack handler it installs signal handlers which prevent us from being able to interrupt tests.
-  # Therefore construct and run the Server instance ourselves.
-  # Rack::Handler::Puma.run(app, { Host: host, Port: port, Threads: "0:4", workers: 0, daemon: false }.merge(options))
-  options = { Host: host, Port: port, Threads: '0:4', workers: 0, daemon: false }.merge(options)
-  conf = Rack::Handler::Puma.config(app, options)
-  events = conf.options[:Silent] ? ::Puma::Events.strings : ::Puma::Events.stdio
-
-  events.log 'Puppetmaster starting Puma...'
-  events.log "* Version #{Puma::Const::PUMA_VERSION} , codename: #{Puma::Const::CODE_NAME}"
-  events.log "* Min threads: #{conf.options[:min_threads]}, max threads: #{conf.options[:max_threads]}"
-
-  Puma::Server.new(conf.app, events, conf.options).tap do |s|
-    s.binder.parse conf.options[:binds], s.events
-    s.min_threads, s.max_threads = conf.options[:min_threads], conf.options[:max_threads]
-  end.run.join
-end
-
-Isomorfeus::Puppetmaster.server = :iodine

data/lib/isomorfeus/puppetmaster/version.rb

@@ -1,3 +1,3 @@
 module Isomorfeus
-  PUPPETMASTER_VERSION = '0.4.1'
+  PUPPETMASTER_VERSION = '0.5.3'
 end

data/lib/isomorfeus/puppetmaster.rb

@@ -3,7 +3,6 @@ module Isomorfeus
     class << self
       attr_accessor :app, :server_port, :session
       attr_writer :download_path, :server_host, :server_scheme
-      attr_reader :server
 
       def boot_app
         @served_app = Isomorfeus::Puppetmaster::Server.new(app, port: server_port, host: server_host).boot
@@ -16,11 +15,11 @@ module Isomorfeus
       end
 
       def driver
-        @driver ||= :chrome
+        @driver ||= :chromium
       end
 
       def driver=(drvr)
-        raise "#{drvr}: no such driver registered! Available drivers: #{drivers.keys.join(', ')}." unless drivers.has_key?(drvr)
+        raise "#{drvr}: no such driver registered! Available drivers: #{drivers.keys.join(', ')}." unless drivers.key?(drvr)
         @driver = drvr
       end
 
@@ -48,8 +47,12 @@ module Isomorfeus
         @served_app ||= boot_app
       end
 
+      def server
+        @server ||= :iodine
+      end
+
       def server=(name)
-        raise "#{name}: no such server registered! Available drivers: #{servers.keys.join(', ')}." unless servers.has_key?(name)
+        raise "#{name}: no such server registered! Available drivers: #{servers.keys.join(', ')}." unless servers.key?(name)
         name, options = *name if name.is_a? Array
         @server = if name.respond_to? :call
                     name
@@ -75,7 +78,7 @@ module Isomorfeus
       private
 
       def build_opal_prelude
-        js = Opal::Builder.new.build_str("require 'opal'\nrequire 'opal-browser'", 'puppetmaster_opal_prelude').to_s
+        Opal::Builder.new.build_str("require 'opal'\n", 'puppetmaster_opal_prelude').to_s
       end
     end
   end

data/lib/isomorfeus-puppetmaster.rb

@@ -3,7 +3,11 @@ require 'uri'
 require 'net/http'
 require 'rack'
 require 'opal'
-require 'opal-browser'
+require 'parser'
+
+# isomorfeus needs kwargs
+Parser::Builders::Default.emit_kwargs = true
+
 require 'unparser'
 require 'method_source'
 require 'securerandom'
@@ -14,8 +18,6 @@ unless ENV["EXECJS_RUNTIME"]
   ExecJS.runtime = ExecJS::Runtimes::Speednode
 end
 
-# require 'uglifier'
-
 require 'isomorfeus/puppetmaster'
 require 'isomorfeus/puppetmaster/self_forwardable'
 require 'isomorfeus/puppetmaster/errors'
@@ -43,4 +45,9 @@ require 'isomorfeus/puppetmaster/server/checker'
 require 'isomorfeus/puppetmaster/server'
 require 'isomorfeus/puppetmaster/server_registration'
 
+Isomorfeus::Puppetmaster.driver = :chromium
+Isomorfeus::Puppetmaster.server = :iodine
+
 require 'isomorfeus/puppetmaster/dsl'
+
+Isomorfeus.node_paths << File.expand_path(File.join(File.dirname(__FILE__), '..', 'node_modules'))

data/node_modules/.bin/extract-zip

@@ -0,0 +1,12 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../extract-zip/cli.js" "$@"
+else 
+  exec node  "$basedir/../extract-zip/cli.js" "$@"
+fi

data/node_modules/.bin/extract-zip.cmd

@@ -0,0 +1,17 @@
+@ECHO off
+GOTO start
+:find_dp0
+SET dp0=%~dp0
+EXIT /b
+:start
+SETLOCAL
+CALL :find_dp0
+
+IF EXIST "%dp0%\node.exe" (
+  SET "_prog=%dp0%\node.exe"
+) ELSE (
+  SET "_prog=node"
+  SET PATHEXT=%PATHEXT:;.JS;=;%
+)
+
+endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%"  "%dp0%\..\extract-zip\cli.js" %*

data/node_modules/.bin/extract-zip.ps1

@@ -0,0 +1,28 @@
+#!/usr/bin/env pwsh
+$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
+
+$exe=""
+if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
+  # Fix case when both the Windows and Linux builds of Node
+  # are installed in the same directory
+  $exe=".exe"
+}
+$ret=0
+if (Test-Path "$basedir/node$exe") {
+  # Support pipeline input
+  if ($MyInvocation.ExpectingInput) {
+    $input | & "$basedir/node$exe"  "$basedir/../extract-zip/cli.js" $args
+  } else {
+    & "$basedir/node$exe"  "$basedir/../extract-zip/cli.js" $args
+  }
+  $ret=$LASTEXITCODE
+} else {
+  # Support pipeline input
+  if ($MyInvocation.ExpectingInput) {
+    $input | & "node$exe"  "$basedir/../extract-zip/cli.js" $args
+  } else {
+    & "node$exe"  "$basedir/../extract-zip/cli.js" $args
+  }
+  $ret=$LASTEXITCODE
+}
+exit $ret

data/node_modules/.bin/mkdirp

@@ -0,0 +1,12 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../mkdirp/bin/cmd.js" "$@"
+else 
+  exec node  "$basedir/../mkdirp/bin/cmd.js" "$@"
+fi

data/node_modules/.bin/mkdirp.cmd

@@ -0,0 +1,17 @@
+@ECHO off
+GOTO start
+:find_dp0
+SET dp0=%~dp0
+EXIT /b
+:start
+SETLOCAL
+CALL :find_dp0
+
+IF EXIST "%dp0%\node.exe" (
+  SET "_prog=%dp0%\node.exe"
+) ELSE (
+  SET "_prog=node"
+  SET PATHEXT=%PATHEXT:;.JS;=;%
+)
+
+endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%"  "%dp0%\..\mkdirp\bin\cmd.js" %*