v2gpti 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bdffa3f751ba70b4294b507f65a7c3f6674568d
-  data.tar.gz: f8bc500b92c556a783be55b4e72e3495738f2d56
+  metadata.gz: c6e841960ee2e72e5ad3b18f677b1c65c8f59505
+  data.tar.gz: 1a7d28cfb47ae45f9e1d17041bd0188efcee8680
 SHA512:
-  metadata.gz: 98c1e7fe0b651c23052b69eb842f5899622da3109275097a0cb2258e485c594b864c1f0371efb64f52495613b40f4e016eeb1c0a96ad073cf4a7e4b4968cf47b
-  data.tar.gz: d2f52f333ddca3fe06e2951142a06d8e57fed152b4a43bfdd4d53773fc92e542c24f996f6d1003cb2c6ba2388d845e0cf432561a3bcd6700de9f77db04963582
+  metadata.gz: 31a93fb8e2d725c0f224ba22a208aa4cf6d8edf50cbc2385ab67c6394635acd520931d21fe332b4bdede4499a3d9d13566d0ff6aac86fb3446c851f221b6d299
+  data.tar.gz: dabf84782ec085a1aa62c5cdc7062add32fdfcf8ddf0b118368ad5004a62ede0b94cdd381c734092a131d898b5976bef933277825a31523918827064f14b342e

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

@@ -38,7 +38,7 @@ class GitPivotalTrackerIntegration::Command::Deliver < GitPivotalTrackerIntegrat
     self.check_branch
     story = GitPivotalTrackerIntegration::Util::Story.select_release @project
     $LOG.debug("story:#{story.name}")
-
+    sort_for_deliver story
     GitPivotalTrackerIntegration::Util::Story.pretty_print story
 
    current_branch = GitPivotalTrackerIntegration::Util::Git.branch_name
@@ -85,7 +85,6 @@ class GitPivotalTrackerIntegration::Command::Deliver < GitPivotalTrackerIntegrat
 
     i_stories = included_stories @project, story
     deliver_stories i_stories, story
-
   end
 
   def check_branch
@@ -118,7 +117,7 @@ def deliver_stories(stories, build_story)
   all_stories = stories.dup
   all_stories << build_story
   all_stories.each {|story|
-    puts "story class:#{story.class}"
+    # puts "story class:#{story.class}"
     s_labels_string = story.labels
     s_labels = ""
     if (s_labels_string)
@@ -129,7 +128,7 @@ def deliver_stories(stories, build_story)
       s_labels_string = build_story.name
     end
     
-    puts "labels:#{s_labels_string}"
+    # puts "labels:#{s_labels_string}"
     story.update(:labels => s_labels_string)
     if (story.story_type == "feature") || (story.story_type == "bug")
       story.update(:current_state => "delivered")
@@ -202,4 +201,17 @@ end
     puts 'OK'
   end
 
+  def sort_for_deliver(release_story)
+    last_release = GitPivotalTrackerIntegration::Util::Story.last_release_story(@project, "b")
+    stories = included_stories(@project, release_story)
+    stories << release_story
+    previous_story = last_release.dup
+    puts "Last release:#{previous_story.name}"
+    stories.each {|story|
+      story.move(:after, previous_story)
+      previous_story = story.dup
+    }
+
+    a=1
+  end
 end

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

@@ -81,7 +81,18 @@ class GitPivotalTrackerIntegration::Command::Release < GitPivotalTrackerIntegrat
     puts GitPivotalTrackerIntegration::Util::Shell.exec "git push" 
     puts GitPivotalTrackerIntegration::Util::Shell.exec "git checkout #{current_branch}"
 
+    s_labels_string = story.labels
+    s_labels = ""
+    if (s_labels_string)
+      s_labels = s_labels_string.split(",")
+      s_labels << story.name
+      s_labels_string = s_labels.uniq.join(",")
+    else
+      s_labels_string = story.name
+    end
 
+    puts "labels:#{s_labels_string}"
+    story.update(:labels => s_labels_string)
 
   end
 

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

@@ -37,6 +37,9 @@ class GitPivotalTrackerIntegration::Command::Start < GitPivotalTrackerIntegratio
     $LOG.debug("#{self.class} in project:#{@project.name} pwd:#{(GitPivotalTrackerIntegration::Util::Shell.exec 'pwd').chop} branch:#{GitPivotalTrackerIntegration::Util::Git.branch_name}")
     self.check_branch
     story = GitPivotalTrackerIntegration::Util::Story.select_story @project, filter
+    if story.nil?
+      abort
+    end
     $LOG.debug("story:#{story.name}")
     GitPivotalTrackerIntegration::Util::Story.pretty_print story
 

data/lib/git-pivotal-tracker-integration/util/story.rb

@@ -171,7 +171,7 @@ class GitPivotalTrackerIntegration::Util::Story
       puts
     else
       if type == "release"
-        last_release_number = last_release(project, release_type)
+        last_release_number = last_release_story(project, release_type).name
         last_release_type_string = (release_type == "b")?"build":"version"
         puts "There are no available release stories. The last #{last_release_type_string} release was #{last_release_number}."
         next_release_number = ask("To create a new #{last_release_type_string}, enter a name for the new release story:")
@@ -186,21 +186,22 @@ class GitPivotalTrackerIntegration::Util::Story
     story
   end
 
-  def self.last_release (project, release_type)
+  def self.last_release_story (project, release_type)
     criteria = {
-      :story_type => "release"
+        :story_type => "release"
     }
 
     candidates = project.stories.all criteria
-    candidates = candidates.select {|x| x.name[0]==release_type}
+    candidates = candidates.select {|x| (x.name[0]==release_type) && !(x.labels.nil? || (!x.labels.include?x.name))}
 
-    candidates[-1].name
+    candidates[-1]
   end
 
   def self.create_new_release (project, next_release_number)
     new_story = PivotalTracker::Story.new
     new_story.project_id = project.id
     new_story.story_type = "release"
+    new_story.current_state = "unstarted"
     new_story.name = next_release_number
 
     uploaded_story = new_story.create

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: v2gpti
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ben Hale
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline