tailor 1.0.0.alpha2 → 1.0.0

data/features/indentation/good_files_with_no_trailing_newline.feature

@@ -5,8 +5,8 @@ Feature: Indentation check on good files without trailing newlines
     Given my configuration file ".tailor" looks like:
     """
     Tailor.config do |config|
-      config.file_set do
-        trailing_newlines 0
+      config.file_set do |style|
+        style.trailing_newlines 0
       end
     end
     """
@@ -28,10 +28,12 @@ Feature: Indentation check on good files without trailing newlines
     | indent/ok/one_line_subclass                  |
     | indent/ok/one_line_subclass_with_inheritance |
 
+  @single_line
   Scenarios: Good single-line statement uses
     | File                                    |
     | indent/ok/class_singlestatement         |
     | indent/ok/require_class_singlestatement |
+    | indent/ok/class_as_symbol               |
 
   @multi_line
   Scenarios: Good multi-line statement uses
@@ -51,11 +53,16 @@ Feature: Indentation check on good files without trailing newlines
     | indent/ok/method_call_multistatement_trailing_comment              |
     | indent/ok/method_call_multistatement_lonely_paren                  |
     | indent/ok/method_call_multistatement_lonely_paren_trailing_comment |
-    | indent/ok/rescue_ending_with_comma                                 |
-    | indent/ok/rescue_ending_with_comma_trailing_comment                |
     | indent/ok/keyword_ending_with_period                               |
     | indent/ok/keyword_ending_with_period_trailing_comment              |
 
+  @multi_line @continuation
+  Scenarios: Good use of continuation keywords
+    | File                                                |
+    | indent/ok/rescue_ending_with_comma                  |
+    | indent/ok/rescue_ending_with_comma_trailing_comment |
+    | indent/ok/def_rescue                                |
+
   Scenarios: Good def uses
     | File                                                |
     | indent/ok/def                                       |
@@ -119,6 +126,7 @@ Feature: Indentation check on good files without trailing newlines
     | indent/ok/multi_line_lonely_braces_as_t_string |
     | indent/ok/multi_line_braces_embedded_arrays    |
     | indent/ok/braces_combo                         |
+    | indent/ok/deep_hash_with_rockets               |
 
   @single_line @brackets
   Scenarios: Good single-line bracket uses
@@ -168,6 +176,7 @@ Feature: Indentation check on good files without trailing newlines
     | indent/ok/multi_line_method_call                        |
     | indent/ok/multi_line_method_call_ends_with_period       |
     | indent/ok/multi_line_method_call_ends_with_many_periods |
+    | indent/ok/method_lonely_args                            |
 
   @multi_line @ops
   Scenarios: Good multi-line if + logical operators
@@ -180,6 +189,7 @@ Feature: Indentation check on good files without trailing newlines
     | indent/ok/multi_line_each_block                    |
     | indent/ok/multi_line_each_block_with_op_and_parens |
     | indent/ok/do_end_block_in_parens                   |
+    | indent/ok/block_in_block_ends_on_same_line         |
 
   @single_line @keywords
   Scenarios: Good use of single-line keyword statements
@@ -195,12 +205,15 @@ Feature: Indentation check on good files without trailing newlines
     | indent/ok/brace_bracket_paren_combo1 |
     | indent/ok/paren_comma_combo1         |
 
+  @multi_line @labels
+  Scenarios: Use of labels
+    | File                           |
+    | indent/ok/line_ends_with_label |
+
   @wip
   Scenarios: WIPs
     | File                                  |
     | indent/ok/case_whens_in               |
     | indent/ok/method_closing_lonely_paren |
-    | indent/ok/method_lonely_args          |
-    | indent/ok/line_ends_with_label        |
     | indent/ok/rparen_and_do_same_line     |
 

data/features/name_detection.feature

@@ -6,8 +6,8 @@ Feature: Name detection
     Given my configuration file ".tailor" looks like:
     """
     Tailor.config do |config|
-      config.file_set do
-        trailing_newlines 0
+      config.file_set do |style|
+        style.trailing_newlines 0
       end
     end
     """

data/features/support/env.rb

@@ -5,5 +5,3 @@ SimpleCov.start do
   add_group "Features", "features/"
   add_group "Lib", "lib"
 end
-
-

data/features/support/file_cases/horizontal_spacing_cases.rb

@@ -88,6 +88,9 @@ H_SPACING_OK[:trailing_comma_with_trailing_comment] =
 end}
 
 H_SPACING_OK[:no_before_comma_in_array] = %Q{[1, 2]}
+H_SPACING_OK[:line_ends_with_backslash] =
+  %Q{{ :thing => a_thing,\\
+  :thing2 => another_thing }}
 
 #-------------------------------------------------------------------------------
 # Braces
@@ -182,7 +185,7 @@ H_SPACING_1[:single_line_block_0_spaces_before_lbrace] =
   %Q{1..10.times{ |n| puts n }}
 
 H_SPACING_1[:two_line_braces_block_2_spaces_before_lbrace] =
-%Q{1..10.times  { |n|
+  %Q{1..10.times  { |n|
 puts n}}
 
 H_SPACING_1[:two_line_braces_block_0_spaces_before_lbrace_trailing_comment] =
@@ -241,7 +244,7 @@ H_SPACING_2[:two_d_array_space_before_rbrackets] =
 #-------------------------------------------------------------------------------
 # Parens
 #-------------------------------------------------------------------------------
-H_SPACING_OK[:empty_parens] = %Q{def thing()}
+H_SPACING_OK[:empty_parens] = %Q{def thing(); end}
 H_SPACING_OK[:simple_method_call] = %Q{thing(one, two)}
 H_SPACING_OK[:multi_line_method_call] = %Q{thing(one,
   two)}
@@ -261,5 +264,3 @@ H_SPACING_1[:multi_line_method_call_space_after_lparen] = %Q{thing( one,
 H_SPACING_1[:multi_line_method_call_space_after_lparen_trailing_comment] =
   %Q{thing( one,
   two)}
-
-

data/features/support/file_cases/indentation_cases.rb

@@ -1,11 +1,11 @@
 INDENT_OK = {}
 
-INDENT_OK[:class] = 
-%Q{class MyClass
+INDENT_OK[:class] =
+  %Q{class MyClass
 end}
 
 INDENT_OK[:one_line_class] =
-%Q{class MyClass; end}
+  %Q{class MyClass; end}
 
 INDENT_OK[:one_line_subclass] =
   %Q{class MyClass < RuntimeError; end}
@@ -17,7 +17,7 @@ INDENT_OK[:one_line_subclass_with_inheritance] =
 end}
 
 INDENT_OK[:class_empty] =
-%Q{class MyClass
+  %Q{class MyClass
 
 end}
 
@@ -27,12 +27,12 @@ INDENT_OK[:class_empty_trailing_comment] =
 end}
 
 INDENT_OK[:class_singlestatement] =
-%Q{class MyClass
+  %Q{class MyClass
   include Stuff
 end}
 
 INDENT_OK[:assignment_addition_multistatement] =
-%Q{thing = 1 +
+  %Q{thing = 1 +
   2 + 3 + 4 +
   5}
 
@@ -42,7 +42,7 @@ INDENT_OK[:assignment_addition_multistatement_trailing_comment] =
   5}
 
 INDENT_OK[:assignment_hash_multistatement] =
-%Q{thing = {
+  %Q{thing = {
   :one => 'one',
   two: 'two'
 }}
@@ -54,7 +54,7 @@ INDENT_OK[:assignment_hash_multistatement_trailing_comment] =
 }}
 
 INDENT_OK[:assignment_array_multistatement] =
-%Q{thing = [
+  %Q{thing = [
   :one,
   :two
 ]}
@@ -78,10 +78,10 @@ INDENT_OK[:assignment_paren_multistatement_trailing_comment] =
   5)}
 
 INDENT_OK[:assignment_twolevel_hash_multistatement] =
-%Q{thing = {
+  %Q{thing = {
   :one => {
     :a => 'a',
-    b: => 'b'
+    b: 'b'
   },
   two: {
     x: 'x',
@@ -90,7 +90,7 @@ INDENT_OK[:assignment_twolevel_hash_multistatement] =
 }}
 
 INDENT_OK[:assignment_twolevel_array_multistatement] =
-%Q{thing = [
+  %Q{thing = [
   [:one],
   [
     :two,
@@ -99,7 +99,7 @@ INDENT_OK[:assignment_twolevel_array_multistatement] =
 ]}
 
 INDENT_OK[:assignment_twolevel_paren_multistatement] =
-%Q{result = Integer(
+  %Q{result = Integer(
   String.new(
     "1"
   ).to_i,
@@ -107,7 +107,7 @@ INDENT_OK[:assignment_twolevel_paren_multistatement] =
 )}
 
 INDENT_OK[:method_call_multistatement] =
-%Q{my_method_with_many_params(one, two,
+  %Q{my_method_with_many_params(one, two,
   three,
   four,
   five)}
@@ -132,6 +132,9 @@ INDENT_OK[:method_call_multistatement_lonely_paren_trailing_comment] =
   five
 )}
 
+#-------------------------------------------------------------------------------
+# Continuation keywords
+#-------------------------------------------------------------------------------
 INDENT_OK[:rescue_ending_with_comma] =
   %Q{begin
   ssh.upload source, dest
@@ -154,6 +157,14 @@ rescue SocketError, ArgumentError, SystemCallError,     # comment
     "\#{ex.message}"
 end}
 
+INDENT_OK[:def_rescue] =
+  %Q{def some_method
+  do_something(one, two)
+rescue => e
+  log "It didn't work."
+  raise e
+end}
+
 INDENT_OK[:keyword_ending_with_period] =
   %Q{if [].
   empty?
@@ -167,36 +178,46 @@ INDENT_OK[:keyword_ending_with_period_trailing_comment] =
 end}
 
 INDENT_OK[:def] =
-%Q{def a_method
+  %Q{def a_method
 end}
 
 INDENT_OK[:def_empty] =
-%Q{def a_method
+  %Q{def a_method
 
 end}
 
 INDENT_OK[:nested_def] =
-%Q{def first_method
+  %Q{def first_method
   def second_method
     puts "hi"
   end
 end}
 
 INDENT_OK[:nested_class] =
-%Q{class MyClass
+  %Q{class MyClass
   class AnotherClass
   end
 end}
 
 INDENT_OK[:require_class_singlestatement] =
-%Q{require 'time'
+  %Q{require 'time'
 
 class MyClass
   include Stuff
 end}
 
+INDENT_OK[:class_as_symbol] =
+  %Q{INDENT_OK = {}
+
+INDENT_OK[:class] =
+  %Q{class MyClass
+end}
+
+INDENT_OK[:one_line_class] =
+  %Q{class MyClass; end}}
+
 INDENT_OK[:require_class_singlestatement_def] =
-%Q{require 'time'
+  %Q{require 'time'
 
 class MyClass
   include Stuff
@@ -206,7 +227,7 @@ class MyClass
 end}
 
 INDENT_OK[:require_class_singlestatement_def_content] =
-%Q{require 'time'
+  %Q{require 'time'
 
 class MyClass
   include Stuff
@@ -217,21 +238,21 @@ class MyClass
 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}
 
 INDENT_OK[:def_return_if_modifier] =
-%Q{def a_method
+  %Q{def a_method
   return @something if @something
 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
+  %Q{def a_method
   return @something unless @something
 end}
 
@@ -357,51 +378,65 @@ INDENT_OK[:for_with_retry_loop] =
 end}
 
 INDENT_OK[:loop_with_braces] =
-  %Q{loop {
+  %Q<loop {
   puts 'stuff'
-}}
+}>
 
 #----------- Braces ----------#
 INDENT_OK[:single_line_braces] =
-  %Q{{ one: 1, two: 2 }}
+  %Q<{ one: 1, two: 2 }>
 
 INDENT_OK[:single_line_braces_as_t_string] =
-  %Q{%Q{this is a t string!}}
+  %Q<%Q{this is a t string!}>
 
 INDENT_OK[:multi_line_braces] =
-  %Q{{ one: 1,
-  two: 2 }}
+  %Q<{ one: 1,
+  two: 2 }>
 
 INDENT_OK[:multi_line_braces_as_t_string] =
-  %Q{%Q{this is a t string!
-suckaaaaaa!}}
+  %Q<%Q{this is a t string!
+suckaaaaaa!}>
 
+# For some reason, Ruby doesn't like '%Q<> here.  Using [] instead.
 INDENT_OK[:multi_line_lonely_braces] =
-  %Q{{
+  %Q[{
   :one => 'one', :two => 'two',
   :three => 'three'
-}}
+}]
 
 INDENT_OK[:multi_line_lonely_braces_as_t_string] =
-  %Q{%Q{
+  %Q<%Q{
 this is a t string!
 suckaaaaaa!
-}}
+}>
 
 INDENT_OK[:multi_line_braces_embedded_arrays] =
-  %Q{{
+  %Q[{
   :one => ['one', 17, {}], :two => ['two'],
   :three => 'three'
-}}
+}]
+
 INDENT_OK[:braces_combo] =
-  %Q{{ three: 3 }
+  %Q<{ three: 3 }
 {
   three: 3 }
 { three: 3
 }
 {
   three: 3
-}}
+}>
+
+INDENT_OK[:deep_hash_with_rockets] =
+  %Q[im_deep =
+  { "one" =>
+    { "1" =>
+      { "a" => "A",
+        "b" => "B",
+        "c" => "C" },
+      "2" =>
+      { "d" => "D",
+        "e" => "E",
+        "f" => "F" } } }]
 
 #----------- Brackets ----------#
 INDENT_OK[:single_line_brackets] =
@@ -631,6 +666,18 @@ INDENT_OK[:do_end_block_in_parens] =
 rescue NoMethodError
 end}
 
+INDENT_OK[:block_in_block_ends_on_same_line] =
+  %Q{%w{
+  foo
+  bar
+  baz
+}.each do |thing|
+  function thing do
+    puts "stuff"
+  end end
+
+puts "post ends"}
+
 INDENT_OK[:rparen_and_do_same_line] =
   %Q{opt.on('-c', '--config-file FILE',
   "Use a specific config file.") do |config|
@@ -663,7 +710,7 @@ INDENT_OK[:combo1] =
 end}
 
 INDENT_OK[:combo2] =
-%Q{class C
+  %Q{class C
 
   send :each do
     def foo
@@ -675,8 +722,8 @@ end}
 INDENT_OK[:combo3] =
   %Q{def report_turducken(results, performance_results)
   stuffing[:log_files] = { "\#{File.basename @logger.log_file_location}" =>
-    File.read(@logger.log_file_location).gsub(/(?<f><)(?<q>\/)?(?<w>\w)/,
-      '\k<f>!\k<q>\k<w>') }.merge remote_logs
+    File.read(@logger.log_file_location).gsub(/(?<f><)(?<q>\\/)?(?<w>\\w)/,
+      '\\k<f>!\\k<q>\\k<w>') }.merge remote_logs
 
   begin
     Stuffer.login(@config[:turducken_server], @config[:turducken_username],
@@ -715,11 +762,11 @@ INDENT_OK[:line_ends_with_label] =
 INDENT_1 = {}
 
 INDENT_1[:class_indented_end] =
-%Q{class MyClass
+  %Q{class MyClass
  end}
 
 INDENT_1[:class_indented_singlestatement] =
-%Q{class MyClass
+  %Q{class MyClass
    include Something
 end}
 
@@ -729,42 +776,42 @@ INDENT_1[:class_indented_singlestatement_trailing_comment] =
 end}
 
 INDENT_1[:class_outdented_singlestatement] =
-%Q{class MyClass
+  %Q{class MyClass
  include Something
 end}
 
 INDENT_1[:def_indented_end] =
-%Q{def a
+  %Q{def a
  end}
 
 INDENT_1[:def_content_indented_end] =
-%Q{def a
+  %Q{def a
   puts "stuff"
  end}
 
 INDENT_1[:class_def_content_outdented_end] =
-%Q{class A
+  %Q{class A
   def a
     puts "stuff"
  end
 end}
 
 INDENT_1[:class_def_outdented_content] =
-%Q{class A
+  %Q{class A
   def a
    puts "stuff"
   end
 end}
 
 INDENT_1[:class_method_def_using_self_outdented] =
-%Q{class A
+  %Q{class A
  self.my_method
     puts 'stuff'
   end
 end}
 
 INDENT_1[:case_indented_whens_level] =
-%Q{def my_method
+  %Q{def my_method
    case true
   when true
     puts "stuff"
@@ -784,7 +831,7 @@ INDENT_1[:case_indented_whens_level_trailing_comment] =
 end}
 
 INDENT_1[:case_outdented_whens_level] =
-%Q{def my_method
+  %Q{def my_method
  case true
   when true
     puts "stuff"
@@ -920,6 +967,11 @@ INDENT_1[:multi_line_string_first_line_indented_trailing_comment] =
   end
 end}
 
+INDENT_1[:multi_line_tstring] =
+  %Q{INDENT_OK[:class] =
+%Q{class MyClass
+end}}
+
 #-------------------------------------------------------------------------------
 # Operators
 #-------------------------------------------------------------------------------
@@ -969,4 +1021,3 @@ INDENT_1[:multi_line_method_call_ends_with_many_periods_last_in_trailing_comment
   %Q{my_hashie.first_level.
   second_level.
     third_level  # comment}
-