Resolve new RuboCop offenses

hartmantis · Feb 9, 2016 · a4ee0a7 · a4ee0a7
1 parent 0df43c6
commit a4ee0a7
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 29 deletions.
diff --git a/libraries/helpers.rb b/libraries/helpers.rb
@@ -73,7 +73,7 @@ def self.latest_version_for(platform)
     # @return [TrueClass, FalseClass] whether the string is valid
     #
     def self.valid_version?(arg)
-      arg.match(/^[0-9]+\.[0-9]+\.[0-9]+$/) ? true : false
+      arg =~ /^[0-9]+\.[0-9]+\.[0-9]+$/ ? true : false
     end
   end
 end
diff --git a/libraries/provider_gimp_app.rb b/libraries/provider_gimp_app.rb
@@ -70,8 +70,8 @@ def whyrun_supported?
       # @raise [NotImplementedError] if not defined for this provider.
       #
       def install!
-        fail(NotImplementedError,
-             "`install!` method not implemented for #{self.class} provider")
+        raise(NotImplementedError,
+              "`install!` method not implemented for #{self.class} provider")
       end
 
       #
@@ -80,8 +80,8 @@ def install!
       # @raise [NotImplementedError] if not defined for this provider.
       #
       def remove!
-        fail(NotImplementedError,
-             "`remove!` method not implemented for #{self.class} provider")
+        raise(NotImplementedError,
+              "`remove!` method not implemented for #{self.class} provider")
       end
     end
   end

diff --git a/libraries/provider_gimp_app_mac_os_x.rb b/libraries/provider_gimp_app_mac_os_x.rb
@@ -29,7 +29,7 @@ class GimpApp < Provider::LWRPBase
       #
       # @author Jonathan Hartman <j@p4nt5.com>
       class MacOsX < GimpApp
-        PATH ||= '/Applications/GIMP.app'
+        PATH ||= '/Applications/GIMP.app'.freeze
 
         provides :gimp_app, platform_family: 'mac_os_x'
 

diff --git a/libraries/resource_gimp_app.rb b/libraries/resource_gimp_app.rb
@@ -37,7 +37,7 @@ class GimpApp < Resource::LWRPBase
       attribute :installed,
                 kind_of: [NilClass, TrueClass, FalseClass],
                 default: nil
-      alias_method :installed?, :installed
+      alias installed? installed
 
       #
       # Allow a user to install a specific version of GIMP.

diff --git a/metadata.rb b/metadata.rb
@@ -1,6 +1,5 @@
 # Encoding: UTF-8
-#
-# rubocop:disable SingleSpaceBeforeFirstArg
+
 name             'gimp'
 maintainer       'Jonathan Hartman'
 maintainer_email 'j@p4nt5.com'
@@ -27,4 +26,3 @@
 supports         'fedora'
 supports         'opensuse'
 supports         'suse'
-# rubocop:enable SingleSpaceBeforeFirstArg
diff --git a/spec/support/cookbooks/apt/metadata.rb b/spec/support/cookbooks/apt/metadata.rb
@@ -1,11 +1,9 @@
 # Encoding: UTF-8
-#
-# rubocop:disable SingleSpaceBeforeFirstArg
+
 name             'apt'
 maintainer       'test'
 maintainer_email 'example@example.com'
 license          'apache2'
 description      'apt'
 long_description 'apt'
 version          '0.0.1'
-# rubocop:enable SingleSpaceBeforeFirstArg
diff --git a/spec/support/cookbooks/dmg/metadata.rb b/spec/support/cookbooks/dmg/metadata.rb
@@ -1,11 +1,9 @@
 # Encoding: UTF-8
-#
-# rubocop:disable SingleSpaceBeforeFirstArg
+
 name             'dmg'
 maintainer       'test'
 maintainer_email 'example@example.com'
 license          'apache2'
 description      'dmg'
 long_description 'dmg'
 version          '0.0.1'
-# rubocop:enable SingleSpaceBeforeFirstArg
diff --git a/spec/support/cookbooks/freebsd/metadata.rb b/spec/support/cookbooks/freebsd/metadata.rb
@@ -1,11 +1,9 @@
 # Encoding: UTF-8
-#
-# rubocop:disable SingleSpaceBeforeFirstArg
+
 name             'freebsd'
 maintainer       'test'
 maintainer_email 'example@example.com'
 license          'apache2'
 description      'freebsd'
 long_description 'freebsd'
 version          '0.0.1'
-# rubocop:enable SingleSpaceBeforeFirstArg
diff --git a/spec/support/cookbooks/windows/metadata.rb b/spec/support/cookbooks/windows/metadata.rb
@@ -1,11 +1,9 @@
 # Encoding: UTF-8
-#
-# rubocop:disable SingleSpaceBeforeFirstArg
+
 name             'windows'
 maintainer       'test'
 maintainer_email 'example@example.com'
 license          'apache2'
 description      'windows'
 long_description 'windows'
 version          '0.0.1'
-# rubocop:enable SingleSpaceBeforeFirstArg
diff --git a/spec/support/cookbooks/zypper/metadata.rb b/spec/support/cookbooks/zypper/metadata.rb
@@ -1,11 +1,9 @@
 # Encoding: UTF-8
-#
-# rubocop:disable SingleSpaceBeforeFirstArg
+
 name             'zypper'
 maintainer       'test'
 maintainer_email 'example@example.com'
 license          'apache2'
 description      'zypper'
 long_description 'zypper'
 version          '0.0.1'
-# rubocop:enable SingleSpaceBeforeFirstArg
diff --git a/test/fixtures/cookbooks/gimp_test/metadata.rb b/test/fixtures/cookbooks/gimp_test/metadata.rb
@@ -1,6 +1,5 @@
 # Encoding: UTF-8
-#
-# rubocop:disable SingleSpaceBeforeFirstArg
+
 name             'gimp_test'
 maintainer       'Jonathan Hartman'
 maintainer_email 'j@p4nt5.com'
@@ -23,4 +22,3 @@
 supports         'fedora'
 supports         'opensuse'
 supports         'suse'
-# rubocop:enable SingleSpaceBeforeFirstArg
diff --git a/test/integration/default/serverspec/spec_helper.rb b/test/integration/default/serverspec/spec_helper.rb
@@ -2,7 +2,7 @@
 
 require 'serverspec'
 
-if RUBY_PLATFORM.match(/mswin|mingw32|windows/)
+if RUBY_PLATFORM =~ /mswin|mingw32|windows/
   set :os, family: 'windows'
   set :backend, :cmd
 else