gless 1.6.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df25d32ad9e354c810d6a689936098b9888bbea0
-  data.tar.gz: fcc4e33ba6276cdd29222f8a538ff82950371b1a
+  metadata.gz: 8b15a2376bbf1adff76a9ac467fee021e9f05e85
+  data.tar.gz: 3dc288ba9043ca99d99d434a1602364c4ed243e3
 SHA512:
-  metadata.gz: 253e1f0db170c8c6a583aec787c844b579de50b06e4ee1b49679b1c7984bbad8a46a5eb1ed98002e237ea2431b7b777d6dcc8917bf98243cac7eade88d65ffb4
-  data.tar.gz: 4d8b8a4029fe9ce45262c4eb3317e2750b2f53cbaf367b331c2cda8fd324ee13f378a3bc2f0c64f192df2a4a024121a5e59f8766b9797dbf834935bed28f8544
+  metadata.gz: a9b8e9ce610408ddd67b669ec47c44a6b1340b5ab01ce886bcaa168cf64b29c3edc2306894daf5041708ee225ff4695f6e20b6edcb9351d76c35979f891d8216
+  data.tar.gz: 75169a727bdbe88082f88b4bebf8c1263765fc36bc6145095c4bf9f42710999fa3103544402f75a81e3d43a3dced7ccd92f3662651eb957869fd7935751e1c4b

data/Changelog.txt

@@ -1,9 +1,27 @@
 - 1.1.0: 29 Jan 2013: By default, "element"s now ignore non-visible
-  elements on the page; use { :invisible => true } to get the old
-  behaviour.
+	 elements on the page; use { :invisible => true } to get the
+	 old behaviour.
 - 1.2.0: 10 Jun 2013: Changes by bairyn.  Added caching, finding
-based on parent element, and block validators.
+	 based on parent element, and block validators.
 - 1.3.0: 8 Aug 2013: Detect and work around errors caused by incorrect caching,
-and add support for element arguments, evaluating elements under new parents,
-finding based on children, and the :unique option to ensure only one element
-matches a specification.
+	 and add support for element arguments, evaluating elements
+	 under new parents, finding based on children, and the
+	 :unique option to ensure only one element matches a
+	 specification.
+- 1.3.1: 19 Aug 2013: Typo fix.
+- 1.4.0: 9 Sep 2013: Support for Sauce Labs related browser
+	 capabilities via options under the :browser option in the
+	 config file.
+- 1.4.1: 11 Sep 2013: More Sauce-specific options.
+- 1.4.2: 13 Sep 2013: Specified a license.
+- 1.5.0: 21 Sep 2013: Better error reporting, deep_merge, click_once
+	 with change_pages
+- 1.5.1: 25 Oct 2013: Support for no config file.
+- 1.5.2: 23 Feb 2014: Don't depend on Ruby's class creation order.
+- 1.6.0: 3 Mar 2014: Allow the replay log to be completely disabled.
+- 1.6.1: 3 Mar 2014: Let the logger decide want to log, instead of
+	 always checking the config state.
+- 2.0.0: 27 Mar 2014: Non-backwards-compatible changes to handling
+	 of both extra browser capabilities and tags.  The former is
+	 now under :browser => :extras in the config file, and the
+	 latter under :tag in the config file.

data/examples/test_github/features/support/env.rb

@@ -7,8 +7,7 @@ World(RSpec::Expectations)
 Before do
   require 'gless'
 
-  # FIXME: the tag entry here will have to change for parallel runs.
-  @logger, @config, @browser = Gless.setup( :test )
+  @logger, @config, @browser = Gless.setup()
 
   if @config.get :global, :debug
     require 'debugger'

data/examples/test_github/lib/config/development.yml.example

@@ -6,13 +6,20 @@
     :type: remote		# Local or remote
     :browser: chrome	# Which browser to use; "ie", "chrome", and "firefox" are definitely valid, there may be others
     :port: 4444		# If remote, port to connect to the selenium server, otherwise ignored
-    # These options would normally only be used with something like
-    # SauceLabs
+    # These options would normally only be used with something like SauceLabs
+    #
     # :url: "http://rlpowell:[snip]@ondemand.saucelabs.com:80/wd/hub" # The URL Sauce gives you
-    # :version: 27  # The browser version to use
-    # :platform: 'Windows 7' # The OS to use
-    # :idle_timeout: 600 # Sauce specific
-    # :max_duration: 5400 # Sauce specific
+    #
+    # "extras" is where special things are defined to add to the
+    # browser capabilities list; used for stuff like Sauce
+    # parameters.
+    #
+    # :extras:
+    #   :version: 27  # The browser version to use
+    #   :platform: 'Windows 7' # The OS to use
+    #   :"idle-timeout": 600 # Sauce specific
+    #   :"max-duration": 5400 # Sauce specific
+    #   :name: "default job name" # Sauce specific
   :verbose: false       # Whether to engage in more verbose/info level logging
   :debug: false	        # Whether to engage in debug logging
   :replay: false        # Whether to create a replay log, which shows html for each step of operations
@@ -21,3 +28,8 @@
   :screenshots: false   # Whether, if debugging is on, to create screenshots as part of the replay log
   :thumbnails: false	# Whether, if screenshots are on, to create small-ish "thumbnail" pictures on the replay page; requires the imagemagick system package and the mini_magick gem
   :cache: false  # Whether, by default, to cache elements, significantly improving performance.   For individual elements, caching can be disabled by adding ":cache => false" to the element specifier.
+
+  # A short name used in creating log lines and writing out the
+  # replay log and so on.  Only really relevant if multiple runs are
+  # happening at once.
+  :tag: "notag"

data/lib/gless.rb

@@ -6,17 +6,13 @@
 # project.
 module Gless
   # The current version number.
-  VERSION = '1.6.1'
+  VERSION = '2.0.0'
 
   # Sets up the config, logger and browser instances, the ordering
   # of which is slightly tricky.  If a block is given, the config, after being
   # initialized from the config file, is passed to the block, which should
   # return the new, updated config.
   #
-  # @param [String] tag A short name used in creating log lines and
-  # writing out the replay log and so on.  Only really relevant if
-  # multiple runs are happening at once.
-  #
   # @param [Hash] hash Defaults to +nil+, which is ignored.  If
   # present, this hash is used intead of reading a config file; the
   # config file is totally ignored in this case.
@@ -25,13 +21,13 @@ module Gless
   #   optional block should return an updated config if given.
   #
   # @return [Gless::Logger, Gless::EnvConfig, Gless::Browser] logger, config, browser (in that order)
-  def self.setup( tag, hash = nil )
+  def self.setup( hash = nil )
     # Create the config reading/storage object
     config = Gless::EnvConfig.new( hash )
     config = yield config if block_given?
 
     logger = Gless::Logger.new(
-      tag,
+      config.get_default( "notag", :global, :tag ),
       config.get_default( false, :global, :replay ),
       config.get_default( '%{home}/public_html/watir_replay/%{tag}', :global, :replay_path )
     )

data/lib/gless/browser.rb

@@ -19,14 +19,17 @@ module Gless
     def initialize( config, logger )
       @config = config
       @logger = logger
+
+      @logger.debug "Requested browser config: #{@config.get :global, :browser }"
+
       type=@config.get :global, :browser, :type
       browser=@config.get :global, :browser, :browser
       port=@config.get :global, :browser, :port
       url=@config.get_default false, :global, :browser, :url
-      browser_version=@config.get_default '', :global, :browser, :version
-      platform=@config.get_default :any, :global, :browser, :platform
-      max_duration=@config.get_default 1800, :global, :browser, :max_duration
-      idle_timeout=@config.get_default 90, :global, :browser, :idle_timeout
+      extra_capabilities=@config.get_default false, :global, :browser, :extras
+      if ! extra_capabilities
+        extra_capabilities = Hash.new
+      end
 
       if browser =~ %r{^\s*ie\s*$} or browser =~ %r{^\s*internet\s*_?\s*explorer\s*$}
         browser = 'internet explorer'
@@ -41,11 +44,13 @@ module Gless
           :javascript_enabled=>true,
           :css_selectors_enabled=>true,
           :takes_screenshot=>true,
-          :'max-duration' => max_duration,
-          :'idle-timeout' => idle_timeout,
-          :version => browser_version,
-          :platform => platform
         )
+        # Load in any other stuff the user asked for
+        @logger.debug "Requested extra capabilities: #{extra_capabilities.inspect}"
+        extra_capabilities.each do |key, value|
+          @logger.debug "Adding capability #{key} with value #{value}"
+          capabilities[key] = value
+        end
 
         if url
           @logger.debug "Launching with custom url #{url}"

data/lib/gless/config.rb

@@ -103,6 +103,9 @@ module Gless
     private
 
     def set_root root, value, *indices
+      if root[indices[0]] == nil
+        root[indices[0]] = Hash.new
+      end
       if indices.length > 1
         set_root root[indices[0]], value, *indices[1..-1]
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gless
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Robin Lee Powell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec