Merge pull request #23 from jessereynolds/rubocop_rake

rubocop fixes for vox.rake

Author: bastelfreak

.rubocop_todo.yml

@@ -27,21 +27,7 @@ Layout/ClosingHeredocIndentation:
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
 
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_brackets
-Layout/FirstArrayElementIndentation:
-  EnforcedStyle: special_inside_parentheses
-
-# Offense count: 6
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_braces
-Layout/FirstHashElementIndentation:
-  EnforcedStyle: special_inside_parentheses
-
-# Offense count: 664
+# Offense count: 666
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 # SupportedHashRocketStyles: key, separator, table
@@ -80,14 +66,6 @@ Layout/LineContinuationSpacing:
 Layout/LineEndStringConcatenationIndentation:
   Enabled: false
 
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForEmptyBraces.
-# SupportedStyles: space, no_space, compact
-# SupportedStylesForEmptyBraces: space, no_space
-Layout/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: space
-
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
@@ -1157,7 +1135,7 @@ Style/StderrPuts:
 Style/StringConcatenation:
   Enabled: false
 
-# Offense count: 3466
+# Offense count: 3463
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
@@ -1194,7 +1172,7 @@ Style/TrailingCommaInArguments:
 Style/TrailingCommaInArrayLiteral:
   Enabled: false
 
-# Offense count: 1610
+# Offense count: 1609
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyleForMultiline.
 # SupportedStylesForMultiline: comma, consistent_comma, diff_comma, no_comma

rakelib/vox.rake

@@ -5,26 +5,26 @@ namespace :vox do
   task 'version:bump:full', [:version] do |_, args|
     abort 'You must provide a tag.' if args[:version].nil? || args[:version].empty?
     version = args[:version]
-    abort "#{version} does not appear to be a valid version string in x.y.z format" unless Gem::Version.correct?(version)
-
+    unless Gem::Version.correct?(version)
+      abort "#{version} does not appear to be a valid version string in x.y.z format"
+    end
     # Update lib/bolt/version.rb and openbolt.gemspec
     puts "Setting version to #{version}"
 
     data = File.read('lib/bolt/version.rb')
     new_data = data.sub(/VERSION = '\d+\.\d+\.\d+(-\w+(\..*)?)?'/, "VERSION = '#{version}'")
-    if data != new_data
-      File.write('lib/bolt/version.rb', new_data)
-    else
+    if data == new_data
       warn 'Failed to update version in lib/bolt/version.rb'
+    else
+      File.write('lib/bolt/version.rb', new_data)
     end
 
     data = File.read('openbolt.gemspec')
     new_data = data.sub(/(spec.version *=) '\d+\.\d+\.\d+(-\w+(\.\w+)?)?'/, "\\1 '#{version}'")
-    if data != new_data
-      File.write('openbolt.gemspec', new_data)
-    else
+    if data == new_data
       warn 'Failed to update version in openbolt.gemspec'
+    else
+      File.write('openbolt.gemspec', new_data)
     end
   end
 end
-