tracker-git 0.0.1 → 0.0.2

data/.travis.yml

@@ -1,4 +1,3 @@
 rvm:
   - 1.9.2
   - 1.9.3
-  - jruby-19mode

data/README.md

@@ -26,10 +26,16 @@ Or install it yourself as:
 
 ## Usage
 
-This gem will create a 'tracker' binary. Call that in your deploy script with the following environment variables set, and your finished stories will be updated to delivered.
+This gem will create a 'tracker' binary. Call that in your deploy script with
+the tracker id and access token as command line arguments, or with following
+environment variables set, and your finished stories will be updated to
+delivered.
 
-    export tracker_token=abc123
-    export tracker_project_id=123456
+    export TRACKER_PROJECT_ID=123456
+    export TRACKER_TOKEN=abc123
+
+Optionally you can specify a specific git branch as the third command line
+argument or with the GIT_BRANCH environment variable.
 
 ## Known Issues
 

data/bin/tracker

@@ -6,11 +6,27 @@ rescue LoadError
   require 'tracker-git'
 end
 
-tracker_token = ENV['tracker_token']
-project_id = ENV['tracker_project_id']
+project_id, tracker_token, git_branch = \
+  if [2, 3].include? ARGV.size
+    ARGV
+  else
+    [ENV['TRACKER_PROJECT_ID'], ENV['TRACKER_TOKEN'], ENV['GIT_BRANCH']]
+  end
+
+unless tracker_token && project_id
+  puts <<-USAGE
+Usage: Pass your pivotal tracker project id and access token on the command
+line, e.g:
+  tracker 123456 abc123
+or as an environment variable:
+  export TRACKER_PROJECT_ID=123456
+  export TRACKER_TOKEN=abc123
+  tracker
+  USAGE
+	exit(1)
+end
 
 project = Tracker::Project.new(tracker_token, project_id)
 git = Tracker::Git.new
 deliverer = Tracker::Deliverer.new(project, git)
-
-deliverer.mark_as_delivered
+deliverer.mark_as_delivered(git_branch)

data/lib/tracker-git/deliverer.rb

@@ -6,9 +6,12 @@ module Tracker
       @git = git
     end
 
-    def mark_as_delivered
+    def mark_as_delivered(branch = nil)
+      options = {}
+      options[:branch] = branch if branch
+
       project.finished.each do |story|
-        if git.contains?(story.id)
+        if git.contains?(story.id, options)
           project.deliver(story)
         end
       end

data/lib/tracker-git/git.rb

@@ -2,7 +2,7 @@ module Tracker
   class Git
     def contains?(message, options = {})
       branch = options.fetch(:branch, "master")
-      result = `git log --grep '#{message}' #{branch}`
+      result = `git log #{branch} --grep='#{message}'`
       result.length > 0
     end
   end

data/lib/tracker-git/version.rb

@@ -1,3 +1,3 @@
 module Tracker
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/deliverer_spec.rb

@@ -11,15 +11,29 @@ describe Tracker::Deliverer do
   let(:git) { stub }
   let(:deliverer) { Tracker::Deliverer.new(project, git) }
 
-  describe "mark_as_delivered" do
-    it("should mark stories as delivered") do
-      project.should_receive(:finished) { finished_stories }
-      git.should_receive(:contains?).with(1) { true }
-      git.should_receive(:contains?).with(2) { false }
-      project.should_receive(:deliver).with(commited_story)
-      project.should_not_receive(:deliver).with(uncommited_story)
+  describe '#mark_as_delivered' do
+    context 'when called without argument' do
+      it('should mark stories as delivered') do
+        project.should_receive(:finished) { finished_stories }
+        git.should_receive(:contains?).with(1, {}) { true }
+        git.should_receive(:contains?).with(2, {}) { false }
+        project.should_receive(:deliver).with(commited_story)
+        project.should_not_receive(:deliver).with(uncommited_story)
 
-      deliverer.mark_as_delivered
+        deliverer.mark_as_delivered
+      end
+    end
+
+    context 'when given a specific branch' do
+      it('should mark stories as delivered') do
+        project.should_receive(:finished) { finished_stories }
+        git.should_receive(:contains?).with(1, {branch: 'develop'}) { true }
+        git.should_receive(:contains?).with(2, {branch: 'develop'}) { false }
+        project.should_receive(:deliver).with(commited_story)
+        project.should_not_receive(:deliver).with(uncommited_story)
+
+        deliverer.mark_as_delivered('develop')
+      end
     end
   end
 

data/spec/git_spec.rb

@@ -4,7 +4,7 @@ describe Tracker::Git do
   describe "#search" do
     let(:message) { "[Finishes #123456]" }
     let(:branch) { "master" }
-    let(:query) { "git log --grep '#{message}' #{branch}"}
+    let(:query) { "git log #{branch} --grep='#{message}'"}
     let(:result) { "Some git message" }
 
     before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tracker-git
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
+date: 2012-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pivotal-tracker
@@ -116,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4298825467225277464
+      hash: 531834068982296945
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4298825467225277464
+      hash: 531834068982296945
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24