From 003d68a73664ee566b547bbb5aac50ea1d93c79b Mon Sep 17 00:00:00 2001
From: Baptiste Courtois <b.courtois@criteo.com>
Date: Fri, 18 Nov 2016 11:56:17 +0100
Subject: [PATCH] Fix some rubocop violations

---
 .rubocop.yml                          | 2 ++
 libraries/v2_helper.rb                | 4 +++-
 libraries/v4_helper.rb                | 8 +++++---
 resources/framework.rb                | 2 +-
 spec/libraries/package_helper_spec.rb | 9 +++++----
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index fc0b401..69e7870 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -6,6 +6,8 @@ MethodLength:
   Enabled: no
 Metrics/AbcSize:
   Enabled: no
+Metrics/BlockLength:
+  Max: 30
 Metrics/ClassLength:
   Enabled: no
 Metrics/CyclomaticComplexity:
diff --git a/libraries/v2_helper.rb b/libraries/v2_helper.rb
index 89dbc16..f128249 100644
--- a/libraries/v2_helper.rb
+++ b/libraries/v2_helper.rb
@@ -29,10 +29,12 @@ def installed_version
       return unless registry_key_exists? REGISTRY_KEY
 
       values = ::Mash[registry_get_values(REGISTRY_KEY).map { |e| [e[:name], e[:data]] }]
+      return if values[:Install].to_i != 1
+
       case sp = values[:SP].to_i
         when 0 then '2.0'
         else "2.0.SP#{sp}"
-      end if values[:Install].to_i == 1
+      end
     end
 
     def supported_versions
diff --git a/libraries/v4_helper.rb b/libraries/v4_helper.rb
index d70f01f..60a82fb 100644
--- a/libraries/v4_helper.rb
+++ b/libraries/v4_helper.rb
@@ -30,6 +30,8 @@ def installed_version
 
       values = ::Mash[registry_get_values(REGISTRY_KEY).map { |e| [e[:name], e[:data]] }]
 
+      return if values[:Install].to_i != 1
+
       case values[:Release].to_i
         when 0 then '4.0'
         when 378_389 then '4.5'
@@ -37,7 +39,7 @@ def installed_version
         when 379_893 then '4.5.2'
         when 393_295, 393_297 then '4.6'
         when 394_254, 394_271 then '4.6.1'
-      end if values[:Install].to_i == 1
+      end
     end
 
     def supported_versions
@@ -102,8 +104,8 @@ def package_setup
     def prerequisite_names
       @patch_names ||= case nt_version
         when 6.3
-          prerequisites_46 = %w(KB2919442 KB2919355)
-          { '4.6' => prerequisites_46, '4.6.1' => prerequisites_46 }
+          prerequisites46 = %w(KB2919442 KB2919355)
+          { '4.6' => prerequisites46, '4.6.1' => prerequisites46 }
         else
           {}
       end
diff --git a/resources/framework.rb b/resources/framework.rb
index db035e8..8a05276 100644
--- a/resources/framework.rb
+++ b/resources/framework.rb
@@ -26,5 +26,5 @@
 attribute :include_patches, default: true,        kind_of: [TrueClass, FalseClass]
 attribute :package_sources, default: {}.freeze,   kind_of: Hash
 attribute :require_support, default: false,       kind_of: [TrueClass, FalseClass]
-attribute :timeout,         default: 600,         kind_of: Fixnum
+attribute :timeout,         default: 600,         kind_of: Integer
 attribute :version,         name_attribute: true, kind_of: String
diff --git a/spec/libraries/package_helper_spec.rb b/spec/libraries/package_helper_spec.rb
index bc1d98e..22e58ff 100644
--- a/spec/libraries/package_helper_spec.rb
+++ b/spec/libraries/package_helper_spec.rb
@@ -33,14 +33,15 @@
   is_server = version_support[:server]
 
   version_support[:arch].each do |arch|
-    is_64 = arch == '64'
+    is_arch64 = arch == '64'
 
     describe "On Windows#{windows_version}-#{arch}" do
-      include_examples 'package_helper', data, x64?: is_64, server?: is_server, core?: false
+      include_examples 'package_helper', data, x64?: is_arch64, server?: is_server, core?: false
     end
 
+    next unless version_support[:core]
     describe "On Windows#{windows_version}-#{arch}-CORE" do
-      include_examples 'package_helper', data, x64?: is_64, server?: is_server, core?: true
-    end if version_support[:core]
+      include_examples 'package_helper', data, x64?: is_arch64, server?: is_server, core?: true
+    end
   end
 end