tailor 1.3.1 → 1.4.0

data/spec/support/string_interpolation_cases.rb

@@ -0,0 +1,45 @@
+INTERPOLATION = {}
+
+INTERPOLATION['one_variable_interpolated_only'] =
+  %q{puts "#{bing}"
+}
+
+INTERPOLATION['mixed_content_and_expression'] =
+  %q{puts "hello: #{bing}"
+}
+
+INTERPOLATION['no_string'] =
+  %q{puts bing
+}
+
+INTERPOLATION['two_variables'] =
+  %q{puts "#{bing}#{bar}"
+}
+
+INTERPOLATION['two_strings_with_unnecessary_interpolation'] =
+  %q{puts "#{foo}" + "#{bar}"
+}
+
+INTERPOLATION['multiline_string_with_unnecessary_interpolation'] =
+  %q{puts "#{foo +
+bar -
+baz}"
+}
+
+INTERPOLATION['multiline_word_list'] =
+  %q{%w{
+  foo
+  bar
+  baz
+}}
+
+INTERPOLATION['nested_interpolation'] =
+  %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"
+  else
+    time.to_s
+  end
+end]

data/spec/support/string_quoting_cases.rb

@@ -0,0 +1,25 @@
+QUOTING = {}
+
+QUOTING['single_quotes_no_interpolation'] =
+  %q{foo = 'bar'
+}
+
+QUOTING['double_quotes_with_interpolation'] =
+  %q{foo = "bar#{baz}"
+}
+
+QUOTING['double_quotes_no_interpolation'] =
+  %q{foo = "bar"
+}
+
+QUOTING['double_quotes_no_interpolation_twice'] =
+  %q{foo = "bar" + "baz"
+}
+
+QUOTING['escape_sequence'] =
+  %q{foo = "bar\n"
+}
+
+QUOTING['nested_quotes'] =
+  %q{foo = "foo#{bar('baz')}"
+}

data/spec/unit/tailor/configuration/file_set_spec.rb

@@ -13,7 +13,7 @@ describe Tailor::Configuration::FileSet do
         it 'builds an Array with that file\'s expanded path' do
           new_list = subject.instance_eval { build_file_list('./test.rb') }
           new_list.should be_an Array
-          new_list.first.should match /.+\/test.rb$/
+          new_list.first.should match %r[/test.rb$]
         end
       end
 
@@ -31,7 +31,7 @@ describe Tailor::Configuration::FileSet do
 
       it 'returns the Array with expanded file paths' do
         subject.instance_eval { build_file_list(['test.rb']) }.
-          first.should match /.+\/test.rb$/
+          first.should match %r[/test.rb$]
       end
     end
 
@@ -59,7 +59,7 @@ describe Tailor::Configuration::FileSet do
       subject.update_file_list('test2.rb')
       subject.instance_variable_get(:@file_list).size.should be 2
       subject.instance_variable_get(:@file_list).last.
-        should match /.+\/test2.rb/
+        should match %r[/test2.rb]
     end
   end
 end

data/spec/unit/tailor/configuration/style_spec.rb

@@ -156,27 +156,30 @@ describe Tailor::Configuration::Style do
   describe '#to_hash' do
     let(:default_values) do
       {
-        :allow_camel_case_methods => [false, { :level => :error }],
-        :allow_hard_tabs => [false, { :level => :error }],
-        :allow_screaming_snake_case_classes => [false, { :level => :error }],
-        :allow_trailing_line_spaces => [false, { :level => :error }],
-        :allow_invalid_ruby => [false, { :level => :warn }],
-        :indentation_spaces => [2, { :level => :error }],
-        :max_code_lines_in_class => [300, { :level => :error }],
-        :max_code_lines_in_method => [30, { :level => :error }],
-        :max_line_length => [80, { :level => :error }],
-        :spaces_after_comma => [1, { :level => :error }],
-        :spaces_after_conditional => [1, { :level=>:error }],
-        :spaces_after_lbrace => [1, { :level => :error }],
-        :spaces_after_lbracket => [0, { :level => :error }],
-        :spaces_after_lparen => [0, { :level => :error }],
-        :spaces_before_comma => [0, { :level => :error }],
-        :spaces_before_lbrace => [1, { :level => :error }],
-        :spaces_before_rbrace => [1, { :level => :error }],
-        :spaces_before_rbracket => [0, { :level => :error }],
-        :spaces_before_rparen => [0, { :level => :error }],
-        :spaces_in_empty_braces => [0, { :level => :error }],
-        :trailing_newlines => [1, { :level => :error }]
+        allow_camel_case_methods: [false, { level: :error }],
+        allow_conditional_parentheses: [false, { level: :warn }],
+        allow_hard_tabs: [false, { level: :error }],
+        allow_screaming_snake_case_classes: [false, { level: :error }],
+        allow_trailing_line_spaces: [false, { level: :error }],
+        allow_unnecessary_interpolation: [false, { level: :warn }],
+        allow_invalid_ruby: [false, { level: :warn }],
+        allow_unnecessary_double_quotes: [false, { level: :warn }],
+        indentation_spaces: [2, { level: :error }],
+        max_code_lines_in_class: [300, { level: :error }],
+        max_code_lines_in_method: [30, { level: :error }],
+        max_line_length: [80, { level: :error }],
+        spaces_after_comma: [1, { level: :error }],
+        spaces_after_conditional: [1, { level: :error }],
+        spaces_after_lbrace: [1, { level: :error }],
+        spaces_after_lbracket: [0, { level: :error }],
+        spaces_after_lparen: [0, { level: :error }],
+        spaces_before_comma: [0, { level: :error }],
+        spaces_before_lbrace: [1, { level: :error }],
+        spaces_before_rbrace: [1, { level: :error }],
+        spaces_before_rbracket: [0, { level: :error }],
+        spaces_before_rparen: [0, { level: :error }],
+        spaces_in_empty_braces: [0, { level: :error }],
+        trailing_newlines: [1, { level: :error }]
       }
     end
 

data/spec/unit/tailor/configuration_spec.rb

@@ -40,16 +40,19 @@ describe Tailor::Configuration do
           file_list: [],
           style: {
             allow_camel_case_methods: [false, { level: :error }],
+            allow_conditional_parentheses: [false, { level: :warn }],
             allow_hard_tabs: [false, { level: :error }],
             allow_screaming_snake_case_classes: [false, { level: :error }],
             allow_trailing_line_spaces: [false, { level: :error }],
+            allow_unnecessary_interpolation: [false, { level: :warn }],
             allow_invalid_ruby: [false, { level: :warn }],
+            allow_unnecessary_double_quotes: [false, { level: :warn }],
             indentation_spaces: [2, { level: :error }],
             max_code_lines_in_class: [300, { level: :error }],
             max_code_lines_in_method: [30, { level: :error }],
             max_line_length: [80, { level: :error }],
             spaces_after_comma: [1, { level: :error }],
-            spaces_after_conditional: [1, { :level=>:error }],
+            spaces_after_conditional: [1, { level: :error }],
             spaces_after_lbrace: [1, { level: :error }],
             spaces_after_lbracket: [0, { level: :error }],
             spaces_after_lparen: [0, { level: :error }],

data/spec/unit/tailor/formatter_spec.rb

@@ -10,11 +10,11 @@ describe Tailor::Formatter do
       {
         'some_file.rb' => [
           {
-            :type => 'allow_invalid_ruby',
-            :line => 0,
-            :column => 0,
-            :message => msg,
-            :level => :warn
+            type: 'allow_invalid_ruby',
+            line: 0,
+            column: 0,
+            message: msg,
+            level: :warn
           }
         ]
       }
@@ -33,11 +33,11 @@ describe Tailor::Formatter do
 
         subject.problems_at_level(problems, :warn).should == [
           {
-            :type => 'allow_invalid_ruby',
-            :line => 0,
-            :column => 0,
-            :message => msg,
-            :level => :warn
+            type: 'allow_invalid_ruby',
+            line: 0,
+            column: 0,
+            message: msg,
+            level: :warn
           }
         ]
       end

data/spec/unit/tailor/reporter_spec.rb

@@ -45,7 +45,6 @@ describe Tailor::Reporter do
 
     context 'without output file' do
       it 'calls #file_report on each @formatters' do
-        label = :some_label
         formatter.should_receive(:summary_report).with(all_problems)
         File.should_not_receive(:open)
 

data/spec/unit/tailor/rulers/indentation_spaces_ruler/indentation_manager_spec.rb

@@ -69,17 +69,6 @@ describe Tailor::Rulers::IndentationSpacesRuler::IndentationManager do
     end
   end
 
-  describe '#set_up_line_transition' do
-    context '@amount_to_change_this < 0' do
-      before { subject.instance_variable_set(:@amount_to_change_this, -1) }
-
-      it 'should call #decrease_this_line' do
-        subject.should_receive(:decrease_this_line)
-        subject.set_up_line_transition
-      end
-    end
-  end
-
   describe '#transition_lines' do
     context '#started? is true' do
       before { subject.stub(:started?).and_return true }

data/spec/unit/tailor/rulers/indentation_spaces_ruler_spec.rb

@@ -44,7 +44,7 @@ describe Tailor::Rulers::IndentationSpacesRuler do
 
   describe '#embexpr_end_update' do
     before do
-      lexed_line.should_receive(:only_on_embexpr_end?).and_return(false)
+      lexed_line.should_receive(:only_embexpr_end?).and_return(false)
     end
 
     it 'pops @embexpr_nesting' do

data/spec/unit/tailor/version_spec.rb

@@ -3,5 +3,5 @@ require 'tailor/version'
 
 
 describe Tailor::VERSION do
-  it { should == '1.3.1' }
+  it { should == '1.4.0' }
 end

data/tailor.gemspec

@@ -27,6 +27,7 @@ project, whatever style that may be.
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
 
   s.add_runtime_dependency 'log_switch', '>= 0.3.0'
+  s.add_runtime_dependency 'nokogiri', '>= 1.6.0'
   s.add_runtime_dependency 'term-ansicolor', '>= 1.0.5'
   s.add_runtime_dependency 'text-table', '>= 1.2.2'
 

metadata

@@ -1,167 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: tailor
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Steve Loveless
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log_switch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: text-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
 description: |
@@ -180,12 +194,11 @@ extra_rdoc_files:
 - History.md
 - README.md
 files:
-- .gemtest
-- .gitignore
-- .infinity_test
-- .rspec
-- .tailor
-- .travis.yml
+- ".gemtest"
+- ".gitignore"
+- ".rspec"
+- ".tailor"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - History.md
@@ -226,12 +239,18 @@ files:
 - lib/tailor/ruler.rb
 - lib/tailor/rulers.rb
 - lib/tailor/rulers/allow_camel_case_methods_ruler.rb
+- lib/tailor/rulers/allow_conditional_parentheses.rb
 - lib/tailor/rulers/allow_hard_tabs_ruler.rb
 - lib/tailor/rulers/allow_invalid_ruby_ruler.rb
 - lib/tailor/rulers/allow_screaming_snake_case_classes_ruler.rb
 - lib/tailor/rulers/allow_trailing_line_spaces_ruler.rb
+- lib/tailor/rulers/allow_unnecessary_double_quotes_ruler.rb
+- lib/tailor/rulers/allow_unnecessary_interpolation_ruler.rb
 - lib/tailor/rulers/indentation_spaces_ruler.rb
+- lib/tailor/rulers/indentation_spaces_ruler/argument_alignment.rb
+- lib/tailor/rulers/indentation_spaces_ruler/ast_xml.rb
 - lib/tailor/rulers/indentation_spaces_ruler/indentation_manager.rb
+- lib/tailor/rulers/indentation_spaces_ruler/line_continuations.rb
 - lib/tailor/rulers/max_code_lines_in_class_ruler.rb
 - lib/tailor/rulers/max_code_lines_in_method_ruler.rb
 - lib/tailor/rulers/max_line_length_ruler.rb
@@ -250,6 +269,7 @@ files:
 - lib/tailor/runtime_error.rb
 - lib/tailor/tailorrc.erb
 - lib/tailor/version.rb
+- spec/functional/conditional_parentheses_spec.rb
 - spec/functional/conditional_spacing_spec.rb
 - spec/functional/configuration_spec.rb
 - spec/functional/horizontal_spacing/braces_spec.rb
@@ -261,23 +281,32 @@ files:
 - spec/functional/horizontal_spacing/parens_spec.rb
 - spec/functional/horizontal_spacing/trailing_whitespace_spec.rb
 - spec/functional/horizontal_spacing_spec.rb
+- spec/functional/indentation_spacing/argument_alignment_spec.rb
 - spec/functional/indentation_spacing/bad_indentation_spec.rb
+- spec/functional/indentation_spacing/line_continuations_spec.rb
 - spec/functional/indentation_spacing_spec.rb
 - spec/functional/naming/camel_case_methods_spec.rb
 - spec/functional/naming/screaming_snake_case_classes_spec.rb
 - spec/functional/naming_spec.rb
 - spec/functional/rake_task_spec.rb
+- spec/functional/string_interpolation_spec.rb
+- spec/functional/string_quoting_spec.rb
 - spec/functional/vertical_spacing/class_length_spec.rb
 - spec/functional/vertical_spacing/method_length_spec.rb
 - spec/functional/vertical_spacing_spec.rb
 - spec/spec_helper.rb
+- spec/support/argument_alignment_cases.rb
 - spec/support/bad_indentation_cases.rb
+- spec/support/conditional_parentheses_cases.rb
 - spec/support/conditional_spacing_cases.rb
 - spec/support/good_indentation_cases.rb
 - spec/support/horizontal_spacing_cases.rb
+- spec/support/line_indentation_cases.rb
 - spec/support/naming_cases.rb
 - spec/support/rake_task_config_no_problems.rb
 - spec/support/rake_task_config_problems.rb
+- spec/support/string_interpolation_cases.rb
+- spec/support/string_quoting_cases.rb
 - spec/support/vertical_spacing_cases.rb
 - spec/unit/tailor/cli/options_spec.rb
 - spec/unit/tailor/cli_spec.rb
@@ -314,17 +343,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A Ruby style & complexity measurer
@@ -340,6 +369,7 @@ test_files:
 - features/support/legacy/long_file_with_indentation.rb
 - features/support/world.rb
 - features/valid_ruby.feature
+- spec/functional/conditional_parentheses_spec.rb
 - spec/functional/conditional_spacing_spec.rb
 - spec/functional/configuration_spec.rb
 - spec/functional/horizontal_spacing/braces_spec.rb
@@ -351,23 +381,32 @@ test_files:
 - spec/functional/horizontal_spacing/parens_spec.rb
 - spec/functional/horizontal_spacing/trailing_whitespace_spec.rb
 - spec/functional/horizontal_spacing_spec.rb
+- spec/functional/indentation_spacing/argument_alignment_spec.rb
 - spec/functional/indentation_spacing/bad_indentation_spec.rb
+- spec/functional/indentation_spacing/line_continuations_spec.rb
 - spec/functional/indentation_spacing_spec.rb
 - spec/functional/naming/camel_case_methods_spec.rb
 - spec/functional/naming/screaming_snake_case_classes_spec.rb
 - spec/functional/naming_spec.rb
 - spec/functional/rake_task_spec.rb
+- spec/functional/string_interpolation_spec.rb
+- spec/functional/string_quoting_spec.rb
 - spec/functional/vertical_spacing/class_length_spec.rb
 - spec/functional/vertical_spacing/method_length_spec.rb
 - spec/functional/vertical_spacing_spec.rb
 - spec/spec_helper.rb
+- spec/support/argument_alignment_cases.rb
 - spec/support/bad_indentation_cases.rb
+- spec/support/conditional_parentheses_cases.rb
 - spec/support/conditional_spacing_cases.rb
 - spec/support/good_indentation_cases.rb
 - spec/support/horizontal_spacing_cases.rb
+- spec/support/line_indentation_cases.rb
 - spec/support/naming_cases.rb
 - spec/support/rake_task_config_no_problems.rb
 - spec/support/rake_task_config_problems.rb
+- spec/support/string_interpolation_cases.rb
+- spec/support/string_quoting_cases.rb
 - spec/support/vertical_spacing_cases.rb
 - spec/unit/tailor/cli/options_spec.rb
 - spec/unit/tailor/cli_spec.rb