tailor 1.0.0.alpha2 → 1.0.0

data/spec/tailor/rulers/indentation_spaces_ruler_spec.rb

@@ -6,40 +6,30 @@ describe Tailor::Rulers::IndentationSpacesRuler do
   let!(:spaces) { 5 }
 
   subject do
-    Tailor::Rulers::IndentationSpacesRuler.new(spaces)
+    Tailor::Rulers::IndentationSpacesRuler.new(spaces, level: :error)
   end
 
-  describe "#initialize" do
-    it "sets @proper to an Hash with :this_line and :next_line keys = 0" do
-      proper_indentation = subject.instance_variable_get(:@proper)
-      proper_indentation.should be_a Hash
-      proper_indentation[:this_line].should be_zero
-      proper_indentation[:next_line].should be_zero
-    end
-  end
-
-
   describe "#comment_update" do
     pending
     context "token does not contain a trailing newline" do
-      
+
     end
-    
+
     context "token contains a trailing newline" do
       context "lexed_line is spaces then a comment" do
-        
+
       end
-      
+
       context "lexed_line is no spaces and a comment" do
-        
+
       end
-      
+
       context "lexed_line ends with an operator" do
-        
+
       end
-      
+
       context "lexed_line ends with a comma" do
-        
+
       end
     end
   end
@@ -102,27 +92,45 @@ describe Tailor::Rulers::IndentationSpacesRuler do
   end
 
   describe "#tstring_beg_update" do
-    it "calls #stop" do
-      subject.should_receive(:stop)
-      subject.tstring_beg_update 1
+    let(:lexed_line) { double "LexedLine" }
+    let(:manager) { double "IndentationManager" }
+
+    it "calls #stop on the indentation_manager object" do
+      manager.should_receive(:update_actual_indentation).with lexed_line
+      manager.should_receive(:stop)
+      subject.instance_variable_set(:@manager, manager)
+      subject.tstring_beg_update(lexed_line, 1)
     end
-    
+
     it "adds the lineno to @tstring_nesting" do
-      subject.tstring_beg_update 1
+      manager.stub(:update_actual_indentation)
+      manager.stub(:stop)
+      subject.instance_variable_set(:@manager, manager)
+      subject.tstring_beg_update(lexed_line, 1)
       subject.instance_variable_get(:@tstring_nesting).should == [1]
     end
   end
 
   describe "#tstring_end_update" do
-    it "calls #start" do
-      subject.should_receive(:start)
-      subject.tstring_end_update
-    end
+    context "@tstring_nesting is not empty" do
+      let(:lexed_line) { double "LexedLine" }
+      let(:manager) { double "IndentationManager" }
+
+      it "calls #start" do
+        manager.should_receive(:start)
+        subject.instance_variable_set(:@manager, manager)
+        subject.tstring_end_update(2)
+      end
 
-    it "removes the lineno to @tstring_nesting" do
-      subject.instance_variable_set(:@tstring_nesting, [1])
-      subject.tstring_end_update
-      subject.instance_variable_get(:@tstring_nesting).should be_empty
+      it "removes the lineno to @tstring_nesting then calls @manager.start" do
+        manager.should_receive(:actual_indentation)
+        manager.should_receive(:start)
+        subject.instance_variable_set(:@manager, manager)
+        subject.instance_variable_set(:@tstring_nesting, [1])
+        subject.should_receive(:measure)
+        subject.tstring_end_update(2)
+        subject.instance_variable_get(:@tstring_nesting).should be_empty
+      end
     end
   end
 end

data/spec/tailor/rulers/{spaces_after_comma_spec.rb → spaces_after_comma_ruler_spec.rb}

@@ -2,25 +2,25 @@ require_relative '../../spec_helper'
 require 'tailor/rulers/spaces_after_comma_ruler'
 
 describe Tailor::Rulers::SpacesAfterCommaRuler do
-  subject { Tailor::Rulers::SpacesAfterCommaRuler.new({}) }
-  
+  subject { Tailor::Rulers::SpacesAfterCommaRuler.new(nil, {}) }
+
   describe "#comma_update" do
     it "adds the column number to @comma_columns" do
       subject.comma_update(",", 2, 1)
       subject.instance_variable_get(:@comma_columns).should == [1]
     end
   end
-  
+
   describe "#check_spaces_after_comma" do
     context "no event after comma" do
       let(:lexed_line) do
         l = double "LexedLine"
         l.stub(:event_at)
         l.stub(:index)
-        
+
         l
       end
-      
+
       it "doesn't detect any problems" do
         Tailor::Problem.should_not_receive(:new)
         expect { subject.check_spaces_after_comma(lexed_line, 1) }.

data/spec/tailor/rulers/spaces_after_lbrace_ruler_spec.rb

@@ -2,8 +2,8 @@ require_relative '../../spec_helper'
 require 'tailor/rulers/spaces_after_lbrace_ruler'
 
 describe Tailor::Rulers::SpacesAfterLbraceRuler do
-  subject { Tailor::Rulers::SpacesAfterLbraceRuler.new('')}
-  
+  subject { Tailor::Rulers::SpacesAfterLbraceRuler.new('', {}) }
+
   describe "#comment_update" do
     context "token has a trailing newline" do
       it "calls #ignored_nl_update" do
@@ -11,7 +11,7 @@ describe Tailor::Rulers::SpacesAfterLbraceRuler do
         subject.comment_update("\n", '', '', 1, 1)
       end
     end
-    
+
     context "token does not have a trailing newline" do
       it "does not call #ignored_nl_update" do
         subject.should_not_receive(:ignored_nl_update)
@@ -19,43 +19,43 @@ describe Tailor::Rulers::SpacesAfterLbraceRuler do
       end
     end
   end
-  
+
   describe "#ignored_nl_update" do
     it "calls #check_spaces_after_lbrace" do
       subject.should_receive(:check_spaces_after_lbrace)
       subject.ignored_nl_update('', 1, 1)
     end
   end
-  
+
   describe "#lbrace_update" do
     it "adds column to @lbrace_columns" do
       subject.lbrace_update('', 1, 1)
       subject.instance_variable_get(:@lbrace_columns).should == [1]
     end
   end
-  
+
   describe "#nl_update" do
     it "calls #ignored_nl_update" do
       subject.should_receive(:ignored_nl_update)
       subject.nl_update('', 1, 1)
     end
   end
-  
+
   describe "#count_spaces" do
     context "lexed_line.event_index returns nil" do
       let(:lexed_line) do
         l = double "LexedLine"
         l.stub(:event_index).and_return nil
-        
+
         l
       end
-      
+
       it "breaks from the loop and returns nil" do
         lexed_line.should_not_receive(:at)
         subject.count_spaces(lexed_line, 1).should be_nil
       end
     end
-    
+
     context "lexed_line.at returns nil" do
       let(:lexed_line) do
         l = double "LexedLine"
@@ -72,7 +72,7 @@ describe Tailor::Rulers::SpacesAfterLbraceRuler do
 
     context "next_event is a :on_nl" do
       let!(:next_event) do
-        [[1,1], :on_nl, "\n"]
+        [[1, 1], :on_nl, "\n"]
       end
 
       let(:lexed_line) do
@@ -90,7 +90,7 @@ describe Tailor::Rulers::SpacesAfterLbraceRuler do
 
     context "next_event is a :on_ignored_nl" do
       let!(:next_event) do
-        [[1,1], :on_ignored_nl, "\n"]
+        [[1, 1], :on_ignored_nl, "\n"]
       end
 
       let(:lexed_line) do
@@ -108,7 +108,7 @@ describe Tailor::Rulers::SpacesAfterLbraceRuler do
 
     context "next_event is a non-space event" do
       let!(:next_event) do
-        [[1,1], :on_kw, "def"]
+        [[1, 1], :on_kw, "def"]
       end
 
       let(:lexed_line) do
@@ -126,7 +126,7 @@ describe Tailor::Rulers::SpacesAfterLbraceRuler do
 
     context "next_event is :on_sp" do
       let!(:next_event) do
-        [[1,1], :on_sp, "  "]
+        [[1, 1], :on_sp, "  "]
       end
 
       let(:lexed_line) do

data/spec/tailor/rulers/spaces_before_lbrace_ruler_spec.rb

@@ -2,7 +2,7 @@ require_relative '../../spec_helper'
 require 'tailor/rulers/spaces_before_lbrace_ruler'
 
 describe Tailor::Rulers::SpacesBeforeLbraceRuler do
-  subject { Tailor::Rulers::SpacesBeforeLbraceRuler.new 1 }
+  subject { Tailor::Rulers::SpacesBeforeLbraceRuler.new(nil, {}) }
   before { Tailor::Logger.stub(:log) }
 
   describe "#count_spaces" do

data/spec/tailor/rulers/spaces_before_rbrace_ruler_spec.rb

@@ -2,7 +2,7 @@ require_relative '../../spec_helper'
 require 'tailor/rulers/spaces_before_rbrace_ruler'
 
 describe Tailor::Rulers::SpacesBeforeRbraceRuler do
-  subject { Tailor::Rulers::SpacesBeforeRbraceRuler.new 1 }
+  subject { Tailor::Rulers::SpacesBeforeRbraceRuler.new(nil, {}) }
   before { Tailor::Logger.stub(:log) }
 
   describe "#count_spaces" do

data/spec/tailor/version_spec.rb

@@ -2,5 +2,5 @@ require_relative '../spec_helper'
 require 'tailor/version'
 
 describe Tailor::VERSION do
-  it { should == "1.0.0.alpha2" }
+  it { should == "1.0.0" }
 end

data/spec/tailor_spec.rb

@@ -2,12 +2,14 @@ require_relative 'spec_helper'
 require 'tailor'
 
 describe Tailor do
+  before { Tailor::Logger.log = false }
+
   describe "::config" do
     it "creates a new Configuration object" do
       Tailor::Configuration.should_receive(:new)
       Tailor.config
     end
-    
+
     it "returns a Configuration object" do
       Tailor.config.should be_a Tailor::Configuration
     end

data/tailor.gemspec

@@ -7,8 +7,16 @@ Gem::Specification.new do |s|
   s.version = Tailor::VERSION
 
   s.author = "Steve Loveless"
-  s.summary = "ruby style checking tool"
-  s.description = "Utility for checking style of Ruby files."
+  s.summary = "A Ruby style & complexity measurer"
+  s.description = <<-DESC
+tailor parses Ruby files and measures them with some style and static analysis
+"rulers".  Default values for the Rulers are based on a number of style guides
+in the Ruby community as well as what seems to be common.  More on this here
+http://wiki.github.com/turboladen/tailor.
+
+tailor's goal is to help you be consistent with your code, throughout your
+project, whatever style that may be.
+  DESC
   s.email = "steve.loveless@gmail.com"
   s.homepage = "http://github.com/turboladen/tailor"
 
@@ -17,7 +25,7 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files -- {spec,features}/*`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
 
-  s.add_runtime_dependency(%q<log_switch>, ">= 0.2.0")
+  s.add_runtime_dependency(%q<log_switch>, ">= 0.3.0")
   s.add_runtime_dependency(%q<term-ansicolor>, ">= 1.0.5")
   s.add_runtime_dependency(%q<text-table>, ">= 1.2.2")
 

data/uest.rb

@@ -0,0 +1,9 @@
+begin
+  ssh.upload source, dest
+  @logger.info "Successfully copied the file #{source} to " +
+    "#{@config[:scp_hostname]}:#{dest}."
+rescue SocketError, ArgumentError, SystemCallError,
+  Net::SCP::Exception, Timeout::Error => ex
+  @logger.error "Failed to copy the file #{source} to #{dest} due to " +
+    "#{ex.message}"
+end

metadata

@@ -1,30 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: tailor
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha2
-  prerelease: 6
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Steve Loveless
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-09 00:00:00.000000000 Z
+date: 2012-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log_switch
-  requirement: &70263733074740 !ruby/object:Gem::Requirement
+  requirement: &70277621236500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70263733074740
+  version_requirements: *70277621236500
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70263733074240 !ruby/object:Gem::Requirement
+  requirement: &70277621235980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70263733074240
+  version_requirements: *70277621235980
 - !ruby/object:Gem::Dependency
   name: text-table
-  requirement: &70263733073740 !ruby/object:Gem::Requirement
+  requirement: &70277621235500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70263733073740
+  version_requirements: *70277621235500
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70263733073260 !ruby/object:Gem::Requirement
+  requirement: &70277621235040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70263733073260
+  version_requirements: *70277621235040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70263733072680 !ruby/object:Gem::Requirement
+  requirement: &70277621234580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70263733072680
+  version_requirements: *70277621234580
 - !ruby/object:Gem::Dependency
   name: code_statistics
-  requirement: &70263733072080 !ruby/object:Gem::Requirement
+  requirement: &70277621234120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70263733072080
+  version_requirements: *70277621234120
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70263733071460 !ruby/object:Gem::Requirement
+  requirement: &70277621233660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *70263733071460
+  version_requirements: *70277621233660
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70263733070680 !ruby/object:Gem::Requirement
+  requirement: &70277621233200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70263733070680
+  version_requirements: *70277621233200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70263733070220 !ruby/object:Gem::Requirement
+  requirement: &70277621232740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70263733070220
+  version_requirements: *70277621232740
 - !ruby/object:Gem::Dependency
   name: roodi
-  requirement: &70263733069620 !ruby/object:Gem::Requirement
+  requirement: &70277621258360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *70263733069620
+  version_requirements: *70277621258360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70263733087360 !ruby/object:Gem::Requirement
+  requirement: &70277621257900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70263733087360
+  version_requirements: *70277621257900
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70263733086880 !ruby/object:Gem::Requirement
+  requirement: &70277621257440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70263733086880
+  version_requirements: *70277621257440
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70263733086420 !ruby/object:Gem::Requirement
+  requirement: &70277621256980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *70263733086420
+  version_requirements: *70277621256980
 - !ruby/object:Gem::Dependency
   name: yard-cucumber
-  requirement: &70263733085960 !ruby/object:Gem::Requirement
+  requirement: &70277621256520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,8 +164,22 @@ dependencies:
         version: 2.1.7
   type: :development
   prerelease: false
-  version_requirements: *70263733085960
-description: Utility for checking style of Ruby files.
+  version_requirements: *70277621256520
+description: ! 'tailor parses Ruby files and measures them with some style and static
+  analysis
+
+  "rulers".  Default values for the Rulers are based on a number of style guides
+
+  in the Ruby community as well as what seems to be common.  More on this here
+
+  http://wiki.github.com/turboladen/tailor.
+
+
+  tailor''s goal is to help you be consistent with your code, throughout your
+
+  project, whatever style that may be.
+
+'
 email: steve.loveless@gmail.com
 executables:
 - tailor
@@ -192,7 +206,6 @@ files:
 - features/indentation/good_files_with_no_trailing_newline.feature
 - features/name_detection.feature
 - features/step_definitions/indentation_steps.rb
-- features/step_definitions/spacing/commas_steps.rb
 - features/support/env.rb
 - features/support/file_cases/horizontal_spacing_cases.rb
 - features/support/file_cases/indentation_cases.rb
@@ -203,6 +216,7 @@ files:
 - features/support/legacy/bad_ternary_colon_spacing.rb
 - features/support/legacy/long_file_with_indentation.rb
 - features/support/world.rb
+- features/valid_ruby.feature
 - features/vertical_spacing.feature
 - lib/ext/string_ext.rb
 - lib/tailor.rb
@@ -210,12 +224,14 @@ files:
 - lib/tailor/cli/options.rb
 - lib/tailor/composite_observable.rb
 - lib/tailor/configuration.rb
+- lib/tailor/configuration/style.rb
 - lib/tailor/critic.rb
+- lib/tailor/formatter.rb
 - lib/tailor/formatters/text.rb
 - lib/tailor/lexed_line.rb
 - lib/tailor/lexer.rb
+- lib/tailor/lexer/lexer_constants.rb
 - lib/tailor/lexer/token.rb
-- lib/tailor/lexer_constants.rb
 - lib/tailor/logger.rb
 - lib/tailor/problem.rb
 - lib/tailor/reporter.rb
@@ -223,6 +239,7 @@ files:
 - lib/tailor/rulers.rb
 - lib/tailor/rulers/allow_camel_case_methods_ruler.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/indentation_spaces_ruler.rb
@@ -244,10 +261,14 @@ files:
 - lib/tailor/runtime_error.rb
 - lib/tailor/tailorrc.erb
 - lib/tailor/version.rb
+- m.rb
 - spec/spec_helper.rb
 - spec/tailor/cli_spec.rb
+- spec/tailor/composite_observable_spec.rb
+- spec/tailor/configuration/style_spec.rb
 - spec/tailor/configuration_spec.rb
 - spec/tailor/critic_spec.rb
+- spec/tailor/formatter_spec.rb
 - spec/tailor/lexed_line_spec.rb
 - spec/tailor/lexer/token_spec.rb
 - spec/tailor/lexer_spec.rb
@@ -257,7 +278,7 @@ files:
 - spec/tailor/ruler_spec.rb
 - spec/tailor/rulers/indentation_spaces_ruler/indentation_manager_spec.rb
 - spec/tailor/rulers/indentation_spaces_ruler_spec.rb
-- spec/tailor/rulers/spaces_after_comma_spec.rb
+- spec/tailor/rulers/spaces_after_comma_ruler_spec.rb
 - spec/tailor/rulers/spaces_after_lbrace_ruler_spec.rb
 - spec/tailor/rulers/spaces_before_lbrace_ruler_spec.rb
 - spec/tailor/rulers/spaces_before_rbrace_ruler_spec.rb
@@ -271,6 +292,7 @@ files:
 - tasks/spec.rake
 - tasks/stats.rake
 - tasks/yard.rake
+- uest.rb
 homepage: http://github.com/turboladen/tailor
 licenses: []
 post_install_message: 
@@ -286,15 +308,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: ruby style checking tool
+summary: A Ruby style & complexity measurer
 test_files:
 - features/configurable.feature
 - features/horizontal_spacing.feature
@@ -303,7 +325,6 @@ test_files:
 - features/indentation/good_files_with_no_trailing_newline.feature
 - features/name_detection.feature
 - features/step_definitions/indentation_steps.rb
-- features/step_definitions/spacing/commas_steps.rb
 - features/support/env.rb
 - features/support/file_cases/horizontal_spacing_cases.rb
 - features/support/file_cases/indentation_cases.rb
@@ -314,11 +335,15 @@ test_files:
 - features/support/legacy/bad_ternary_colon_spacing.rb
 - features/support/legacy/long_file_with_indentation.rb
 - features/support/world.rb
+- features/valid_ruby.feature
 - features/vertical_spacing.feature
 - spec/spec_helper.rb
 - spec/tailor/cli_spec.rb
+- spec/tailor/composite_observable_spec.rb
+- spec/tailor/configuration/style_spec.rb
 - spec/tailor/configuration_spec.rb
 - spec/tailor/critic_spec.rb
+- spec/tailor/formatter_spec.rb
 - spec/tailor/lexed_line_spec.rb
 - spec/tailor/lexer/token_spec.rb
 - spec/tailor/lexer_spec.rb
@@ -328,7 +353,7 @@ test_files:
 - spec/tailor/ruler_spec.rb
 - spec/tailor/rulers/indentation_spaces_ruler/indentation_manager_spec.rb
 - spec/tailor/rulers/indentation_spaces_ruler_spec.rb
-- spec/tailor/rulers/spaces_after_comma_spec.rb
+- spec/tailor/rulers/spaces_after_comma_ruler_spec.rb
 - spec/tailor/rulers/spaces_after_lbrace_ruler_spec.rb
 - spec/tailor/rulers/spaces_before_lbrace_ruler_spec.rb
 - spec/tailor/rulers/spaces_before_rbrace_ruler_spec.rb