diff --git a/.travis.yml b/.travis.yml index 70356ad..5e2df6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,6 @@ before_install: - sudo apt-get install xvfb language: ruby rvm: -- 1.8.7 -- 1.9.2 - 1.9.3 +- 2.0.0 +- 2.1.0 diff --git a/CHANGES b/CHANGES index aa8e81c..8ceeb35 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +1.0.0 +Base required Ruby version now 1.9.3 or later +Bumped gem dependency versions +Updated Travis build lists to include Ruby 2.0, 2.1 + 0.2.34 Improved validate_online method to disregard system/OS errors. diff --git a/Gemfile b/Gemfile index 12b7c76..b2ea0e9 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -source :rubygems +source 'https://rubygems.org' platforms :jruby do gem "jruby-openssl" diff --git a/Gemfile.lock b/Gemfile.lock index 17461cd..e103a67 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - frameworks-capybara (0.2.34) + frameworks-capybara (1.0.0) capybara (~> 1.1.2) capybara-celerity capybara-mechanize (>= 0.3.0, < 1.0.0) @@ -9,14 +9,14 @@ PATH headless json mechanize (= 2.7.2) - mime-types (~> 1.25) - nokogiri (~> 1.5.10) - rubyzip (~> 0.9.9) + mime-types + nokogiri + rubyzip selenium-webdriver w3c_validators GEM - remote: http://rubygems.org/ + remote: https://rubygems.org/ specs: builder (3.2.2) capybara (1.1.4) @@ -33,7 +33,7 @@ GEM capybara (~> 1.1) mechanize (~> 2.3) celerity (0.9.2) - childprocess (0.3.9) + childprocess (0.5.1) ffi (~> 1.0, >= 1.0.11) cucumber (1.3.10) builder (>= 2.1.2) @@ -42,7 +42,7 @@ GEM multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.0.2) diff-lcs (1.2.5) - domain_name (0.5.15) + domain_name (0.5.16) unf (>= 0.0.5, < 1.0.0) ffi (1.9.3) gherkin (2.12.2) @@ -61,16 +61,18 @@ GEM ntlm-http (~> 0.1, >= 0.1.1) webrobots (>= 0.0.9, < 0.2) mime-types (1.25.1) - multi_json (1.8.2) - multi_test (0.0.2) + mini_portile (0.5.2) + multi_json (1.8.4) + multi_test (0.0.3) net-http-digest_auth (1.4) - net-http-persistent (2.9) - nokogiri (1.5.11) + net-http-persistent (2.9.4) + nokogiri (1.6.1) + mini_portile (~> 0.5.0) ntlm-http (0.1.1) rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) - rake (10.1.0) + rake (10.1.1) rspec (2.13.0) rspec-core (~> 2.13.0) rspec-expectations (~> 2.13.0) @@ -79,11 +81,11 @@ GEM rspec-expectations (2.13.0) diff-lcs (>= 1.1.3, < 2.0) rspec-mocks (2.13.1) - rubyzip (0.9.9) - selenium-webdriver (2.35.1) - childprocess (>= 0.2.5) + rubyzip (1.1.0) + selenium-webdriver (2.40.0) + childprocess (>= 0.5.0) multi_json (~> 1.0) - rubyzip (< 1.0.0) + rubyzip (~> 1.0) websocket (~> 1.0.4) unf (0.1.3) unf_ext diff --git a/frameworks-capybara.gemspec b/frameworks-capybara.gemspec index cb007dc..f2fc992 100644 --- a/frameworks-capybara.gemspec +++ b/frameworks-capybara.gemspec @@ -20,16 +20,9 @@ Gem::Specification.new do |s| s.files = `git ls-files`.split("\n") - if RUBY_VERSION < "1.9" - s.add_runtime_dependency("mime-types", ["~>1.25"]) - s.add_runtime_dependency("nokogiri", ["~>1.5.10"]) - s.add_runtime_dependency("rubyzip", ["~>0.9.9"]) - else - s.add_runtime_dependency("mime-types") - s.add_runtime_dependency("nokogiri") - s.add_runtime_dependency("rubyzip") - s.add_runtime_dependency("zip") - end + s.add_runtime_dependency("mime-types") + s.add_runtime_dependency("nokogiri") + s.add_runtime_dependency("rubyzip") s.add_runtime_dependency("selenium-webdriver") s.add_runtime_dependency("capybara", ["~>1.1.2"]) s.add_runtime_dependency("mechanize", ["2.7.2"]) diff --git a/lib/version.rb b/lib/version.rb index 2ca9a95..dc4635f 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -1,3 +1,3 @@ module FrameworksCapybara - VERSION = '0.2.34' + VERSION = '1.0.0' end