unobtainium 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a03cc8ff5ee6dcf02b0b2b967a32ccc3053b093
-  data.tar.gz: ea904b1a9f7e20fd051d74fefec4a33b9c9c21ff
+  metadata.gz: 32ec07edb9ef9b7a1794e3660a6dbaedec57054f
+  data.tar.gz: 36ec4332fb3921acb4e3b723b4fe0f208bc839e6
 SHA512:
-  metadata.gz: c4db733242a110f7bdb634cfe883ba3553e6b0022774800daa7b9de8058b4fbbeafcc475911d9c5eef56b9b117689fd9b8124fc27bf405b3ff5c03fdf9c0fe49
-  data.tar.gz: 18bc60d149c2a2856085c511fc3cf477bc6a061a125e1a96058de4bdd581cff347a8897393653a9b4a10d76ee2271eb75aad289907a343a2699bbc7d344ba125
+  metadata.gz: 140e9dbdc8f5f83d4ff607ffd9fe5381652f710e3a9cf6036ef278daa3da8c792c450883b701395680094997983bd880ee5dc5eb5d0403fd2f690da05b311d13
+  data.tar.gz: 5f6dcef3056e6110c49a6b3fba2913641f43a1c4a15895c5802edf3af8569e6be0ec0f2a66b01a88694937d450b6650683981f456f39d400447ac77e914fdf8e

data/.gitignore

@@ -10,10 +10,24 @@
 /test/version_tmp/
 /tmp/
 
+# Used by dotenv library to load environment variables.
+# .env
+
 ## Specific to RubyMotion:
 .dat*
 .repl_history
 build/
+*.bridgesupport
+build-iPhoneOS/
+build-iPhoneSimulator/
+
+## Specific to RubyMotion (use of CocoaPods):
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# vendor/Pods/
 
 ## Documentation cache and generated files:
 /.yardoc/

data/.travis.yml

@@ -3,6 +3,9 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+script:
+  - bundle exec rake
+  - bundle exec codeclimate-test-reporter
 addons:
   code_climate:
     repo_token: 5dcf014e3a26ded8ffe8ff8bc70f98d49523e4851613123d8359035d44937953

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    unobtainium (0.8.0)
-      collapsium (~> 0.4)
-      collapsium-config (~> 0.2)
+    unobtainium (0.8.1)
+      collapsium (~> 0.6)
+      collapsium-config (~> 0.4)
       ptools (~> 1.3)
       sys-proctable (~> 1.1)
 
@@ -26,11 +26,10 @@ GEM
     chromedriver-helper (1.0.0)
       archive-zip (~> 0.7.0)
       nokogiri (~> 1.6)
-    codeclimate-test-reporter (0.6.0)
-      simplecov (>= 0.7.1, < 1.0.0)
-    collapsium (0.4.1)
-    collapsium-config (0.2.1)
-      collapsium (~> 0.4)
+    codeclimate-test-reporter (1.0.1)
+    collapsium (0.6.1)
+    collapsium-config (0.4.0)
+      collapsium (~> 0.6)
     cucumber (2.4.0)
       builder (>= 2.1.2)
       cucumber-core (~> 1.5.0)
@@ -51,22 +50,20 @@ GEM
     mini_portile2 (2.1.0)
     multi_json (1.12.1)
     multi_test (0.1.2)
-    nokogiri (1.6.8)
+    nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
-    parser (2.3.1.2)
+    parser (2.3.1.4)
       ast (~> 2.2)
     phantomjs (2.1.1.0)
-    pkg-config (1.1.7)
     powerpack (0.1.1)
     ptools (1.3.3)
     rainbow (2.1.0)
-    rake (11.2.2)
+    rake (11.3.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
       rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.3)
+    rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -75,7 +72,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.42.0)
+    rubocop (0.45.0)
       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -92,7 +89,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sys-proctable (1.1.1)
+    sys-proctable (1.1.3)
     tomlrb (1.2.3)
     unicode-display_width (1.1.1)
     websocket (1.2.3)
@@ -108,13 +105,13 @@ DEPENDENCIES
   codeclimate-test-reporter
   cucumber
   phantomjs
-  rake (~> 11.2)
+  rake (~> 11.3)
   rspec (~> 3.5)
-  rubocop (~> 0.42)
+  rubocop (~> 0.45)
   selenium-webdriver
   simplecov (~> 0.12)
   unobtainium!
   yard (~> 0.9)
 
 BUNDLED WITH
-   1.12.5
+   1.13.6

data/docs/CONFIGURATION.md

@@ -1,110 +1,7 @@
 # Configuration
 
-The `Config` class, and it's major user, the `World.config` method make using
-complex configuration files in your project easier.
-
-## Basic Configuration Features
-
-### Pathed Access
-
-`Config` is a `Hash` with pathed access. Take a nested structure such as this
-as an example:
-
-```yaml
----
-foo:
-  bar: baz
-```
-
-Instead of accessing `config['foo']['bar']`, you can instead use a path such
-as `config['foo.bar']`. The major benefit is that if *any* of the path components
-does not exist, nil is returned (and the behaviour is equivalent to other access
-methods such as `:fetch`, etc.)
-
-Similarly you can use this type of access for writing: `config['baz.quux'] = 42`
-will create both the `baz` hash, and it's child the `quux` key.
-
-### Configuration Loading
-
-If you're using `World.config`, configuration is automatically loaded at the
-time it's first invoked from the location specified by `World.config_file`, which
-defaults to `config/config.yml`.
-
-This is equivalent to invoking `Config.load_config` with that location manually.
-
-### Local Configuration Overrides
-
-For the example file of `config/config.yml`, if a file with the same path and
-name, and the name postfix `-local` exists (i.e. `config/config-local.yml`), that
-file will also be loaded. It's keys will be recursively added to the keys from the
-main configuration file, overwriting only leaves, not entire hashes.
-
-Example:
-
-```yaml
-# config/config.yml
----
-foo:
-  bar: 42
-  baz: quux
-
-# config/config-local.yml
----
-something: else
-foo:
-  baz: override
-
-# result
----
-something: else
-foo:
-  bar: 42
-  baz: override
-```
-
-### Configuration Extension
-
-An additional feature of the `Config` class is that you can extend individual
-hashes with values from other hashes.
-
-```yaml
----
-root:
-  foo: bar
-derived:
-  baz: quux
-  extends: root
-```
-
-This results in:
-
-```yaml
----
-root:
-  foo: bar
-derived:
-  baz: quux
-  foo: bar
-  base: root
-```
-
-**Notes:**
-
-- This feature means that `extends` and `base` are reserved configuration keys!
-- Multiple levels of extension are supported. The `base` keyword will *always
-  name the root-most element*, not the immediate ancestor.
-- Extending from multiple bases is not supported.
-- Extending from nonexistent bases is supported; all that happens is that the
-  `base` key is set.
-
-### Environment Variable Override
-
-Given a configuration path, any environment variable with the same name (change
-path to upper case letters and replace `.` with `_`, e.g. `foo.bar` becomes
-`FOO_BAR`) overrides the values in the configuration file.
-
-If the environment variable is parseable as JSON, then that parsed JSON will
-**replace** the original configuration path (i.e. it will not be merged).
+The main configuration features are best described by [collapsium-config](https://github.com/jfinkhaeuser/collapsium-config)
+upon which the configuration is based.
 
 ## Configuration Values Interpreted by World
 

data/lib/unobtainium/drivers/appium.rb

@@ -31,6 +31,7 @@ module Unobtainium
       # requests.
       class DriverProxy
         ##
+        attr_reader :appium_driver, :selenium_driver
         # Initialize
         def initialize(driver, compatibility = true)
           @appium_driver = driver

data/lib/unobtainium/version.rb

@@ -8,5 +8,5 @@
 #
 module Unobtainium
   # The current release version
-  VERSION = "0.8.0".freeze
+  VERSION = "0.8.1".freeze
 end

data/lib/unobtainium/world.rb

@@ -82,7 +82,18 @@ module Unobtainium
       # The merged/extended options might define a "base"; that's the label
       # we need to use.
       if not options.nil? and not options["base"].nil?
-        label = options["base"]
+        bases = options["base"]
+
+        # Collapsium config returns an Array of bases, but we really only want
+        # one. We'll have to do the sensible thing and only use one of the bases
+        # which also is a driver for the label. Since there's no better choice,
+        # let's default to the first of those.
+        bases.each do |base|
+          if not base.start_with?(".drivers.")
+            next
+          end
+          label = base.gsub(/^\.drivers\./, '')
+        end
 
         # Unfortunately, the "base" key may not be recognized by the drivers,
         # which could lead to errors down the road. Let's remove it; it's reserved

data/spec/spec_helper.rb

@@ -1,9 +1,3 @@
-# Only start CodeClimate from travis
-if ENV['CODECLIMATE_REPO_TOKEN']
-  require 'codeclimate-test-reporter'
-  CodeClimate::TestReporter.start
-end
-
 # Always start SimpleCov
 require 'simplecov'
 SimpleCov.start do

data/spec/utility_spec.rb

@@ -12,7 +12,7 @@ class Tester
 end # class Tester
 
 describe ::Unobtainium::Support::Utility do
-  it "returns nil for a lable that can't be matched" do
+  it "returns nil for a label that can't be matched" do
     expect(Tester.normalize_label("nomatch")).to be_nil
     expect(Tester.normalize_label(:nomatch)).to be_nil
   end

data/spec/world_spec.rb

@@ -32,7 +32,7 @@ describe ::Unobtainium::World do
   end
 
   it "extends driver options, but doesn't pass 'base' on" do
-    expect(@tester.config["drivers.leaf.base"]).to eql "mock"
+    expect(@tester.config["drivers.leaf.base"]).to eql %w(.drivers.mock)
     expect(@tester.driver.passed_options["base"]).to be_nil
   end
 end

data/unobtainium.gemspec

@@ -13,6 +13,7 @@ require 'unobtainium/version'
 
 # rubocop:disable Style/UnneededPercentQ, Style/ExtraSpacing
 # rubocop:disable Style/SpaceAroundOperators
+# rubocop:disable Metrics/BlockLength
 Gem::Specification.new do |spec|
   spec.name          = "unobtainium"
   spec.version       = Unobtainium::VERSION
@@ -43,8 +44,8 @@ Gem::Specification.new do |spec|
                        "'phantomjs'"
 
   spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rubocop", "~> 0.42"
-  spec.add_development_dependency "rake", "~> 11.2"
+  spec.add_development_dependency "rubocop", "~> 0.45"
+  spec.add_development_dependency "rake", "~> 11.3"
   spec.add_development_dependency "rspec", "~> 3.5"
   spec.add_development_dependency "simplecov", "~> 0.12"
   spec.add_development_dependency "yard", "~> 0.9"
@@ -56,8 +57,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "sys-proctable", "~> 1.1"
   spec.add_dependency "ptools", "~> 1.3"
-  spec.add_dependency "collapsium", "~> 0.4"
-  spec.add_dependency "collapsium-config", "~> 0.2"
+  spec.add_dependency "collapsium", "~> 0.6"
+  spec.add_dependency "collapsium-config", "~> 0.4"
 end
+# rubocop:enable Metrics/BlockLength
 # rubocop:enable Style/SpaceAroundOperators
 # rubocop:enable Style/UnneededPercentQ, Style/ExtraSpacing

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unobtainium
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Jens Finkhaeuser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-12 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.42'
+        version: '0.45'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.42'
+        version: '0.45'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '11.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '11.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -198,28 +198,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: collapsium-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
 description: "\n    Unobtainium wraps Selenium and Appium in a simple driver abstraction
   so that\n    test code can more easily cover desktop browsers, mobile browsers and
   mobile\n    apps.\n\n    Some additional useful functionality for the maintenance