Ruby 2.1, 2.2 compatibility

congt · Jan 17, 2019 · 4de6f1b · 4de6f1b
1 parent dfd5487
commit 4de6f1b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/Gemfile b/Gemfile
@@ -5,10 +5,9 @@ source 'https://rubygems.org'
 group :development do
   gem 'bundler'
   gem 'rake'
-  gem 'rubocop'
+  gem 'rubocop', install_if: -> { RUBY_VERSION >= '2.3' }
 end
 
-gem 'logger'
 gem 'rspec'
 
 gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -13,7 +13,6 @@ GEM
     colorize (0.8.1)
     diff-lcs (1.2.5)
     jaro_winkler (1.5.2)
-    logger (1.3.0)
     parallel (1.13.0)
     parser (2.6.0.0)
       ast (~> 2.4.0)
@@ -52,7 +51,6 @@ PLATFORMS
 DEPENDENCIES
   bundler
   git-fastclone!
-  logger
   rake
   rspec
   rubocop

diff --git a/Rakefile b/Rakefile
@@ -2,10 +2,15 @@
 
 require 'bundler/setup'
 
-task default: %w[spec rubocop]
+task default: %w[spec]
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new
 
-require 'rubocop/rake_task'
-RuboCop::RakeTask.new
+begin
+  require 'rubocop/rake_task'
+  RuboCop::RakeTask.new
+  task default: :rubocop
+rescue LoadError => e
+  raise unless e.path == 'rubocop/rake_task'
+end
diff --git a/spec/git_fastclone_runner_spec.rb b/spec/git_fastclone_runner_spec.rb
@@ -32,7 +32,6 @@
     lockfile
   end
 
-  # Modified ARGV, watch out
   before do
     stub_const('ARGV', ['ssh://[email protected]/git-fastclone.git', 'test_reference_dir'])
   end