Merge pull request #2 from jlambert121/future_parser

enable future_parser
evenup · Apr 8, 2015 · 996c208 · 996c208
2 parents ec22f7c + 89c15e1
commit 996c208
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 22 deletions.
diff --git a/.sync.yml b/.sync.yml
@@ -1,4 +1,16 @@
 ---
   .travis.yml:
+    script: "\"bundle exec rake validate && bundle exec rake test SPEC_OPTS='--format documentation'\""
+    includes:
+      - rvm: 1.9.3
+        env: PUPPET_GEM_VERSION="~> 3.3.0"
+      - rvm: 1.9.3
+        env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+      - rvm: 2.0.0
+        env: PUPPET_GEM_VERSION="~> 3.3.0"
+      - rvm: 2.0.0
+        env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+      - rvm: 2.1.0
+        env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
     hc_secure: "O4brQNu9Hk4IUfgaNU+R8QWe0A/5ucmEBzTPX3kzrCXALHP1f4opc3MgIFzPohc/O9Y64oNcV/TZk2Bwy1mUunxCubfQfF4G1VoE0yQc/z7qOBOrYPvOU2S5srcrbwyg7zBt1H0dXKoDvgoW4fSTz4LMv3ahIlYZYmgmaeZioE4="
 
diff --git a/.travis.yml b/.travis.yml
@@ -7,10 +7,6 @@ sudo: false
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3.3.0"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
   - rvm: 1.9.3
     env: PUPPET_GEM_VERSION="~> 3.3.0"
   - rvm: 1.9.3

diff --git a/Gemfile b/Gemfile
@@ -1,24 +1,25 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :unit_tests do
-  gem 'rake',                                              :require => false
-  gem 'rspec', '~> 3.1.0',                                 :require => false
-  gem 'rspec-puppet',                                      :require => false
-  gem 'puppetlabs_spec_helper',                            :require => false
-  gem 'puppet-lint', '1.0.1',                              :require => false
-  gem 'puppet-syntax',                                     :require => false
-  gem 'metadata-json-lint',                                :require => false
-  gem 'json',                                              :require => false
-  gem 'puppet-lint-absolute_classname-check',              :require => false
-  gem 'puppet-lint-appends-check',                         :require => false
-  gem 'puppet-lint-empty_string-check',                    :require => false
-  gem 'puppet-lint-file_ensure-check',                     :require => false
-  gem 'puppet-lint-leading_zero-check',                    :require => false
-  gem 'puppet-lint-spaceship_operator_without_tag-check',  :require => false
-  gem 'puppet-lint-trailing_comma-check',                  :require => false
-  gem 'puppet-lint-undef_in_function-check',               :require => false
-  gem 'puppet-lint-unquoted_string-check',                 :require => false
-  gem 'puppet-lint-version_comparison-check',              :require => false
+  gem 'rake',                                                       :require => false
+  gem 'rspec', '~> 3.1.0',                                          :require => false
+  gem 'rspec-puppet',                                               :require => false
+  gem 'puppetlabs_spec_helper',                                     :require => false
+  gem 'puppet-lint', '1.0.1',                                       :require => false
+  gem 'puppet-syntax',                                              :require => false
+  gem 'metadata-json-lint',                                         :require => false
+  gem 'json',                                                       :require => false
+  gem 'puppet-lint-absolute_classname-check',                       :require => false
+  gem 'puppet-lint-appends-check',                                  :require => false
+  gem 'puppet-lint-empty_string-check',                             :require => false
+  gem 'puppet-lint-file_ensure-check',                              :require => false
+  gem 'puppet-lint-leading_zero-check',                             :require => false
+  gem 'puppet-lint-spaceship_operator_without_tag-check',           :require => false
+  gem 'puppet-lint-trailing_comma-check',                           :require => false
+  gem 'puppet-lint-undef_in_function-check',                        :require => false
+  gem 'puppet-lint-unquoted_string-check',                          :require => false
+  gem 'puppet-lint-version_comparison-check',                       :require => false
+  gem 'puppet-lint-classes_and_types_beginning_with_digits-check',  :require => false
 end
 group :development do
   gem 'simplecov',   :require => false