Pin google-api-client; sanitize Gemfile

Change-Id: I078a8bcb3db04c399f8a903e69edd7c1cc70bc92

Gemfile

@@ -1,8 +1,11 @@
 source 'https://rubygems.org'
 
-group :development, :unit_tests do
+group :development, :test do
   gem 'puppetlabs_spec_helper', :require => false
 
+  # Pin google-api-client after it released a ruby 2.0 only version
+  gem 'google-api-client', '0.9.4'
+
   gem 'metadata-json-lint'
   # This is nice and all, but let's not worry about it until we've actually
   # got puppet 4.x sorted
@@ -18,16 +21,16 @@ group :development, :unit_tests do
   gem 'puppet-lint-variable_contains_upcase'
   gem 'puppet-lint-spaceship_operator_without_tag-check'
   gem 'puppet-lint-undef_in_function-check'
+
+  if puppetversion = ENV['PUPPET_GEM_VERSION']
+    gem 'puppet', puppetversion, :require => false
+  else
+    gem 'puppet', '~> 3.0', :require => false
+  end
 end
 
 group :system_tests do
   gem 'beaker-rspec', :require => false
 end
 
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', '~> 3.0', :require => false
-end
-
 # vim:ft=ruby