Skip to content

Commit

Permalink
Fix travis build (#34)
Browse files Browse the repository at this point in the history
* Remove the .ruby-version for source control

* Remove duplicate build status from README

* Update the Travis config to run against more versions of Ruby

* Colorize the rspec build

* Run tests against multiple versions of ActiveSupport

* Update the install script for Travis

* Drop support for Ruby 1.9.3

* Reconfigure with all builds again
  • Loading branch information
rrosenblum authored and orieken committed Nov 4, 2016
1 parent e7ac88d commit 30788c7
Show file tree
Hide file tree
Showing 13 changed files with 65 additions and 17 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Expand Up @@ -2,7 +2,5 @@
.bundle
Gemfile.lock
pkg/*
.rspec
.rvmrc
.idea/

1 change: 1 addition & 0 deletions .rspec
@@ -0,0 +1 @@
--color
1 change: 0 additions & 1 deletion .ruby-version

This file was deleted.

39 changes: 32 additions & 7 deletions .travis.yml
@@ -1,13 +1,38 @@
language: ruby
before_install: gem install bundler -v 1.11.2
script: "bundle exec rspec spec"
before_install: gem update --remote bundler
cache: bundler
rvm:
- 1.9.3
- 2.0.0
- 2.1.0
- 2.0
- 2.1
- 2.2
- 2.3
- ruby-head
- jruby-19mode
- rbx-2
- jruby-9
- rbx-2.2.7
- rbx-3
gemfile:
- Gemfile.activesupport-3.2
- Gemfile.activesupport-4.0
- Gemfile.activesupport-4.1
- Gemfile.activesupport-4.2
- Gemfile.activesupport-5.0
matrix:
allow_failures:
- rvm: ruby-head
- rvm: rbx-2.2.7
- rvm: rbx-3
exclude:
- rvm: 2.0
gemfile: Gemfile.activesupport-5.0
- rvm: 2.1
gemfile: Gemfile.activesupport-5.0
- rvm: 2.3
gemfile: Gemfile.activesupport-3.2
- rvm: ruby-head
gemfile: Gemfile.activesupport-3.2
- rvm: jruby-9
gemfile: Gemfile.activesupport-5.0
fast_finish: true
notifications:
email:
- pnascimento@gmail.com
Expand Down
1 change: 0 additions & 1 deletion Gemfile
@@ -1,4 +1,3 @@
source "https://rubygems.org"

# Specify your gem's dependencies in taza.gemspec
gemspec
5 changes: 5 additions & 0 deletions Gemfile.activesupport-3.2
@@ -0,0 +1,5 @@
source "https://rubygems.org"

gemspec

gem 'activesupport', '~> 3.2.0'
5 changes: 5 additions & 0 deletions Gemfile.activesupport-4.0
@@ -0,0 +1,5 @@
source "https://rubygems.org"

gemspec

gem 'activesupport', '~> 4.0.0'
5 changes: 5 additions & 0 deletions Gemfile.activesupport-4.1
@@ -0,0 +1,5 @@
source "https://rubygems.org"

gemspec

gem 'activesupport', '~> 4.1.0'
5 changes: 5 additions & 0 deletions Gemfile.activesupport-4.2
@@ -0,0 +1,5 @@
source "https://rubygems.org"

gemspec

gem 'activesupport', '~> 4.2.0'
5 changes: 5 additions & 0 deletions Gemfile.activesupport-5.0
@@ -0,0 +1,5 @@
source "https://rubygems.org"

gemspec

gem 'activesupport', '~> 5.0.0'
4 changes: 4 additions & 0 deletions History.txt
@@ -1,3 +1,7 @@
=== master

* Run builds against more versions of Ruby and ActiveSupport

=== 1.0
updated to RSpec 3 (thanks @drewboardman)
taza now accepts erb settings.yml (thanks @drewboardman)
Expand Down
5 changes: 1 addition & 4 deletions README.md
Expand Up @@ -3,9 +3,6 @@
###### Master
[![Build Status](https://travis-ci.org/hammernight/taza.svg?branch=master)](https://travis-ci.org/hammernight/taza) [![Code Climate](https://codeclimate.com/github/hammernight/taza.png)](https://codeclimate.com/github/hammernight/taza) [![Build Status](https://snap-ci.com/hammernight/taza/branch/master/build_image)](https://snap-ci.com/hammernight/taza/branch/master)

###### Branches
[![Build Status](https://secure.travis-ci.org/hammernight/taza.png)](http://travis-ci.org/hammernight/taza)


* https://github.com/hammernight/taza
* Wiki: http://github.com/scudco/taza/wikis
Expand Down Expand Up @@ -58,7 +55,7 @@ That will generate an RSpec HTML report at artifacts/functional/google/index.htm

## REQUIREMENTS:

* Ruby >= 1.9.3
* Ruby >= 2.0.0
* A browser.

## INSTALL:
Expand Down
4 changes: 2 additions & 2 deletions taza.gemspec
Expand Up @@ -11,7 +11,7 @@ Gem::Specification.new do |s|
s.homepage = "http://github.com/hammernight/taza"
s.summary = "Taza is an opinionated page object framework."
s.description = "Taza is an opinionated page object framework."
s.required_ruby_version = '>= 1.9.3'
s.required_ruby_version = '>= 2.0.0'
s.rubyforge_project = "taza"
s.files = `git ls-files`.split("\n")
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
Expand All @@ -25,7 +25,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency(%q<firewatir>, ["~> 1.9.4"])
s.add_runtime_dependency(%q<watir-webdriver>, ["~> 0.4"])
s.add_runtime_dependency(%q<watir>, ["~> 5.0.0"])
s.add_runtime_dependency(%q<activesupport>, [">= 3.1.0"])
s.add_runtime_dependency(%q<activesupport>, [">= 3.2.0"])
s.add_runtime_dependency(%q<thor>, [">= 0.18.1"])
s.add_runtime_dependency(%q<rspec>, ["~> 3.0"])
end

0 comments on commit 30788c7

Please sign in to comment.