tailor-hook 0.1.2 → 0.2.0

data/.rvmrc

@@ -0,0 +1 @@
+rvm 1.9.2-p180@tailor-hook

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "tailor", :git => "git://github.com/sergio-fry/tailor.git"
+gem "tailor", "~> 0.1.5"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -12,4 +12,6 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
+  gem "rr"
+  gem "guard-minitest"
 end

data/Gemfile.lock

@@ -1,30 +1,32 @@
-GIT
-  remote: git://github.com/sergio-fry/tailor.git
-  revision: 7f737091752ed8581762a6586547428a52c9e622
-  specs:
-    tailor (0.1.3.1)
-      term-ansicolor (>= 1.0.5)
-      term-ansicolor (>= 1.0.5)
-
 GEM
   remote: http://rubygems.org/
   specs:
     git (1.2.5)
+    guard (0.7.0)
+      thor (~> 0.14.6)
+    guard-minitest (0.4.0)
+      guard (~> 0.4)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     rake (0.9.2)
     rcov (0.9.10)
+    rr (1.0.4)
     shoulda (2.11.3)
+    tailor (0.1.5)
+      term-ansicolor (>= 1.0.5)
     term-ansicolor (1.0.6)
+    thor (0.14.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.0.0)
+  guard-minitest
   jeweler (~> 1.6.4)
   rcov
+  rr
   shoulda
-  tailor!
+  tailor (~> 0.1.5)

data/Guardfile

@@ -0,0 +1,8 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'minitest' do
+  watch(%r|^spec/(.*)_spec\.rb|)
+  watch(%r|^lib/(.*)\.rb|)            { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r|^spec/spec_helper\.rb|)    { "spec" }
+end

data/README.rdoc

@@ -1,11 +1,13 @@
 = tailor-hook
 
-This gem creates git pre-commit hook, that validates updated .rb files with Tailor gem.
+This gem creates git pre-commit hook to validate updated .rb files with Tailor gem.
+
+TailorHook validates only staged files. Very handy. Just check it out!
 
 == Installation
 
 * Install "tailor-hook" gem
-* Run "tailor-hook-install" command inside your project path to add hook.
+* Run "tailor-hook-install" command inside your project path to add the hook.
 
 == Contributing to tailor-hook
  

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/tailor-hook.rb

@@ -0,0 +1,3 @@
+require 'tailor-hook/git_repo'
+require 'tailor-hook/hook'
+

data/lib/tailor-hook/git_repo.rb

@@ -0,0 +1,20 @@
+module TailorHook
+  class GitRepo
+    def initialize(path)
+      @path = File.expand_path path
+    end
+
+    def staged_ruby_files
+      staged_files.find_all { |f| f.match /\.rb$/ }
+    end
+
+    private
+
+    def staged_files
+      files = `cd #{@path} ; git diff --name-only --staged`.split
+
+      # filter deleted files
+      files.map { |p| File.expand_path(p) }.find_all { |p| File.exists? p }
+    end
+  end
+end

data/lib/tailor-hook/hook.rb

@@ -0,0 +1,35 @@
+module TailorHook
+  class Hook
+    def initialize(path)
+      @git_repo = GitRepo.new(path)
+    end
+
+    def hook!
+      @errors = []
+
+      @git_repo.staged_ruby_files.each do |path|
+        check_file(path)
+      end
+
+
+      if @errors.empty?
+        result = 0
+      else
+        @errors.each { |e| print e }
+        result = 1
+      end
+
+      result
+    end
+
+    private
+
+    def check_file(path)
+      output = `tailor #{path}`
+
+      unless $?.success?
+        @errors << output
+      end
+    end
+  end
+end

data/pre-commit

@@ -1,44 +1,7 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 
-class TailorHook
-  LAST_LINE = "The following files are out of style"
-
-  def initialize
-    @errors = []
-  end
-
-  def hook!
-    ruby_files.each do |filename|
-      check_file(filename)
-    end
-
-    if @errors.empty?
-      exit 0
-    else
-      @errors.each { |e| print e }
-      exit 1
-    end
-  end
-
-  private
-
-  def check_file(filename)
-    output = `tailor #{filename}`
-
-    unless output.split("\n")[-1].include? LAST_LINE
-      @errors << output
-    end
-  end
-
-  def ruby_files
-    `git status -s`.split("\n").collect do |line|
-      filename = line.split[1]
-      filename if filename.match(/\.rb$/)
-    end.compact
-  end
-end
-
-hook = TailorHook.new
-hook.hook!
+require 'tailor-hook'
 
+hook = TailorHook::Hook.new(File.join(File.dirname(__FILE__), "../.."))
+exit hook.hook! # exit value
 

data/{test → spec}/helper.rb

@@ -7,12 +7,17 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'test/unit'
+require 'minitest/spec'
+require 'minitest/autorun'
 require 'shoulda'
+require 'rr'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'tailor-hook'
 
-class Test::Unit::TestCase
+include TailorHook
+
+class MiniTest::Unit::TestCase
+  include RR::Adapters::MiniTest
 end

data/spec/tailor-hook/git_repo_spec.rb

@@ -0,0 +1,15 @@
+require 'helper'
+
+describe GitRepo do
+  before do
+    @parser = GitRepo.new(".")
+  end
+
+  it "should list staged ruby files" do
+    stub(@parser).staged_files { ["file.rb", "Gemfile"] }
+    @parser.staged_ruby_files.must_equal ["file.rb"]
+
+    stub(@parser).staged_files { ["file.rb", "Gemfile", "file_2.rb"] }
+    @parser.staged_ruby_files.sort.must_equal ["file.rb", "file_2.rb"]
+  end
+end

data/spec/tailor-hook/hook_spec.rb

@@ -0,0 +1,9 @@
+require 'helper'
+
+describe Hook do
+  it "should work" do
+    hook = Hook.new(".")
+    hook.hook!.must_equal 0
+  end
+end
+

data/tailor-hook.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tailor-hook"
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergei O. Udalov"]
-  s.date = "2011-09-23"
+  s.date = "2011-09-29"
   s.description = "pre-commit hook, that checks ruby-style"
   s.email = "sergei.udalov@gmail.com"
   s.executables = ["tailor-hook-install"]
@@ -19,18 +19,23 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".rvmrc",
     "Gemfile",
     "Gemfile.lock",
+    "Guardfile",
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
     "VERSION",
     "bin/tailor-hook-install",
     "lib/tailor-hook.rb",
+    "lib/tailor-hook/git_repo.rb",
+    "lib/tailor-hook/hook.rb",
     "pre-commit",
-    "tailor-hook.gemspec",
-    "test/helper.rb",
-    "test/test_tailor-hook.rb"
+    "spec/helper.rb",
+    "spec/tailor-hook/git_repo_spec.rb",
+    "spec/tailor-hook/hook_spec.rb",
+    "tailor-hook.gemspec"
   ]
   s.homepage = "http://github.com/sergio-fry/tailor-hook"
   s.licenses = ["MIT"]
@@ -42,24 +47,30 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<tailor>, [">= 0"])
+      s.add_runtime_dependency(%q<tailor>, ["~> 0.1.5"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<rr>, [">= 0"])
+      s.add_development_dependency(%q<guard-minitest>, [">= 0"])
     else
-      s.add_dependency(%q<tailor>, [">= 0"])
+      s.add_dependency(%q<tailor>, ["~> 0.1.5"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rr>, [">= 0"])
+      s.add_dependency(%q<guard-minitest>, [">= 0"])
     end
   else
-    s.add_dependency(%q<tailor>, [">= 0"])
+    s.add_dependency(%q<tailor>, ["~> 0.1.5"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rr>, [">= 0"])
+    s.add_dependency(%q<guard-minitest>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tailor-hook
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-23 00:00:00.000000000Z
+date: 2011-09-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tailor
-  requirement: &18221760 !ruby/object:Gem::Requirement
+  requirement: &84635070 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *18221760
+  version_requirements: *84635070
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &18220640 !ruby/object:Gem::Requirement
+  requirement: &84634830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18220640
+  version_requirements: *84634830
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &18219440 !ruby/object:Gem::Requirement
+  requirement: &84634590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *18219440
+  version_requirements: *84634590
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &18217880 !ruby/object:Gem::Requirement
+  requirement: &84634350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,32 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *18217880
+  version_requirements: *84634350
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &18216440 !ruby/object:Gem::Requirement
+  requirement: &84634110 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *84634110
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: &84633870 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *84633870
+- !ruby/object:Gem::Dependency
+  name: guard-minitest
+  requirement: &84633630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18216440
+  version_requirements: *84633630
 description: pre-commit hook, that checks ruby-style
 email: sergei.udalov@gmail.com
 executables:
@@ -76,18 +98,23 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .document
+- .rvmrc
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
 - bin/tailor-hook-install
 - lib/tailor-hook.rb
+- lib/tailor-hook/git_repo.rb
+- lib/tailor-hook/hook.rb
 - pre-commit
+- spec/helper.rb
+- spec/tailor-hook/git_repo_spec.rb
+- spec/tailor-hook/hook_spec.rb
 - tailor-hook.gemspec
-- test/helper.rb
-- test/test_tailor-hook.rb
 homepage: http://github.com/sergio-fry/tailor-hook
 licenses:
 - MIT
@@ -103,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2105528715305497944
+      hash: -412855309
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/test/test_tailor-hook.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestTailorHook < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end