Merge pull request #394 from pixeltrix/fix-warnings

Fix warnings when running specs with `$VERBOSE = true`

Author: sferik

.rspec

@@ -1 +1 @@
---color
+-w --color

.travis.yml

@@ -10,6 +10,7 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - rbx
   - ruby-head
 matrix:

lib/thor.rb

@@ -19,14 +19,11 @@ def package_name(name, options = {})
     # meth<Symbol>:: name of the default command
     #
     def default_command(meth = nil)
-      @default_command = case meth
-                         when :none
-                           'help'
-                         when nil
-                           @default_command || from_superclass(:default_command, 'help')
-                         else
-                           meth.to_s
-                         end
+      if meth
+        @default_command = meth == :none ? 'help' : meth.to_s
+      else
+        @default_command ||= from_superclass(:default_command, 'help')
+      end
     end
     alias_method :default_task, :default_command
 
@@ -195,7 +192,7 @@ def help(shell, subcommand = false)
       end
       list.sort! { |a, b| a[0] <=> b[0] }
 
-      if @package_name
+      if defined?(@package_name) && @package_name
         shell.say "#{@package_name} commands:"
       else
         shell.say 'Commands:'
@@ -310,15 +307,17 @@ def check_unknown_options?(config) #:nodoc:
     # ==== Parameters
     # Symbol ...:: A list of commands that should be affected.
     def stop_on_unknown_option!(*command_names)
-      @stop_on_unknown_option ||= Set.new
-      @stop_on_unknown_option.merge(command_names)
+      stop_on_unknown_option.merge(command_names)
     end
 
     def stop_on_unknown_option?(command) #:nodoc:
-      command && !@stop_on_unknown_option.nil? && @stop_on_unknown_option.include?(command.name.to_sym)
+      command && stop_on_unknown_option.include?(command.name.to_sym)
     end
 
   protected
+    def stop_on_unknown_option #:nodoc:
+      @stop_on_unknown_option ||= Set.new
+    end
 
     # The method responsible for dispatching given the args.
     def dispatch(meth, given_args, given_opts, config) #:nodoc: # rubocop:disable MethodLength
@@ -382,6 +381,10 @@ def dynamic_command_class #:nodoc:
     end
 
     def create_command(meth) #:nodoc:
+      @usage ||= nil
+      @desc ||= nil
+      @long_desc ||= nil
+      
       if @usage && @desc
         base_class = @hide ? Thor::HiddenCommand : Thor::Command
         commands[meth] = base_class.new(meth, @desc, @long_desc, @usage, method_options)

lib/thor/actions.rb

@@ -28,7 +28,7 @@ def source_paths
       # Stores and return the source root for this class
       def source_root(path = nil)
         @_source_root = path if path
-        @_source_root
+        @_source_root ||= nil
       end
 
       # Returns the source paths in the following order:

lib/thor/base.rb

@@ -317,12 +317,11 @@ def remove_class_option(*names)
       # name<String|Symbol>
       #
       def group(name = nil)
-        @group = case name
-                 when nil
-                   @group || from_superclass(:group, 'standard')
-                 else
-                   name.to_s
-                 end
+        if name
+          @group = name.to_s
+        else
+          @group ||= from_superclass(:group, 'standard')
+        end
       end
 
       # Returns the commands for this Thor class.
@@ -592,6 +591,7 @@ def method_added(meth)
         # Return if it's not a public instance method
         return unless public_method_defined?(meth.to_sym)
 
+        @no_commands ||= false
         return if @no_commands || !create_command(meth)
 
         is_thor_reserved_word?(meth, :command)

lib/thor/core_ext/ordered_hash.rb

@@ -28,7 +28,7 @@ def []=(key, value)
           else
             node = Node.new(key, value)
 
-            if @first.nil?
+            if !defined?(@first) || @first.nil?
               @first = @last = node
             else
               node.prev = @last
@@ -68,7 +68,7 @@ def values
         end
 
         def each
-          return unless @first
+          return unless defined?(@first) && @first
           yield [@first.key, @first.value]
           node = @first
           yield [node.key, node.value] while node = node.next # rubocop:disable AssignmentInCondition

lib/thor/group.rb

@@ -14,12 +14,11 @@ class << self
     # description<String>:: The description for this Thor::Group.
     #
     def desc(description = nil)
-      @desc = case description
-              when nil
-                @desc || from_superclass(:desc, nil)
-              else
-                description
-              end
+      if description
+        @desc = description
+      else
+        @desc ||= from_superclass(:desc, nil)
+      end
     end
 
     # Prints help information.

lib/thor/line_editor/readline.rb

@@ -48,6 +48,9 @@ def use_path_completion?
       end
 
       class PathCompletion
+        attr_reader :text
+        private :text
+        
         def initialize(text)
           @text = text
         end
@@ -58,8 +61,6 @@ def matches
 
         private
 
-        attr_reader :text
-
         def relative_matches
           absolute_matches.map { |path| path.sub(base_path, '') }
         end

lib/thor/shell/basic.rb

@@ -9,7 +9,7 @@ class Basic # rubocop:disable ClassLength
       # Initialize base, mute and padding to nil.
       #
       def initialize #:nodoc:
-        @base, @mute, @padding = nil, false, 0
+        @base, @mute, @padding, @always_force = nil, false, 0, false
       end
 
       # Mute everything that's inside given block

spec/actions/create_file_spec.rb

@@ -3,6 +3,7 @@
 
 describe Thor::Actions::CreateFile do
   before do
+    @silence = false
     ::FileUtils.rm_rf(destination_root)
   end
 
@@ -29,13 +30,13 @@ def silence!
     it 'creates a file' do
       create_file('doc/config.rb')
       invoke!
-      expect(File.exists?(File.join(destination_root, 'doc/config.rb'))).to be true
+      expect(File.exist?(File.join(destination_root, 'doc/config.rb'))).to be true
     end
 
     it 'does not create a file if pretending' do
       create_file('doc/config.rb', {}, :pretend => true)
       invoke!
-      expect(File.exists?(File.join(destination_root, 'doc/config.rb'))).to be false
+      expect(File.exist?(File.join(destination_root, 'doc/config.rb'))).to be false
     end
 
     it 'shows created status to the user' do
@@ -58,7 +59,7 @@ def silence!
     it 'converts encoded instructions' do
       create_file('doc/%file_name%.rb.tt')
       invoke!
-      expect(File.exists?(File.join(destination_root, 'doc/rdoc.rb.tt'))).to be true
+      expect(File.exist?(File.join(destination_root, 'doc/rdoc.rb.tt'))).to be true
     end
 
     describe 'when file exists' do
@@ -137,13 +138,13 @@ def silence!
       create_file('doc/config.rb')
       invoke!
       revoke!
-      expect(File.exists?(@action.destination)).to be false
+      expect(File.exist?(@action.destination)).to be false
     end
 
     it 'does not raise an error if the file does not exist' do
       create_file('doc/config.rb')
       revoke!
-      expect(File.exists?(@action.destination)).to be false
+      expect(File.exist?(@action.destination)).to be false
     end
   end