Use guard clauses (rubocop warning)

3 files changed, 18 insertions, 20 deletions

diff --git a/lib/highline/menu.rb b/lib/highline/menu.rb
index b1205d8..5f73cd7 100644
--- a/lib/highline/menu.rb
+++ b/lib/highline/menu.rb
@@ -269,11 +269,11 @@ class HighLine
     def index=(style)
       @index = style
 
+      return unless @index == :none || @index.is_a?(::String)
+
       # Default settings.
-      if @index == :none || @index.is_a?(::String)
-        @index_suffix = " "
-        @select_by    = :name
-      end
+      @index_suffix = " "
+      @select_by    = :name
     end
 
     #
diff --git a/test/test_highline.rb b/test/test_highline.rb
index 94ab060..e215986 100755
--- a/test/test_highline.rb
+++ b/test/test_highline.rb
@@ -1168,11 +1168,9 @@ class TestHighLine < Minitest::Test
 
   class NameClass
     def self.parse(string)
-      if string =~ /^\s*(\w+),\s*(\w+)\s+(\w+)\s*$/
-        new(Regexp.last_match(2), Regexp.last_match(3), Regexp.last_match(1))
-      else
-        raise ArgumentError, "Invalid name format."
-      end
+      raise ArgumentError, "Invalid name format." unless
+        string =~ /^\s*(\w+),\s*(\w+)\s+(\w+)\s*$/
+      new(Regexp.last_match(2), Regexp.last_match(3), Regexp.last_match(1))
     end
 
     def initialize(first, middle, last)
diff --git a/test/test_string_extension.rb b/test/test_string_extension.rb
index 8f97dbe..44b514e 100644
--- a/test/test_string_extension.rb
+++ b/test/test_string_extension.rb
@@ -35,18 +35,18 @@ class TestStringExtension < Minitest::Test
 
   def test_Highline_String_is_yaml_serializable
     require "yaml"
-    unless Gem::Version.new(YAML::VERSION) < Gem::Version.new("2.0.2")
-      highline_string =
-        HighLine::String.new("Yaml didn't messed with HighLine::String")
-      yaml_highline_string = highline_string.to_yaml
-      yaml_loaded_string =
-        YAML.safe_load(yaml_highline_string, [HighLine::String])
+    return if Gem::Version.new(YAML::VERSION) < Gem::Version.new("2.0.2")
 
-      assert_equal "Yaml didn't messed with HighLine::String",
-                   yaml_loaded_string
-      assert_equal highline_string, yaml_loaded_string
-      assert_instance_of HighLine::String, yaml_loaded_string
-    end
+    highline_string =
+      HighLine::String.new("Yaml didn't messed with HighLine::String")
+    yaml_highline_string = highline_string.to_yaml
+    yaml_loaded_string =
+      YAML.safe_load(yaml_highline_string, [HighLine::String])
+
+    assert_equal "Yaml didn't messed with HighLine::String",
+                 yaml_loaded_string
+    assert_equal highline_string, yaml_loaded_string
+    assert_instance_of HighLine::String, yaml_loaded_string
   end
 
   def test_highline_string_respond_to_color