arguments.rb in thor-0.19.0

- old
+ new

@@ -1,7 +1,7 @@
 class Thor
-  class Arguments #:nodoc:
+  class Arguments #:nodoc: # rubocop:disable ClassLength
     NUMERIC = /(\d*\.\d+|\d+)/
 
     # Receives an array of args and returns two arrays, one with arguments
     # and one with switches.
     #
@@ -11,26 +11,26 @@
       args.each do |item|
         break if item =~ /^-/
         arguments << item
       end
 
-      return arguments, args[Range.new(arguments.size, -1)]
+      [arguments, args[Range.new(arguments.size, -1)]]
     end
 
     def self.parse(*args)
       to_parse = args.pop
       new(*args).parse(to_parse)
     end
 
     # Takes an array of Thor::Argument objects.
     #
-    def initialize(arguments=[])
+    def initialize(arguments = [])
       @assigns, @non_assigned_required = {}, []
       @switches = arguments
 
       arguments.each do |argument|
-        if argument.default != nil
+        if !argument.default.nil?
           @assigns[argument.human_name] = argument.default
         elsif argument.required?
           @non_assigned_required << argument
         end
       end
@@ -47,125 +47,129 @@
 
       check_requirement!
       @assigns
     end
 
-    def remaining
+    def remaining # rubocop:disable TrivialAccessors
       @pile
     end
 
-    private
+  private
 
-      def no_or_skip?(arg)
-        arg =~ /^--(no|skip)-([-\w]+)$/
-        $2
-      end
+    def no_or_skip?(arg)
+      arg =~ /^--(no|skip)-([-\w]+)$/
+      $2
+    end
 
-      def last?
-        @pile.empty?
-      end
+    def last?
+      @pile.empty?
+    end
 
-      def peek
-        @pile.first
-      end
+    def peek
+      @pile.first
+    end
 
-      def shift
-        @pile.shift
-      end
+    def shift
+      @pile.shift
+    end
 
-      def unshift(arg)
-        unless arg.kind_of?(Array)
-          @pile.unshift(arg)
-        else
-          @pile = arg + @pile
-        end
+    def unshift(arg)
+      if arg.kind_of?(Array)
+        @pile = arg + @pile
+      else
+        @pile.unshift(arg)
       end
+    end
 
-      def current_is_value?
-        peek && peek.to_s !~ /^-/
-      end
+    def current_is_value?
+      peek && peek.to_s !~ /^-/
+    end
 
-      # Runs through the argument array getting strings that contains ":" and
-      # mark it as a hash:
-      #
-      #   [ "name:string", "age:integer" ]
-      #
-      # Becomes:
-      #
-      #   { "name" => "string", "age" => "integer" }
-      #
-      def parse_hash(name)
-        return shift if peek.is_a?(Hash)
-        hash = {}
+    # Runs through the argument array getting strings that contains ":" and
+    # mark it as a hash:
+    #
+    #   [ "name:string", "age:integer" ]
+    #
+    # Becomes:
+    #
+    #   { "name" => "string", "age" => "integer" }
+    #
+    def parse_hash(name)
+      return shift if peek.is_a?(Hash)
+      hash = {}
 
-        while current_is_value? && peek.include?(?:)
-          key, value = shift.split(':',2)
-          hash[key] = value
-        end
-        hash
+      while current_is_value? && peek.include?(":")
+        key, value = shift.split(":", 2)
+        hash[key] = value
       end
+      hash
+    end
 
-      # Runs through the argument array getting all strings until no string is
-      # found or a switch is found.
-      #
-      #   ["a", "b", "c"]
-      #
-      # And returns it as an array:
-      #
-      #   ["a", "b", "c"]
-      #
-      def parse_array(name)
-        return shift if peek.is_a?(Array)
-        array = []
+    # Runs through the argument array getting all strings until no string is
+    # found or a switch is found.
+    #
+    #   ["a", "b", "c"]
+    #
+    # And returns it as an array:
+    #
+    #   ["a", "b", "c"]
+    #
+    def parse_array(name)
+      return shift if peek.is_a?(Array)
+      array = []
+      array << shift while current_is_value?
+      array
+    end
 
-        while current_is_value?
-          array << shift
-        end
-        array
+    # Check if the peek is numeric format and return a Float or Integer.
+    # Check if the peek is included in enum if enum is provided.
+    # Otherwise raises an error.
+    #
+    def parse_numeric(name)
+      return shift if peek.is_a?(Numeric)
+
+      unless peek =~ NUMERIC && $& == peek
+        fail MalformattedArgumentError, "Expected numeric value for '#{name}'; got #{peek.inspect}"
       end
 
-      # Check if the peek is numeric format and return a Float or Integer.
-      # Otherwise raises an error.
-      #
-      def parse_numeric(name)
-        return shift if peek.is_a?(Numeric)
-
-        unless peek =~ NUMERIC && $& == peek
-          raise MalformattedArgumentError, "Expected numeric value for '#{name}'; got #{peek.inspect}"
+      value = $&.index(".") ? shift.to_f : shift.to_i
+      if @switches.is_a?(Hash) && switch = @switches[name]
+        if switch.enum && !switch.enum.include?(value)
+          fail MalformattedArgumentError, "Expected '#{name}' to be one of #{switch.enum.join(', ')}; got #{value}"
         end
-
-        $&.index('.') ? shift.to_f : shift.to_i
       end
+      value
+    end
 
-      # Parse string:
-      # for --string-arg, just return the current value in the pile
-      # for --no-string-arg, nil
-      #
-      def parse_string(name)
-        if no_or_skip?(name)
-          nil
-        else
-          value = shift
-          if @switches.is_a?(Hash) && switch = @switches[name]
-            if switch.enum && !switch.enum.include?(value)
-              raise MalformattedArgumentError, "Expected '#{name}' to be one of #{switch.enum.join(', ')}; got #{value}"
-            end
+    # Parse string:
+    # for --string-arg, just return the current value in the pile
+    # for --no-string-arg, nil
+    # Check if the peek is included in enum if enum is provided. Otherwise raises an error.
+    #
+    def parse_string(name)
+      if no_or_skip?(name)
+        nil
+      else
+        value = shift
+        if @switches.is_a?(Hash) && switch = @switches[name] # rubocop:disable AssignmentInCondition
+          if switch.enum && !switch.enum.include?(value)
+            fail MalformattedArgumentError, "Expected '#{name}' to be one of #{switch.enum.join(', ')}; got #{value}"
           end
-          value
         end
+        value
       end
+    end
 
-      # Raises an error if @non_assigned_required array is not empty.
-      #
-      def check_requirement!
-        unless @non_assigned_required.empty?
-          names = @non_assigned_required.map do |o|
-            o.respond_to?(:switch_name) ? o.switch_name : o.human_name
-          end.join("', '")
+    # Raises an error if @non_assigned_required array is not empty.
+    #
+    def check_requirement!
+      unless @non_assigned_required.empty?
+        names = @non_assigned_required.map do |o|
+          o.respond_to?(:switch_name) ? o.switch_name : o.human_name
+        end.join("', '")
 
-          class_name = self.class.name.split('::').last.downcase
-          raise RequiredArgumentMissingError, "No value provided for required #{class_name} '#{names}'"
-        end
+        class_name = self.class.name.split("::").last.downcase
+        fail RequiredArgumentMissingError, "No value provided for required #{class_name} '#{names}'"
       end
-
+    end
   end
 end