Merge pull request #353 from mezuro/update_travis_yml

Update travis yml

Merge pull request #353 from mezuro/update_travis_yml
Update travis yml
Eduardo Silva
2 parents e518917e 6ab21887
Showing 4 changed files with 41 additions and 15 deletions Show diff stats
.travis.yml
CHANGELOG.rdoc
features/support/header.rb
spec/rails_helper.rb
 language: ruby
 rvm:
   - 2.3.0
+  - 2.0.0-p598 # CentOS 7
+  - 2.1.5 # Debian 8
+
 addons:
   postgresql: "9.3"
  
+before_install:
+  - if ruby --version | cut -d ' ' -f 2 | grep -q 2.1.5p273 ; then gem update --system 2.4.8; fi
+
 before_script:
-  - git clone https://github.com/mezuro/kalibro_install.git -b v4.0 kalibro_install
+  - git clone https://github.com/mezuro/kalibro_install.git -b v4.2 kalibro_install
+  - export KALIBRO_CONFIGURATIONS_START=0
+  - export KALIBRO_PROCESSOR_START=0
   - pushd kalibro_install
-    # Remove bugged libzmq3 package, see https://github.com/travis-ci/travis-ci/issues/982 and https://github.com/travis-ci/travis-ci/issues/1715 for details
+  #
+  # Remove bugged libzmq3 package, see https://github.com/travis-ci/travis-ci/issues/982 and https://github.com/travis-ci/travis-ci/issues/1715 for details
+  #
+  # In 2016/04/27 the state is:
+  #   * The first issue has been closed and apparently fixed by a PR
+  #   * The second one has been closed without a PR and removing the workaround below breaks the build
+  #
   - sudo apt-get remove libzmq3
-  - export KALIBRO_PROCESSOR_VERSION=v1.2.1
-  - export KALIBRO_CONFIGURATIONS_VERSION=v2.0.0
   - bash install.sh
   - popd
   - cp config/database.yml.sample config/database.yml
-  - bundle exec rake db:setup
+  # Do not run setup as the Kalibro services are up and this is not even necessary!
+  - bundle exec rake db:create
+  - bundle exec rake db:migrate
   - cp features/support/kalibro_cucumber_helpers.yml.sample features/support/kalibro_cucumber_helpers.yml
   - export BUNDLE_GEMFILE=$PWD/Gemfile
   - export CODECLIMATE_REPO_TOKEN=045c2433d496f108c0c6afa5516a72ddbfb1868fb34bf7a9bd095b7a0ea34a79
  
 script:
+  # Unit tests
   - bundle exec rake spec
   - bundle exec rake konacha:run
+  #
+  # Start kalibro for acceptance tests
+  - pushd kalibro_install
+  - bash start_kalibro_services.sh
+  - popd
+  #
+  # Acceptance tests
   - bundle exec rake cucumber
  
 notifications:
@@ -13,10 +13,13 @@ Prezento is the web interface for Mezuro.
 * Pluralize navigation menu links
 * Add missing translation for CompoundMetric
 * Make Compound Metric Config. metric list not include Hotspot metrics
-* Fix 'Tree Metrics' and 'Hotspot Metrics' PT translations in Configuration show view  
+* Fix 'Tree Metrics' and 'Hotspot Metrics' PT translations in Configuration show view
 * Show the notify push url for the repository's owner (Gitlab only)
 * Support for hiding repositories
 * Fix home latest content caching effectiveness
+* Update travis script
+* Support for ruby 2.0.0-p598 (CentOS 7 default) and 2.1.5 (Debian 8 default)
+* Make Travis fail if minimun unit test coverage is below 100%
  
 == v0.11.3 - 01/04/2016
  
@@ -10,6 +10,9 @@ module HeaderUtils
   end
  
   def set_headers(headers)
-    headers.each(&method(:set_header))
+    # The call 'headers.each(&method(:set_header))' breaks on ruby 2.0.0-p598, which is the
+    # default version on CentOS 7. When that SO updates ruby, this should be reverted to
+    # the more concise syntax.
+    headers.each { |key, value| method(:set_header).call(key, value) }
   end
 end
@@ -3,17 +3,15 @@ require &quot;codeclimate-test-reporter&quot;
 CodeClimate::TestReporter.start
 require 'simplecov'
  
-SimpleCov.start do
+SimpleCov.start 'rails' do
+  # Minimum coverage is only desired on CI tools when building the environment. CI is a
+  # default environment variable used by Travis. For reference, see here:
+  # https://docs.travis-ci.com/user/environment-variables/#Default-Environment-Variables
+  minimum_coverage 100 if ENV["CI"] == 'true'
   coverage_dir 'coverage/rspec'
  
-  add_group "Models", "app/models"
-  add_group "Controllers", "app/controllers"
-  add_group "Helpers", "app/helpers"
-  add_group "Mailers", "app/mailers"
-
   add_filter "/spec/"
   add_filter "/features/"
-  add_filter "/config/"
 end
  
 # This file is copied to spec/ when you run 'rails generate rspec:install'
@@ -61,4 +59,4 @@ RSpec.configure do |config|
  
   # Devise helpers
   config.include Devise::TestHelpers, :type => :controller
-end
 \ No newline at end of file
+end
1	1	language: ruby
2	2	rvm:
3	3	- 2.3.0
	4	+ - 2.0.0-p598 # CentOS 7
	5	+ - 2.1.5 # Debian 8
	6	+
4	7	addons:
5	8	postgresql: "9.3"
6	9
	10	+before_install:
	11	+ - if ruby --version \| cut -d ' ' -f 2 \| grep -q 2.1.5p273 ; then gem update --system 2.4.8; fi
	12	+
7	13	before_script:
8		- - git clone https://github.com/mezuro/kalibro_install.git -b v4.0 kalibro_install
	14	+ - git clone https://github.com/mezuro/kalibro_install.git -b v4.2 kalibro_install
	15	+ - export KALIBRO_CONFIGURATIONS_START=0
	16	+ - export KALIBRO_PROCESSOR_START=0
9	17	- pushd kalibro_install
10		- # Remove bugged libzmq3 package, see https://github.com/travis-ci/travis-ci/issues/982 and https://github.com/travis-ci/travis-ci/issues/1715 for details
	18	+ #
	19	+ # Remove bugged libzmq3 package, see https://github.com/travis-ci/travis-ci/issues/982 and https://github.com/travis-ci/travis-ci/issues/1715 for details
	20	+ #
	21	+ # In 2016/04/27 the state is:
	22	+ # * The first issue has been closed and apparently fixed by a PR
	23	+ # * The second one has been closed without a PR and removing the workaround below breaks the build
	24	+ #
11	25	- sudo apt-get remove libzmq3
12		- - export KALIBRO_PROCESSOR_VERSION=v1.2.1
13		- - export KALIBRO_CONFIGURATIONS_VERSION=v2.0.0
14	26	- bash install.sh
15	27	- popd
16	28	- cp config/database.yml.sample config/database.yml
17		- - bundle exec rake db:setup
	29	+ # Do not run setup as the Kalibro services are up and this is not even necessary!
	30	+ - bundle exec rake db:create
	31	+ - bundle exec rake db:migrate
18	32	- cp features/support/kalibro_cucumber_helpers.yml.sample features/support/kalibro_cucumber_helpers.yml
19	33	- export BUNDLE_GEMFILE=$PWD/Gemfile
20	34	- export CODECLIMATE_REPO_TOKEN=045c2433d496f108c0c6afa5516a72ddbfb1868fb34bf7a9bd095b7a0ea34a79
21	35
22	36	script:
	37	+ # Unit tests
23	38	- bundle exec rake spec
24	39	- bundle exec rake konacha:run
	40	+ #
	41	+ # Start kalibro for acceptance tests
	42	+ - pushd kalibro_install
	43	+ - bash start_kalibro_services.sh
	44	+ - popd
	45	+ #
	46	+ # Acceptance tests
25	47	- bundle exec rake cucumber
26	48
27	49	notifications:
...	...
...	...	@@ -13,10 +13,13 @@ Prezento is the web interface for Mezuro.
13	13	* Pluralize navigation menu links
14	14	* Add missing translation for CompoundMetric
15	15	* Make Compound Metric Config. metric list not include Hotspot metrics
16		-* Fix 'Tree Metrics' and 'Hotspot Metrics' PT translations in Configuration show view
	16	+* Fix 'Tree Metrics' and 'Hotspot Metrics' PT translations in Configuration show view
17	17	* Show the notify push url for the repository's owner (Gitlab only)
18	18	* Support for hiding repositories
19	19	* Fix home latest content caching effectiveness
	20	+* Update travis script
	21	+* Support for ruby 2.0.0-p598 (CentOS 7 default) and 2.1.5 (Debian 8 default)
	22	+* Make Travis fail if minimun unit test coverage is below 100%
20	23
21	24	== v0.11.3 - 01/04/2016
22	25
...	...
...	...	@@ -10,6 +10,9 @@ module HeaderUtils
10	10	end
11	11
12	12	def set_headers(headers)
13		- headers.each(&method(:set_header))
	13	+ # The call 'headers.each(&method(:set_header))' breaks on ruby 2.0.0-p598, which is the
	14	+ # default version on CentOS 7. When that SO updates ruby, this should be reverted to
	15	+ # the more concise syntax.
	16	+ headers.each { \|key, value\| method(:set_header).call(key, value) }
14	17	end
15	18	end
...	...
...	...	@@ -3,17 +3,15 @@ require "codeclimate-test-reporter"
3	3	CodeClimate::TestReporter.start
4	4	require 'simplecov'
5	5
6		-SimpleCov.start do
	6	+SimpleCov.start 'rails' do
	7	+ # Minimum coverage is only desired on CI tools when building the environment. CI is a
	8	+ # default environment variable used by Travis. For reference, see here:
	9	+ # https://docs.travis-ci.com/user/environment-variables/#Default-Environment-Variables
	10	+ minimum_coverage 100 if ENV["CI"] == 'true'
7	11	coverage_dir 'coverage/rspec'
8	12
9		- add_group "Models", "app/models"
10		- add_group "Controllers", "app/controllers"
11		- add_group "Helpers", "app/helpers"
12		- add_group "Mailers", "app/mailers"
13		-
14	13	add_filter "/spec/"
15	14	add_filter "/features/"
16		- add_filter "/config/"
17	15	end
18	16
19	17	# This file is copied to spec/ when you run 'rails generate rspec:install'
...	...	@@ -61,4 +59,4 @@ RSpec.configure do \|config\|
61	59
62	60	# Devise helpers
63	61	config.include Devise::TestHelpers, :type => :controller
64		-end
65	62	\ No newline at end of file
	63	+end
...	...