Merge pull request #27 from jnbt/update-ruby

Update upto Ruby 2.5.1

.rubocop.yml

@@ -22,3 +22,9 @@ Metrics/BlockLength:
 Security/MarshalLoad:
   Exclude:
     - 'lib/candy_check/play_store/discovery_repository.rb'
+Style/DateTime:
+  Enabled: false
+Style/Encoding:
+  Enabled: false
+Style/ExpandPathArguments:
+  Enabled: false

.ruby-version

@@ -1 +1 @@
-2.4.1
+2.5.1

.travis.yml

@@ -2,8 +2,10 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
+  - 2.5.1
+  - 2.4.4
   - 2.4.1
-  - 2.3.4
+  - 2.3.7
   - 2.2
   - 2.1
   - 2.0
@@ -18,4 +20,6 @@ matrix:
     - rvm: ruby-head
     - rvm: jruby-head
   fast_finish: true
-before_install: gem install bundler -v 1.14.6
+before_install:
+  - gem update --system
+  - gem install bundler -v 1.16.2

Rakefile

@@ -12,4 +12,4 @@ end
 
 RuboCop::RakeTask.new
 
-task default: %i(spec rubocop)
+task default: %i(spec)

candy_check.gemspec

@@ -20,17 +20,17 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = Gem::Requirement.new('>= 2.0')
 
-  spec.add_dependency 'multi_json',        '~> 1.10'
   spec.add_dependency 'google-api-client', '~> 0.8.6'
+  spec.add_dependency 'multi_json',        '~> 1.10'
   spec.add_dependency 'thor',              '~> 0.19'
 
-  spec.add_development_dependency 'rubocop',         '~> 0.48'
-  spec.add_development_dependency 'inch',            '~> 0.7'
   spec.add_development_dependency 'bundler',         '~> 1.14'
-  spec.add_development_dependency 'rake',            '~> 12.0'
   spec.add_development_dependency 'coveralls',       '~> 0.8'
+  spec.add_development_dependency 'inch',            '~> 0.7'
   spec.add_development_dependency 'minitest',        '~> 5.10'
   spec.add_development_dependency 'minitest-around', '~> 0.4'
-  spec.add_development_dependency 'webmock',         '~> 3.0'
+  spec.add_development_dependency 'rake',            '~> 12.0'
+  spec.add_development_dependency 'rubocop',         '~> 0.48'
   spec.add_development_dependency 'timecop',         '~> 0.8'
+  spec.add_development_dependency 'webmock',         '~> 3.0'
 end

lib/candy_check/play_store/client.rb

@@ -35,7 +35,8 @@ def initialize(config)
       def boot!
         @api_client = Google::APIClient.new(
           application_name:    config.application_name,
-          application_version: config.application_version
+          application_version: config.application_version,
+          user_agent: user_agent
         )
         discover!
         authorize!
@@ -86,6 +87,18 @@ def execute(parameters, api_method)
         ).data.to_hash
       end
 
+      # Builds a custom user agent to prevent Google::APIClient to
+      # use an invalid auto-generated one
+      # @see https://github.com/google/google-api-ruby-client/blob/15853007bf1fc8ad000bb35dafdd3ca6bfa8ae26/lib/google/api_client.rb#L112
+      def user_agent
+        [
+          "#{config.application_name}/#{config.application_version}",
+          "google-api-ruby-client/#{Google::APIClient::VERSION::STRING}",
+          Google::APIClient::ENV::OS_VERSION,
+          '(gzip)'
+        ].join(' ').delete("\n")
+      end
+
       def discover!
         @rpc = load_discover_dump || request_discover
         validate_rpc!

lib/candy_check/version.rb

@@ -1,4 +1,4 @@
 module CandyCheck
   # The current gem's version
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end