Merge 692021e into 02a3658

hlascelles · Nov 3, 2018 · 3f5c0bf · 3f5c0bf
2 parents 02a3658 + 692021e
commit 3f5c0bf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -141,14 +141,14 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.59.2)
+    rubocop (0.60.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (~> 1.4.0)
     ruby-progressbar (1.10.0)
     ruby_parser (3.11.0)
       sexp_processor (~> 4.9)
@@ -192,7 +192,7 @@ DEPENDENCIES
   rake
   reek (~> 4.8)
   rspec
-  rubocop (~> 0.59.2)
+  rubocop (~> 0.60.0)
   sqlite3 (>= 1.3)
   timecop
   zonebie

diff --git a/gemfiles/activesupport_4.gemfile.lock b/gemfiles/activesupport_4.gemfile.lock
@@ -144,14 +144,14 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.59.2)
+    rubocop (0.60.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (~> 1.4.0)
     ruby-progressbar (1.10.0)
     ruby_parser (3.11.0)
       sexp_processor (~> 4.9)
@@ -196,7 +196,7 @@ DEPENDENCIES
   rake
   reek (~> 4.8)
   rspec
-  rubocop (~> 0.59.2)
+  rubocop (~> 0.60.0)
   sqlite3 (>= 1.3)
   timecop
   zonebie

diff --git a/gemfiles/activesupport_5.gemfile.lock b/gemfiles/activesupport_5.gemfile.lock
@@ -141,14 +141,14 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.59.2)
+    rubocop (0.60.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (~> 1.4.0)
     ruby-progressbar (1.10.0)
     ruby_parser (3.11.0)
       sexp_processor (~> 4.9)
@@ -193,7 +193,7 @@ DEPENDENCIES
   rake
   reek (~> 4.8)
   rspec
-  rubocop (~> 0.59.2)
+  rubocop (~> 0.60.0)
   sqlite3 (>= 1.3)
   timecop
   zonebie

diff --git a/que-scheduler.gemspec b/que-scheduler.gemspec
@@ -3,6 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'que/scheduler/version'
 
 Gem::Specification.new do |spec|
+  # rubocop:disable Layout/AlignHash
   spec.name          = 'que-scheduler'
   spec.version       = Que::Scheduler::VERSION
   spec.authors       = ['Harry Lascelles']
@@ -41,8 +42,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'reek', '~> 4.8' # 5.0 requires ruby 2.3+
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop', '~> 0.59.2'
+  spec.add_development_dependency 'rubocop', '~> 0.60.0'
   spec.add_development_dependency 'sqlite3', '>= 1.3'
   spec.add_development_dependency 'timecop'
   spec.add_development_dependency 'zonebie'
+  # rubocop:enable Layout/AlignHash
 end