Merge pull request #275 from DavidS/cleanup-Gemfile-codecov

(maint) Cleanup gemfile and fix codecov dependency

Author: david22swan

Gemfile

@@ -1,45 +1,60 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in puppet-resource_api.gemspec
 gemspec
 
 group :tests do
-  gem 'codecov'
+  gem 'CFPropertyList'
   gem 'rspec', '~> 3.0'
-  # rubocop 0.58 throws when testing against ruby 2.1, so pin to the latest,
-  # unless we're dealing with jruby...
+  gem 'simplecov-console'
+
+  # the test gems required for module testing
+  gem 'puppetlabs_spec_helper', '~> 2.7'
+  gem 'rspec-puppet'
+
+  # since the Resource API runs inside the puppetserver, test against the JRuby versions we ship
+  # these require special dependencies to have everything load properly
+
+  # `codecov` 0.1.17 introduced usage of %i[] which is not recognised by JRuby 1.7
+  if RUBY_PLATFORM == 'java' && Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('2.3.0')
+    gem 'codecov', '= 0.1.16'
+  else
+    gem 'codecov'
+  end
+
+  # `rake` dropped support for older versions of ruby a while back
   if RUBY_PLATFORM == 'java'
-    # load a rake version that works on java
     gem 'rake', '~> 10.0'
+  else
+    gem 'rake', '~> 12.3'
+  end
+
+  # rubocop is special, as usual
+  if RUBY_PLATFORM == 'java'
     # load a rubocop version that works on java for the Rakefile
     gem 'parser', '2.3.3.1'
     gem 'rubocop', '0.41.2'
-    # JRuby 1.7 does not like json 2.3.0, jruby 9.1.9.0 has RUBY_VERSION == '2.3.3'
-    gem 'json', '2.2.0' if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('2.3.0')
   elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.0')
+    # rubocop 0.58 throws when testing against ruby 2.1, so pin to the latest version that works
     gem 'rubocop', '0.57.2'
-    # the last version of parallel to support ruby 2.1
-    gem 'parallel', '1.13.0'
     gem 'rubocop-rspec'
   else
-    # the rake everyone else should be using
-    gem 'rake', '~> 12.3'
     # 2.1-compatible analysis was dropped after version 0.58
     # This needs to be removed once we drop puppet4 support.
     gem 'rubocop', '~> 0.57.0'
     gem 'rubocop-rspec'
-    # license_finder does not install on windows using older versions of rubygems.
-    # ruby 2.4 is confirmed working on appveyor.
-    gem 'license_finder' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
   end
-  gem 'simplecov-console'
-  # the test gems required for module testing
-  gem 'puppetlabs_spec_helper', '~> 2.7'
-  gem 'rspec-puppet'
 
-  gem 'CFPropertyList'
+  # JRuby 1.7 does not like json 2.3.0, jruby 9.1.9.0 has RUBY_VERSION == '2.3.3'
+  gem 'json', '2.2.0' if RUBY_PLATFORM == 'java' && Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('2.3.0')
+  # the last version of parallel to support ruby 2.1
+  gem 'parallel', '1.13.0' if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('2.2.0')
+
+  # license_finder does not install on windows using older versions of rubygems.
+  # ruby 2.4 is confirmed working on appveyor and we only need to run it on the newest gemset anyways
+  gem 'license_finder' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
 end
 
 group :development do