v2gpti 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5befd5b69f9da456a4b67b05bead65eba1104d7
-  data.tar.gz: 7f962da0b7b9ddbe7b7ff633f66a23cf095a07ba
+  metadata.gz: 9815c11959085a7eb42681ba759803313d27691d
+  data.tar.gz: c048425c25049ccf789d6cf5c6cde126d39898b1
 SHA512:
-  metadata.gz: de385feddfb531e9b7520d8b3f389607e038cda4317cee796d33f8fe12b920b195e94ec1931423a1e8bebfb2a11c0e17b9622af770fff4644c4d90181cdf0e50
-  data.tar.gz: c4426064c074a03184cf0ca261248318cdff24537ac9bff1a099bf2ef4336e98223904482370b0e9bde8a1bbe7aba6efef2b836954a063ce715aed428b214962
+  metadata.gz: 6375484ae663c990e20533e10d89a17b6a884a5d39132da07e0cf3dbb1efe544e79e4c77bf85ef48512f0940aaf852b7e17d7ece8180f2c3189a4b263d8d17c8
+  data.tar.gz: 9d0e96f96a5cb9c606aec448b52e44bab9877ac39a2e6aa0b026442036ee27e503a4c6b0c516a7fcbb1025d80c88d6fab238484421ac39aa8054b11a6858d7f1

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

@@ -134,7 +134,20 @@ module GitPivotalTrackerIntegration
 
       def included_stories(project, build_story)
 
-        stories = project.stories(filter: "current_state:finished  type:bug,chore,feature -id:#{build_story.id}", limit: 1000)
+        stories_finished = project.stories(filter: "current_state:finished  type:bug,chore,feature -id:#{build_story.id}", limit: 1000)
+        story_ids_finished = stories_finished.map { |e| e.id }
+        story_ids_merged = `git log | grep \"\\[Completes\" | egrep -o \"\\d{9}\"`.split("\n").map(&:to_i)
+
+        story_ids_intersection = story_ids_finished & story_ids_merged
+        stories = stories_finished.map { |e| e if story_ids_intersection.include? e.id }.compact
+       
+          #puts "story IDs finished:\n#{story_ids_finished}"
+          #puts "story IDs merged:\n#{story_ids_merged}"
+          #puts "story IDs intersection:\n#{story_ids_intersection}"
+          #puts "story IDs:\n#{stories.map { |e| e.id }}"
+          #puts "stories count:#{stories.count}"
+          #abort "abort"
+
 
         # capture story details in a file as well as to stdout
         FileUtils.mkdir_p 'release_notes'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: v2gpti
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Jeff Wolski
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-23 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -338,15 +338,15 @@ description: Provides a set of additional Git commands to help developers when w
   with Pivotal Tracker
 email: jeff@xxxxxxxxx.com
 executables:
-- git-qa
-- git-uat
-- git-newbug
+- git-deliver
 - git-finish
-- git-report
+- git-newbug
 - git-newfeature
-- git-start
-- git-deliver
+- git-qa
 - git-release
+- git-report
+- git-start
+- git-uat
 extensions: []
 extra_rdoc_files: []
 files:
@@ -446,17 +446,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Git commands for integration with Pivotal Tracker
 test_files:
+- spec/git-pivotal-tracker-integration/command/base_spec.rb
+- spec/git-pivotal-tracker-integration/command/configuration_spec.rb
+- spec/git-pivotal-tracker-integration/command/finish_spec.rb
+- spec/git-pivotal-tracker-integration/command/release_spec.rb
+- spec/git-pivotal-tracker-integration/command/start_spec.rb
 - spec/git-pivotal-tracker-integration/util/git_spec.rb
 - spec/git-pivotal-tracker-integration/util/shell_spec.rb
 - spec/git-pivotal-tracker-integration/util/story_spec.rb
 - spec/git-pivotal-tracker-integration/version-update/gradle_spec.rb
-- spec/git-pivotal-tracker-integration/command/configuration_spec.rb
-- spec/git-pivotal-tracker-integration/command/finish_spec.rb
-- spec/git-pivotal-tracker-integration/command/start_spec.rb
-- spec/git-pivotal-tracker-integration/command/release_spec.rb
-- spec/git-pivotal-tracker-integration/command/base_spec.rb