idealian-git-pivotal 0.2.3 → 0.2.4

data/Rakefile

@@ -7,12 +7,12 @@ $LOAD_PATH.unshift('lib')
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "git-pivotal"
-    gemspec.summary = "A collection of git utilities to ease integration with Pivotal Tracker"
+    gemspec.name = "idealian-git-pivotal"
+    gemspec.summary = "a fork of git-pivital to support owner picking and different local integration branch A collection of git utilities to ease integration with Pivotal Tracker"
     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", "Sam Stokes"]
+    gemspec.authors = ["Jeff Tucker", "Sam Stokes", "Taylor Luk"]
     
     gemspec.add_dependency "nokogiri"
     gemspec.add_dependency "rest-client"

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.4

data/git-pivotal.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{git-pivotal}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Tucker", "Sam Stokes"]
-  s.date = %q{2010-03-11}
+  s.date = %q{2010-04-09}
   s.description = %q{A collection of git utilities to ease integration with Pivotal Tracker}
   s.email = %q{jeff@trydionel.com}
   s.executables = ["git-bug", "git-chore", "git-feature", "git-finish", "git-pick"]

data/lib/commands/base.rb

@@ -41,10 +41,12 @@ module Commands
       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
+      target = get("git config --get pivotal.target").strip
 
       options[:api_token] = token unless token == ""
       options[:project_id] = id unless id == ""
       options[:full_name] = name unless name == ""
+      options[:target] = target == "" ? "master" : target
     end
 
     def parse_argv(*args)

data/lib/commands/feature.rb

@@ -15,5 +15,15 @@ module Commands
       "feature"
     end
 
+    private
+      def story
+        # Try your own story first
+        @story ||= project.stories.find(:conditions => { 
+          :story_type => type, :current_state => :unstarted, :owner => options[:full_name]
+        }, :limit => 1).first
+
+        # try anything not started
+        @story ||= project.stories.find(:conditions => { :story_type => type, :current_state => :unstarted }, :limit => 1).first
+      end
   end
 end

data/lib/commands/finish.rb

@@ -21,7 +21,7 @@ module Commands
       put "Marking Story #{story_id} as finished..."
       if story.update_attributes(:current_state => :finished)
       
-        target_branch = "develop"
+        target_branch = options[:target]
         put "Merging #{current_branch} into #{target_branch}"
         sys "git checkout #{target_branch}"
         sys "git merge --no-ff #{current_branch}"

data/lib/commands/pick.rb

@@ -19,10 +19,6 @@ module Commands
       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 => type, :current_state => :unstarted }, :limit => 1).first
     
       unless story
         put "No #{plural_type} available!"
@@ -56,6 +52,18 @@ module Commands
         return 1
       end
     end
-
+    
+    protected
+      def api
+        @api ||= Pivotal::Api.new(:api_token => options[:api_token])
+      end
+    
+      def project
+        @project ||= api.projects.find(:id => options[:project_id])
+      end
+      
+      def story
+        @story ||= project.stories.find(:conditions => { :story_type => type, :current_state => :unstarted }, :limit => 1).first
+      end
   end
 end

data/readme.markdown

@@ -30,7 +30,7 @@ When on a feature branch, this command will close the associated story in Pivota
 ##Installation
 To install git-pivotal, simply run
 
-    [sudo] gem install git-pivotal
+    [sudo] gem install idealian-git-pivotal
 
 <h2 id="config">Configuration</h2>
 Once installed, git pivotal needs three bits of info: your Pivotal Tracker API Token, your name as it appears in Pivotal Tracker and your Pivotal Tracker project id.  The former two are best set as a global git config options:
@@ -41,6 +41,11 @@ Once installed, git pivotal needs three bits of info: your Pivotal Tracker API T
 The project id is best placed within your project's git config:
 
     git config -f .git/config pivotal.project-id 88888
+    
+Different local integration branch (default: master)
+
+    git config -f .git/config pivotal.target develop
+
 
 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.
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: idealian-git-pivotal
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Jeff Tucker
@@ -16,16 +17,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-09 00:00:00 +10:00
+date: 2010-05-26 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -35,9 +38,11 @@ dependencies:
   name: rest-client
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -47,9 +52,11 @@ dependencies:
   name: builder
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -59,9 +66,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -71,9 +80,11 @@ dependencies:
   name: rcov
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -83,9 +94,11 @@ dependencies:
   name: mocha
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -154,23 +167,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: a fork of git-pivital to support owner picking and different local integration branch A collection of git utilities to ease integration with Pivotal Tracker