Improved code style

rodjek · Mar 20, 2017 · 7a668f0 · 7a668f0
1 parent 20ba804
commit 7a668f0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 26 deletions.
diff --git a/lib/puppet-lint/checkplugin.rb b/lib/puppet-lint/checkplugin.rb
@@ -21,7 +21,7 @@ def run
     check
 
     @problems.each do |problem|
-      if problem[:check] != :syntax && PuppetLint::Data.ignore_overrides[problem[:check]].has_key?(problem[:line])
+      if problem[:check] != :syntax && PuppetLint::Data.ignore_overrides[problem[:check]].key?(problem[:line])
         problem[:kind] = :ignored
         problem[:reason] = PuppetLint::Data.ignore_overrides[problem[:check]][problem[:line]]
         next
@@ -166,7 +166,7 @@ def notify(kind, problem)
     end
 
     [:message, :line, :column, :check].each do |attr|
-      unless problem.has_key? attr
+      unless problem.key? attr
         raise ArgumentError, "problem hash must contain #{attr.inspect}"
       end
     end

diff --git a/lib/puppet-lint/checks.rb b/lib/puppet-lint/checks.rb
@@ -82,6 +82,6 @@ def enabled_checks
   #
   # Returns the manifest as a String.
   def manifest
-    PuppetLint::Data.tokens.map { |t| t.to_manifest }.join('')
+    PuppetLint::Data.tokens.map(&:to_manifest).join('')
   end
 end
diff --git a/lib/puppet-lint/data.rb b/lib/puppet-lint/data.rb
@@ -81,7 +81,7 @@ def title_tokens
               }
               title_array_tokens = tokens[(array_start_idx + 1)..(token_idx - 2)]
               result += title_array_tokens.select { |token|
-                {:STRING => true, :NAME => true}.include? token.type
+                {STRING: true, NAME: true}.include? token.type
               }
             else
               next_token = tokens[token_idx].next_code_token
@@ -116,7 +116,7 @@ def resource_indexes
                 real_idx = token_idx + idx + 1
                 if tokens[real_idx].type == :LBRACE
                   depth += 1
-                elsif {:SEMIC => true, :RBRACE => true}.include? tokens[real_idx].type
+                elsif {SEMIC: true, RBRACE: true}.include? tokens[real_idx].type
                   unless tokens[real_idx].type == :SEMIC && depth > 1
                     depth -= 1
                     if depth == 0

diff --git a/lib/puppet-lint/lexer.rb b/lib/puppet-lint/lexer.rb
@@ -176,12 +176,8 @@ def tokenise(code)
         KNOWN_TOKENS.each do |type, regex|
           if value = chunk[regex, 1]
             length = value.size
-            if type == :NAME
-              if KEYWORDS.include? value
-                tokens << new_token(value.upcase.to_sym, value, length)
-              else
-                tokens << new_token(type, value, length)
-              end
+            if type == :NAME && KEYWORDS.include?(value)
+              tokens << new_token(value.upcase.to_sym, value, length)
             else
               tokens << new_token(type, value, length)
             end
@@ -272,11 +268,7 @@ def possible_regex?
 
       return true if prev_token.nil?
 
-      if REGEX_PREV_TOKENS.include? prev_token.type
-        true
-      else
-        false
-      end
+      REGEX_PREV_TOKENS.include? prev_token.type
     end
 
     # Internal: Create a new PuppetLint::Lexer::Token object, calculate its

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -40,17 +40,9 @@ def matches?(problems)
         @problems = problems
 
         problems.any? do |problem|
-          ret = true
-          @expected_problem.each do |key, value|
-            if !problem.key?(key)
-              ret = false
-              break
-            elsif problem[key] != value
-              ret = false
-              break
-            end
+          @expected_problem.all? do |key, value|
+            problem.key?(key) && problem[key] == value
           end
-          ret
         end
       end