Fix end alignment

Author: sferik

.rubocop.yml

@@ -64,3 +64,12 @@ AccessModifierIndentation:
 
 EmptyLinesAroundAccessModifier:
   Enabled: true
+
+# Align ends correctly
+EndAlignment:
+  AlignWith: variable
+
+# Indentation of when/else
+CaseIndentation:
+  IndentWhenRelativeTo: end
+  IndentOneStep: false

Gemfile

@@ -4,20 +4,25 @@ gem 'rake', '>= 0.9'
 gem 'rdoc', '>= 3.9'
 
 group :development do
+  gem 'guard-rspec'
   gem 'pry'
-  gem 'pry-debugger', :platforms => :mri_19
+  gem 'pry-rescue'
+  platforms :ruby_19, :ruby_20 do
+    gem 'pry-debugger'
+    gem 'pry-stack_explorer'
+  end
 end
 
 group :test do
   gem 'childlabor'
   gem 'coveralls', '>=0.5.7', :require => false
   # mime-types is required indirectly by coveralls
   # needs to be < 2.0 to work with Ruby 1.8.7
-  gem 'mime-types', '~> 1.25', :platforms => :ruby_18
+  gem 'mime-types', '~> 1.25', :platforms => [:jruby, :ruby_18]
   gem 'fakeweb', '>= 1.3'
   gem 'rspec', '>= 2.14'
   gem 'rspec-mocks', '>= 2.12.2'
-  gem 'rubocop', '>= 0.15', :platforms => [:ruby_19, :ruby_20]
+  gem 'rubocop', '>= 0.16', :platforms => [:ruby_19, :ruby_20, :ruby_21]
   gem 'simplecov', :require => false
 end
 

lib/thor.rb

@@ -147,10 +147,10 @@ def method_options(options = nil)
     #
     def method_option(name, options = {})
       scope = if options[:for]
-                find_and_refresh_command(options[:for]).options
-              else
-                method_options
-              end
+        find_and_refresh_command(options[:for]).options
+      else
+        method_options
+      end
 
       build_option(name, options, scope)
     end

lib/thor/actions/create_file.rb

@@ -50,10 +50,10 @@ def identical?
       #
       def render
         @render ||= if data.is_a?(Proc)
-                      data.call
-                    else
-                      data
-                    end
+          data.call
+        else
+          data
+        end
       end
 
       def invoke!

lib/thor/actions/file_manipulation.rb

@@ -82,10 +82,10 @@ def get(source, *args, &block)
       render = open(source) { |input| input.binmode.read }
 
       destination ||= if block_given?
-                        block.arity == 1 ? block.call(render) : block.call
-                      else
-                        File.basename(source)
-                      end
+        block.arity == 1 ? block.call(render) : block.call
+      else
+        File.basename(source)
+      end
 
       create_file destination, render, config
     end

lib/thor/actions/inject_into_file.rb

@@ -51,10 +51,10 @@ def invoke!
         say_status :invoke
 
         content = if @behavior == :after
-                    '\0' + replacement
-                  else
-                    replacement + '\0'
-                  end
+          '\0' + replacement
+        else
+          replacement + '\0'
+        end
 
         replace!(/#{flag}/, content, config[:force])
       end
@@ -63,12 +63,12 @@ def revoke!
         say_status :revoke
 
         regexp = if @behavior == :after
-                   content = '\1\2'
-                   /(#{flag})(.*)(#{Regexp.escape(replacement)})/m
-                 else
-                   content = '\2\3'
-                   /(#{Regexp.escape(replacement)})(.*)(#{flag})/m
-                 end
+          content = '\1\2'
+          /(#{flag})(.*)(#{Regexp.escape(replacement)})/m
+        else
+          content = '\2\3'
+          /(#{Regexp.escape(replacement)})(.*)(#{flag})/m
+        end
 
         replace!(regexp, content, true)
       end
@@ -77,16 +77,16 @@ def revoke!
 
       def say_status(behavior)
         status = if behavior == :invoke
-                   if flag == /\A/
-                     :prepend
-                   elsif flag == /\z/
-                     :append
-                   else
-                     :insert
-                   end
-                 else
-                   :subtract
-                 end
+          if flag == /\A/
+            :prepend
+          elsif flag == /\z/
+            :append
+          else
+            :insert
+          end
+        else
+          :subtract
+        end
 
         super(status, config[:verbose])
       end

lib/thor/base.rb

@@ -210,12 +210,12 @@ def argument(name, options = {}) # rubocop:disable MethodLength
         no_commands { attr_accessor name }
 
         required = if options.key?(:optional)
-                     !options[:optional]
-                   elsif options.key?(:required)
-                     options[:required]
-                   else
-                     options[:default].nil?
-                   end
+          !options[:optional]
+        elsif options.key?(:required)
+          options[:required]
+        else
+          options[:default].nil?
+        end
 
         remove_argument name
 

lib/thor/group.rb

@@ -172,11 +172,11 @@ def class_options_help(shell, groups = {}) #:nodoc:
     def get_options_from_invocations(group_options, base_options) #:nodoc: # rubocop:disable MethodLength
       invocations.each do |name, from_option|
         value = if from_option
-                  option = class_options[name]
-                  option.type == :boolean ? name : option.default
-                else
-                  name
-                end
+          option = class_options[name]
+          option.type == :boolean ? name : option.default
+        else
+          name
+        end
         next unless value
 
         klass, _ = prepare_for_invocation(name, value)

lib/thor/parser/option.rb

@@ -78,10 +78,10 @@ def human_name
 
     def usage(padding = 0)
       sample = if banner && !banner.to_s.empty?
-                 "#{switch_name}=#{banner}"
-               else
-                 switch_name
-               end
+        "#{switch_name}=#{banner}"
+      else
+        switch_name
+      end
 
       sample = "[#{sample}]" unless required?
 

lib/thor/runner.rb

@@ -76,10 +76,10 @@ def install(name) # rubocop:disable MethodLength
     end
 
     location = if options[:relative] || name =~ %r{^https?://}
-                 name
-               else
-                 File.expand_path(name)
-               end
+      name
+    else
+      File.expand_path(name)
+    end
 
     thor_yaml[as] = {
       :filename   => Digest::MD5.hexdigest(name + as),