v2gpti 0.2.0.3 → 0.2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e69e16edb5358423c49a4b109ee611c055fe3fd
-  data.tar.gz: 2c90f667d52bf131e02184ce36c4424f546cc64b
+  metadata.gz: eb7fe1c58e20da7e1d498fca6800378197b4314a
+  data.tar.gz: b5746858ddfffd3fca9fb1c442ae54c8e32432ac
 SHA512:
-  metadata.gz: 80dfe2e1b23885f87719776b8aee175ec7cdd7eaa13d1bc19017053b6ece83128fbfc0207cdace35d82f0b47d9d2277dae44a43122b298fdeb642e07613ec596
-  data.tar.gz: d2e46538da9bbdf4357e31fa0abd741484ef83b493ac89350583536a9865f40c5d0142015fd41655a08182d532986ad52c9dd1cdf3b073b743f3005e70886500
+  metadata.gz: 30613ae7a32c8d67e49f8e26f484d273594c63a5e65bbdaf35f1fe46d800bfe6fe2ce7b92e126e0fa561f411ab6e5f2d00132f2c6730b5ed65edc9fda736c5a8
+  data.tar.gz: 88c18c003d1aca06435a64d90291345f1b300ed41bba0de774fae8ded0f0e80030243fce1c00d011c885a2af026fa97a05517fcf53562b8311ed784c0876588d

data/bin/git-deliver

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby -U
+# v2gpti
+# Copyright (c) 2014 V2 Solutions Inc.
+# All Rights Reserved
+
+
+require 'git-pivotal-tracker-integration/command/deliver'
+
+GitPivotalTrackerIntegration::Command::Deliver.new().run ARGV[0]

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

@@ -0,0 +1,197 @@
+# Git Pivotal Tracker Integration
+# Copyright (c) 2013 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'git-pivotal-tracker-integration/command/base'
+require 'git-pivotal-tracker-integration/command/command'
+require 'git-pivotal-tracker-integration/util/git'
+require 'git-pivotal-tracker-integration/util/story'
+require 'pivotal-tracker'
+
+# The class that encapsulates starting a Pivotal Tracker Story
+class GitPivotalTrackerIntegration::Command::Deliver < GitPivotalTrackerIntegration::Command::Base
+
+  # Starts a Pivotal Tracker story by doing the following steps:
+  # * Create a branch
+  # * Add default commit hook
+  # * Start the story on Pivotal Tracker
+  #
+  # @param [String, nil] filter a filter for selecting the story to start.  This
+  #   filter can be either:
+  #   * a story id
+  #   * a story type (feature, bug, chore)
+  #   * +nil+
+  # @return [void]
+  def run(filter)
+    self.check_branch
+    story = GitPivotalTrackerIntegration::Util::Story.select_release @project
+
+    GitPivotalTrackerIntegration::Util::Story.pretty_print story
+
+   current_branch = GitPivotalTrackerIntegration::Util::Git.branch_name
+
+    GitPivotalTrackerIntegration::Util::Shell.exec "git checkout QA"
+    if (GitPivotalTrackerIntegration::Util::Shell.exec "git merge -s recursive --strategy-option theirs develop")
+      puts "Merged 'develop' in to 'QA'"
+    else
+      abort "FAILED to merge 'develop' in to 'QA'"
+    end
+
+        puts "storyNAME:#{story.name}"
+
+    build_number = story.name.dup
+    build_number[0] = ""
+    puts "storyNAME:#{story.name}"
+    puts "build_number:#{build_number}"
+    project_directory = ((GitPivotalTrackerIntegration::Util::Shell.exec 'find . -name "*.xcodeproj" 2>/dev/null').split /\/(?=[^\/]*$)/)[0]
+    working_directory = (GitPivotalTrackerIntegration::Util::Shell.exec "pwd").chop
+    puts "working_directory:#{working_directory}*"
+    
+    # cd to the project_directory
+    Dir.chdir(project_directory)
+
+    # set build number and project number in project file
+    GitPivotalTrackerIntegration::Util::Shell.exec "pwd"   
+    puts GitPivotalTrackerIntegration::Util::Shell.exec "xcrun agvtool new-version -all #{build_number}", false
+    puts GitPivotalTrackerIntegration::Util::Shell.exec "xcrun agvtool new-marketing-version SNAPSHOT"
+
+    # cd back to the working_directory
+    Dir.chdir(working_directory)
+
+    # Create a new build commit, push to QA, checkout develop
+    GitPivotalTrackerIntegration::Util::Git.create_commit( "Update build number to #{build_number} for delivery to QA", story)
+    puts GitPivotalTrackerIntegration::Util::Shell.exec "git push" 
+    puts GitPivotalTrackerIntegration::Util::Shell.exec "git checkout develop"
+
+    i_stories = included_stories @project, story
+    deliver_stories i_stories, story
+
+  end
+
+  def check_branch
+
+      current_branch = GitPivotalTrackerIntegration::Util::Git.branch_name
+
+      suggested_branch = "develop"
+
+      if !suggested_branch.nil? && suggested_branch.length !=0 && current_branch != suggested_branch
+          should_chage_branch = ask("Your currently checked out branch is '#{current_branch}'. Do you want to checkout '#{suggested_branch}' before starting?(Y/n)")
+          if should_chage_branch != "n"
+              print "Checking out branch '#{suggested_branch}'...\n\n"
+              GitPivotalTrackerIntegration::Util::Shell.exec "git checkout #{suggested_branch}"
+              GitPivotalTrackerIntegration::Util::Shell.exec 'git pull'
+
+          else
+              abort "You must be on the #{suggested_branch} branch to run this command."
+          end
+
+      end
+
+  end
+
+  private
+
+    CANDIDATE_STATES = %w(finished unstarted).freeze
+    CANDIDATE_TYPES = %w(bug chore feature release)
+
+def deliver_stories(stories, build_story)
+  all_stories = stories.dup
+  all_stories << build_story
+  all_stories.each {|story|
+    puts "story class:#{story.class}"
+    s_labels_string = story.labels
+    s_labels = ""
+    if (s_labels_string)
+      s_labels = s_labels_string.split(",")
+      s_labels << build_story.name
+      s_labels_string = s_labels.uniq.join(",")
+    else
+      s_labels_string = build_story.name
+    end
+    
+    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")
+    elsif (story.story_type == "chore") 
+      story.update(:current_state => "accepted")      
+    end
+  }
+end
+
+  def included_stories(project, build_story)
+
+    criteria = {
+      :current_state => CANDIDATE_STATES,
+      :limit => 1000,
+      :story_type => CANDIDATE_TYPES
+    }
+    
+
+    candidates = project.stories.all criteria
+
+    # only include stories that have been estimated
+    estimated_candidates = Array.new
+    val_is_valid = true
+    puts "Included stories:\n"
+    candidates.each {|val|
+        val_is_valid = true
+        if (val.id == build_story.id) 
+          break
+        end
+        if (val.current_state != "finished")
+          val_is_valid = false
+        end
+        if (val.story_type == "release")
+          val_is_valid = false
+        end
+        if val_is_valid
+          # puts "val_is_valid:#{val_is_valid}"
+           estimated_candidates << val
+           puts "#{val.id}"
+
+        end 
+    }
+    candidates = estimated_candidates
+  end
+
+
+
+  def development_branch_name(story)
+      prefix = "#{story.id}-"
+      story_name = "#{story.name.gsub(/[^0-9a-z\\s]/i, '_')}"
+      if(story_name.length > 30)
+          suggested_suffix = story_name[0..27]
+          suggested_suffix << "__"
+      else
+          suggested_suffix = story_name
+      end
+      branch_name = "#{prefix}" + ask("Enter branch name (#{story.id}-<#{suggested_suffix}>): ")
+      puts
+      if branch_name == "#{prefix}"
+          branch_name << suggested_suffix
+      end
+      branch_name.gsub(/[^0-9a-z\\s\-]/i, '_')
+  end
+
+  def start_on_tracker(story)
+    print 'Starting story on Pivotal Tracker... '
+    story.update(
+      :current_state => 'started',
+      :owned_by => GitPivotalTrackerIntegration::Util::Git.get_config('user.name')
+    )
+    puts 'OK'
+  end
+
+end

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

@@ -53,7 +53,7 @@ class GitPivotalTrackerIntegration::Util::Story
   #   * +nil+: offers the user a selection of stories of all types
   # @param [Fixnum] limit The number maximum number of stories the user can choose from
   # @return [PivotalTracker::Story] The Pivotal Tracker story selected by the user
-  def self.select_story(project, filter = nil, limit = 5)
+  def self.select_story(project, filter = nil, limit = 12)
     if filter =~ /[[:digit:]]/
       story = project.stories.find filter.to_i
     else
@@ -63,6 +63,21 @@ class GitPivotalTrackerIntegration::Util::Story
     story
   end
 
+  def self.select_release(project, filter = 'b', limit = 10)
+    if filter =~ /[[:digit:]]/
+      story = project.stories.find filter.to_i
+      if story.(story_type != "release")
+        story = nil
+        puts "Specified story##{filter} is not a valid release story"
+        abort 'FAIL'
+      end
+    else
+      story = find_story project, filter, limit
+    end
+
+    story
+  end
+
   private
 
   CANDIDATE_STATES = %w(rejected unstarted unscheduled).freeze
@@ -94,6 +109,10 @@ class GitPivotalTrackerIntegration::Util::Story
   end
 
   def self.find_story(project, type, limit)
+    if (type == "b" || type == "v")
+      release_type = type
+      type = "release"      
+    end
     criteria = {
       :current_state => CANDIDATE_STATES,
       :limit => limit
@@ -106,11 +125,25 @@ class GitPivotalTrackerIntegration::Util::Story
 
     # only include stories that have been estimated
     estimated_candidates = Array.new
+    val_is_valid = true
     candidates.each {|val|
-        #puts "story_type:#{val.story_type} estimate:#{val.estimate}"
-        if !(val.story_type == "feature" && val.estimate < 0)
-            estimated_candidates << val
+        val_is_valid = true
+        if (val.story_type == "feature" ) 
+          # puts "#{val.story_type} #{val.name}.estimate:#{val.estimate} "
+          if (val.estimate < 0)
+            # puts "#{val.estimate} < 0" 
+            val_is_valid = false 
+          end
+        elsif (val.story_type == "release")
+          if (val.name[0] != release_type)
+            val_is_valid = false
+          end
         end
+
+        if val_is_valid
+          # puts "val_is_valid:#{val_is_valid}"
+           estimated_candidates << val
+        end 
     }
     candidates = estimated_candidates
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: v2gpti
 version: !ruby/object:Gem::Version
-  version: 0.2.0.3
+  version: 0.2.0.4
 platform: ruby
 authors:
 - Ben Hale
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -141,6 +141,7 @@ description: Provides a set of additional Git commands to help developers when w
   with Pivotal Tracker
 email: jeff@xxxxxxxxx.com
 executables:
+- git-deliver
 - git-finish
 - git-release
 - git-start
@@ -150,12 +151,14 @@ files:
 - LICENSE
 - NOTICE
 - README.md
+- bin/git-deliver
 - bin/git-finish
 - bin/git-release
 - bin/git-start
 - lib/git-pivotal-tracker-integration/command/base.rb
 - lib/git-pivotal-tracker-integration/command/command.rb
 - lib/git-pivotal-tracker-integration/command/configuration.rb
+- lib/git-pivotal-tracker-integration/command/deliver.rb
 - lib/git-pivotal-tracker-integration/command/finish.rb
 - lib/git-pivotal-tracker-integration/command/prepare-commit-msg.sh
 - lib/git-pivotal-tracker-integration/command/release.rb