tailor 1.3.1 → 1.4.0

data/spec/support/bad_indentation_cases.rb

@@ -28,20 +28,20 @@ INDENT_1['def_indented_end'] =
 
 INDENT_1['def_content_indented_end'] =
   %Q{def a
-  puts "stuff"
+  puts 'stuff'
  end}
 
 INDENT_1['class_def_content_outdented_end'] =
   %Q{class A
   def a
-    puts "stuff"
+    puts 'stuff'
  end
 end}
 
 INDENT_1['class_def_outdented_content'] =
   %Q{class A
   def a
-   puts "stuff"
+   puts 'stuff'
   end
 end}
 
@@ -56,9 +56,9 @@ INDENT_1['case_indented_whens_level'] =
   %Q{def my_method
    case true
   when true
-    puts "stuff"
+    puts 'stuff'
   when false
-    puts "blah blah"
+    puts 'blah blah'
   end
 end}
 
@@ -66,9 +66,9 @@ INDENT_1['case_indented_whens_level_trailing_comment'] =
   %Q{def my_method
    case true        # comment
   when true
-    puts "stuff"
+    puts 'stuff'
   when false
-    puts "blah blah"
+    puts 'blah blah'
   end
 end}
 
@@ -76,9 +76,9 @@ INDENT_1['case_outdented_whens_level'] =
   %Q{def my_method
  case true
   when true
-    puts "stuff"
+    puts 'stuff'
   when false
-    puts "blah blah"
+    puts 'blah blah'
   end
 end}
 
@@ -86,9 +86,9 @@ INDENT_1['case_when_indented_whens_level'] =
   %Q{def my_method
   case true
    when true
-    puts "stuff"
+    puts 'stuff'
   when false
-    puts "blah blah"
+    puts 'blah blah'
   end
 end}
 
@@ -96,9 +96,9 @@ INDENT_1['case_when_outdented_whens_level'] =
   %Q{def my_method
   case true
  when true
-    puts "stuff"
+    puts 'stuff'
   when false
-    puts "blah blah"
+    puts 'blah blah'
   end
 end}
 
@@ -106,35 +106,35 @@ INDENT_1['case_indented_whens_in'] =
   %Q{def my_method
    case true
     when true
-      puts "stuff"
+      puts 'stuff'
     when false
-      puts "blah blah"
+      puts 'blah blah'
   end
 end}
 
 INDENT_1['while_do_indented'] =
   %Q{ while true do
-  puts "something"
+  puts 'something'
 end}
 
 INDENT_1['while_do_outdented'] =
   %Q{def my_method
  while true do
-    puts "something"
+    puts 'something'
   end
 end}
 
 INDENT_1['while_do_content_outdented'] =
   %Q{def my_method
   while true do
-   puts "something"
+   puts 'something'
   end
 end}
 
 INDENT_1['while_do_content_indented'] =
   %Q{def my_method
   while true do
-     puts "something"
+     puts 'something'
   end
 end}
 
@@ -240,7 +240,7 @@ INDENT_1['multi_line_string_concat_with_plus_out'] =
  '/profiles/DVR5000/ssdp_notification.erb'}
 
 INDENT_1['multi_line_method_call_end_in'] =
-  %Q{def initialize(raw_response)
+  %q{def initialize(raw_response)
   if raw_response.nil? || raw_response.empty?
     raise RTSP::Error,
       "#{self.class} received nil string--this shouldn't happen."

data/spec/support/conditional_parentheses_cases.rb

@@ -0,0 +1,60 @@
+CONDITIONAL_PARENTHESES = {}
+
+CONDITIONAL_PARENTHESES['no_parentheses'] =
+  %q{if foo
+end}
+
+CONDITIONAL_PARENTHESES['with_parentheses'] =
+  %q{if (foo)
+end}
+
+CONDITIONAL_PARENTHESES['with_parentheses_no_space'] =
+  %q{if(foo)
+end}
+
+CONDITIONAL_PARENTHESES['method_call'] =
+  %q{if foo(bar)
+end}
+
+CONDITIONAL_PARENTHESES['indented_method_call'] =
+%q{foo do
+  if foo(bar)
+  end
+end}
+
+CONDITIONAL_PARENTHESES['method_call_on_parens'] =
+  %q{unless (foo & bar).sort
+end
+}
+
+CONDITIONAL_PARENTHESES['double_parens'] =
+  %q{if ((bar))
+end}
+
+CONDITIONAL_PARENTHESES['unless_no_parentheses'] =
+  %q{unless bar
+end}
+
+CONDITIONAL_PARENTHESES['unless_with_parentheses'] =
+  %q{unless (bar)
+end}
+
+CONDITIONAL_PARENTHESES['case_no_parentheses'] =
+  %q{case bar
+when 1 then 'a'
+when 2 then 'b'
+end}
+
+CONDITIONAL_PARENTHESES['case_with_parentheses'] =
+  %q{case (bar)
+when 1 then 'a'
+when 2 then 'b'
+end}
+
+CONDITIONAL_PARENTHESES['while_no_parentheses'] =
+  %q{while bar
+end}
+
+CONDITIONAL_PARENTHESES['while_with_parentheses'] =
+  %q{while (bar)
+end}

data/spec/support/good_indentation_cases.rb

@@ -101,7 +101,7 @@ INDENT_OK['assignment_twolevel_array_multistatement'] =
 INDENT_OK['assignment_twolevel_paren_multistatement'] =
   %Q{result = Integer(
   String.new(
-    "1"
+    '1'
   ).to_i,
   16
 )}
@@ -143,7 +143,7 @@ INDENT_OK['rescue_ending_with_comma'] =
 rescue SocketError, ArgumentError, SystemCallError,
   Net::SCP::Exception, Timeout::Error => ex
   @logger.error "Failed to copy the file \#{source} to \#{dest} due to " +
-    "\#{ex.message}"
+    ex.message
 end}
 
 INDENT_OK['rescue_ending_with_comma_trailing_comment'] =
@@ -154,14 +154,14 @@ INDENT_OK['rescue_ending_with_comma_trailing_comment'] =
 rescue SocketError, ArgumentError, SystemCallError,     # comment
   Net::SCP::Exception, Timeout::Error => ex
   @logger.error "Failed to copy the file \#{source} to \#{dest} due to " +
-    "\#{ex.message}"
+    ex.message
 end}
 
 INDENT_OK['def_rescue'] =
   %Q{def some_method
   do_something(one, two)
 rescue => e
-  log "It didn't work."
+  log 'It didn't work.'
   raise e
 end}
 
@@ -189,7 +189,7 @@ end}
 INDENT_OK['nested_def'] =
   %Q{def first_method
   def second_method
-    puts "hi"
+    puts 'hi'
   end
 end}
 
@@ -233,12 +233,12 @@ class MyClass
   include Stuff
 
   def a_method
-    puts "hello"
+    puts 'hello'
   end
 end}
 
 INDENT_OK['if_modifier'] =
-  %Q{puts "hi" if nil.nil?}
+  %Q{puts 'hi' if nil.nil?}
 
 INDENT_OK['if_modifier2'] =
   %Q{start_key_registration_server if @profiles.values.include? :SM5000}
@@ -249,7 +249,7 @@ INDENT_OK['def_return_if_modifier'] =
 end}
 
 INDENT_OK['unless_modifier'] =
-  %Q{puts "hi" unless nil.nil?}
+  %Q{puts 'hi' unless nil.nil?}
 
 INDENT_OK['def_return_unless_modifier'] =
   %Q{def a_method
@@ -269,9 +269,9 @@ INDENT_OK['case_whens_level'] =
   %Q{def my_method
   case true
   when true
-    puts "stuff"
+    puts 'stuff'
   when false
-    puts "blah blah"
+    puts 'blah blah'
   end
 end}
 
@@ -297,7 +297,7 @@ end}
 
 INDENT_OK['while_do_loop'] =
   %Q{while true do
-  puts "something"
+  puts 'something'
 end}
 
 INDENT_OK['while_do_loop2'] =
@@ -311,7 +311,7 @@ end}
 
 INDENT_OK['until_do_loop'] =
   %Q{until true do
-  puts "something"
+  puts 'something'
 end}
 
 INDENT_OK['until_do_loop2'] =
@@ -430,22 +430,22 @@ INDENT_OK['braces_combo'] =
 
 INDENT_OK['deep_hash_with_rockets'] =
   %Q[im_deep =
-  { "one" =>
-    { "1" =>
-      { "a" => "A",
-        "b" => "B",
-        "c" => "C" },
-      "2" =>
-      { "d" => "D",
-        "e" => "E",
-        "f" => "F" } } }]
+  { 'one' =>
+    { '1' =>
+      { 'a' => 'A',
+        'b' => 'B',
+        'c' => 'C' },
+      '2' =>
+      { 'd' => 'D',
+        'e' => 'E',
+        'f' => 'F' } } }]
 
 INDENT_OK['embedded_strings_in_embedded_strings'] =
   %q[def friendly_time(time)
   if hours < 24
     "#{(hours > 0) ? "#{hours} hour" : '' }#{(hours > 1) ? 's' : ''}" +
       " #{(mins > 0) ? "#{mins} minute" : '' }#{(mins > 1) ? 's' : ''}" +
-      " #{seconds} second#{(seconds > 1) ? "s" : ''} ago"
+      " #{seconds} second#{(seconds > 1) ? 's' : ''} ago"
   else
     time.to_s
   end
@@ -483,8 +483,8 @@ suckaaaaaa!
 ]}
 
 INDENT_OK['multi_line_brackets_embedded_hashes'] =
-  %Q{summary_table.rows << [{ value: "File", align: :center },
-  { value: "Total Problems", align: :center }]}
+  %Q{summary_table.rows << [{ value: 'File', align: :center },
+  { value: 'Total Problems', align: :center }]}
 
 INDENT_OK['brackets_combo'] =
   %Q{[2]
@@ -634,7 +634,7 @@ INDENT_OK['method_lonely_args'] =
   %Q{def your_thing(
   one
 )
-  puts "stuff"
+  puts 'stuff'
 end}
 
 #------------------------------------------------------------------------------
@@ -688,10 +688,10 @@ INDENT_OK['block_in_block_ends_on_same_line'] =
   baz
 }.each do |thing|
   function thing do
-    puts "stuff"
+    puts 'stuff'
   end end
 
-puts "post ends"}
+puts 'post ends'}
 
 =begin
 INDENT_OK['rparen_and_do_same_line'] =
@@ -706,8 +706,8 @@ end}
 #-------------------------------------------------------------------------------
 INDENT_OK['single_line_begin_rescue_end'] =
   %Q{def log
-  l = begin; lineno; rescue; "<EOF>"; end
-  c = begin; column; rescue; "<EOF>"; end
+  l = begin; lineno; rescue; '<EOF>'; end
+  c = begin; column; rescue; '<EOF>'; end
   subclass_name = self.class.to_s.sub(/^Tailor::/, '')
   args.first.insert(0, "<\#{subclass_name}> \#{l}[\#{c}]: ")
   Tailor::Logger.log(*args)
@@ -738,7 +738,7 @@ end}
 
 INDENT_OK['combo3'] =
   %Q{def report_turducken(results, performance_results)
-  stuffing[:log_files] = { "\#{File.basename @logger.log_file_location}" =>
+  stuffing[:log_files] = { "\#{File.basename @logger.log_file_location}/path" =>
     File.read(@logger.log_file_location).gsub(/(?<f><)(?<q>\\/)?(?<w>\\w)/,
       '\\k<f>!\\k<q>\\k<w>') }.merge remote_logs
 
@@ -747,7 +747,7 @@ INDENT_OK['combo3'] =
       @config[:turducken_password])
     suite_result_url = Stuffer.stuff(stuffing)
   rescue Errno::ECONNREFUSED
-    @logger.error "Unable to connect to Turducken server!"
+    @logger.error 'Unable to connect to Turducken server!'
   end
 
   suite_result_url

data/spec/support/horizontal_spacing_cases.rb

@@ -87,7 +87,7 @@ H_SPACING_OK['empty_hash_in_string_in_block'] =
   %Q{[1].map { |n| { :first => "\#{n}-\#{{}}" } }}
 
 H_SPACING_OK['string_interp_with_colonop'] =
-  %Q{"\#{::Rails.root}"}
+  %Q{"\#{::Rails.root + 'file'}"}
 
 
 

data/spec/support/line_indentation_cases.rb

@@ -0,0 +1,71 @@
+LINE_INDENT = {}
+
+LINE_INDENT['hash_spans_lines'] =
+  %q{db_connection = { :host => "localhost", :username => 'root',
+  :password => node['db']['password'] }}
+
+LINE_INDENT['if_else'] =
+  %q{case "foo"
+when "foo"
+  if node["foo"]["version"].to_f >= 5.5
+    default['foo']['service_name'] = "foo"
+    default['foo']['pid_file'] = "/var/run/foo/foo.pid"
+  else
+    default['foo']['service_name'] = "food"
+    default['foo']['pid_file'] = "/var/run/food/food.pid"
+  end
+end}
+
+LINE_INDENT['line_continues_at_same_indentation'] =
+  %q{if someconditional_that == is_really_long.function().stuff() or
+  another_condition == some_thing
+  puts "boop"
+end}
+
+LINE_INDENT['line_continues_further_indented'] =
+  %q{if someconditional_that == is_really_long.function().stuff() or
+    another_condition == some_thing
+  puts "boop"
+end}
+
+LINE_INDENT['line_continues_without_nested_statements'] =
+  %q{attribute "foo/password",
+  :display_name => "Password",
+  :description => "Randomly generated password",
+  :default => "randomly generated"}
+
+LINE_INDENT['minitest_test_cases'] =
+  %q{describe "foo" do
+  it 'includes the disk_free_limit configuration setting' do
+    file("#{node['foo']['config_root']}/foo.config").
+      must_match /\{disk_free_limit, \{mem_relative, #{node['foo']['df']}/
+  end
+  it 'includes the vm_memory_high_watermark configuration setting' do
+    file("#{node['foo']['config_root']}/foo.config").
+      must_match /\{vm_memory_high_watermark, #{node['foo']['vm']}/
+  end
+end}
+
+LINE_INDENT['nested_blocks'] =
+  %q{node['foo']['client']['packages'].each do |foo_pack|
+  package foo_pkg do
+    action :install
+  end
+end}
+
+LINE_INDENT['one_assignment_per_line'] =
+  %q{default['foo']['bar']['apt_key_id'] = 'BD2EFD2A'
+default['foo']['bar']['apt_uri'] = "http://repo.example.com/apt"
+default['foo']['bar']['apt_keyserver'] = "keys.example.net"}
+
+LINE_INDENT['parameters_continuation_indent_across_lines'] =
+  %q{def something(waka, baka, bing,
+    bla, goop, foop)
+  stuff
+end}
+
+LINE_INDENT['parameters_no_continuation_indent_across_lines'] =
+  %q{def something(waka, baka, bing,
+  bla, goop, foop)
+  stuff
+end}