git-pivotal 0.2.3 → 0.8.0

data/lib/commands/pick.rb

@@ -2,57 +2,61 @@ require 'commands/base'
 
 module Commands
   class Pick < Base
-  
+
     def type
       raise Error("must define in subclass")
     end
-    
+
     def plural_type
       raise Error("must define in subclass")
     end
-  
+
     def branch_suffix
       raise Error("must define in subclass")
     end
-    
+
     def run!
-      super
+      response = super
+      return response if response > 0
 
       msg = "Retrieving latest #{plural_type} from Pivotal Tracker"
       if options[:only_mine]
         msg += " for #{options[:full_name]}"
       end
       put "#{msg}..."
-      
+
       unless story
         put "No #{plural_type} available!"
         return 0
       end
-    
+
       put "Story: #{story.name}"
       put "URL:   #{story.url}"
 
       put "Updating #{type} 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 == ""
+      if story.update(:owned_by => options[:full_name], :current_state => :started)
+
+        suffix_or_prefix = ""
+        unless options[:quiet] || options[:defaults]
+          put "Enter branch name (will be #{options[:append_name] ? 'appended' : 'prepended'} by #{story.id}) [#{suffix_or_prefix}]: ", false
+          suffix_or_prefix = input.gets.chomp
         end
+        suffix_or_prefix = branch_suffix if suffix_or_prefix == ""
 
-        branch = "#{story.id}-#{suffix}"
+        if options[:append_name]
+          branch = "#{suffix_or_prefix}-#{story.id}"
+        else
+          branch = "#{story.id}-#{suffix_or_prefix}"
+        end
         if get("git branch").match(branch).nil?
-          put "Creating #{branch} branch..."
+          put "Switched to a new branch '#{branch}'"
           sys "git checkout -b #{branch}"
         end
-    
+
         return 0
       else
         put "Unable to mark #{type} as started"
-        
+
         return 1
       end
     end
@@ -61,10 +65,10 @@ module Commands
 
     def story
       return @story if @story
-      
-      conditions = { :story_type => type, :current_state => :unstarted }
+
+      conditions = { :story_type => type, :current_state => "unstarted", :limit => 1, :offset => 0 }
       conditions[:owned_by] = options[:full_name] if options[:only_mine]
-      @story = project.stories.find(:conditions => conditions, :limit => 1).first
+      @story = project.stories.all(conditions).first
     end
   end
 end

data/lib/git-pivotal.rb

@@ -0,0 +1,9 @@
+$:.unshift(File.dirname(__FILE__))
+
+require File.join('commands', 'base')
+require File.join('commands', 'pick')
+require File.join('commands', 'feature')
+require File.join('commands', 'bug')
+require File.join('commands', 'chore')
+require File.join('commands', 'finish')
+require File.join('commands', 'info')

data/readme.markdown

@@ -27,6 +27,15 @@ When on a feature branch, this command will close the associated story in Pivota
     Removing 1234567-testing branch
     4 git-pivotal:master %
 
+###Git Info
+When on a feature/bug/chore branch, this command will display the story information as recorded in Pivotal Tracker.
+
+    5 git-pivotal:1234567-testing % git info
+    Story:        Test git pivotal
+    URL:          http://www.pivotaltracker.com/story/show/1234567
+    Description:  The awesome story description
+    6 git-pivotal:1234567-testing % 
+
 ##Installation
 To install git-pivotal, simply run
 
@@ -50,6 +59,10 @@ The project id is best placed within your project's git config:
 
     git config -f .git/config pivotal.project-id 88888
 
+If you would rather have the story id appended to the branch name (feature-123456) instead of prepending (123456-feature), you can configue that:
+
+    git config -f .git/config pivotal.append-name true
+
 If you're not interested in storing these options in git, you can pass them into git pivotal as command line arguments.  See the usage guides for more details.
 
 ##TODO

data/spec/commands/base_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'commands/base'
 
 describe Commands::Base do
   
@@ -101,4 +100,24 @@ describe Commands::Base do
     @pick.run!    
   end
   
+  it "should set the append name flag with the -a option" do
+    @pick = Commands::Base.new(@input, @output,"-a")
+    @pick.options[:append_name].should be_true
+  end
+
+  it "should set the append name flag from git config" do
+    Commands::Base.any_instance.stubs(:get).with("git config --get pivotal.append-name").returns("true")
+    @pick = Commands::Base.new
+    @pick.options[:append_name].should be_true
+  end
+
+  it "should set the append name flag with the --append-name" do
+    @pick = Commands::Base.new(@input, @output, "--append-name")
+    @pick.options[:append_name].should be_true
+  end
+
+  it "should default the append name flag if none is specified" do
+    @pick = Commands::Base.new
+    @pick.options[:append_name].should be_false
+  end
 end

data/spec/commands/bug_spec.rb

@@ -1,4 +1,3 @@
-require 'commands/bug'
 require 'spec_helper'
 
 describe Commands::Bug do

data/spec/commands/chore_spec.rb

@@ -1,4 +1,3 @@
-require 'commands/chore'
 require 'spec_helper'
 
 describe Commands::Chore do

data/spec/commands/feature_spec.rb

@@ -1,4 +1,3 @@
-require 'commands/feature'
 require 'spec_helper'
 
 describe Commands::Feature do

data/spec/commands/finish_spec.rb

@@ -1,4 +1,3 @@
-require 'commands/finish'
 require 'spec_helper'
 
 describe Commands::Finish do
@@ -46,7 +45,7 @@ describe Commands::Finish do
     # stub out git config requests
     Commands::Finish.any_instance.stubs(:get).with { |v| v =~ /git config/ }.returns("")
 
-    Pivotal::Api.any_instance.stubs(:projects).returns(mock_projects)
+    PivotalTracker::Project.stubs(:find).returns(mock_projects)
 
     @finish = Commands::Finish.new(nil, nil, "-p", mock_project_id)
     @finish.stubs(:sys)

data/spec/spec_helper.rb

@@ -1,18 +1,14 @@
-require 'rubygems'
+require 'rspec'
 require 'mocha'
 require 'builder'
-require 'pivotal'
+require 'lib/git-pivotal'
+
 require File.join(File.dirname(__FILE__), 'factories')
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.mock_with :mocha
 end
 
 def stub_connection_to_pivotal
   RestClient::Resource.any_instance.stubs(:get).returns("")
-end
-
-def pivotal_api
-  stub_connection_to_pivotal
-  Pivotal::Api.new :api_token => 1
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: git-pivotal
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 3
-  version: 0.2.3
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Jeff Tucker
@@ -16,93 +15,93 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-23 00:00:00 -04:00
+date: 2011-04-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: builder
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: pivotal-tracker
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
-        - 1
-        - 4
         - 0
-        version: 1.4.0
+        - 3
+        - 1
+        version: 0.3.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: builder
+  name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
+        - 2
+        - 5
         - 0
-        version: "0"
-  type: :runtime
+        version: 2.5.0
+  type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rcov
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: cucumber
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
-        version: "0"
+        - 9
+        - 2
+        version: 0.9.2
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: aruba
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
-        version: "0"
+        - 2
+        - 3
+        version: 0.2.3
   type: :development
   version_requirements: *id006
 description: A collection of git utilities to ease integration with Pivotal Tracker
@@ -112,6 +111,7 @@ executables:
 - git-chore
 - git-feature
 - git-finish
+- git-info
 - git-pick
 extensions: []
 
@@ -127,22 +127,48 @@ files:
 - bin/git-chore
 - bin/git-feature
 - bin/git-finish
+- bin/git-info
 - bin/git-pick
+- features/bug.feature
+- features/chore.feature
+- features/feature.feature
+- features/finish.feature
+- features/info.feature
+- features/step_definitions/steps.rb
+- features/support/env.rb
+- features/support/git-pivotal.rb
+- features/test_repo/readme
+- features/test_repo/working.git/COMMIT_EDITMSG
+- features/test_repo/working.git/HEAD
+- features/test_repo/working.git/config
+- features/test_repo/working.git/description
+- features/test_repo/working.git/hooks/applypatch-msg.sample
+- features/test_repo/working.git/hooks/commit-msg.sample
+- features/test_repo/working.git/hooks/post-commit.sample
+- features/test_repo/working.git/hooks/post-receive.sample
+- features/test_repo/working.git/hooks/post-update.sample
+- features/test_repo/working.git/hooks/pre-applypatch.sample
+- features/test_repo/working.git/hooks/pre-commit.sample
+- features/test_repo/working.git/hooks/pre-rebase.sample
+- features/test_repo/working.git/hooks/prepare-commit-msg.sample
+- features/test_repo/working.git/hooks/update.sample
+- features/test_repo/working.git/index
+- features/test_repo/working.git/info/exclude
+- features/test_repo/working.git/logs/HEAD
+- features/test_repo/working.git/logs/refs/heads/master
+- features/test_repo/working.git/objects/0c/6f7b1384910d1a2f137590095f008a06c7e00c
+- features/test_repo/working.git/objects/10/ecf2b7ce989f01f3f7266e712b48d9275f2635
+- features/test_repo/working.git/objects/a5/71d56305df09fb060f6ccb730b46080d305beb
+- features/test_repo/working.git/refs/heads/master
 - git-pivotal.gemspec
 - lib/commands/base.rb
 - lib/commands/bug.rb
 - lib/commands/chore.rb
 - lib/commands/feature.rb
 - lib/commands/finish.rb
+- lib/commands/info.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
+- lib/git-pivotal.rb
 - readme.markdown
 - spec/commands/base_spec.rb
 - spec/commands/bug_spec.rb
@@ -151,14 +177,6 @@ files:
 - spec/commands/finish_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
-- spec/pivotal/story_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/trydionel/git-pivotal
@@ -174,7 +192,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -183,7 +200,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -202,11 +218,4 @@ test_files:
 - spec/commands/finish_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
-- spec/pivotal/story_spec.rb
 - spec/spec_helper.rb

data/lib/pivotal/api.rb

@@ -1,17 +0,0 @@
-module Pivotal
-  class Api < Base
-  
-    attr_accessor :api_token
-    has_collection :projects, :of => Pivotal::Project
-    
-    def initialize(options = {})
-      super(options)
-      @api_url = "https://www.pivotaltracker.com/services/v3"
-    end
-  
-    def resource
-      @resource ||= RestClient::Resource.new @api_url, :headers => { 'X-TrackerToken' => api_token, 'Content-Type' => 'application/xml' }
-    end
-  
-  end
-end

data/lib/pivotal/associations.rb

@@ -1,17 +0,0 @@
-module Pivotal
-  module Associations
-    
-    def self.included(base)
-      base.extend ClassMethods
-    end
-    
-    module ClassMethods
-      def has_collection(name, options = {})
-        define_method name do
-          Pivotal::Collection.new resource[name], options[:of]
-        end
-      end
-    end
-    
-  end
-end

data/lib/pivotal/attributes.rb

@@ -1,25 +0,0 @@
-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 { |attribute| attribute.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

@@ -1,73 +0,0 @@
-require 'rubygems'
-gem 'rest-client', '~>1.4.0'
-require 'rest_client'
-require 'nokogiri'
-require 'builder'
-
-module Pivotal
-  class Base
-    include Pivotal::Associations
-    include Pivotal::Attributes
-    
-    attr_accessor :resource, :xml
-    
-    def initialize(params = {})
-      params.each do |key, value|
-        send("#{key}=", value)
-      end
-    end    
-    
-    def xml
-      @xml ||= resource.get.body
-    end
-
-    def parsed_resource
-      @parsed_resource ||= Nokogiri::XML(xml)
-    end
-    
-    def update_attributes(options = {})
-      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
-      def name_as_xml_attribute
-        self.name.gsub(/.+\:\:/, '').downcase
-      end
-      
-      def xpath
-        '//' + self.name_as_xml_attribute
-      end
-    end
-    
-  private
-  
-    def generate_xml(options = {})
-      builder = Builder::XmlMarkup.new
-      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.target!
-    end
-    
-    def allowed_keys(options = {})
-      options.reject do |key, _|
-        !self.class.attributes.include? key.to_s
-      end
-    end
-    
-  end
-end

data/lib/pivotal/collection.rb

@@ -1,63 +0,0 @@
-require 'cgi'
-
-module Pivotal
-  class Collection
-    
-    attr_accessor :resource, :component_class
-    
-    def initialize(resource, component_class)
-      @resource, @component_class = resource, component_class
-    end
-    
-    # Param queries will break our REST structure,
-    # so if we find an :id parameter, accept it and
-    # ignore all other params.
-    def find(*args)
-      params = args.last.is_a?(Hash) ? args.pop : {}
-      finder = args.first
-      
-      return item(params[:id]) if params[:id]
-      return item(finder) if finder.is_a?(Numeric)
-      
-      all(params)
-    end
-    
-    def first
-      all.first
-    end
-    
-  private
-  
-    def item(id)
-      component_class.new :resource => resource[id]
-    end
-  
-    def filters(params = {})
-      return "" if params.empty?
-
-      param_url = []
-      if params[:conditions]
-        condition_string = params[:conditions].map { |k,v| "#{k}:#{v}" }.join " "
-        param_url << "filter=#{CGI::escape(condition_string)}"
-      end
-      
-      if params[:limit]
-        param_url << "limit=#{params[:limit]}&offset=#{params[:offset]||0}"
-      end
-      
-      "?" + param_url.join("&")
-    end
-    
-    def build_collection_from_xml(xml = "")
-      Nokogiri::XML(xml).xpath(component_class.xpath).map do |item|
-        item_id = item.xpath("id").text
-        component_class.new :resource => resource[item_id], :xml => item.to_xml
-      end
-    end
-    
-    def all(params = {})
-      build_collection_from_xml resource[filters(params)].get.body
-    end
-    
-  end
-end

data/lib/pivotal/project.rb

@@ -1,14 +0,0 @@
-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