isomorfeus-puppetmaster 0.6.1 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fe1ac013c902f9119e5be6dcb20513155e76b8dec0900453ba0b5337a36aeb4
-  data.tar.gz: 1f122d99fa89df0dca58878a5a90e6dce7363d3592f6cedcfb9ceba9d4a750f5
+  metadata.gz: 4080f1a27758c6b60a17ee8b2c7979dddfd5bc1467c06092152b3da62ffdb80a
+  data.tar.gz: 2617266b139434cdeb3b0abb4eaf06ce9a642ccfe9afb14e662fb2bd4e38e4b5
 SHA512:
-  metadata.gz: b0eac78e29a2e3031427761cd8aa5ab1ddfb813e2f0f7bd67f9f7dbce7bd339708bd137eee98f500cdfec84aefbe4713fe75dc404dbf097ea1e5f46a96c0c8c9
-  data.tar.gz: fb825b194042ef57993fdc9cdfe07b3ca4c72d6bd5a7337a79607d33f52fbf3063bd1b46f7fa3e76d69d9790e0b7a073eaf4c3b9b94ae385d188c71a28fafa47
+  metadata.gz: e18012b7ff457a3124282ad3818065f1aa171003de3cee74977b31a1b71cf98c70e061cd8014cbbb92d101f90eccaac4bfe14b59f458fa22d858c18cbd25f128
+  data.tar.gz: 24767df77157b6414355f94e8f2be863f0fd82582971f4da608bf5b8415969f365e0537ad5fe87b92d6b4ae4b279c35f87767efabce6fe9ffd89d95bc8cc87aa

data/README.md

@@ -8,7 +8,7 @@ Allows for writing javascript browser tests in pure ruby.
 It is tailored for Isomorfeus and using [puppeteer-ruby](https://github.com/YusukeIwaki/puppeteer-ruby).
 
 ### Community and Support
-At the [Isomorfeus Framework Project](http://isomorfeus.com)
+At the [Isomorfeus Framework Project](https://isomorfeus.com)
 
 ## Installation
 

data/lib/isomorfeus/puppetmaster/dsl.rb

@@ -3,11 +3,12 @@ module Isomorfeus
     module DSL
       @@launch_options = nil
 
-      def set_launch_options(args: nil, channel: nil, default_viewport: nil, devtools: nil, dumpio: nil,
+      def set_launch_options(app: nil, args: nil, channel: nil, default_viewport: nil, devtools: nil, dumpio: nil,
                              env: nil, executable_path: nil, handle_SIGINT: nil, handle_SIGTERM: nil, handle_SIGHUP: nil,
                              headless: true, ignore_default_args: nil, ignore_https_errors: nil, pipe: nil,
                              product: :chrome, slow_mo: nil, timeout: nil, user_data_dir: nil)
         @@launch_options = {
+          app: app,
           args: args,
           channel: channel&.to_s,
           devtools: devtools,
@@ -55,7 +56,7 @@ module Isomorfeus
         Isomorfeus::Puppetmaster.served_app.on_server(ruby_source, &block)
       end
 
-      def new_session(app:, args: nil, channel: nil, default_viewport: nil, devtools: nil, dumpio: nil,
+      def new_session(app: nil, args: nil, channel: nil, default_viewport: nil, devtools: nil, dumpio: nil,
                       env: nil, executable_path: nil, handle_SIGINT: nil, handle_SIGTERM: nil, handle_SIGHUP: nil,
                       headless: true, ignore_default_args: nil, ignore_https_errors: nil, pipe: nil,
                       product: :chrome, slow_mo: nil, timeout: nil, user_data_dir: nil)

data/lib/isomorfeus/puppetmaster/session.rb

@@ -24,6 +24,10 @@ module Isomorfeus
         ObjectSpace.define_finalizer(self, self.class.close_browser(self))
       end
 
+      def close
+        @browser.close
+      end
+
       def devices
         ::Puppeteer::DEVICES
       end
@@ -39,7 +43,7 @@ module Isomorfeus
       def goto(uri, referer: nil, timeout: nil, wait_until: 'networkidle0')
         parsed_uri = parse_uri(uri)
         @response = @default_page.goto(parsed_uri.to_s, referer: referer, timeout: timeout, wait_until: wait_until)
-        self
+        @default_page
       end
       alias_method :visit, :goto
 
@@ -89,7 +93,7 @@ module Isomorfeus
 
       def eval_ruby(ruby_source = '', &block)
         ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
-        compiled_ruby = compile_ruby_source(ruby_source)
+        compiled_ruby = Isomorfeus::Puppetmaster.compile_ruby_source(ruby_source)
         res = self.evaluate "function(){ try { return #{compiled_ruby} } catch (e) { return { error: e.name, message: e.message, stack: e.stack }; }}"
         if res.is_a?(Hash) && res.key?('error') && res.key?('message') && res.key?('stack')
           e = RuntimeError.new("#{res['error']}: #{res['message']}")
@@ -101,7 +105,7 @@ module Isomorfeus
 
       def eval_with_opal(ruby_source = '', &block)
         ruby_source = Isomorfeus::Puppetmaster.block_source_code(&block) if block_given?
-        compiled_ruby = compile_ruby_source(ruby_source)
+        compiled_ruby = Isomorfeus::Puppetmaster.compile_ruby_source(ruby_source)
         res = self.evaluate <<~JAVASCRIPT
           function(){
             if (typeof Opal === "undefined") {

data/lib/isomorfeus/puppetmaster/version.rb

@@ -1,3 +1,3 @@
 module Isomorfeus
-  PUPPETMASTER_VERSION = '0.6.1'
+  PUPPETMASTER_VERSION = '0.6.5'
 end

data/lib/isomorfeus/puppetmaster.rb

@@ -9,8 +9,11 @@ module Isomorfeus
       end
 
       def block_source_code(&block)
-        source_block = Parser::CurrentRuby.parse(block.source).children.last
-        source_block = source_block.children.last if source_block.type == :block
+        source_block = Parser::CurrentRuby.parse(block.source.strip)
+        unless source_block.type == :block
+           source_block = source_block.children[source_block.children.index { |c| c.respond_to?(:type) && c.type == :block }]
+        end
+        source_block = source_block.children[2]
         Unparser.unparse(source_block)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-puppetmaster
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.5
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2022-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.1
+        version: 0.40.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.1
+        version: 0.40.3
 - !ruby/object:Gem::Dependency
   name: tty-which
   requirement: !ruby/object:Gem::Requirement
@@ -178,34 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: launchy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.5
+        version: 1.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.5
+        version: 1.13.1
 - !ruby/object:Gem::Dependency
   name: opal-browser
   requirement: !ruby/object:Gem::Requirement
@@ -282,14 +268,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.51.0
+        version: 3.52.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.51.0
+        version: 3.52.0
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -327,11 +313,12 @@ files:
 - lib/isomorfeus/puppetmaster/server/middleware.rb
 - lib/isomorfeus/puppetmaster/session.rb
 - lib/isomorfeus/puppetmaster/version.rb
-homepage: http://isomorfeus.com
+homepage: https://isomorfeus.com
 licenses:
 - MIT
 metadata:
   github_repo: ssh://github.com/isomorfeus/gems
+  source_code_uri: https://github.com/isomorfeus/isomorfeus-puppetmaster
 post_install_message:
 rdoc_options: []
 require_paths: