From fe5eeaef03b1c594e7a82b58391932465184126d Mon Sep 17 00:00:00 2001
From: "Abinoam P. Marques Jr" <abinoam@gmail.com>
Date: Sun, 2 Jul 2017 02:24:40 -0300
Subject: More manual fixes for Rubocop warnings

---
 lib/highline/style.rb            | 35 ++++++++++++++++++++++++-----------
 lib/highline/terminal/ncurses.rb |  3 ++-
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/lib/highline/style.rb b/lib/highline/style.rb
index 1ac66c4..7930f21 100755
--- a/lib/highline/style.rb
+++ b/lib/highline/style.rb
@@ -133,12 +133,11 @@ class HighLine
     def self.rgb(*colors)
       hex = rgb_hex(*colors)
       name = ('rgb_' + hex).to_sym
-      if style = list[name]
-        style
-      else
-        parts = rgb_parts(hex)
-        new(name: name, code: "\e[38;5;#{rgb_number(parts)}m", rgb: parts)
-      end
+      style = list[name]
+      return style if style
+
+      parts = rgb_parts(hex)
+      new(name: name, code: "\e[38;5;#{rgb_number(parts)}m", rgb: parts)
     end
 
     # Returns the rgb number to be used as escape code on ANSI terminals.
@@ -236,7 +235,8 @@ class HighLine
       code + string + HighLine::CLEAR
     end
 
-    # @return [String] all codes of the Style list joined together (if a Style list)
+    # @return [String] all codes of the Style list joined together
+    #   (if a Style list)
     # @return [String] the Style code
     def code
       if @list
@@ -269,11 +269,19 @@ class HighLine
       raise "Cannot create a variant of a style list (#{inspect})" if @list
       new_code = options[:code] || code
       if options[:increment]
-        raise "Unexpected code in #{inspect}" unless new_code =~ /^(.*?)(\d+)(.*)/
-        new_code = Regexp.last_match(1) + (Regexp.last_match(2).to_i + options[:increment]).to_s + Regexp.last_match(3)
+        raise "Unexpected code in #{inspect}" unless
+          new_code =~ /^(.*?)(\d+)(.*)/
+
+        new_code =
+          Regexp.last_match(1) +
+          (Regexp.last_match(2).to_i +
+          options[:increment]).to_s +
+          Regexp.last_match(3)
       end
       new_rgb = options[:rgb] || @rgb
-      self.class.new(to_hash.merge(name: new_name, code: new_code, rgb: new_rgb))
+      self.class.new(to_hash.merge(name: new_name,
+                                   code: new_code,
+                                   rgb: new_rgb))
     end
 
     # Uses the color as background and return a new style.
@@ -298,7 +306,12 @@ class HighLine
     def create_bright_variant(variant_name)
       raise "Cannot create a #{name} variant of a style list (#{inspect})" if @list
       new_name = ("#{variant_name}_" + @name.to_s).to_sym
-      new_rgb = @rgb == [0, 0, 0] ? [128, 128, 128] : @rgb.map { |color| color == 0 ? 0 : [color + 128, 255].min }
+      new_rgb =
+        if @rgb == [0, 0, 0]
+          [128, 128, 128]
+        else
+          @rgb.map { |color| color == 0 ? 0 : [color + 128, 255].min }
+        end
 
       find_style(new_name) || variant(new_name, increment: 60, rgb: new_rgb)
     end
diff --git a/lib/highline/terminal/ncurses.rb b/lib/highline/terminal/ncurses.rb
index 3f399e0..b2e206d 100644
--- a/lib/highline/terminal/ncurses.rb
+++ b/lib/highline/terminal/ncurses.rb
@@ -3,7 +3,8 @@
 class HighLine
   class Terminal
     # NCurses HighLine::Terminal
-    # @note Code migrated +UNTESTED+ from the old code base to the new terminal api.
+    # @note Code migrated +UNTESTED+ from the old code base to the new
+    # terminal api.
     class NCurses < Terminal
       require 'ffi-ncurses'
 
-- 
cgit v1.2.1