v2gpti 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d32c53700d4c10eed175e334f2fa5d88be21255d
-  data.tar.gz: 417da34d4ac4214d7c17f3eec25463b9e275a581
+  metadata.gz: 407115cdfe7f437aeaf30bc325ef59b20635004e
+  data.tar.gz: 87b290c0c989eac656f421fb3f27420cabaa5bee
 SHA512:
-  metadata.gz: 278245d35a288d71ac3bb536a5acd5f440468fde46bb6b3843a0109e542183bb2e18b4d4c9a49a891e77c7eae7e451d5b62e7e7a00e03e4a384ed4958de14e04
-  data.tar.gz: 334395c82849448aeaedcaf21edd88e4fbb5d33cc1b3827db3620e3aa9ac20cef8eb9145bdaf301ce42ef2118670e1e3168f4d6e0809dc2c69031dfb5f34e2c1
+  metadata.gz: e775a908da1c9deb527fb2f6a32c02c67cbfcd70bc136a02f3de488781d884d5950d293267a70ff8ada28bd7a14713a4f684357474e139d7e36ebf8532c2b39b
+  data.tar.gz: da3003f9db12d75815967a7c7204ab054370fe8235c515ddc2909170db3d4dd3ef1931b97036b4888b0a9ff654945b7ea43f5c048fa395aebf5d7d4a97655945

data/lib/git-pivotal-tracker-integration/command/deliver.rb

@@ -216,8 +216,10 @@ class GitPivotalTrackerIntegration::Command::Deliver < GitPivotalTrackerIntegrat
     stories.reverse!
 
     stories.each do |story|
-      if not_accepted_releases.size == 1
+      if not_accepted_releases.size == 1 && !last_accepted_release_story.nil?
         story.move(:after, last_accepted_release_story)
+      elsif previous_story.current_state == 'accepted'
+        story.move(:after, not_accepted_releases[not_accepted_releases.size - 2])
       else
         story.move(:after, previous_story)
       end

data/lib/git-pivotal-tracker-integration/command/release.rb

@@ -36,6 +36,8 @@ class GitPivotalTrackerIntegration::Command::Release < GitPivotalTrackerIntegrat
   def run(filter)
     $LOG.debug("#{self.class} in project:#{@project.name} pwd:#{pwd} branch:#{GitPivotalTrackerIntegration::Util::Git.branch_name}")
     story = GitPivotalTrackerIntegration::Util::Story.select_release(@project, filter.nil? ? 'v' : filter)
+    place_version_release story
+    pull_out_rejected_stories story
     GitPivotalTrackerIntegration::Util::Story.pretty_print story
     $LOG.debug("story:#{story.name}")
 
@@ -99,7 +101,34 @@ class GitPivotalTrackerIntegration::Command::Release < GitPivotalTrackerIntegrat
     story.update(:labels => s_labels_string)
 
   end
-
-
+  
+  private
+  
+  def place_version_release(release_story)
+	not_accepted_releases = nil
+	not_accepted_releases_ids = nil
+	not_accepted_releases = @project.stories.all(:current_state => 'unstarted', :story_type => 'release')
+	not_accepted_releases_ids = Array.new
+	not_accepted_releases.collect{|not_accepted_release| not_accepted_releases_ids.push not_accepted_release.id.to_i }
+	unless (not_accepted_releases_ids.include?(release_story.id))
+		not_accepted_releases << release_story
+		not_accepted_releases_ids.clear
+		not_accepted_releases.collect{|not_accepted_release| not_accepted_releases_ids.push not_accepted_release.id.to_i }
+	end
+    specified_pt_story = @project.stories.all(:current_state => ['unstarted', 'started', 'finished', 'delivered', 'rejected']).first
+    last_accepted_release_story=@project.stories.all(:current_state => 'accepted', :story_type => 'release').last
+    if not_accepted_releases.size > 1
+		release_story.move(:after, not_accepted_releases[not_accepted_releases.size - 2])
+    elsif !specified_pt_story.nil?
+		release_story.move(:before, specified_pt_story)
+    end
+  end
+  
+  def pull_out_rejected_stories(release_story)
+      rejected_stories=@project.stories.all(:current_state => ['rejected'], :story_type => ['bug', 'chore', 'feature'])
+      rejected_stories.each{|rejected_story|
+          rejected_story.move(:after, release_story)
+      }	
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: v2gpti
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Jeff Wolski
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline