isomorfeus-puppetmaster 0.6.0 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80d9cce921986638a386996065b1a98eac3ce78d8b94aadec05f205cf48df5a2
-  data.tar.gz: e46bf120b12d46f9f966b104fc4b220a642c0c0ad6ac3bbbf519b2abcc48a669
+  metadata.gz: e54d9dd005c6c0e9afa0f9a18ea7a0a6a837da33b0eb5ec53faf81a7ce3056d2
+  data.tar.gz: 6f783f0d1e7fe33f94ea023441e3cef2b2a556b9424b5b39e09c29a319102b0e
 SHA512:
-  metadata.gz: f3d3c7d5276df8e8efb6c72ba023829d13a6d210a81e6797994397f6134f908df11fab3a269bc47e50e666414fbddfb4b59c71540a2a9bb88e15b492392e321b
-  data.tar.gz: 17bf71299943c74bc6c6763c25502b1b9f26868b56bce21dcc55a10c89c903832fd08ff5e40911f1f046446ed28a7aa051369927314665e163cd5a4b3bf51373
+  metadata.gz: 529c766594a02a539251eb416b360c05d0dd0b490a64974b44bf0c06d2983c01dc2bdf32a0e6fc69f4815b2a44fae3ebdd7d27da1f86ff191685d2c609319572
+  data.tar.gz: 6e5ccce74a50c1435f99ecc1f3e80e0c28b3e4df98f17261d274211fddc61b4e01d34cbcddb8a403905a612d38ee3cc0f4286b74fb9534deab9bb59ef00e9801

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.0'
+  PUPPETMASTER_VERSION = '0.6.4'
 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.0
+  version: 0.6.4
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-15 00:00:00.000000000 Z
+date: 2022-01-25 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.0
+        version: 0.40.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.40.1
 - !ruby/object:Gem::Dependency
   name: tty-which
   requirement: !ruby/object:Gem::Requirement