tailor 1.4.0 → 1.4.1

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

@@ -38,19 +38,19 @@ describe Tailor::Rulers::IndentationSpacesRuler do
     it 'sets @embexpr_nesting to [true]' do
       subject.instance_variable_set(:@embexpr_nesting, [])
       subject.embexpr_beg_update(lexed_line, 1, 1)
-      subject.instance_variable_get(:@embexpr_nesting).should == [true]
+      expect(subject.instance_variable_get(:@embexpr_nesting)).to eq [true]
     end
   end
 
   describe '#embexpr_end_update' do
     before do
-      lexed_line.should_receive(:only_embexpr_end?).and_return(false)
+      expect(lexed_line).to receive(:only_embexpr_end?).and_return(false)
     end
 
     it 'pops @embexpr_nesting' do
       subject.instance_variable_set(:@embexpr_nesting, [true])
       subject.embexpr_end_update(lexed_line, 1, 1)
-      subject.instance_variable_get(:@embexpr_nesting).should == []
+      expect(subject.instance_variable_get(:@embexpr_nesting)).to eq []
     end
   end
 
@@ -98,18 +98,18 @@ describe Tailor::Rulers::IndentationSpacesRuler do
     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)
+      expect(manager).to receive(:update_actual_indentation).with lexed_line
+      expect(manager).to receive(:stop)
       subject.instance_variable_set(:@manager, manager)
       subject.tstring_beg_update(lexed_line, 1)
     end
 
     it 'adds the lineno to @tstring_nesting' do
-      manager.stub(:update_actual_indentation)
-      manager.stub(:stop)
+      allow(manager).to receive(:update_actual_indentation)
+      allow(manager).to receive(:stop)
       subject.instance_variable_set(:@manager, manager)
       subject.tstring_beg_update(lexed_line, 1)
-      subject.instance_variable_get(:@tstring_nesting).should == [1]
+      expect(subject.instance_variable_get(:@tstring_nesting)).to eq [1]
     end
   end
 
@@ -118,19 +118,19 @@ describe Tailor::Rulers::IndentationSpacesRuler do
       let(:manager) { double 'IndentationManager' }
 
       it 'calls #start' do
-        manager.should_receive(:start)
+        expect(manager).to receive(:start)
         subject.instance_variable_set(:@manager, manager)
         subject.tstring_end_update(2)
       end
 
       it 'removes the lineno to @tstring_nesting then calls @manager.start' do
-        manager.should_receive(:actual_indentation)
-        manager.should_receive(:start)
+        expect(manager).to receive(:actual_indentation)
+        expect(manager).to receive(:start)
         subject.instance_variable_set(:@manager, manager)
         subject.instance_variable_set(:@tstring_nesting, [1])
-        subject.should_receive(:measure)
+        expect(subject).to receive(:measure)
         subject.tstring_end_update(2)
-        subject.instance_variable_get(:@tstring_nesting).should be_empty
+        expect(subject.instance_variable_get(:@tstring_nesting)).to be_empty
       end
     end
   end

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

@@ -7,7 +7,7 @@ describe Tailor::Rulers::SpacesAfterCommaRuler do
   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]
+      expect(subject.instance_variable_get(:@comma_columns)).to eq [1]
     end
   end
 
@@ -15,14 +15,14 @@ describe Tailor::Rulers::SpacesAfterCommaRuler do
     context 'no event after comma' do
       let(:lexed_line) do
         l = double 'LexedLine'
-        l.stub(:event_at)
-        l.stub(:index)
+        allow(l).to receive(:event_at)
+        allow(l).to receive(:index)
 
         l
       end
 
       it 'does not detect any problems' do
-        Tailor::Problem.should_not_receive(:new)
+        expect(Tailor::Problem).to_not receive(:new)
         expect { subject.check_spaces_after_comma(lexed_line, 1) }.
           to_not raise_error
       end

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

@@ -7,14 +7,14 @@ describe Tailor::Rulers::SpacesAfterLbraceRuler do
   describe '#comment_update' do
     context 'token has a trailing newline' do
       it 'calls #ignored_nl_update' do
-        subject.should_receive(:ignored_nl_update)
+        expect(subject).to receive(:ignored_nl_update)
         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)
+        expect(subject).to_not receive(:ignored_nl_update)
         subject.comment_update('# comment', '', '', 1, 1)
       end
     end
@@ -22,7 +22,7 @@ describe Tailor::Rulers::SpacesAfterLbraceRuler do
 
   describe '#ignored_nl_update' do
     it 'calls #check_spaces_after_lbrace' do
-      subject.should_receive(:check_spaces_after_lbrace)
+      expect(subject).to receive(:check_spaces_after_lbrace)
       subject.ignored_nl_update('', 1, 1)
     end
   end
@@ -30,13 +30,13 @@ describe Tailor::Rulers::SpacesAfterLbraceRuler do
   describe '#lbrace_update' do
     it 'adds column to @lbrace_columns' do
       subject.lbrace_update('', 1, 1)
-      subject.instance_variable_get(:@lbrace_columns).should == [1]
+      expect(subject.instance_variable_get(:@lbrace_columns)).to eq [1]
     end
   end
 
   describe '#nl_update' do
     it 'calls #ignored_nl_update' do
-      subject.should_receive(:ignored_nl_update)
+      expect(subject).to receive(:ignored_nl_update)
       subject.nl_update('', 1, 1)
     end
   end
@@ -51,8 +51,8 @@ describe Tailor::Rulers::SpacesAfterLbraceRuler do
       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
+        expect(lexed_line).to_not receive(:at)
+        expect(subject.count_spaces(lexed_line, 1)).to be_nil
       end
     end
 
@@ -66,7 +66,7 @@ describe Tailor::Rulers::SpacesAfterLbraceRuler do
       end
 
       it 'returns 0' do
-        subject.count_spaces(lexed_line, 1).should be_zero
+        expect(subject.count_spaces(lexed_line, 1)).to be_zero
       end
     end
 
@@ -77,14 +77,14 @@ describe Tailor::Rulers::SpacesAfterLbraceRuler do
 
       let(:lexed_line) do
         l = double 'LexedLine'
-        l.stub(:event_index).and_return 1
-        l.should_receive(:at).with(2).and_return next_event
+        allow(l).to receive(:event_index).and_return 1
+        expect(l).to receive(:at).with(2).and_return next_event
 
         l
       end
 
       it 'returns 0' do
-        subject.count_spaces(lexed_line, 1).should be_zero
+        expect(subject.count_spaces(lexed_line, 1)).to be_zero
       end
     end
 
@@ -95,8 +95,8 @@ describe Tailor::Rulers::SpacesAfterLbraceRuler do
 
       let(:lexed_line) do
         l = double 'LexedLine'
-        l.stub(:event_index).and_return 1
-        l.should_receive(:at).with(2).and_return next_event
+        allow(l).to receive(:event_index).and_return 1
+        expect(l).to receive(:at).with(2).and_return next_event
 
         l
       end
@@ -113,14 +113,14 @@ describe Tailor::Rulers::SpacesAfterLbraceRuler do
 
       let(:lexed_line) do
         l = double 'LexedLine'
-        l.stub(:event_index).and_return 1
-        l.stub(:at).and_return next_event
+        allow(l).to receive(:event_index).and_return 1
+        allow(l).to receive(:at).and_return next_event
 
         l
       end
 
       it 'returns 0' do
-        subject.count_spaces(lexed_line, 1).should be_zero
+        expect(subject.count_spaces(lexed_line, 1)).to be_zero
       end
     end
 
@@ -131,14 +131,14 @@ describe Tailor::Rulers::SpacesAfterLbraceRuler do
 
       let(:lexed_line) do
         l = double 'LexedLine'
-        l.stub(:event_index).and_return 1
-        l.stub(:at).and_return next_event
+        allow(l).to receive(:event_index).and_return 1
+        allow(l).to receive(:at).and_return next_event
 
         l
       end
 
       it 'returns 2' do
-        subject.count_spaces(lexed_line, 1).should == 2
+        expect(subject.count_spaces(lexed_line, 1)).to eq 2
       end
     end
   end

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

@@ -15,12 +15,12 @@ describe Tailor::Rulers::SpacesBeforeLbraceRuler do
         l
       end
 
-      specify { subject.count_spaces(lexed_line, 1).should be_zero }
+      specify { expect(subject.count_spaces(lexed_line, 1)).to be_zero }
 
       it 'sets @do_measurement to false' do
         expect { subject.count_spaces(lexed_line, 1) }.
-          to change{subject.instance_variable_get(:@do_measurement)}.from(true).
-          to(false)
+          to change { subject.instance_variable_get(:@do_measurement) }.
+          from(true).to(false)
       end
     end
 
@@ -33,7 +33,7 @@ describe Tailor::Rulers::SpacesBeforeLbraceRuler do
         l
       end
 
-      specify { subject.count_spaces(lexed_line, 1).should be_zero }
+      specify { expect(subject.count_spaces(lexed_line, 1)).to be_zero }
     end
 
     context '1 space before lbrace' do
@@ -45,7 +45,7 @@ describe Tailor::Rulers::SpacesBeforeLbraceRuler do
         l
       end
 
-      specify { subject.count_spaces(lexed_line, 1).should == 1 }
+      specify { expect(subject.count_spaces(lexed_line, 1)).to eq 1 }
     end
 
     context '> 1 space before lbrace' do
@@ -57,7 +57,7 @@ describe Tailor::Rulers::SpacesBeforeLbraceRuler do
         l
       end
 
-      specify { subject.count_spaces(lexed_line, 3).should == 2 }
+      specify { expect(subject.count_spaces(lexed_line, 3)).to eq 2 }
     end
   end
 end

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

@@ -15,12 +15,12 @@ describe Tailor::Rulers::SpacesBeforeRbraceRuler do
         l
       end
 
-      specify { subject.count_spaces(lexed_line, 1).should be_zero }
+      specify { expect(subject.count_spaces(lexed_line, 1)).to be_zero }
 
       it 'sets @do_measurement to false' do
         expect { subject.count_spaces(lexed_line, 1) }.
-          to change{subject.instance_variable_get(:@do_measurement)}.from(true).
-          to(false)
+          to change { subject.instance_variable_get(:@do_measurement) }.
+          from(true).to(false)
       end
     end
 
@@ -33,7 +33,7 @@ describe Tailor::Rulers::SpacesBeforeRbraceRuler do
         l
       end
 
-      specify { subject.count_spaces(lexed_line, 1).should be_zero }
+      specify { expect(subject.count_spaces(lexed_line, 1)).to be_zero }
     end
 
     context '1 space before rbrace' do
@@ -45,7 +45,7 @@ describe Tailor::Rulers::SpacesBeforeRbraceRuler do
         l
       end
 
-      specify { subject.count_spaces(lexed_line, 1).should == 1 }
+      specify { expect(subject.count_spaces(lexed_line, 1)).to eq 1 }
     end
 
     context '> 1 space before rbrace' do
@@ -57,7 +57,7 @@ describe Tailor::Rulers::SpacesBeforeRbraceRuler do
         l
       end
 
-      specify { subject.count_spaces(lexed_line, 1).should == 2 }
+      specify { expect(subject.count_spaces(lexed_line, 1)).to eq 2 }
     end
   end
 end

data/spec/unit/tailor/rulers_spec.rb

@@ -4,6 +4,6 @@ require 'tailor/rulers'
 describe Tailor::Rulers do
   it 'requires all of its children' do
     # if it does one, it'll have done them all.
-    subject.const_get('AllowCamelCaseMethodsRuler').should be_true
+    expect(subject.const_get('AllowCamelCaseMethodsRuler')).to be_truthy
   end
 end

data/spec/unit/tailor/version_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 require 'tailor/version'
 
-
 describe Tailor::VERSION do
-  it { should == '1.4.0' }
+  it { is_expected.to eq '1.4.1' }
 end

data/spec/unit/tailor_spec.rb

@@ -6,12 +6,12 @@ describe Tailor do
 
   describe '.config' do
     it 'creates a new Configuration object' do
-      Tailor::Configuration.should_receive(:new)
+      expect(Tailor::Configuration).to receive(:new)
       Tailor.config
     end
 
     it 'returns a Configuration object' do
-      Tailor.config.should be_a Tailor::Configuration
+      expect(Tailor.config).to be_a Tailor::Configuration
     end
   end
 end

data/tailor.gemspec

@@ -26,7 +26,7 @@ project, whatever style that may be.
   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 'log_switch', '>= 0.3.0'
+  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'
@@ -36,8 +36,8 @@ project, whatever style that may be.
   s.add_development_dependency 'cucumber', '>= 1.0.2'
   s.add_development_dependency 'fakefs', '>= 0.4.2'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec', '>= 2.5.0'
+  s.add_development_dependency 'rspec', '~> 3.1'
+  s.add_development_dependency 'rspec-its'
   s.add_development_dependency 'simplecov', '>= 0.4.0'
   s.add_development_dependency 'yard', '>= 0.7.0'
 end
-

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: tailor
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Steve Loveless
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-11-05 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
@@ -138,18 +138,32 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement