Use consistent % literal delimiters

Author: sferik

.rubocop.yml

@@ -73,3 +73,18 @@ EndAlignment:
 CaseIndentation:
   IndentWhenRelativeTo: end
   IndentOneStep: false
+
+DoubleNegation:
+  Enabled: false
+
+PercentLiteralDelimiters:
+  PreferredDelimiters:
+    '%':  ()
+    '%i': ()
+    '%q': ()
+    '%Q': ()
+    '%r': '{}'
+    '%s': ()
+    '%w': '[]'
+    '%W': '[]'
+    '%x': ()

Gemfile

@@ -22,7 +22,7 @@ group :test do
   gem 'fakeweb', '>= 1.3'
   gem 'rspec', '>= 2.14'
   gem 'rspec-mocks', '>= 2.12.2'
-  gem 'rubocop', '>= 0.16', :platforms => [:ruby_19, :ruby_20, :ruby_21]
+  gem 'rubocop', '>= 0.19', :platforms => [:ruby_19, :ruby_20, :ruby_21]
   gem 'simplecov', :require => false
 end
 

lib/thor/actions.rb

@@ -308,7 +308,7 @@ def _shared_configuration #:nodoc:
     def _cleanup_options_and_set(options, key) #:nodoc:
       case options
       when Array
-        %w(--force -f --skip -s).each { |i| options.delete(i) }
+        %w[--force -f --skip -s].each { |i| options.delete(i) }
         options << "--#{key}"
       when Hash
         [:force, :skip, 'force', 'skip'].each { |i| options.delete(i) }

lib/thor/base.rb

@@ -14,11 +14,11 @@ class Thor
   autoload :Group,      'thor/group'
 
   # Shortcuts for help.
-  HELP_MAPPINGS       = %w(-h -? --help -D)
+  HELP_MAPPINGS       = %w[-h -? --help -D]
 
   # Thor methods that should not be overwritten by the user.
-  THOR_RESERVED_WORDS = %w(invoke shell options behavior root destination_root relative_root
-                           action add_file create_file in_root inside run run_ruby_script)
+  THOR_RESERVED_WORDS = %w[invoke shell options behavior root destination_root relative_root
+                           action add_file create_file in_root inside run run_ruby_script]
 
   TEMPLATE_EXTNAME = '.tt'
 

lib/thor/shell/basic.rb

@@ -353,11 +353,11 @@ def dynamic_width
       end
 
       def dynamic_width_stty
-        %x{stty size 2>/dev/null}.split[1].to_i
+        %x(stty size 2>/dev/null).split[1].to_i
       end
 
       def dynamic_width_tput
-        %x{tput cols 2>/dev/null}.to_i
+        %x(tput cols 2>/dev/null).to_i
       end
 
       def unix?

spec/actions/directory_spec.rb

@@ -24,7 +24,7 @@ def revoke!(*args, &block)
   end
 
   def exists_and_identical?(source_path, destination_path)
-    %w(config.rb README).each do |file|
+    %w[config.rb README].each do |file|
       source      = File.join(source_root, source_path, file)
       destination = File.join(destination_root, destination_path, file)
 

spec/parser/arguments_spec.rb

@@ -33,7 +33,7 @@ def parse(*args)
     it 'accepts arrays' do
       create :string => nil, :array => nil
       expect(parse('product', 'title', 'age')['string']).to eq('product')
-      expect(parse('product', 'title', 'age')['array']).to eq(%w(title age))
+      expect(parse('product', 'title', 'age')['array']).to eq(%w[title age])
     end
 
     describe 'with no inputs' do

spec/parser/options_spec.rb

@@ -290,7 +290,7 @@ def remaining
       end
 
       it "raises error when value isn't in enum" do
-        enum = %w(apple banana)
+        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")

spec/runner_spec.rb

@@ -112,7 +112,8 @@ def when_no_thorfiles_exist
     it 'does not swallow Thor InvocationError' do
       ARGV.replace %w[my_script:animal]
       content = capture(:stderr) { Thor::Runner.start }
-      expect(content.strip).to eq(%Q'ERROR: "thor animal" was called with no arguments\nUsage: "thor my_script:animal TYPE"')
+      expect(content.strip).to eq(%Q(ERROR: "thor animal" was called with no arguments
+Usage: "thor my_script:animal TYPE"))
     end
   end
 

spec/thor_spec.rb

@@ -259,12 +259,18 @@ def boring(*args)
         stderr = capture(:stderr) { Scripts::Arities.start(args) }
         expect(stderr.strip).to eq(msg)
       end
-      arity_asserter.call %w[zero_args one], %Q'ERROR: "thor zero_args" was called with arguments ["one"]\nUsage: "thor scripts:arities:zero_args"'
-      arity_asserter.call %w[one_arg], %Q'ERROR: "thor one_arg" was called with no arguments\nUsage: "thor scripts:arities:one_arg ARG"'
-      arity_asserter.call %w[one_arg one two], %Q'ERROR: "thor one_arg" was called with arguments ["one", "two"]\nUsage: "thor scripts:arities:one_arg ARG"'
-      arity_asserter.call %w[one_arg one two], %Q'ERROR: "thor one_arg" was called with arguments ["one", "two"]\nUsage: "thor scripts:arities:one_arg ARG"'
-      arity_asserter.call %w[two_args one], %Q'ERROR: "thor two_args" was called with arguments ["one"]\nUsage: "thor scripts:arities:two_args ARG1 ARG2"'
-      arity_asserter.call %w[optional_arg one two], %Q'ERROR: "thor optional_arg" was called with arguments ["one", "two"]\nUsage: "thor scripts:arities:optional_arg [ARG]"'
+      arity_asserter.call %w[zero_args one], %Q(ERROR: "thor zero_args" was called with arguments ["one"]
+Usage: "thor scripts:arities:zero_args")
+      arity_asserter.call %w[one_arg], %Q(ERROR: "thor one_arg" was called with no arguments
+Usage: "thor scripts:arities:one_arg ARG")
+      arity_asserter.call %w[one_arg one two], %Q(ERROR: "thor one_arg" was called with arguments ["one", "two"]
+Usage: "thor scripts:arities:one_arg ARG")
+      arity_asserter.call %w[one_arg one two], %Q(ERROR: "thor one_arg" was called with arguments ["one", "two"]
+Usage: "thor scripts:arities:one_arg ARG")
+      arity_asserter.call %w[two_args one], %Q(ERROR: "thor two_args" was called with arguments ["one"]
+Usage: "thor scripts:arities:two_args ARG1 ARG2")
+      arity_asserter.call %w[optional_arg one two], %Q(ERROR: "thor optional_arg" was called with arguments ["one", "two"]
+Usage: "thor scripts:arities:optional_arg [ARG]")
     end
 
     it 'raises an error if the invoked command does not exist' do