Skip to content

Commit e69a71b

Browse files
committed
(FM-5972) Update to next modulesync_configs [dedaf10]
1 parent bc6320f commit e69a71b

File tree

6 files changed

+7
-9
lines changed

6 files changed

+7
-9
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ coverage/
1212
*.iml
1313
.*.sw[op]
1414
.DS_Store
15-
.rspec
1615
tmp/
16+
vendor/
1717

.rspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
--color
2+
--format documentation

.sync.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22
.travis.yml:
3-
script: "\"bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--color --format documentation'\""
43
extras:
54
- rvm: 1.9.3
65
env: PUPPET_GEM_VERSION="3.7.0"

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
sudo: false
33
language: ruby
44
bundler_args: --without system_tests
5-
script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--color --format documentation'"
5+
script: "bundle exec rake validate lint spec"
66
matrix:
77
fast_finish: true
88
include:

Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ group :development do
5757
gem 'rubocop-rspec', '~> 1.6', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')
5858
gem 'pry', :require => false
5959
gem 'json_pure', '<= 2.0.1', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
60+
gem 'fast_gettext', '1.1.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
61+
gem 'fast_gettext', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
6062
gem 'yard', :require => false
6163
end
6264

@@ -70,6 +72,7 @@ group :system_tests do
7072
gem 'beaker-puppet_install_helper', :require => false
7173
gem 'master_manipulator', :require => false
7274
gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
75+
gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
7376
end
7477

7578
gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])

spec/spec.opts

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)