Skip to content

Commit 1d97e9e

Browse files
committed
Merge pull request #61 from puppetinabox/rubocop
Rubocop
2 parents ea33483 + bb7b6f7 commit 1d97e9e

20 files changed

+650
-126
lines changed

.gitignore

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1-
Gemfile.lock
2-
vendor
3-
.bundle
1+
.*.sw?
2+
/pkg
3+
/spec/fixtures
4+
/.rspec_system
5+
/.vagrant
6+
/.bundle
7+
/vendor
8+
/Gemfile.lock
9+
/junit
10+
/log
11+
.yardoc
12+
coverage

.travis.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
---
22
sudo: false
33
language: ruby
4+
branches:
5+
only:
6+
production
47
bundler_args: --without development system_tests
58
script: "cd dist/profile && bundle exec rake test"
69
notifications:
@@ -16,8 +19,8 @@ env:
1619
- PUPPET_VERSION="~> 3.5.0" STRICT_VARIABLES=yes
1720
- PUPPET_VERSION="~> 3.6.0" STRICT_VARIABLES=yes
1821
- PUPPET_VERSION="~> 3.7.0" STRICT_VARIABLES=yes
19-
#- PUPPET_VERSION="~> 3.7.0" STRICT_VARIABLES=yes FUTURE_PARSER=yes
20-
#- PUPPET_VERSION="~> 4.0.0" STRICT_VARIABLES=yes
22+
- PUPPET_VERSION="~> 3.7.0" STRICT_VARIABLES=yes FUTURE_PARSER=yes
23+
- PUPPET_VERSION="~> 4.0.0" STRICT_VARIABLES=yes
2124
matrix:
2225
exclude:
2326
# Ruby 2.1.0
@@ -27,3 +30,5 @@ matrix:
2730
env: PUPPET_VERSION="~> 3.3.0"
2831
- rvm: 2.1.0
2932
env: PUPPET_VERSION="~> 3.4.0"
33+
allow_failures:
34+
- env: PUPPET_VERSION="~> 4.0.0" STRICT_VARIABLES=yes

dist/profile/.gitignore

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,2 @@
1-
.*.sw?
2-
/pkg
31
/spec/fixtures/*
42
!/spec/fixtures/hiera*
5-
/.rspec_system
6-
/.vagrant
7-
/.bundle
8-
/vendor
9-
/Gemfile.lock
10-
/junit
11-
/log
12-
.yardoc

0 commit comments

Comments
 (0)