git-precommit 1.2.3 → 1.2.4

data/.gitignore

@@ -1 +1,5 @@
-pkg
+pkg/*
+.bundle
+*.gem
+tmp/*
+rerun.txt

data/.rvmrc

@@ -0,0 +1 @@
+rvm --create @git-precommit

data/Gemfile

@@ -0,0 +1,2 @@
+source "http://rubygems.org"
+gemspec

data/Gemfile.lock

@@ -0,0 +1,49 @@
+PATH
+  remote: .
+  specs:
+    git-precommit (1.2.4)
+      rake
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    aruba (0.2.3)
+      background_process
+      cucumber (~> 0.9.0)
+    background_process (1.2)
+    builder (2.1.2)
+    cucumber (0.9.2)
+      builder (~> 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.2.5)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    diff-lcs (1.1.2)
+    gherkin (2.2.9)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    json (1.4.6)
+    rake (0.8.7)
+    rspec (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
+      rspec-mocks (= 2.0.0)
+    rspec-core (2.0.0)
+    rspec-expectations (2.0.0)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
+    syntax (1.0.0)
+    term-ansicolor (1.0.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aruba
+  cucumber (~> 0.9.0)
+  git-precommit!
+  rake
+  rspec (~> 2.0.0)
+  syntax

data/Rakefile

@@ -1,17 +1,17 @@
+require "rake"
+require "rake/rdoctask"
+
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name    = "git-precommit"
-    gemspec.summary = "Fail commits if the tests fail."
-    gemspec.description = <<-EOS
-    A set of rake tasks that install git pre-commit hooks to call your build.
-    If your build fails, the commit will not proceed.
-    EOS
-    gemspec.email   = "toby.tripp+git@gmail.com"
-    gemspec.homepage = "http://github.com/tobytripp/git-pre-commit"
-    gemspec.authors = ["Toby Tripp"]
-  end
-  Jeweler::GemcutterTasks.new
+  require 'bundler/setup'
+  Bundler::GemHelper.install_tasks
 rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
+  puts "Bundler not available. Install it with: gem install bundler"
 end
+
+Dir["./tasks/**/*.rake"].each { |task| load task }
+
+require "git_precommit"
+GitPrecommit::PrecommitTasks.new
+
+task :default => ".git/hooks/pre-commit"
+task :precommit => :default

data/config/cucumber.yml

@@ -0,0 +1,12 @@
+<%
+rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
+rerun_opts = rerun.to_s.strip.empty? ?
+  "--format progress features" :
+  "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
+std_opts =
+  "#{rerun_opts} --format rerun --out rerun.txt --strict --tags ~@wip"
+html_opts =
+  "--format html --out log/cucumber.out.html"
+%>
+default: <%= std_opts %>
+wip:     --tags @wip:10 --wip features

data/features/draconian.feature

@@ -0,0 +1,27 @@
+#!/usr/bin/env cucumber
+Feature: Draconian option
+Background:
+  Given a directory named ".git/hooks"
+    And a file named "Rakefile" with:
+    """
+    require "../../lib/git_precommit"
+    GitPrecommit::PrecommitTasks.new :draconian => true
+    
+    task :default => ".git/hooks/pre-commit"
+    """
+  
+Scenario: No pre-commit hook is installed
+  When I successfully run "rake"
+
+  Then the following files should exist:
+    | .git/hooks/pre-commit |
+
+Scenario: The pre-commit hook is modified
+  When I append to ".git/hooks/pre-commit" with:
+  """
+  echo "My new hook!"
+  """
+
+  And I successfully run "rake"
+  
+  Then the file ".git/hooks/pre-commit" should not contain "echo"

data/features/pre-commit.feature

@@ -0,0 +1,28 @@
+#!/usr/bin/env cucumber
+Feature: Pre commit hook installation
+Background:
+  Given a directory named ".git/hooks"
+    And a file named "Rakefile" with:
+    """
+    require "../../lib/git_precommit"
+    GitPrecommit::PrecommitTasks.new
+    
+    task :default => ".git/hooks/pre-commit"
+    """
+
+Scenario: No pre-commit hook is installed
+  When I successfully run "rake"
+  
+  Then the following files should exist:
+    | .git/hooks/pre-commit |
+
+Scenario: The pre-commit hook is modified
+  When I append to ".git/hooks/pre-commit" with:
+  """
+  echo "My new hook!"
+  """
+  
+   And I successfully run "rake --trace"
+   
+  Then the file ".git/hooks/pre-commit" should contain "echo"
+

data/features/support/setup.rb

@@ -0,0 +1 @@
+require 'aruba'

data/git-precommit.gemspec

@@ -1,51 +1,38 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "git-precommit/version"
 
 Gem::Specification.new do |s|
   s.name = %q{git-precommit}
-  s.version = "1.2.3"
+  s.version = GitPrecommit::VERSION
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Toby Tripp"]
-  s.date = %q{2010-03-10}
-  s.default_executable = %q{setpairs}
-  s.description = %q{    A set of rake tasks that install git pre-commit hooks to call your build.
-    If your build fails, the commit will not proceed.
-}
-  s.email = %q{toby.tripp+git@gmail.com}
-  s.executables = ["setpairs"]
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "bin/setpairs",
-     "git-hooks/post-commit",
-     "git-hooks/pre-commit",
-     "git-precommit.gemspec",
-     "lib/git-precommit/precommit_tasks.rb",
-     "lib/git-precommit/tasks.rb",
-     "lib/git_precommit.rb"
-  ]
+  s.authors  = ["Toby Tripp"]
+  s.email    = %q{toby.tripp+git@gmail.com}
   s.homepage = %q{http://github.com/tobytripp/git-pre-commit}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
+
+  s.summary = %q{Abort git commit if the tests fail.}
+  s.description = %q{
+    A set of rake tasks that install git pre-commit hooks to run your tests.
+    If your build fails, the commit will not proceed.
+    
+    Git-precommit will call `rake precommit` to run your tests.  Be sure to define this task.
+  }
+  
+  s.files            = `git ls-files`.split("\n")
+  s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths    = ["lib"]
+  
+  s.extra_rdoc_files = %w[README.rdoc]
+  s.rdoc_options     = ["--charset=UTF-8"]
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Fail commits if the tests fail.}
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "git-precommit"
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+  s.add_dependency "rake"
+  
+  s.add_development_dependency "rspec",    "~> 2.0.0"
+  s.add_development_dependency "cucumber", "~> 0.9.0"
+  s.add_development_dependency "aruba"
+  s.add_development_dependency "syntax"
 end
 

data/lib/git-precommit/precommit_tasks.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# -*- encoding: utf-8 -*-
 require "rake"
 require "rake/tasklib"
 
@@ -8,7 +8,11 @@ module GitPrecommit
       File.expand_path File.join( File.dirname(__FILE__), '..', '..', 'git-hooks' )
     attr_accessor :template_path
     
-    def initialize()
+    def initialize( options={} )
+      @options = {
+        :draconian => false
+      }.merge options
+      
       yield self if block_given?
       @template_path ||= TEMPLATE_PATH
       
@@ -16,8 +20,21 @@ module GitPrecommit
     end
     
     def define()
+      pre_commit     = ".git/hooks/pre-commit"
+      pre_commit_src = "#{template_path}/pre-commit"
+      
+      task :overwrite do |t|
+        if @options[:draconian]
+          copy  pre_commit_src, pre_commit
+          chmod 0755, pre_commit
+        end
+      end
+
+      deps =  [pre_commit_src]
+      deps += [:overwrite] if @options[:draconian]
+      
       desc "Install the git pre-commit hook"
-      file ".git/hooks/pre-commit" => "#{template_path}/pre-commit" do |t|
+      file pre_commit => deps do |t|
         warn "Git pre-commit hook missing, setting up…"
         copy  t.prerequisites.first, t.name
         chmod 0755, t.name
@@ -31,7 +48,7 @@ module GitPrecommit
       
       namespace :git do
         desc "Install the git pre-commit hook"
-        task :precommit => ".git/hooks/pre-commit"
+        task :precommit => pre_commit
         
         desc "Install the git post-commit hook"
         task :postcommit => ".git/hooks/post-commit"

data/lib/git-precommit/tasks.rb

@@ -2,10 +2,11 @@ if defined? Rails
   ENVIRONMENT = Rails.env
 else 
   ENVIRONMENT   = RAILS_ENV if defined? RAILS_ENV
+  ENVIRONMENT ||= ENV["RACK_ENV"] if ENV["RACK_ENV"]
   ENVIRONMENT ||= "development"
 end
 
-if %w[development test].include? ENVIRONMENT
+if %w[development cucumber test].include? ENVIRONMENT
   require "git_precommit"
   
   GitPrecommit::PrecommitTasks.new

data/lib/git-precommit/version.rb

@@ -0,0 +1,3 @@
+module GitPrecommit
+  VERSION = "1.2.4"
+end

data/lib/git_precommit.rb

@@ -1,3 +1,4 @@
 $:.unshift File.dirname(__FILE__)
 
+require "rake"
 require "git-precommit/precommit_tasks.rb"

data/tasks/cucumber.rake

@@ -0,0 +1,53 @@
+task :default => [:cucumber]
+
+begin
+  require 'cucumber/rake/task'
+
+  namespace :cucumber do
+    Cucumber::Rake::Task.new( :ok,
+      'Run features that should pass') do |t|
+      t.fork = true # You may get faster startup if you set this to false
+      t.profile = 'default'
+    end
+
+    Cucumber::Rake::Task.new(:wip,
+      'Run features that are being worked on') do |t|
+      t.fork = true # You may get faster startup if you set this to false
+      t.profile = 'wip'
+    end
+
+    Cucumber::Rake::Task.new( :cruise, 
+      "Run features and generate HTML report" ) do |t|
+      t.fork = true
+      t.profile = 'cruise'
+    end
+
+    desc 'Run all features'
+    task :all => [:ok, :wip]
+
+    desc 'list uncommented feature and scenario names'
+    task :list, [:file_pattern] do |t, args|
+      scenario_count = 0
+      Dir["#{RUBY_ROOT}/features/**/#{args.file_pattern || '*'}.feature"].sort.each do |file|
+        puts file
+        File.read(file).split(/\n/).each do |line|
+          puts $1                                       if line =~ /^\s*(Feature:.+)/
+          printf("\t%3d:%s\n", scenario_count += 1, $1) if line =~ /^\s*Scenario:(.+)/
+        end
+        puts
+      end
+    end
+  end
+
+  desc 'Alias for cucumber:ok'
+  task :cucumber => 'cucumber:ok'
+
+  task :features => :cucumber do
+    STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
+  end
+rescue LoadError
+  desc 'cucumber rake task not available (cucumber not installed)'
+  task :cucumber do
+    abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 3
-  version: 1.2.3
+  - 4
+  version: 1.2.4
 platform: ruby
 authors: 
 - Toby Tripp
@@ -14,11 +14,79 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-10 00:00:00 -06:00
-default_executable: setpairs
-dependencies: []
-
-description: "    A set of rake tasks that install git pre-commit hooks to call your build.\n    If your build fails, the commit will not proceed.\n"
+date: 2010-11-04 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: aruba
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: syntax
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+description: "\n    A set of rake tasks that install git pre-commit hooks to run your tests.\n    If your build fails, the commit will not proceed.\n    \n    Git-precommit will call `rake precommit` to run your tests.  Be sure to define this task.\n  "
 email: toby.tripp+git@gmail.com
 executables: 
 - setpairs
@@ -28,16 +96,24 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- .rvmrc
+- Gemfile
+- Gemfile.lock
 - README.rdoc
 - Rakefile
-- VERSION
 - bin/setpairs
+- config/cucumber.yml
+- features/draconian.feature
+- features/pre-commit.feature
+- features/support/setup.rb
 - git-hooks/post-commit
 - git-hooks/pre-commit
 - git-precommit.gemspec
 - lib/git-precommit/precommit_tasks.rb
 - lib/git-precommit/tasks.rb
+- lib/git-precommit/version.rb
 - lib/git_precommit.rb
+- tasks/cucumber.rake
 has_rdoc: true
 homepage: http://github.com/tobytripp/git-pre-commit
 licenses: []
@@ -48,6 +124,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -55,6 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -63,10 +141,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.6
+rubyforge_project: git-precommit
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Fail commits if the tests fail.
+summary: Abort git commit if the tests fail.
 test_files: []
 

data/VERSION

@@ -1 +0,0 @@
-1.2.3