Fix indentation, etc.

Author: sferik

lib/thor.rb

@@ -226,7 +226,7 @@ def subcommand(subcommand, subcommand_class)
 
       define_method(subcommand) do |*args|
         args, opts = Thor::Arguments.split(args)
-        args.unshift("help") if opts.include? "--help" or opts.include? "-h"
+        args.unshift('help') if opts.include? '--help' or opts.include? '-h'
         invoke subcommand_class, args, opts, :invoked_via_subcommand => true, :class_options => options
       end
     end

lib/thor/actions/file_manipulation.rb

@@ -292,8 +292,8 @@ def remove_file(path, config = {})
     end
     alias_method :remove_dir, :remove_file
 
-  attr_accessor :output_buffer
-  private :output_buffer, :output_buffer=
+    attr_accessor :output_buffer
+    private :output_buffer, :output_buffer=
 
   private
 

lib/thor/actions/inject_into_file.rb

@@ -38,7 +38,7 @@ def initialize(base, destination, data, config)
         super(base, destination, {:verbose => true}.merge(config))
 
         @behavior, @flag = if @config.key?(:after)
-                             [:after, @config.delete(:after)]
+          [:after, @config.delete(:after)]
                            else
                              [:before, @config.delete(:before)]
                            end

lib/thor/line_editor.rb

@@ -3,7 +3,7 @@
 
 class Thor
   module LineEditor
-    def self.readline(prompt, options={})
+    def self.readline(prompt, options = {})
       best_available.new(prompt, options).readline
     end
 

lib/thor/line_editor/basic.rb

@@ -17,7 +17,7 @@ def readline
         get_input
       end
 
-      private
+    private
 
       def get_input
         if echo?

lib/thor/line_editor/readline.rb

@@ -23,17 +23,17 @@ def readline
         end
       end
 
-      private
+    private
 
       def add_to_history?
         options.fetch(:add_to_history, true)
       end
 
       def completion_proc
         if use_path_completion?
-          Proc.new { |text| PathCompletion.new(text).matches }
+          proc { |text| PathCompletion.new(text).matches }
         elsif completion_options.any?
-          Proc.new do |text|
+          proc do |text|
             completion_options.select { |option| option.start_with?(text) }
           end
         end
@@ -59,7 +59,7 @@ def matches
           relative_matches
         end
 
-        private
+      private
 
         def relative_matches
           absolute_matches.map { |path| path.sub(base_path, '') }

lib/thor/parser/arguments.rb

@@ -132,11 +132,11 @@ def parse_numeric(name)
       end
 
       value = $&.index('.') ? shift.to_f : shift.to_i
-        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
+      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
+      end
       value
     end
 

lib/thor/shell/basic.rb

@@ -291,7 +291,7 @@ def set_color(string, *args) #:nodoc:
     protected
 
       def prepare_message(message, *color)
-        spaces = "  " * padding
+        spaces = '  ' * padding
         spaces + set_color(message.to_s, *color)
       end
 

spec/line_editor/readline_spec.rb

@@ -38,12 +38,12 @@
     it 'provides tab completion when given a limited_to option' do
       expect(::Readline).to receive(:readline)
       expect(::Readline).to receive(:completion_proc=) do |proc|
-        expect(proc.call('')).to eq ['Apples', 'Chicken', 'Chocolate']
-        expect(proc.call('Ch')).to eq ['Chicken', 'Chocolate']
+        expect(proc.call('')).to eq %w[Apples Chicken Chocolate]
+        expect(proc.call('Ch')).to eq %w[Chicken Chocolate]
         expect(proc.call('Chi')).to eq ['Chicken']
       end
 
-      editor = Thor::LineEditor::Readline.new('Best food: ', :limited_to => ['Apples', 'Chicken', 'Chocolate'])
+      editor = Thor::LineEditor::Readline.new('Best food: ', :limited_to => %w[Apples Chicken Chocolate])
       editor.readline
     end
 

spec/parser/options_spec.rb

@@ -292,8 +292,8 @@ def remaining
       it "raises error when value isn't in enum" do
         enum = %w[apple banana]
         create :fruit => Thor::Option.new('fruit', :type => :string, :enum => enum)
-        expect{ parse('--fruit', 'orange') }.to raise_error(Thor::MalformattedArgumentError,
-          "Expected '--fruit' to be one of #{enum.join(', ')}; got orange")
+        expect { parse('--fruit', 'orange') }.to raise_error(Thor::MalformattedArgumentError,
+                                                             "Expected '--fruit' to be one of #{enum.join(', ')}; got orange")
       end
     end
 
@@ -405,8 +405,8 @@ def remaining
       it "raises error when value isn't in enum" do
         enum = [1, 2]
         create :limit => Thor::Option.new('limit', :type => :numeric, :enum => enum)
-        expect{ parse('--limit', '3') }.to raise_error(Thor::MalformattedArgumentError,
-          "Expected '--limit' to be one of #{enum.join(', ')}; got 3")
+        expect { parse('--limit', '3') }.to raise_error(Thor::MalformattedArgumentError,
+                                                        "Expected '--limit' to be one of #{enum.join(', ')}; got 3")
       end
     end