git-pivotal 0.1.1 → 0.1.2

data/CHANGELOG

@@ -0,0 +1,14 @@
+v 0.1.3
+- Fixed bug preventing command line args from being properly interpretted
+
+v 0.1.2
+- Fixed bug introduced in v 0.1.1 which prevented git pick from completing
+
+v 0.1.1
+- Updated git pick to tell Pivotal who owns the picked feature
+- Improved Pivotal Tracker framework write ability
+
+v 0.1.0
+- Initial release
+- Basic framework for reading from Pivotal Tracker
+- git pick utility

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bin/git-pick

@@ -5,4 +5,4 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'pivotal'
 require 'commands/pick'
 
-exit Pick.new.run(*ARGV)
+exit Pick.new(*ARGV).run!

data/git-pivotal.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{git-pivotal}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Tucker"]
-  s.date = %q{2010-01-29}
+  s.date = %q{2010-01-30}
   s.default_executable = %q{git-pick}
   s.description = %q{A collection of git utilities to ease integration with Pivotal Tracker}
   s.email = %q{jeff@trydionel.com}
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "CHANGELOG",
      "LICENSE",
      "Rakefile",
      "VERSION",

data/lib/commands/pick.rb

@@ -2,7 +2,7 @@ require 'optparse'
 
 class Pick
   
-  attr_accessor :api
+  attr_accessor :options
   
   def initialize(*args)
     @options = {}
@@ -10,23 +10,53 @@ class Pick
     parse_argv(*args)
   end
   
-  def run
-    connect_to_pivotal
+  def run!
+    unless options[:api_token] && options[:project_id]
+      puts "Pivotal Tracker API Token and Project ID are required"
+      return 1
+    end
+    
+    puts "Retrieving latest stories from Pivotal Tracker..."
+    api = Pivotal::Api.new(:api_token => options[:api_token])
+
+    project = api.projects.find(:id => options[:project_id])
+    story = project.stories.find(:conditions => { :story_type => :feature, :current_state => :unstarted }, :limit => 1).first
     
-    story = find_story
-    build_feature_branch story
-    start_story story
+    unless story
+      puts "No stories available!"
+      return 0
+    end
+    
+    puts "Story: #{story.name}"
+    puts "URL:   #{story.url}"
+
+    suffix = "feature"
+    unless options[:quiet]
+      print "Enter branch name (will be prepended by #{story.id}) [feature]: "
+      suffix = gets.chomp
+      
+      suffix = "feature" if suffix == ""
+    end
+
+    puts "Creating branch..."
+    branch = "#{story.id}-#{suffix}"
+    create_branch branch
+    
+    puts "Updating story status in Pivotal Tracker..."
+    story.start!(:owned_by => options[:full_name])
+    
+    return 0
   end
   
 private
   
   def sys(cmd)
-    puts cmd if @options[:verbose]
+    puts cmd if options[:verbose]
     system cmd
   end
   
   def get(cmd)
-    puts cmd if @options[:verbose]
+    puts cmd if options[:verbose]
     `#{cmd}`
   end
   
@@ -35,56 +65,27 @@ private
     id    = get("git config --get pivotal.project-id").strip
     name  = get("git config --get pivotal.full-name").strip
     
-    @options[:api_token] = token if token
-    @options[:project_id] = id if id
-    @options[:full_name] = name if name
+    options[:api_token] = token if token
+    options[:project_id] = id if id
+    options[:full_name] = name if name
   end
   
   def parse_argv(*args)
     OptionParser.new do |opts|
       opts.banner = "Usage: git pick [options]"
-      opts.on("-k", "--api-key=", "Pivotal Tracker API key") { |k| @options[:api_token] = k }
-      opts.on("-p", "--project-id=", "Pivotal Trakcer project id") { |p| @options[:project_id] = p }
-      opts.on("-n", "--full-name=", "Pivotal Trakcer full name") { |n| @options[:full_name] = n }
-      opts.on("-q", "--quiet", "Quiet, no-interaction mode") { |q| @options[:quiet] = q }
-      opts.on("-v", "--[no-]verbose", "Run verbosely") { |v| @options[:verbose] = v }
+      opts.on("-k", "--api-key=", "Pivotal Tracker API key") { |k| options[:api_token] = k }
+      opts.on("-p", "--project-id=", "Pivotal Trakcer project id") { |p| options[:project_id] = p }
+      opts.on("-n", "--full-name=", "Pivotal Trakcer full name") { |n| options[:full_name] = n }
+      opts.on("-q", "--quiet", "Quiet, no-interaction mode") { |q| options[:quiet] = q }
+      opts.on("-v", "--[no-]verbose", "Run verbosely") { |v| options[:verbose] = v }
       opts.on_tail("-h", "--help", "This usage guide") { puts opts; exit 0 }
     end.parse!(args)
   end
   
-  def connect_to_pivotal
-    unless @options[:api_token] && @options[:project_id]
-      puts "Pivotal Tracker API Token and Project ID are required"
-      exit 0
-    end
-    
-    puts "Retrieving latest stories from Pivotal Tracker..."
-    @api = Pivotal::Api.new(:api_token => @options[:api_token])
-  end
-  
   def agrees?(selection)
     selection =~ /y/i || selection == ""
   end
   
-  def find_story
-    project = @api.projects.find(:id => @options[:project_id])
-    story = project.stories.find(:conditions => { :story_type => :feature, :current_state => :unstarted }, :limit => 1).first
-    
-    unless story
-      puts "No stories available!"
-      exit 0
-    end
-    
-    puts "Story: #{story.name}"
-    puts "URL:   #{story.url}"
-    print "Accept this story? (Yn): "
-    selection = gets.chomp
-        
-    exit 0 if !agrees?(selection)
-    
-    story
-  end
-  
   def create_branch(branch)
     unless branch_exists?(branch)
       puts "Creating #{branch} branch..."
@@ -96,24 +97,4 @@ private
     !get("git branch").match(branch).nil?
   end
 
-  def build_feature_branch(story)
-    branch = "feature-#{story.id}"
-
-    puts "Suggested branch name: #{branch}"
-    print "Accept this name? (Yn): "
-    selection = gets.chomp
-
-    unless agrees?(selection)
-      print "Enter new name (will be prepended by #{story.id}): "
-      branch = "#{story.id}-" + gets.chomp
-    end
-    
-    create_branch branch
-  end
-  
-  def start_story(story)
-    puts "Updating story status in Pivotal Tracker..."
-    story.start!(:owned_by => @options[:full_name])
-  end
-
 end

data/lib/pivotal/base.rb

@@ -30,6 +30,7 @@ module Pivotal
     
     def update_attributes(options = {})
       @xml = resource.put generate_xml(options)
+      return self
     end
     
     class << self
@@ -46,11 +47,13 @@ module Pivotal
   
     def generate_xml(options = {})
       builder = Builder::XmlMarkup.new
-      allowed_keys(options).each do |key, value|
-        builder.key(value.to_s)
+      builder.__send__ self.class.name_as_xml_attribute do
+        allowed_keys(options).each do |key, value|
+          builder.__send__(key, value.to_s)
+        end
       end
       
-      builder
+      builder.target!
     end
     
     def allowed_keys(options = {})

data/readme.markdown

@@ -13,12 +13,10 @@ This selects the top-most available feature from your Pivotal Tracker, and offer
     Collecting latest stories from Pivotal Tracker...
     Story: Test git pivotal
     URL:   http://www.pivotaltracker.com/story/show/1234567
-    Accept this story? (Yn): y
-    Suggested branch: feature-1234567
-    Accept this name? (Yn): y
-    Creating feature-1234567 branch...
-    Updating story status in Pivotal Tracker...
-    2 git-pick:feature-1234567 %
+    Enter branch name (will be prepended by 1234567) [feature]: testing
+    Creating branch...
+    Creating 1234567-testing branch...
+    2 git-pick:1234567-testing %
     
 ##Installation
 To install git-pivotal, simply run
@@ -43,5 +41,5 @@ This is <del>some seriously</del> alpha software.  Several things on the ol' tod
 * <del>Create a general Pivotal::Base#update_attributes method</del>
 * <del>`git pick` doesn't update the story to indicate who claimed it</del>
 * Add command to close/finish currently 'picked' feature
-* Reduce verbosity of `git pick`
+* <del>Reduce verbosity of `git pick`</del>
 * More that I can't recall at the moment

data/spec/commands/pick_spec.rb

@@ -1,7 +1,66 @@
+require 'spec_helper'
 require 'commands/pick'
 
 describe Pick do
-  it "should work" do
-    true
+  
+  before(:each) do
+    # stub out git config requests
+    Pick.any_instance.expects(:get).times(3).with { |v| v =~ /git config/}.returns("")
   end
+  
+  it "should set the api key with the -k option" do
+    @pick = Pick.new("-k", "1234")
+    @pick.options[:api_token].should == "1234"
+  end
+  
+  it "should set the api key with the --api-token= option" do
+    @pick = Pick.new("--api-key=1234")
+    @pick.options[:api_token].should == "1234"
+  end
+  
+  it "should set the project id with the -p option" do
+    @pick = Pick.new("-p", "1")
+    @pick.options[:project_id].should == "1"
+  end
+  
+  it "should set the project id with the --project-id= option" do
+    @pick = Pick.new("--project-id=1")
+    @pick.options[:project_id].should == "1"
+  end
+  
+  it "should set the full name with the -n option" do
+    @pick = Pick.new("-n", "Jeff Tucker")
+    @pick.options[:full_name].should == "Jeff Tucker"
+  end
+  
+  it "should set the full name with the --full-name= option" do
+    @pick = Pick.new("--full-name=Jeff Tucker")
+    @pick.options[:full_name].should == "Jeff Tucker"
+  end
+  
+  it "should set the quiet flag with the -q option" do
+    @pick = Pick.new("-q")
+    @pick.options[:quiet].should be_true
+  end
+  
+  it "should set the quiet flag with the --quiet option" do
+    @pick = Pick.new("--quiet")
+    @pick.options[:quiet].should be_true
+  end
+  
+  it "should set the verbose flag with the -v option" do
+    @pick = Pick.new("-v")
+    @pick.options[:verbose].should be_true
+  end
+  
+  it "should set the verbose flag with the --verbose option" do
+    @pick = Pick.new("--verbose")
+    @pick.options[:verbose].should be_true
+  end
+  
+  it "should unset the verbose flag with the --no-verbose option" do
+    @pick = Pick.new("--no-verbose")
+    @pick.options[:verbose].should be_false
+  end
+  
 end

data/spec/pivotal/base_spec.rb

@@ -36,7 +36,7 @@ describe Pivotal::Base do
   describe "updating the remote resource" do
     
     before(:each) do
-      @xml = "<story><current_state>started</current_state></story>"
+      @xml = "<api><current_state>started</current_state></api>"
       @base.resource.expects(:put).with(@xml).returns(@xml)
     end
 
@@ -49,7 +49,7 @@ describe Pivotal::Base do
     end
     
     it "should not update attributes which don't exist on the remote model" do
-      @base.update_attributes(:unknown_attribute => true)
+      @base.update_attributes(:current_state => :started, :unknown_attribute => true)
     end
     
     it "should update the stored xml with the new remote model" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: git-pivotal
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jeff Tucker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-29 00:00:00 -05:00
+date: 2010-01-30 00:00:00 -05:00
 default_executable: git-pick
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,7 @@ extra_rdoc_files:
 - LICENSE
 files: 
 - .gitignore
+- CHANGELOG
 - LICENSE
 - Rakefile
 - VERSION