git_tracker 1.3.1 → 1.4.0

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 tags
 .rvmrc
+.rbenv-version

data/.travis.yml

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

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ### dev
 [full changelog](https://github.com/highgroove/git_tracker/compare/v1.3.0...master)
+Enhancements
+
+* Support Ruby 1.8.7
+* Generate standalone binary via `rake git-tracker`
 
 ### 1.3.1 / 2012-04-23
 [full changelog](https://github.com/highgroove/git_tracker/compare/v1.3.0...v1.3.1)

data/Rakefile

@@ -4,3 +4,9 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
+
+file 'git-tracker' => FileList.new('lib/git_tracker.rb, lib/git_tracker/*.rb') do |task|
+  $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+  require 'git_tracker/standalone'
+  GitTracker::Standalone.save(task.name)
+end

data/bin/git-tracker

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 require 'git_tracker'
-GitTracker.execute(*ARGV)
+GitTracker::Runner.execute(*ARGV)

data/git_tracker.gemspec

@@ -13,9 +13,9 @@ Gem::Specification.new do |gem|
     better... and easier... um, besier!
   EOF
 
-  gem.add_development_dependency "rspec", "~> 2.9.0"
+  gem.add_development_dependency "rspec", "~> 2.9"
   gem.add_development_dependency "rspec-spies", "~> 2.0"
-  gem.add_development_dependency "pry", "~> 0.9.8"
+  gem.add_development_dependency "pry", "~> 0.9"
   gem.add_development_dependency "activesupport", "~> 3.2"
   gem.add_development_dependency "rake"
 

data/lib/git_tracker/branch.rb

@@ -4,7 +4,7 @@ require 'git_tracker/repository'
 module GitTracker
   module Branch
     def self.story_number
-      current[/#?(?<number>\d+)/, :number]
+      current[/#?(\d+)/, 1]
     end
 
     def self.current
@@ -12,7 +12,7 @@ module GitTracker
 
       Repository.ensure_exists unless exit_successful?
 
-      branch_path[%r{refs/heads/(?<name>.+)}, :name] || ''
+      branch_path[%r{refs/heads/(.+)}, 1] || ''
     end
 
     private

data/lib/git_tracker/runner.rb

@@ -0,0 +1,22 @@
+require 'git_tracker/prepare_commit_message'
+require 'git_tracker/hook'
+
+module GitTracker
+  module Runner
+
+    def self.execute(cmd_arg, *args)
+      command = cmd_arg.gsub(/-/, '_')
+      abort("[git_tracker] command: '#{cmd_arg}' does not exist.") unless respond_to?(command)
+      send(command, *args)
+    end
+
+    def self.prepare_commit_msg(*args)
+      PrepareCommitMessage.run(*args)
+    end
+
+    def self.install
+      Hook.install
+    end
+  end
+
+end

data/lib/git_tracker/standalone.rb

@@ -0,0 +1,72 @@
+module GitTracker
+  module Standalone
+    extend self
+
+    GIT_TRACKER_ROOT = File.expand_path('../../..', __FILE__)
+    PREAMBLE = <<-preamble
+#
+# This file is generated code. DO NOT send patches for it.
+#
+# Original source files with comments are at:
+# https://github.com/highgroove/git_tracker
+#
+
+preamble
+
+    def save(filename, path = '.')
+      dest = File.join(File.expand_path(path), filename)
+      File.open(dest, 'w') do |f|
+        build(f)
+        f.chmod(0755)
+      end
+    end
+
+    def build(io)
+      io.puts "#!#{ruby_executable}"
+      io << PREAMBLE
+
+      each_source_file do |filename|
+        File.open(filename, 'r') do |source|
+          inline_source(source, io)
+        end
+      end
+
+      io.puts 'GitTracker::Runner.execute(*ARGV)'
+      io
+    end
+
+    def inline_source(code, io)
+      code.each_line do |line|
+        io << line unless comment?(line) || require_own_file?(line)
+      end
+      io.puts ''
+    end
+
+    def comment?(line)
+      line =~ /^\s*#/
+    end
+
+    def require_own_file?(line)
+      line =~ /^\s*require\s+["']git_tracker\//
+    end
+
+    def each_source_file
+      File.open(File.join(GIT_TRACKER_ROOT, 'lib/git_tracker.rb'), 'r') do |main|
+        main.each_line do |req|
+          if req =~ /^require\s+["'](.+)["']/
+            yield File.join(GIT_TRACKER_ROOT, 'lib', "#{$1}.rb")
+          end
+        end
+      end
+    end
+
+    def ruby_executable
+      if File.executable? '/usr/bin/ruby' then '/usr/bin/ruby'
+      else
+        require 'rbconfig'
+        File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
+      end
+    end
+
+  end
+end

data/lib/git_tracker/version.rb

@@ -1,3 +1,3 @@
 module GitTracker
-  VERSION = '1.3.1'
+  VERSION = '1.4.0'
 end

data/lib/git_tracker.rb

@@ -1,19 +1,8 @@
 require 'git_tracker/hook'
+require 'git_tracker/repository'
 require 'git_tracker/prepare_commit_message'
+require 'git_tracker/runner'
+require 'git_tracker/branch'
+require 'git_tracker/commit_message'
 require 'git_tracker/version'
 
-module GitTracker
-  def self.execute(cmd_arg, *args)
-    command = cmd_arg.gsub(/-/, '_')
-    abort("[git_tracker] command: '#{cmd_arg}' does not exist.") unless respond_to?(command)
-    send(command, *args)
-  end
-
-  def self.prepare_commit_msg(*args)
-    PrepareCommitMessage.run(*args)
-  end
-
-  def self.install
-    Hook.install
-  end
-end

data/spec/git_tracker/prepare_commit_message_spec.rb

@@ -60,7 +60,7 @@ describe GitTracker::PrepareCommitMessage do
 
     context 'branch name with a Pivotal Tracker story number' do
       let(:story) { '8675309' }
-      let(:commit_message) { stub('CommitMessage', mentions_story?: false) }
+      let(:commit_message) { stub('CommitMessage', :mentions_story? => false) }
 
       before do
         commit_message.stub(:keyword) { nil }

data/spec/{git_tracker_spec.rb → git_tracker/runner_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
-require 'git_tracker'
+require 'git_tracker/runner'
 
-describe GitTracker do
+describe GitTracker::Runner do
   subject { described_class }
   let(:args) { ['a_file', 'the_source', 'sha1234'] }
 

data/spec/git_tracker/standalone_spec.rb

@@ -0,0 +1,78 @@
+require 'git_tracker/standalone'
+
+describe GitTracker::Standalone do
+
+  describe '#save' do
+    before do
+      File.delete 'git-tracker' if File.exists? 'git-tracker'
+    end
+
+    after do
+      File.delete 'git-tracker' if File.exists? 'git-tracker'
+    end
+
+    it 'saves to the named file' do
+      described_class.save('git-tracker')
+      File.size('./git-tracker').should > 100
+    end
+
+    it 'marks the binary as executable' do
+      described_class.save('git-tracker')
+      File.should be_executable('./git-tracker')
+    end
+  end
+
+  describe '#build' do
+    subject { standalone }
+    let(:io) { StringIO.new }
+    let(:standalone) { described_class.build(io).string }
+
+    it 'declares a shebang' do
+      subject.should =~ /#!.+/
+    end
+
+    it 'includes generated code notice' do
+      subject.should include('This file is generated')
+    end
+
+    it 'inlines the code' do
+      subject.should include('Hook')
+      subject.should include('Repository')
+      subject.should include('PrepareCommitMessage')
+      subject.should include('Runner')
+      subject.should include('Branch')
+      subject.should include('CommitMessage')
+      subject.should include('VERSION')
+    end
+
+    it 'does not inline the standalone code' do
+      subject.should_not include('module Standalone')
+    end
+
+    it 'includes the call to execute the hook' do
+      subject.should include('GitTracker::Runner.execute(*ARGV)')
+    end
+
+    it 'excludes requiring git_tracker code' do
+      subject.should_not =~ /^require\s+["']git_tracker/
+    end
+  end
+
+  describe '#ruby_executable' do
+    subject { described_class }
+    before do
+      RbConfig::CONFIG.stub(:[]).with('bindir') { '/some/other/bin' }
+      RbConfig::CONFIG.stub(:[]).with('ruby_install_name') { 'ruby' }
+    end
+
+    it 'uses user-level ruby binary when it is executable' do
+      File.stub(:executable?).with('/usr/bin/ruby') { true }
+      subject.ruby_executable.should == '/usr/bin/ruby'
+    end
+
+    it 'uses rbconfig ruby when user-level ruby binary not executable' do
+      File.stub(:executable?).with('/usr/bin/ruby') { false }
+      subject.ruby_executable.should == '/some/other/bin/ruby'
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'fake_file'
 require 'commit_message_helper'
-require_relative 'support/matchers/exit_code_matchers'
+require 'matchers/exit_code_matchers'
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_tracker
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000 Z
+date: 2012-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: rspec-spies
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +116,8 @@ files:
 - lib/git_tracker/hook.rb
 - lib/git_tracker/prepare_commit_message.rb
 - lib/git_tracker/repository.rb
+- lib/git_tracker/runner.rb
+- lib/git_tracker/standalone.rb
 - lib/git_tracker/version.rb
 - prepare-commit-msg.example
 - spec/git_tracker/branch_spec.rb
@@ -123,7 +125,8 @@ files:
 - spec/git_tracker/hook_spec.rb
 - spec/git_tracker/prepare_commit_message_spec.rb
 - spec/git_tracker/repository_spec.rb
-- spec/git_tracker_spec.rb
+- spec/git_tracker/runner_spec.rb
+- spec/git_tracker/standalone_spec.rb
 - spec/spec_helper.rb
 - spec/support/commit_message_helper.rb
 - spec/support/fake_file.rb
@@ -148,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Teaching Git about Pivotal Tracker.
@@ -158,7 +161,8 @@ test_files:
 - spec/git_tracker/hook_spec.rb
 - spec/git_tracker/prepare_commit_message_spec.rb
 - spec/git_tracker/repository_spec.rb
-- spec/git_tracker_spec.rb
+- spec/git_tracker/runner_spec.rb
+- spec/git_tracker/standalone_spec.rb
 - spec/spec_helper.rb
 - spec/support/commit_message_helper.rb
 - spec/support/fake_file.rb