git-pivotal 0.1.3 → 0.2.0

data/Rakefile

@@ -12,14 +12,14 @@ begin
     gemspec.description = "A collection of git utilities to ease integration with Pivotal Tracker"
     gemspec.email = "jeff@trydionel.com"
     gemspec.homepage = "http://github.com/trydionel/git-pivotal"
-    gemspec.authors = ["Jeff Tucker"]
-    
-    gemspec.executables = ["git-pick"]
+    gemspec.authors = ["Jeff Tucker", "Sam Stokes"]
     
     gemspec.add_dependency "nokogiri"
     gemspec.add_dependency "rest-client"
+    gemspec.add_dependency "builder"
     
     gemspec.add_development_dependency "rspec"
+    gemspec.add_development_dependency "rcov"
     gemspec.add_development_dependency "mocha"
   end
   
@@ -29,7 +29,7 @@ rescue
 end
 
 Spec::Rake::SpecTask.new do |t|
-  t.warning = true
+  t.spec_opts = ['--color']
   t.rcov = true
   t.rcov_opts = ['--exclude', 'gems']
 end

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/bin/git-bug

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'pivotal'
+require 'commands/bug'
+
+exit Commands::Bug.new(STDIN, STDOUT, *ARGV).run!

data/bin/git-feature

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'pivotal'
+require 'commands/feature'
+
+exit Commands::Feature.new(STDIN, STDOUT, *ARGV).run!

data/bin/git-finish

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'pivotal'
+require 'commands/finish'
+
+exit Commands::Finish.new(STDIN, STDOUT, *ARGV).run!

data/bin/git-pick

@@ -3,6 +3,7 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'pivotal'
-require 'commands/pick'
+require 'commands/feature'
 
-exit Pick.new(*ARGV).run!
+STDOUT.puts "DEPRECATION WARNING: git pick has been deprecated.  Please use git feature instead."
+exit Commands::Feature.new(STDIN, STDOUT, *ARGV).run!

data/git-pivotal.gemspec

@@ -5,15 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{git-pivotal}
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jeff Tucker"]
-  s.date = %q{2010-01-30}
-  s.default_executable = %q{git-pick}
+  s.authors = ["Jeff Tucker", "Sam Stokes"]
+  s.date = %q{2010-02-14}
   s.description = %q{A collection of git utilities to ease integration with Pivotal Tracker}
   s.email = %q{jeff@trydionel.com}
-  s.executables = ["git-pick"]
+  s.executables = ["git-bug", "git-feature", "git-finish", "git-pick"]
   s.extra_rdoc_files = [
     "LICENSE"
   ]
@@ -23,20 +22,33 @@ Gem::Specification.new do |s|
      "LICENSE",
      "Rakefile",
      "VERSION",
+     "bin/git-bug",
+     "bin/git-feature",
+     "bin/git-finish",
      "bin/git-pick",
      "git-pivotal.gemspec",
+     "lib/commands/base.rb",
+     "lib/commands/bug.rb",
+     "lib/commands/feature.rb",
+     "lib/commands/finish.rb",
      "lib/commands/pick.rb",
      "lib/pivotal.rb",
      "lib/pivotal/api.rb",
      "lib/pivotal/associations.rb",
+     "lib/pivotal/attributes.rb",
      "lib/pivotal/base.rb",
      "lib/pivotal/collection.rb",
      "lib/pivotal/project.rb",
      "lib/pivotal/story.rb",
      "readme.markdown",
-     "spec/commands/pick_spec.rb",
+     "spec/commands/base_spec.rb",
+     "spec/commands/bug_spec.rb",
+     "spec/commands/feature_spec.rb",
+     "spec/factories.rb",
+     "spec/factory.rb",
      "spec/pivotal/api_spec.rb",
      "spec/pivotal/associations_spec.rb",
+     "spec/pivotal/attributes_spec.rb",
      "spec/pivotal/base_spec.rb",
      "spec/pivotal/collection_spec.rb",
      "spec/pivotal/project_spec.rb",
@@ -49,9 +61,14 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{A collection of git utilities to ease integration with Pivotal Tracker}
   s.test_files = [
-    "spec/commands/pick_spec.rb",
+    "spec/commands/base_spec.rb",
+     "spec/commands/bug_spec.rb",
+     "spec/commands/feature_spec.rb",
+     "spec/factories.rb",
+     "spec/factory.rb",
      "spec/pivotal/api_spec.rb",
      "spec/pivotal/associations_spec.rb",
+     "spec/pivotal/attributes_spec.rb",
      "spec/pivotal/base_spec.rb",
      "spec/pivotal/collection_spec.rb",
      "spec/pivotal/project_spec.rb",
@@ -66,18 +83,24 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<rest-client>, [">= 0"])
+      s.add_runtime_dependency(%q<builder>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
     else
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<rest-client>, [">= 0"])
+      s.add_dependency(%q<builder>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
     end
   else
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<rest-client>, [">= 0"])
+    s.add_dependency(%q<builder>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
   end
 end

data/lib/commands/base.rb

@@ -0,0 +1,63 @@
+require 'optparse'
+
+module Commands
+  class Base
+
+    attr_accessor :input, :output, :options
+  
+    def initialize(input=STDIN, output=STDOUT, *args)
+      @input = input
+      @output = output
+      @options = {}
+      
+      parse_gitconfig
+      parse_argv(*args)
+    end
+  
+    def put(string, newline=true)
+      @output.print(newline ? string + "\n" : string) unless options[:quiet]
+    end
+
+    def sys(cmd)
+      put cmd if options[:verbose]
+      system cmd
+    end
+
+    def get(cmd)
+      put cmd if options[:verbose]
+      `#{cmd}`
+    end
+    
+    def run!
+      unless options[:api_token] && options[:project_id]
+        put "Pivotal Tracker API Token and Project ID are required"
+        return 1
+      end
+    end
+
+  private
+
+    def parse_gitconfig
+      token = get("git config --get pivotal.api-token").strip
+      id    = get("git config --get pivotal.project-id").strip
+      name  = get("git config --get pivotal.full-name").strip
+
+      options[:api_token] = token unless token == ""
+      options[:project_id] = id unless id == ""
+      options[:full_name] = name unless 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_tail("-h", "--help", "This usage guide") { put opts; exit 0 }
+      end.parse!(args)
+    end
+
+  end
+end

data/lib/commands/bug.rb

@@ -0,0 +1,19 @@
+require 'commands/pick'
+
+module Commands
+  class Bug < Pick
+
+    def type
+      "bug"
+    end
+    
+    def plural_type
+      "bugs"
+    end
+    
+    def branch_suffix
+      "bugfix"
+    end
+
+  end
+end

data/lib/commands/feature.rb

@@ -0,0 +1,19 @@
+require 'commands/pick'
+
+module Commands
+  class Feature < Pick
+
+    def type
+      "feature"
+    end
+    
+    def plural_type
+      "features"
+    end
+    
+    def branch_suffix
+      "feature"
+    end
+
+  end
+end

data/lib/commands/finish.rb

@@ -0,0 +1,41 @@
+require 'commands/base'
+
+module Commands
+  class Finish < Base
+  
+    def run!
+      super
+      
+      # clunky way to get branch name... need better method
+      current_branch = get('git status | head -1').gsub(/^.+On branch /, '').chomp
+      story_id = current_branch[/\d+/]
+      unless story_id
+        put "Branch name must contain a Pivotal Tracker story id"
+        return 1
+      end
+
+      api = Pivotal::Api.new(:api_token => options[:api_token])
+      project = api.projects.find(:id => options[:project_id])
+      story = project.stories.find(:id => story_id)
+      
+      put "Marking Story #{story_id} as finished..."
+      if story.update_attributes(:current_state => :finished)
+      
+        target_branch = "develop"
+        put "Merging #{current_branch} into #{target_branch}"
+        sys "git checkout #{target_branch}"
+        sys "git merge --no-ff #{current_branch}"
+      
+        put "Removing #{current_branch} branch"
+        sys "git branch -d #{current_branch}"
+
+        return 0
+      else
+        put "Unable to mark Story #{story_id} as finished"
+        
+        return 1
+      end
+    end
+
+  end
+end

data/lib/commands/pick.rb

@@ -1,100 +1,61 @@
-require 'optparse'
+require 'commands/base'
 
-class Pick
+module Commands
+  class Pick < Base
   
-  attr_accessor :options
-  
-  def initialize(*args)
-    @options = {}
-    parse_gitconfig
-    parse_argv(*args)
-  end
+    def type
+      raise Error "must define in subclass"
+    end
+    
+    def plural_type
+      raise Error "must define in subclass"
+    end
   
-  def run!
-    unless options[:api_token] && options[:project_id]
-      puts "Pivotal Tracker API Token and Project ID are required"
-      return 1
+    def branch_suffix
+      raise Error "must define in subclass"
     end
     
-    puts "Retrieving latest stories from Pivotal Tracker..."
-    api = Pivotal::Api.new(:api_token => options[:api_token])
+    def run!
+      super
+    
+      put "Retrieving latest #{plural_type} 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
+      project = api.projects.find(:id => options[:project_id])
+      story = project.stories.find(:conditions => { :story_type => type, :current_state => :unstarted }, :limit => 1).first
     
-    unless story
-      puts "No stories available!"
-      return 0
-    end
+      unless story
+        put "No stories available!"
+        return 0
+      end
     
-    puts "Story: #{story.name}"
-    puts "URL:   #{story.url}"
+      put "Story: #{story.name}"
+      put "URL:   #{story.url}"
 
-    suffix = "feature"
-    unless options[:quiet]
-      print "Enter branch name (will be prepended by #{story.id}) [feature]: "
-      suffix = gets.chomp
+      put "Updating story status in Pivotal Tracker..."
+      if story.start!(:owned_by => options[:full_name])
+    
+        suffix = branch_suffix
+        unless options[:quiet]
+          put "Enter branch name (will be prepended by #{story.id}) [#{suffix}]: ", false
+          suffix = input.gets.chomp
       
-      suffix = "feature" if suffix == ""
-    end
+          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]
-    system cmd
-  end
-  
-  def get(cmd)
-    puts cmd if options[:verbose]
-    `#{cmd}`
-  end
-  
-  def parse_gitconfig
-    token = get("git config --get pivotal.api-token").strip
-    id    = get("git config --get pivotal.project-id").strip
-    name  = get("git config --get pivotal.full-name").strip
+        branch = "#{story.id}-#{suffix}"
+        if get("git branch").match(branch).nil?
+          put "Creating #{branch} branch..."
+          sys "git checkout -b #{branch}"
+        end
     
-    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_tail("-h", "--help", "This usage guide") { puts opts; exit 0 }
-    end.parse!(args)
-  end
-  
-  def agrees?(selection)
-    selection =~ /y/i || selection == ""
-  end
-  
-  def create_branch(branch)
-    unless branch_exists?(branch)
-      puts "Creating #{branch} branch..."
-      sys "git checkout -b #{branch}"
+        return 0
+      else
+        put "Unable to mark story as started"
+        
+        return 1
+      end
     end
-  end
 
-  def branch_exists?(branch)
-    !get("git branch").match(branch).nil?
   end
-
 end

data/lib/pivotal/attributes.rb

@@ -0,0 +1,25 @@
+module Pivotal
+  module Attributes
+    
+    def self.included(base)
+      base.extend ClassMethods
+
+      class << base
+        attr_accessor :attributes
+      end
+    end
+    
+    module ClassMethods
+      def has_attributes(*attributes)
+        @attributes = attributes.map(&:to_s)
+        
+        attributes.each do |attribute|
+          define_method attribute do
+            parsed_resource.xpath("*/" + attribute.to_s).text
+          end
+        end
+      end
+    end
+    
+  end
+end

data/lib/pivotal/base.rb

@@ -6,9 +6,9 @@ require 'builder'
 module Pivotal
   class Base
     include Pivotal::Associations
+    include Pivotal::Attributes
     
     attr_accessor :resource, :xml
-    undef id
     
     def initialize(params = {})
       params.each do |key, value|
@@ -24,13 +24,19 @@ module Pivotal
       @parsed_resource ||= Nokogiri::XML(xml)
     end
     
-    def method_missing(method, *args)
-      parsed_resource.css(method.to_s).text
-    end
-    
     def update_attributes(options = {})
-      @xml = resource.put generate_xml(options)
-      return self
+      begin
+        resource.put generate_xml(options) do |response|
+          if response.code == 200
+            @xml = response.body
+            return true
+          else
+            return false
+          end
+        end
+      rescue RestClient::Exception
+        return false
+      end
     end
     
     class << self
@@ -58,9 +64,7 @@ module Pivotal
     
     def allowed_keys(options = {})
       options.reject do |key, _|
-        !%w[id story_type url estimate current_state
-           description name requested_by owned_by
-           created_at accepted_at labels].include? key.to_s
+        !self.class.attributes.include? key.to_s
       end
     end
     

data/lib/pivotal/collection.rb

@@ -50,7 +50,7 @@ module Pivotal
     
     def build_collection_from_xml(xml = "")
       Nokogiri::XML(xml).xpath(component_class.xpath).map do |item|
-        item_id = item.xpath("//id").text
+        item_id = item.xpath("id").text
         component_class.new :resource => resource[item_id], :xml => item.to_xml
       end
     end

data/lib/pivotal/project.rb

@@ -2,6 +2,13 @@ module Pivotal
   class Project < Base
 
     has_collection :stories, :of => Pivotal::Story
+    has_attributes :id, :name, :iteration_length, :week_start_day,
+                   :point_scale, :account, :velocity_scheme,
+                   :current_velocity, :initial_velocity,
+                   :number_of_iterations_to_show, :labels,
+                   :allow_attachments, :public, :use_https,
+                   :bugs_and_chores_are_estimatable, :commit_mode,
+                   :last_activity_at, :memberships, :integrations
 
   end
 end

data/lib/pivotal/story.rb

@@ -1,9 +1,35 @@
 module Pivotal
   class Story < Base
     
+    has_attributes :id, :story_type, :url, :estimate, :current_state,
+                   :description, :name, :requested_by, :owned_by,
+                   :created_at, :accepted_at, :labels
+    
     def start!(options = {})
+      return false if feature? && unestimated?
+      
       update_attributes(options.merge(:current_state => :started))
     end
+    
+    def feature?
+      story_type == "feature"
+    end
+    
+    def bug?
+      story_type == "bug"
+    end
+    
+    def chore?
+      story_type == "chore"
+    end
+    
+    def release?
+      story_type == "release"
+    end
+    
+    def unestimated?
+      estimate == "unestimated"
+    end
   
   end
 end

data/lib/pivotal.rb

@@ -1,5 +1,6 @@
 require File.join(File.dirname(__FILE__),'pivotal', 'collection')
 require File.join(File.dirname(__FILE__),'pivotal', 'associations')
+require File.join(File.dirname(__FILE__),'pivotal', 'attributes')
 
 require File.join(File.dirname(__FILE__),'pivotal','base')
 require File.join(File.dirname(__FILE__),'pivotal','story')

data/spec/commands/base_spec.rb

@@ -0,0 +1,83 @@
+require 'spec_helper'
+require 'commands/base'
+
+describe Commands::Base do
+  
+  before(:each) do
+    @input = mock('input')
+    @output = mock('output')
+    
+    # stub out git config requests
+    Commands::Base.any_instance.stubs(:get).with { |v| v =~ /git config/ }.returns("")
+  end
+  
+  it "should set the api key with the -k option" do
+    @pick = Commands::Base.new(@input, @output,"-k", "1234")
+    @pick.options[:api_token].should == "1234"
+  end
+  
+  it "should set the api key with the --api-token= option" do
+    @pick = Commands::Base.new(@input, @output,"--api-key=1234")
+    @pick.options[:api_token].should == "1234"
+  end
+  
+  it "should set the project id with the -p option" do
+    @pick = Commands::Base.new(@input, @output,"-p", "1")
+    @pick.options[:project_id].should == "1"
+  end
+  
+  it "should set the project id with the --project-id= option" do
+    @pick = Commands::Base.new(@input, @output,"--project-id=1")
+    @pick.options[:project_id].should == "1"
+  end
+  
+  it "should set the full name with the -n option" do
+    @pick = Commands::Base.new(@input, @output,"-n", "Jeff Tucker")
+    @pick.options[:full_name].should == "Jeff Tucker"
+  end
+  
+  it "should set the full name with the --full-name= option" do
+    @pick = Commands::Base.new(@input, @output,"--full-name=Jeff Tucker")
+    @pick.options[:full_name].should == "Jeff Tucker"
+  end
+  
+  it "should set the quiet flag with the -q option" do
+    @pick = Commands::Base.new(@input, @output,"-q")
+    @pick.options[:quiet].should be_true
+  end
+  
+  it "should set the quiet flag with the --quiet option" do
+    @pick = Commands::Base.new(@input, @output,"--quiet")
+    @pick.options[:quiet].should be_true
+  end
+  
+  it "should set the verbose flag with the -v option" do
+    @pick = Commands::Base.new(@input, @output,"-v")
+    @pick.options[:verbose].should be_true
+  end
+  
+  it "should set the verbose flag with the --verbose option" do
+    @pick = Commands::Base.new(@input, @output,"--verbose")
+    @pick.options[:verbose].should be_true
+  end
+  
+  it "should unset the verbose flag with the --no-verbose option" do
+    @pick = Commands::Base.new(@input, @output,"--no-verbose")
+    @pick.options[:verbose].should be_false
+  end
+  
+  it "should print a message if the API token is missing" do
+    @output.expects(:print).with("Pivotal Tracker API Token and Project ID are required\n")
+
+    @pick = Commands::Base.new(@input, @output, "-p", "1")
+    @pick.run!
+  end
+  
+  it "should print a message if the project ID is missing" do
+    @output.expects(:print).with("Pivotal Tracker API Token and Project ID are required\n")
+
+    @pick = Commands::Base.new(@input, @output, "-k", "1")
+    @pick.run!    
+  end
+  
+end

data/spec/commands/bug_spec.rb

@@ -0,0 +1,25 @@
+require 'commands/bug'
+require 'spec_helper'
+
+describe Commands::Bug do
+
+  before(:each) do
+    # stub out git config requests
+    Commands::Bug.any_instance.stubs(:get).with { |v| v =~ /git config/ }.returns("")
+
+    @bug = Commands::Bug.new
+  end
+  
+  it "should specify its story type" do
+    @bug.type.should == "bug"
+  end
+  
+  it "should specify a plural for its story types" do
+    @bug.plural_type.should == "bugs"
+  end
+  
+  it "should specify its branch suffix" do
+    @bug.branch_suffix.should == "bugfix"
+  end
+  
+end

data/spec/commands/feature_spec.rb

@@ -0,0 +1,25 @@
+require 'commands/feature'
+require 'spec_helper'
+
+describe Commands::Feature do
+
+  before(:each) do
+    # stub out git config requests
+    Commands::Feature.any_instance.stubs(:get).with { |v| v =~ /git config/ }.returns("")
+
+    @feature = Commands::Feature.new
+  end
+  
+  it "should specify its story type" do
+    @feature.type.should == "feature"
+  end
+  
+  it "should specify a plural for its story types" do
+    @feature.plural_type.should == "features"
+  end
+  
+  it "should specify its branch suffix" do
+    @feature.branch_suffix.should == "feature"
+  end
+  
+end

data/spec/factories.rb

@@ -0,0 +1,13 @@
+require File.join(File.dirname(__FILE__), 'factory')
+
+Factory.define :story, {
+  :id            => 1,
+  :current_state => :unstarted,
+  :story_type    => :feature,
+  :estimate      => 1,
+}
+
+Factory.define :project, {
+  :id   => 1,
+  :name => "Project"
+}

data/spec/factory.rb

@@ -0,0 +1,26 @@
+class Factory
+  class << self
+    def factories
+      @@factories ||= {}
+    end
+    
+    def define(type, attributes)
+      factories[type] = attributes
+    end
+  end
+end
+
+
+def Factory(type, attrs = {})
+  defaults = Factory.factories[type]
+  attrs = defaults.merge(attrs)
+  
+  markup = Builder::XmlMarkup.new
+  markup.__send__(type) do
+    attrs.each do |attribute, value|
+      markup.__send__(attribute, value.to_s)
+    end
+  end
+  
+  markup.target!
+end

data/spec/pivotal/attributes_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Pivotal::Attributes do
+  
+  it "should load the #has_attributes method onto a class" do
+    @base = Class.new
+    @base.should_not respond_to(:has_attributes)
+    
+    @base.send :include, Pivotal::Attributes
+    @base.should respond_to(:has_attributes)
+  end
+  
+  it "should add methods specified in #has_attributes to the object" do
+    @base = Class.new
+    @base.send :include, Pivotal::Attributes
+    
+    @base.new.should_not respond_to(:one)
+    @base.has_attributes :one
+    @base.new.should respond_to(:one)
+  end
+  
+  it "should add the attributes specified in #has_attributes to the class #attributes list" do
+    @base = Class.new
+    @base.send :include, Pivotal::Attributes
+    
+    @base.attributes.should be_nil
+    @base.has_attributes :one
+    @base.attributes.should == ["one"]
+  end
+  
+end

data/spec/pivotal/base_spec.rb

@@ -20,11 +20,6 @@ describe Pivotal::Base do
     @base.parsed_resource.should be_a(Nokogiri::XML::Document)
   end
   
-  it "should forward undefined methods to the XML parse tree" do
-    @base.should_not respond_to(:id)
-    @base.id.should == "1"
-  end
-  
   it "should present the class's item xpath" do
     @base.class.xpath.should == "//api"
   end
@@ -37,7 +32,12 @@ describe Pivotal::Base do
     
     before(:each) do
       @xml = "<api><current_state>started</current_state></api>"
-      @base.resource.expects(:put).with(@xml).returns(@xml)
+      @response = mock("Response")
+      @response.stubs(:code).returns(200)
+      @response.stubs(:body).returns(@xml)
+      
+      @base.resource.expects(:put).with(@xml).yields(@response)
+      @base.class.has_attributes :current_state
     end
 
     it "should be able to update the remote resource with a hash of string values" do
@@ -55,7 +55,16 @@ describe Pivotal::Base do
     it "should update the stored xml with the new remote model" do
       lambda {
         @base.update_attributes(:current_state => "started")
-      }.should change(@base, :xml).to(@xml)
+      }.should change(@base, :xml).to(@response.body)
+    end
+    
+    it "should return true if the response code is 200" do
+      @base.update_attributes(:current_state => :started).should == true
+    end
+    
+    it "should return false if the response code is not 200" do
+      @response.stubs(:code).returns(422)
+      @base.update_attributes(:current_state => :started).should == false
     end
     
   end

data/spec/pivotal/collection_spec.rb

@@ -4,6 +4,7 @@ describe Pivotal::Collection do
   
   before(:each) do
     @api = pivotal_api
+    RestClient::Resource.any_instance.stubs(:get).returns("<project><id>1</id></project>")
   end
   
   it "should find a single item given an id" do

data/spec/pivotal/project_spec.rb

@@ -3,8 +3,7 @@ require 'spec_helper'
 describe Pivotal::Project do
   
   before(:each) do
-    @api = pivotal_api
-    @project = Pivotal::Project.new :resource => @api.resource["projects"][1]
+    @project = Pivotal::Project.new :resource => pivotal_api.resource["projects"][1]
   end
   
   it "should be connected to the project resource" do
@@ -16,4 +15,20 @@ describe Pivotal::Project do
     @project.stories.component_class.should == Pivotal::Story
   end
   
+  [:id, :name, :iteration_length, :week_start_day,
+   :point_scale, :account, :velocity_scheme,
+   :current_velocity, :initial_velocity,
+   :number_of_iterations_to_show, :labels,
+   :allow_attachments, :public, :use_https,
+   :bugs_and_chores_are_estimatable, :commit_mode,
+   :last_activity_at, :memberships, :integrations].map(&:to_s).each do |method|
+     it "should have an accessor method for #{method}" do
+       @project.methods.should include(method)
+     end
+
+     it "should include #{method} in the list of valid attributes" do
+       @project.class.attributes.should include(method)
+     end    
+  end
+  
 end

data/spec/pivotal/story_spec.rb

@@ -2,28 +2,93 @@ require 'spec_helper'
 
 describe Pivotal::Story do
 
+  def story_type(type = "feature")
+    Factory(:story, :story_type => type)
+  end
+  
   before(:each) do
-    @api = pivotal_api
-    @project = Pivotal::Project.new :resource => @api.resource["projects"][1]
-    @story = Pivotal::Story.new :resource => @project.resource["stories"][1]
+    @story = Pivotal::Story.new :resource => pivotal_api.resource["projects"][1]["stories"][1]
   end
   
   it "should be connected to the story resource" do
     @story.resource.url.should == "https://www.pivotaltracker.com/services/v3/projects/1/stories/1"
   end
   
-  it "should be able to mark the story as started" do
-    @xml = "<story><current_state>started</current_state></story>"
-    @story.resource.expects(:put).with(@xml)
+  [:id, :story_type, :url, :estimate, :current_state,
+     :description, :name, :requested_by, :owned_by,
+     :created_at, :accepted_at, :labels].map(&:to_s).each do |method|
+    it "should have an accessor method for #{method}" do
+      @story.methods.should include(method)
+    end
+    
+    it "should include #{method} in the list of valid attributes" do
+      @story.class.attributes.should include(method)
+    end
+    
+    it "should return the proper value when #{method} is called" do
+      @story.xml = Factory(:story, method.to_sym => "Test Result")
+      @story.send(method).should == "Test Result"
+    end
+  end
+  
+  it "should specify whether the story is a feature" do
+    @story.xml = story_type "feature"
+
+    @story.should be_a_feature
+    @story.should_not be_a_bug
+    @story.should_not be_a_chore
+    @story.should_not be_a_release
+  end
+  
+  it "should specify whether the story is a bug" do
+    @story.xml = story_type "bug"
+
+    @story.should_not be_a_feature
+    @story.should be_a_bug
+    @story.should_not be_a_chore
+    @story.should_not be_a_release
+  end
+  
+  it "should specify whether the story is a chore" do
+    @story.xml = story_type "chore"
 
+    @story.should_not be_a_feature
+    @story.should_not be_a_bug
+    @story.should be_a_chore
+    @story.should_not be_a_release
+  end
+  
+  it "should specify whether the story is a release" do
+    @story.xml = story_type "release"
+
+    @story.should_not be_a_feature
+    @story.should_not be_a_bug
+    @story.should_not be_a_chore
+    @story.should be_a_release
+  end
+  
+  it "should be able to mark the story as started" do
+    @xpath = "//current_state = 'started'"
+    @story.resource.expects(:put).with { |xml| Nokogiri::XML(xml).xpath(@xpath) }
     @story.start!
   end
   
   it "should be able to update other attributes when marking the story as started" do
-    @xml = "<story><current_state>started</current_state><owned_by>Jeff Tucker</owned_by></story>"
-    @story.resource.expects(:put).with(@xml)
-
+    # Check the XML contains the right options.
+    # Can't just check the XML string, because the elements may be in a
+    # different order (because it's built from a hash).
+    @xpath = "//current_state = 'started' and //owned_by = 'Jeff Tucker'"
+    @story.resource.expects(:put).with {|xml| Nokogiri.XML(xml).xpath(@xpath) }
     @story.start!(:owned_by => "Jeff Tucker")
   end
   
-end
+  it "should return false if attempting to start an unestimated feature story" do
+    # bad_response = mock("Response")
+    # bad_response.stubs(:code).returns(422)
+    # RestClient::Resource.any_instance.stubs(:put).yields(bad_response)
+    
+    @story.xml = Factory(:story, :story_type => :feature, :estimate => :unestimated)
+    @story.start!.should be_false
+  end
+  
+end

data/spec/spec_helper.rb

@@ -2,20 +2,14 @@ require 'rubygems'
 require 'mocha'
 require 'builder'
 require 'pivotal'
-require 'commands/pick'
+require File.join(File.dirname(__FILE__), 'factories')
 
 Spec::Runner.configure do |config|
   config.mock_with :mocha
 end
 
-def demo_xml
-  Builder::XmlMarkup.new.project do |project|
-    project.id 1
-  end
-end
-
 def stub_connection_to_pivotal
-  RestClient::Resource.any_instance.stubs(:get).returns(demo_xml)
+  RestClient::Resource.any_instance.stubs(:get).returns("")
 end
 
 def pivotal_api

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: git-pivotal
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jeff Tucker
+- Sam Stokes
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-01-30 00:00:00 -05:00
-default_executable: git-pick
+date: 2010-02-14 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -32,6 +33,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: builder
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   type: :development
@@ -42,6 +53,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: mocha
   type: :development
@@ -55,6 +76,9 @@ dependencies:
 description: A collection of git utilities to ease integration with Pivotal Tracker
 email: jeff@trydionel.com
 executables: 
+- git-bug
+- git-feature
+- git-finish
 - git-pick
 extensions: []
 
@@ -66,20 +90,33 @@ files:
 - LICENSE
 - Rakefile
 - VERSION
+- bin/git-bug
+- bin/git-feature
+- bin/git-finish
 - bin/git-pick
 - git-pivotal.gemspec
+- lib/commands/base.rb
+- lib/commands/bug.rb
+- lib/commands/feature.rb
+- lib/commands/finish.rb
 - lib/commands/pick.rb
 - lib/pivotal.rb
 - lib/pivotal/api.rb
 - lib/pivotal/associations.rb
+- lib/pivotal/attributes.rb
 - lib/pivotal/base.rb
 - lib/pivotal/collection.rb
 - lib/pivotal/project.rb
 - lib/pivotal/story.rb
 - readme.markdown
-- spec/commands/pick_spec.rb
+- spec/commands/base_spec.rb
+- spec/commands/bug_spec.rb
+- spec/commands/feature_spec.rb
+- spec/factories.rb
+- spec/factory.rb
 - spec/pivotal/api_spec.rb
 - spec/pivotal/associations_spec.rb
+- spec/pivotal/attributes_spec.rb
 - spec/pivotal/base_spec.rb
 - spec/pivotal/collection_spec.rb
 - spec/pivotal/project_spec.rb
@@ -114,9 +151,14 @@ signing_key:
 specification_version: 3
 summary: A collection of git utilities to ease integration with Pivotal Tracker
 test_files: 
-- spec/commands/pick_spec.rb
+- spec/commands/base_spec.rb
+- spec/commands/bug_spec.rb
+- spec/commands/feature_spec.rb
+- spec/factories.rb
+- spec/factory.rb
 - spec/pivotal/api_spec.rb
 - spec/pivotal/associations_spec.rb
+- spec/pivotal/attributes_spec.rb
 - spec/pivotal/base_spec.rb
 - spec/pivotal/collection_spec.rb
 - spec/pivotal/project_spec.rb

data/spec/commands/pick_spec.rb

@@ -1,66 +0,0 @@
-require 'spec_helper'
-require 'commands/pick'
-
-describe Pick do
-  
-  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