tailor 1.1.3 → 1.1.4

data/.travis.yml

@@ -1,4 +1,3 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tailor (1.1.3)
+    tailor (1.1.4)
       log_switch (>= 0.3.0)
       term-ansicolor (>= 1.0.5)
       text-table (>= 1.2.2)
@@ -16,7 +16,6 @@ GEM
     builder (3.1.4)
     childprocess (0.3.7)
       ffi (~> 1.0, >= 1.0.6)
-    code_statistics (0.2.13)
     cucumber (1.2.1)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -26,17 +25,15 @@ GEM
     fakefs (0.4.2)
     ffi (1.3.1)
     ffi (1.3.1-java)
-    gherkin (2.11.5)
-      json (>= 1.4.6)
-    gherkin (2.11.5-java)
-      json (>= 1.4.6)
+    gherkin (2.11.6)
+      json (>= 1.7.6)
+    gherkin (2.11.6-java)
+      json (>= 1.7.6)
     json (1.7.6)
     json (1.7.6-java)
     log_switch (0.4.0)
     multi_json (1.5.0)
     rake (10.0.3)
-    roodi (2.2.0)
-      ruby_parser (~> 2.3.0)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -45,9 +42,6 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.2)
-    ruby_parser (2.3.1)
-      sexp_processor (~> 3.0)
-    sexp_processor (3.2.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -55,10 +49,6 @@ GEM
     term-ansicolor (1.0.7)
     text-table (1.2.2)
     yard (0.8.3)
-    yard-cucumber (2.2.2)
-      cucumber (>= 0.7.5)
-      gherkin (>= 2.2.9)
-      yard (>= 0.8.1)
 
 PLATFORMS
   java
@@ -67,13 +57,10 @@ PLATFORMS
 DEPENDENCIES
   aruba
   bundler
-  code_statistics
   cucumber (>= 1.0.2)
-  fakefs (>= 0.4.0)
+  fakefs (>= 0.4.2)
   rake
-  roodi (>= 2.1.0)
   rspec (>= 2.5.0)
   simplecov (>= 0.4.0)
   tailor!
   yard (>= 0.7.0)
-  yard-cucumber (>= 2.1.7)

data/History.rdoc

@@ -1,3 +1,11 @@
+=== 1.1.4 2013-01-29
+
+* gh-127[https://github.com/turboladen/tailor/issues/127]
+  * RakeTask now actually does something (works).
+* tailor should now abort (and let you know) when it can't find the config file
+  that you told it to use.  Previously, it would just fall back to default
+  settings.
+
 === 1.1.3 2013-01-28
 
 * gh-121[https://github.com/turboladen/tailor/issues/121]

data/README.rdoc

@@ -3,6 +3,7 @@
 * http://github.com/turboladen/tailor
 
 {<img src="https://secure.travis-ci.org/turboladen/tailor.png?branch=master" alt="Build Status" />}[http://travis-ci.org/turboladen/tailor]
+{<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/turboladen/tailor]
 
 == DESCRIPTION:
 
@@ -93,7 +94,7 @@ Check defaults (lib/**/*.rb):
 
   $ tailor
   
-Use defaults via a Rake task:
+Use defaults via a Rake task (if you have a .tailor file, it'll use those settings):
 
   require 'tailor/rake_task'
   
@@ -345,7 +346,6 @@ Next time you run tailor, your Ruler will get initialized and used.
 == REQUIREMENTS:
 
 * Rubies (tested)
-  * 1.9.2
   * 1.9.3
 * Gems
   * log_switch
@@ -360,7 +360,7 @@ Next time you run tailor, your Ruler will get initialized and used.
 
 (The MIT License)
 
-Copyright (c) 2010-2012 Steve Loveless
+Copyright (c) 2010-2013 Steve Loveless
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,8 +1,56 @@
 require 'bundler/gem_tasks'
+require 'cucumber'
+require 'cucumber/rake/task'
+require 'rspec/core/rake_task'
+require 'yard'
 
-# Load rakefile extensions
-Dir["tasks/*.rake"].each { |ext| load ext }
 
-desc "Run RSpec code examples"
+#------------------------------------------------------------------------------
+# spec
+#------------------------------------------------------------------------------
+RSpec::Core::RakeTask.new
+
+namespace :spec do
+  desc "Run specs with Ruby warnings turned on"
+  RSpec::Core::RakeTask.new(:warn) do |t|
+    t.ruby_opts = %w(-w)
+  end
+
+  desc "Run unit tests"
+  RSpec::Core::RakeTask.new(:unit) do |t|
+    t.pattern = "./spec/unit/**/*_spec.rb"
+  end
+
+  desc "Run functional tests"
+  RSpec::Core::RakeTask.new(:functional) do |t|
+    t.pattern = "./spec/functional/**/*_spec.rb"
+  end
+end
+
+#------------------------------------------------------------------------------
+# features
+#------------------------------------------------------------------------------
+Cucumber::Rake::Task.new(:features) do |t|
+  t.cucumber_opts = %w(--format progress features --tags ~@wip)
+end
+
+#------------------------------------------------------------------------------
+# yard
+#------------------------------------------------------------------------------
+YARD::Rake::YardocTask.new do |t|
+  t.files = %w(lib/**/*.rb - History.rdoc)
+  t.options = %w(--private --protected --verbose)
+end
+
+namespace :yard do
+  YARD::Rake::YardocTask.new(:with_features) do |t|
+    YARD::Config.load_plugin 'cucumber'
+
+    t.files = %w(lib/**/*.rb features/**/*.feature - History.rdoc)
+  end
+end
+
+
+desc "Run RSpec examples and Cucumber features"
 task test: [:spec, :features]
 task default: [:test]

data/features/continuous_integration.feature

@@ -22,7 +22,15 @@ Feature: Continuous Integration
     And the exit status should be 0
     
   Scenario: Errors found
-    Given a file named "errors.rb" with:
+    Given my configuration file ".tailor" looks like:
+    """
+    Tailor.config do |config|
+      config.file_set do |style|
+        style.trailing_newlines 0, level: :error
+      end
+    end
+    """
+    And a file named "errors.rb" with:
     """
     puts 'hi'
     

data/lib/tailor/configuration.rb

@@ -88,7 +88,7 @@ class Tailor
             "Couldn't load config file: #{user_config_file}"
         end
       else
-        log "No config file found at #{user_config_file}."
+        abort "No config file found at #{user_config_file}."
       end
     end
 

data/lib/tailor/rake_task.rb

@@ -3,8 +3,7 @@ require 'rake/tasklib'
 require_relative 'critic'
 require_relative 'configuration'
 require_relative 'logger'
-require_relative 'reporter'
-require_relative 'cli/options'
+require_relative 'cli'
 
 begin
   # Support Rake > 0.8.7
@@ -50,13 +49,12 @@ class Tailor
     # set in your config file.
     attr_accessor :tailor_opts
 
+    # @return [Array] The list of formatters to use.  (not really used yet)
     attr_accessor :formatters
 
     # @param [String] name The task name.
     # @param [String] desc Description of the task.
     def initialize(name = "tailor", desc = "Check style")
-      Tailor::Logger.log = false
-
       @name, @desc = name, desc
       @tailor_opts = []
       @file_sets = []
@@ -93,55 +91,17 @@ class Tailor
           @tailor_opts.concat %W(--config-file=#{config_file})
         end
 
-        configuration = create_config
-        @reporter = Tailor::Reporter.new(configuration.formatters)
-
-        create_file_sets_for configuration
-        create_recursive_file_sets_for configuration
-        check_default_file_set_in configuration
-
-        critic = Tailor::Critic.new
-
-        critic.critique(configuration.file_sets) do |problems_for_file, label|
-          @reporter.file_report(problems_for_file, label)
+        begin
+          failure = Tailor::CLI.run(@tailor_opts)
+          exit(1) if failure
+        rescue Tailor::RuntimeError => ex
+          STDERR.puts ex.message
+          STDERR.puts ex.backtrace.join("\n")
+        rescue Exception => ex
+          STDERR.puts("#{ex.message} (#{ex.class})")
+          STDERR.puts(ex.backtrace.join("\n"))
+          exit(1)
         end
-
-        @reporter.summary_report(critic.problems)
-
-        critic.problem_count > 0
-      end
-    end
-
-    # @return [Tailor::Configuration]
-    def create_config
-      configuration = Tailor::Configuration.new([],
-        Tailor::CLI::Options.parse!(@tailor_opts))
-      configuration.load!
-      configuration.formatters(formatters) if formatters
-
-      configuration
-    end
-
-    # @param [Tailor::Configuration] config
-    def create_recursive_file_sets_for config
-      unless @recursive_file_sets.empty?
-        @recursive_file_sets.each do |fs|
-          config.recursive_file_set(fs[0], fs[1], &fs[2])
-        end
-      end
-    end
-
-    # @param [Tailor::Configuration] config
-    def create_file_sets_for config
-      unless @file_sets.empty?
-        @file_sets.each { |fs| config.file_set(fs[0], fs[1], &fs[2]) }
-      end
-    end
-
-    # @param [Tailor::Configuration] config
-    def check_default_file_set_in config
-      if @file_sets.none? { |fs| fs[1] == :default }
-        config.file_sets.delete(:default)
       end
     end
   end

data/lib/tailor/version.rb

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

data/spec/functional/rake_task_spec.rb

@@ -0,0 +1,83 @@
+require "spec_helper"
+require "tailor/rake_task"
+
+
+describe Tailor::RakeTask do
+  let(:rake) do
+    Rake::Application.new
+  end
+
+  before do
+    FakeFS.deactivate!
+    Rake.application = rake
+  end
+
+  describe 'rake tailor' do
+    context "with problematic files" do
+      subject do
+        Tailor::RakeTask.new do |t|
+          t.config_file = File.expand_path 'spec/support/rake_task_config_problems.rb'
+        end
+      end
+
+      it "finds problems" do
+        subject
+
+        expect {
+          rake['tailor'].invoke
+        }.to raise_error SystemExit
+      end
+    end
+
+    context "with OK files" do
+      subject do
+        Tailor::RakeTask.new do |t|
+          t.config_file = File.expand_path 'spec/support/rake_task_config_no_problems.rb'
+        end
+      end
+
+      it "doesn't find problems" do
+        subject
+
+        expect {
+          rake['tailor'].invoke
+        }.to_not raise_error
+      end
+    end
+  end
+
+  context "using a custom task name" do
+    subject do
+      Tailor::RakeTask.new(task_name) do |t|
+        t.config_file = File.expand_path 'spec/support/rake_task_config_problems.rb'
+      end
+    end
+
+    let(:task_name) { 'my_neat_task' }
+
+    it "runs the task" do
+      subject
+
+      expect {
+        rake[task_name].invoke
+      }.to_not raise_error RuntimeError, "Don't know how to build task '#{task_name}''"
+    end
+  end
+
+  context "overriding tailor opts within the task" do
+    subject do
+      Tailor::RakeTask.new do |t|
+        t.config_file = File.expand_path 'spec/support/rake_task_config_problems.rb'
+        t.tailor_opts = %w[--max-line-length=1000]
+      end
+    end
+
+    it "uses the options from the rake task" do
+      subject
+
+      expect {
+        rake['tailor'].invoke
+      }.to_not raise_error
+    end
+  end
+end

data/spec/support/rake_task_config_no_problems.rb

@@ -0,0 +1,5 @@
+Tailor.config do |config|
+  config.file_set 'spec/support/bad_indentation_cases.rb', :test do |style|
+    style.max_line_length 1000, level: :error
+  end
+end

data/spec/support/rake_task_config_problems.rb

@@ -0,0 +1,5 @@
+Tailor.config do |config|
+  config.file_set 'spec/support/bad_indentation_cases.rb', :test do |style|
+    style.max_line_length 1, level: :error
+  end
+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.3" }
+  it { should == "1.1.4" }
 end

data/tailor.gemspec

@@ -31,14 +31,11 @@ project, whatever style that may be.
 
   s.add_development_dependency %q<aruba>
   s.add_development_dependency %q<bundler>
-  s.add_development_dependency %q<code_statistics>
   s.add_development_dependency %q<cucumber>, ">= 1.0.2"
-  s.add_development_dependency %q<fakefs>, ">= 0.4.0"
+  s.add_development_dependency %q<fakefs>, ">= 0.4.2"
   s.add_development_dependency %q<rake>
-  s.add_development_dependency %q<roodi>, ">= 2.1.0"
   s.add_development_dependency %q<rspec>, ">= 2.5.0"
   s.add_development_dependency %q<simplecov>, ">= 0.4.0"
   s.add_development_dependency %q<yard>, ">= 0.7.0"
-  s.add_development_dependency %q<yard-cucumber>, ">= 2.1.7"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tailor
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log_switch
@@ -91,22 +91,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: code_statistics
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +114,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +122,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -155,22 +139,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: roodi
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -219,22 +187,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.7.0
-- !ruby/object:Gem::Dependency
-  name: yard-cucumber
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.1.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.1.7
 description: ! 'tailor parses Ruby files and measures them with some style and static
   analysis
 
@@ -340,6 +292,7 @@ files:
 - 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/vertical_spacing/class_length_spec.rb
 - spec/functional/vertical_spacing/method_length_spec.rb
 - spec/functional/vertical_spacing_spec.rb
@@ -348,6 +301,8 @@ files:
 - spec/support/good_indentation_cases.rb
 - spec/support/horizontal_spacing_cases.rb
 - spec/support/naming_cases.rb
+- spec/support/rake_task_config_no_problems.rb
+- spec/support/rake_task_config_problems.rb
 - spec/support/vertical_spacing_cases.rb
 - spec/unit/tailor/cli_spec.rb
 - spec/unit/tailor/composite_observable_spec.rb
@@ -373,12 +328,6 @@ files:
 - spec/unit/tailor/version_spec.rb
 - spec/unit/tailor_spec.rb
 - tailor.gemspec
-- tasks/features.rake
-- tasks/roodi.rake
-- tasks/roodi_config.yaml
-- tasks/spec.rake
-- tasks/stats.rake
-- tasks/yard.rake
 homepage: http://github.com/turboladen/tailor
 licenses: []
 post_install_message: 
@@ -429,6 +378,7 @@ test_files:
 - 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/vertical_spacing/class_length_spec.rb
 - spec/functional/vertical_spacing/method_length_spec.rb
 - spec/functional/vertical_spacing_spec.rb
@@ -437,6 +387,8 @@ test_files:
 - spec/support/good_indentation_cases.rb
 - spec/support/horizontal_spacing_cases.rb
 - spec/support/naming_cases.rb
+- spec/support/rake_task_config_no_problems.rb
+- spec/support/rake_task_config_problems.rb
 - spec/support/vertical_spacing_cases.rb
 - spec/unit/tailor/cli_spec.rb
 - spec/unit/tailor/composite_observable_spec.rb

data/tasks/features.rake

@@ -1,7 +0,0 @@
-require 'tracer'
-require 'cucumber'
-require 'cucumber/rake/task'
-
-Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = %w(--format progress features --tags ~@wip)
-end

data/tasks/roodi.rake

@@ -1,9 +0,0 @@
-require 'rake/tasklib'  # roodi_task fails without this.
-require 'roodi'
-require 'roodi_task'
-
-RoodiTask.new do |t|
-  t.config = 'tasks/roodi_config.yaml'
-  t.patterns = Dir.glob("{features,lib,spec}/**/*.rb")
-  t.verbose = true
-end

data/tasks/roodi_config.yaml

@@ -1,14 +0,0 @@
----
-AssignmentInConditionalCheck:    { }
-CaseMissingElseCheck:            { }
-ClassLineCountCheck:             { line_count: 300 }
-ClassNameCheck:                  { pattern: !ruby/regexp '/^[A-Z][a-zA-Z0-9]*$/' }
-CyclomaticComplexityBlockCheck:  { complexity: 4 }
-CyclomaticComplexityMethodCheck: { complexity: 8 }
-EmptyRescueBodyCheck:            { }
-ForLoopCheck:                    { }
-MethodLineCountCheck:            { line_count: 30 }
-MethodNameCheck:                 { pattern: !ruby/regexp '/^[_a-z<>=\[\]|+-\/\*`]+[_a-z0-9_<>=~@\[\]]*[=!\?]?$/' }
-ModuleLineCountCheck:            { line_count: 300 }
-ModuleNameCheck:                 { pattern: !ruby/regexp '/^[A-Z][a-zA-Z0-9]*$/' }
-ParameterNumberCheck:            { parameter_count: 5 }

data/tasks/spec.rake

@@ -1,21 +0,0 @@
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new
-
-namespace :spec do
-  desc "Run specs with Ruby warnings turned on"
-  RSpec::Core::RakeTask.new(:warn) do |t|
-    t.ruby_opts = %w(-w)
-  end
-
-  desc "Run unit tests"
-  RSpec::Core::RakeTask.new(:unit) do |t|
-    t.pattern = "./spec/unit/**/*_spec.rb"
-  end
-
-  desc "Run functional tests"
-  RSpec::Core::RakeTask.new(:functional) do |t|
-    t.pattern = "./spec/functional/**/*_spec.rb"
-  end
-end
-

data/tasks/stats.rake

@@ -1,12 +0,0 @@
-require 'code_statistics'
-
-STATS_DIRECTORIES = [
-  %w(Library            lib/),
-  %w(Feature\ tests     features/),
-  %w(Unit\ tests        spec/)
-].collect { |name, dir| [ name, "#{dir}" ] }.select { |name, dir| File.directory?(dir) }
-
-desc "Report code statistics (KLOCs, etc) from the application"
-task :stats do
-  CodeStatistics.new(*STATS_DIRECTORIES).to_s
-end

data/tasks/yard.rake

@@ -1,14 +0,0 @@
-require 'yard'
-
-YARD::Rake::YardocTask.new do |t|
-  t.files = %w(lib/**/*.rb - History.rdoc)
-  t.options = %w(--private --protected --verbose)
-end
-
-namespace :yard do
-  YARD::Rake::YardocTask.new(:with_features) do |t|
-    YARD::Config.load_plugin 'cucumber'
-    
-    t.files = %w(lib/**/*.rb features/**/*.feature - History.rdoc)
-  end
-end