git-whistles 0.3.1 → 0.4.1

data/README.md

@@ -66,7 +66,7 @@ This lets you keep work in progress on multiple branches without committing it.
 I tend to alias this to `git co`.
 
 
-## outstanding-features
+#### outstanding-features
 
 `git checkout production ; git outstanding-features`
 

data/bin/git-pull-request

@@ -4,6 +4,9 @@
 # 
 #   Open a pull request for the current branch in your default browser
 # 
+#   Assumes the branches are named
+#   <team>/<branch-title>-<story-id>
+# 
 # Copyright (C) 2012 Julien Letessier
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -24,7 +27,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-require 'CGI'
+# require 'CGI'
+require 'rubygems'
+require 'pivotal-tracker'
+require 'term/ansicolor'
 
 origin_url = `git config --get remote.origin.url`.strip
 unless origin_url =~ /github\.com/
@@ -48,6 +54,61 @@ end
 
 against = ARGV[1] || 'master'
 
-url = "https://github.com/#{repo}/pull/new?base_repo=#{CGI.escape(repo)}&base_ref=#{against}&head_ref=#{branch}"
+# build the base query
+query = {
+  :base_repo => repo,
+  :base_ref  => against,
+  :head_ref  => branch
+}
+
+# guess team name
+if branch =~ %r{^(\w+)/.*}
+  team = $1.capitalize
+end
+
+# guess title.
+title = branch.split('/').last.split(/[_-]/).delete_if { |word| word =~ /^\d+$/ }.join(' ').capitalize
+query[:title] = "#{team}: #{title}"
+
+# find the PT story, or fall back to the branch-name-based titling
+if branch =~ /(\d+)$/
+  story_id = $1.to_i
+  token = `git config pivotal-tracker.token`.strip
+  if token.empty?
+    puts Term::ANSIColor.yellow %Q{
+      I don't know your Pivotal Tracker token!
+      Please set it with:
+      $ git config pivotal-tracker.token <token>
+    }
+    exit 1
+  else
+    $stdout.write Term::ANSIColor.green "Finding your project and story "
+    $stdout.flush
+
+    PivotalTracker::Client.token = token
+    story, project = PivotalTracker::Project.all.find do |project|
+      $stdout.write Term::ANSIColor.green '.'
+      $stdout.flush
+      story = project.stories.find(story_id) and break story, project
+    end
+    $stdout.puts
+
+    if story.nil?
+      puts Term::ANSIColor.yellow "Apologies... I could not find story #{story_id}."
+    else
+      $stdout.puts Term::ANSIColor.green "Found story #{story_id} in '#{project.name}'"
+
+      headline = "Pivotal tracker story [##{story_id}](#{story.url}) in project *#{project.name}*:"
+      description = story.description.split("\n").map { |line| "> #{line}" }
+      body = "#{headline}\n\n#{description}"
+      title = "#{project.name}: #{story.name} [##{story.id}]"
+
+      query.merge! :subject => story.name, :body => body, :title => title
+    end
+  end
+end
+
+query_string = query.map { |key,value| "#{CGI.escape key.to_s}=#{CGI.escape value}"}.join('&')
+url = "https://github.com/#{repo}/pull/new?#{query_string}"
 puts "Preparing a pull request for branch #{branch}"
 system "open", url

data/git-whistles.gemspec

@@ -16,6 +16,10 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "bundler", ">= 1.0.0"
   gem.add_development_dependency "rake"
+  gem.add_development_dependency "pry"
+
+  gem.add_dependency "pivotal-tracker", "~> 0.5.6"
+  gem.add_dependency "term-ansicolor"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/git-whistles/version.rb

@@ -2,7 +2,7 @@ require 'pathname'
 
 module Git
   module Whistles
-    VERSION = "0.3.1"
+    VERSION = "0.4.1"
     GEMDIR = Pathname.new(__FILE__).parent.parent.parent
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-whistles
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 13
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 1
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Julien Letessier
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-26 00:00:00 +01:00
+date: 2012-08-31 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,50 @@ dependencies:
   name: rake
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  name: pry
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 5
+        - 6
+        version: 0.5.6
+  prerelease: false
+  name: pivotal-tracker
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  name: term-ansicolor
+  type: :runtime
+  version_requirements: *id005
 description: A few helpers for classic Git workflows
 email: 
 - julien.letessier@gmail.com