tailor 1.1.4 → 1.1.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tailor (1.1.4)
+    tailor (1.1.5)
       log_switch (>= 0.3.0)
       term-ansicolor (>= 1.0.5)
       text-table (>= 1.2.2)

data/History.rdoc

@@ -1,3 +1,11 @@
+=== 1.1.5 2013-01-30
+
+* gh-127[https://github.com/turboladen/tailor/issues/127]
+  * The last fix had SystemExit being displayed to the user at all times (since
+    it should've been getting rescued from when the program exits).  Properly
+    rescuing this now for Rake tasks, so it now behaves just like bin/tailor in
+    this respect.
+
 === 1.1.4 2013-01-29
 
 * gh-127[https://github.com/turboladen/tailor/issues/127]

data/features/continuous_integration.feature

@@ -2,7 +2,7 @@ Feature: Continuous Integration
   As a Ruby developer, I want builds to fail when my project encounters tailor
   errors so I can be sure to fix those errors as soon as possible.
 
-  Scenario: Warnings found, but not errors
+  Scenario: tailor executable, warnings found, but no errors
     Given my configuration file ".tailor" looks like:
     """
     Tailor.config do |config|
@@ -21,7 +21,7 @@ Feature: Continuous Integration
     Then the output should match /File has 2 trailing newlines/
     And the exit status should be 0
     
-  Scenario: Errors found
+  Scenario: tailor executable, errors found
     Given my configuration file ".tailor" looks like:
     """
     Tailor.config do |config|
@@ -38,5 +38,84 @@ Feature: Continuous Integration
     """
     When I run `tailor -d -c .tailor errors.rb`
     Then the output should match /File has 2 trailing newlines/
+    And the output should not match /SystemExit/
     And the exit status should be 1
 
+  Scenario: Rake task, warnings found, but no errors
+    Given a file named "warnings.rb" with:
+    """
+    puts 'hi'
+
+
+    """
+    And my configuration file ".tailor" looks like:
+    """
+    Tailor.config do |config|
+      config.file_set 'warnings.rb' do |style|
+        style.trailing_newlines 0, level: :warn
+      end
+    end
+    """
+    And a file named "Rakefile" with:
+    """
+    require 'tailor/rake_task'
+
+    Tailor::RakeTask.new
+    """
+    When I successfully run `rake tailor`
+    Then the output should match /File has 2 trailing newlines/
+    And the exit status should be 0
+
+  Scenario: Rake task, errors found
+    Given a file named "errors.rb" with:
+    """
+    puts 'hi'
+
+
+    """
+    And my configuration file ".tailor" looks like:
+    """
+    Tailor.config do |config|
+      config.file_set 'errors.rb' do |style|
+        style.trailing_newlines 0, level: :error
+      end
+    end
+    """
+    And a file named "Rakefile" with:
+    """
+    require 'tailor/rake_task'
+
+    Tailor::RakeTask.new
+    """
+    When I run `rake tailor`
+    Then the output should match /File has 2 trailing newlines/
+    And the output should not match /SystemExit/
+    And the exit status should be 1
+
+  Scenario: Rake task, missing config file
+    Given a file named "errors.rb" with:
+    """
+    puts 'hi'
+
+
+    """
+    And my configuration file ".tailor" looks like:
+    """
+    Tailor.config do |config|
+      config.file_set 'errors.rb' do |style|
+        style.trailing_newlines 0, level: :error
+      end
+    end
+    """
+    And a file named "Rakefile" with:
+    """
+    require 'tailor/rake_task'
+
+    Tailor::RakeTask.new do |t|
+      t.config_file = 'asdfasdfasdfasdfadsfasdfasdfadsfadsfadsfasdfasdfasdfsad'
+    end
+    """
+    When I run `rake tailor`
+    Then the output should match /No config file found at/
+    And the output should not match /SystemExit/
+    And the exit status should be 1

data/lib/tailor/rake_task.rb

@@ -97,6 +97,8 @@ class Tailor
         rescue Tailor::RuntimeError => ex
           STDERR.puts ex.message
           STDERR.puts ex.backtrace.join("\n")
+        rescue SystemExit => ex
+          exit(ex.status)
         rescue Exception => ex
           STDERR.puts("#{ex.message} (#{ex.class})")
           STDERR.puts(ex.backtrace.join("\n"))

data/lib/tailor/version.rb

@@ -1,3 +1,3 @@
 class Tailor
-  VERSION = '1.1.4'
+  VERSION = '1.1.5'
 end

data/spec/unit/tailor/version_spec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tailor
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log_switch
@@ -348,7 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A Ruby style & complexity measurer