ruby-appraiser 1.0.0 → 1.0.1

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0

data/README.md

@@ -67,6 +67,11 @@ class Foo < RubyAppraiser::Adapter
 end
 ```
 
+This project uses the [git-flow][] branching model, which means every commit
+on `master` is by definition a release. Security-related fixes should be
+submitted as hotfix branches off of `master`; all other features and fixes
+**must** be based on `develop`.
+
 License
 -------
 See [LICENSE][]
@@ -75,3 +80,5 @@ See [LICENSE][]
 [rubocop]: https://github.com/bbatslov/rubocop
 [reek]: https://github.com/troessner/reek
 [flog]: https://github.com/seattlerb/flog
+
+[git-flow]: http://nvie.com/git-model

data/Rakefile

@@ -1,2 +1,10 @@
 # encoding: utf-8
 require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.warning = true
+  t.verbose = true
+end
+
+task :default => :test

data/lib/ruby-appraiser/adapter/line-length.rb

@@ -6,10 +6,10 @@ class RubyAppraiser::Adapter::LineLength < RubyAppraiser::Adapter
   def appraise
     source_files.each do |source_file|
       File.open(source_file) do |source|
-        source.lines.each_with_index do |line, number|
+        source.each_line do |line|
           line_length = line.chomp.length
           if line_length > 80
-            add_defect(source_file, number,
+            add_defect(source_file, source.lineno,
                        "Line too long [#{line_length}/80]")
           end
         end

data/lib/ruby-appraiser/appraisal.rb

@@ -94,6 +94,7 @@ class RubyAppraiser
       when 'staged'   then staged_authored_lines
       when 'authored' then authored_lines
       when 'touched'  then all_lines_in touched_files
+      when 'last'     then last_commit_lines
       when 'all'      then all_lines_in source_files
       else            raise ArgumentError, "Unsupported mode #{mode}."
       end
@@ -109,6 +110,15 @@ class RubyAppraiser
       end
     end
 
+    def last_commit_lines
+      unless authored_lines.empty?
+        raise ArgumentError, 'mode=last only works on *clean* checkout. ' +
+                             'git-stash your changes and try again.'
+      end
+      @last_commit_lines ||=
+        RubyAppraiser::Git::authored_lines(range:'HEAD~1..HEAD')
+    end
+
     def touched_files
       @touched_files ||= authored_lines.keys
     end

data/lib/ruby-appraiser/cli.rb

@@ -8,6 +8,9 @@ class RubyAppraiser
   class CLI
     def initialize(args = ARGV)
       @argv = ARGV.dup
+    end
+
+    def configure
       args = @argv.dup # needed for --git-hook
       @options = {}
       adapters = Set.new
@@ -21,12 +24,13 @@ class RubyAppraiser
           puts available_adapters
           exit 1
         end
+        opts.on('-t', '--trace', 'Enable backtrace')
         opts.on('--silent', 'Silence output') do |silent|
           @options[:silent] = true
         end
         opts.on('--mode=MODE',
                 'Set the mode. ' +
-                '[staged,authored,touched,all]') do |mode|
+                '[staged,authored,touched,last,all]') do |mode|
           @options[:mode] = mode
         end
         opts.on('--git-hook', 
@@ -83,12 +87,18 @@ class RubyAppraiser
     end
 
     def run
+      self.configure
       @appraisal.run!
       puts @appraisal unless @options[:silent]
       puts @appraisal.summary if @options[:verbose]
       @appraisal.success?
-    rescue Object
-      puts "#{@appraisal.class.name} caught #{$!} at #{$!.backtrace.first}."
+    rescue Exception
+      $stderr.puts $!.message
+      unless (@argv & ['--trace','-t']).empty?
+        $stderr.puts $!.inspect
+        $stderr.puts $!.backtrace
+      end
+      nil
     end
 
     def available_adapters

data/lib/ruby-appraiser/git.rb

@@ -5,14 +5,24 @@ class RubyAppraiser
     extend self
 
     def authored_lines(options = {})
-      diff_command = ['git diff']
+      diff_command = ['git', 'diff']
       if options[:range]
         diff_command << options[:range]
       else
         diff_command << (options[:staged] ? '--cached' : 'HEAD')
       end
 
-      diff_output = IO.popen(diff_command.join(' ')) { |io| io.read }
+      diff_io = IO.popen(diff_command << {err: [:child, :out]})
+      diff_output = diff_io.read
+
+      case diff_output
+      when /^fatal: Not a git/i
+        then raise 'ruby-appraiser only works in git repos.'
+      when /^fatal: ambiguous argument 'HEAD'/i
+        then raise 'this ruby-appraiser mode only works with previous ' +
+                   'commits, and your repository doesn\t appear to have ' +
+                   'any. Make some commits first, or try a different mode.'
+      end
 
       current_path, current_line = nil, nil
       authored_lines = Hash.new { |hash, key| hash[key] = [] }

data/lib/ruby-appraiser/rake.rb

@@ -0,0 +1,26 @@
+namespace :appraise do
+  def appraise_task(mode = 'all')
+    task mode do
+      require 'ruby-appraiser'
+      @appraisal = RubyAppraiser::Appraisal.new(mode: mode.to_s)
+      RubyAppraiser::Adapter::all.each do |adapter|
+        @appraisal.add_adapter adapter.adapter_type
+      end
+      @appraisal.run!
+      puts @appraisal
+      @appraisal.success? || fail('appraisal found defects')
+    end
+  end
+
+  {
+    all: 'show all defects',
+    staged: 'show staged defects',
+    authored: 'show uncommitted defects',
+    touched: 'show defects in all files that have been touched',
+  }.each do |mode, description|
+    desc description
+    appraise_task mode
+  end
+end
+
+task appraise: 'appraise:all'

data/lib/ruby-appraiser/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 class RubyAppraiser
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/ruby-appraiser.gemspec

@@ -16,4 +16,8 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
+
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'bundler'
+  gem.add_development_dependency 'minitest', '>= 5'
 end

data/test/test_cli.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby -w
+# test_cli.rb: verify RubyAppraiser::CLI works as designed
+
+require 'pathname'
+
+# add lib to loadpath
+lib_path = Pathname.new(__FILE__).join('../../lib').expand_path
+$LOAD_PATH.unshift(lib_path) unless $LOAD_PATH.include? lib_path
+
+require 'minitest/autorun'
+require 'minitest/benchmark'
+
+require 'ruby-appraiser/cli'
+
+class TestCLI < Minitest::Test
+  def test_empty_options
+    cli = RubyAppraiser::CLI.new("")
+    assert_equal({}, cli.options)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-appraiser
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-01 00:00:00.000000000 Z
-dependencies: []
+date: 2013-06-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  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: bundler
+  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: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '5'
 description: Run multiple code-quality tools against staged changes
 email:
 - ryan@simplymeasured.com
@@ -20,6 +68,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE-APACHE.md
 - LICENSE-MIT.md
@@ -34,8 +83,10 @@ files:
 - lib/ruby-appraiser/cli.rb
 - lib/ruby-appraiser/defect.rb
 - lib/ruby-appraiser/git.rb
+- lib/ruby-appraiser/rake.rb
 - lib/ruby-appraiser/version.rb
 - ruby-appraiser.gemspec
+- test/test_cli.rb
 homepage: https://github.com/simplymeasured
 licenses: []
 post_install_message: 
@@ -60,5 +111,6 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A Common interface/executor for code quality tools
-test_files: []
+test_files:
+- test/test_cli.rb
 has_rdoc: