v2gpti 1.1.3 → 1.1.4

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

@@ -28,9 +28,9 @@ class GitPivotalTrackerIntegration::Command::Finish < GitPivotalTrackerIntegrati
   #
   # @return [void]
   def run(argument)
-    $LOG.debug("#{self.class} in project:#{@project.name} pwd:#{(GitPivotalTrackerIntegration::Util::Shell.exec 'pwd').chop} branch:#{GitPivotalTrackerIntegration::Util::Git.branch_name}")
+    $LOG.debug("#{self.class} in project:#{@project.name} pwd:#{pwd} branch:#{GitPivotalTrackerIntegration::Util::Git.branch_name}")
     no_complete = argument =~ /--no-complete/
-    
+
     branch_status_check = GitPivotalTrackerIntegration::Util::Shell.exec "git status -s"
     abort "\n\nThere are some unstaged changes in your current branch. Please do execute the below commands first and then try with git finish \n git add . \n git commit -m '<your-commit-message>'" unless branch_status_check.empty?
 
@@ -39,8 +39,10 @@ class GitPivotalTrackerIntegration::Command::Finish < GitPivotalTrackerIntegrati
     $LOG.debug("configuration:#{@configuration}")
     $LOG.debug("project:#{@project}")
     $LOG.debug("story:#{@configuration.story(@project)}")
+
     memm =  PivotalTracker::Membership.all(@project)
     self.commit_new_build
+
     time_spent = ""
     while 1
       time_spent = ask("How much time did you spend on this task? (example: 15m, 2.5h)")
@@ -48,36 +50,41 @@ class GitPivotalTrackerIntegration::Command::Finish < GitPivotalTrackerIntegrati
         break
       end
     end
+
     finish_toggle(@configuration, time_spent)
+
     GitPivotalTrackerIntegration::Util::Git.merge(@configuration.story(@project), no_complete)
     GitPivotalTrackerIntegration::Util::Git.push GitPivotalTrackerIntegration::Util::Git.branch_name
   end
 
 
-def commit_new_build
-  # Update version and build numbers
-  build_number = Time.now.utc.strftime("%y%m%d-%H%M")
+  def commit_new_build
+    # Update version and build numbers
+    build_number      = Time.now.utc.strftime("%y%m%d-%H%M")
+    working_directory = pwd
 
-  puts "build_number:#{build_number}"
-  project_directory = ((GitPivotalTrackerIntegration::Util::Shell.exec 'find . -name "*.xcodeproj" 2>/dev/null').split /\/(?=[^\/]*$)/)[0]
-  if project_directory.nil?
-    return
-  end
-  working_directory = (GitPivotalTrackerIntegration::Util::Shell.exec "pwd").chop
-  puts "working_directory:#{working_directory}*"
+    puts "build_number:#{build_number}"
+    puts "working_directory:#{working_directory}*"
 
-  # cd to the project_directory
-  Dir.chdir(project_directory)
+    if (OS.mac? && ["y","ios"].include?(@platform.downcase))
+      project_directory = ((GitPivotalTrackerIntegration::Util::Shell.exec 'find . -name "*.xcodeproj" 2>/dev/null').split /\/(?=[^\/]*$)/)[0]
+      return if project_directory.nil?
 
-  # 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 to the project_directory
+      Dir.chdir(project_directory)
+
+      # set build number and project number in project file
+      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)
+    end
+
+    # Create a new build commit, push to develop
+    GitPivotalTrackerIntegration::Util::Git.create_commit( "Update build number to #{build_number}", @configuration.story(@project))
+  end
 
-  # cd back to the working_directory
-  Dir.chdir(working_directory)
 
-  # Create a new build commit, push to develop
-  GitPivotalTrackerIntegration::Util::Git.create_commit( "Update build number to #{build_number}", @configuration.story(@project))
-end
 end

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

@@ -0,0 +1,59 @@
+# 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 creating a Pivotal Tracker Bug Story
+class GitPivotalTrackerIntegration::Command::Newbug < GitPivotalTrackerIntegration::Command::Base
+
+  # Creates a Pivotal Tracker story by doing the following steps:
+  # * Takes arguments from command line
+  # * If arguments contains -i then it creates a bug story under icebox
+  # * If arguments contains -b then it creates a bug story under backlog
+  # * If arguments contains -tl then it creates a bug story at top of specified list
+  # * If arguments contains -bl then it creates a bug story at bottom of specified list
+  # * If there are no arguments passed then it creates a bug story in icebox top of the list if you wish to create
+  def run(args)
+    my_projects = PivotalTracker::Project.all
+    $LOG.debug("#{self.class} in project:#{@project.name} pwd:#{pwd} branch:#{GitPivotalTrackerIntegration::Util::Git.branch_name}")
+    story = nil
+    if (!args.empty? && args.any?{|arg| arg.include?("-i")})
+      story = self.create_icebox_bug_story(args)
+    elsif (!args.empty? && args.any?{|arg| arg.include?("-b")})
+      story = self.create_backlog_bug_story(args)
+	else
+	  puts "\n Syntax for creating new bug story in icebox top of the list:\n git newbug -i -tl <bug-title> \n Syntax for creating new bug story in icebox bottom of the list: \n git newbug -i -bl <bug-title>\n"
+	  puts "\n Syntax for creating new bug story in backlog top of the list:\n git newbug -b -tl <bug-title> \n Syntax for creating new bug story in backlog bottom of the list: \n git newbug -b -bl <bug-title>\n"
+	  user_response = nil
+	  while (user_response.nil? || user_response.empty?)
+	  user_response = ask("\nYou have missed some parameters to pass...If you are ok with creating new bug story in icebox then enter y otherwise enter n")
+	  end
+	  while !(["y","n"].include?(user_response))
+	  user_response = ask("\nInvalid entry...If you are ok with creating new bug story in icebox then enter y otherwise enter n")
+	  end
+	  if user_response.downcase == "y"
+		story = self.create_icebox_bug_story(args)
+	  else
+	  abort "\nCheck your new bug story creation syntax and then try again"
+	  end
+    end
+	puts "A new bug story has been created successfully with ID:#{story.id}"
+  end
+
+end

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

@@ -0,0 +1,62 @@
+# 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 creating a Pivotal Tracker Bug Story
+class GitPivotalTrackerIntegration::Command::Newfeature < GitPivotalTrackerIntegration::Command::Base
+
+  # Creates a Pivotal Tracker story by doing the following steps:
+  # * Takes arguments from command line
+  # * If arguments contains -i then it creates a feature story under icebox
+  # * If arguments contains -b then it creates a feature story under backlog
+  # * If arguments contains -tl then it creates a feature story at top of specified list
+  # * If arguments contains -bl then it creates a feature story at bottom of specified list
+  # * If arguments contains -p1 then it creates a feature story with estimate as 1 point.
+  # * If arguments contains -p2 then it creates a feature story with estimate as 2 points.
+  # * If arguments contains -p3 then it creates a feature story with estimate as 3 points.
+  # * If there are no arguments passed then it creates a feature story in icebox top of the list if you wish to create
+  def run(args)
+    my_projects = PivotalTracker::Project.all
+    $LOG.debug("#{self.class} in project:#{@project.name} pwd:#{pwd} branch:#{GitPivotalTrackerIntegration::Util::Git.branch_name}")
+    story = nil
+    if (!args.empty? && args.any?{|arg| arg.include?("-i")})
+      story = self.create_icebox_feature_story(args)
+    elsif (!args.empty? && args.any?{|arg| arg.include?("-b")})
+      story = self.create_backlog_feature_story(args)
+	else
+	  puts "\n Syntax for creating new feature story in icebox top of the list:\n git newfeature -i -tl <feature-title> \n Syntax for creating new feature story in icebox bottom of the list: \n git newfeature -i -bl <feature-title>\n"
+	  puts "\n Syntax for creating new feature story in backlog top of the list:\n git newfeature -b -tl <feature-title> \n Syntax for creating new feature story in backlog bottom of the list: \n git newfeature -b -bl <feature-title>\n"
+	  user_response = nil
+	  while (user_response.nil? || user_response.empty?)
+	  user_response = ask("\nYou have missed some parameters to pass...If you are ok with creating new feature story in icebox then enter y otherwise enter n")
+	  end
+	  while !(["y","n"].include?(user_response.downcase))
+	  user_response = ask("\nInvalid entry...If you are ok with creating new feature story in icebox then enter y otherwise enter n")
+	  end
+	  if user_response.downcase == "y"
+		story = self.create_icebox_feature_story(args)
+	  else
+	  abort "\nCheck your new feature story creation syntax and then try again"
+	  end
+    end
+	puts "A new feature story has been created successfully with ID:#{story.id}"
+  end
+
+end

data/lib/git-pivotal-tracker-integration/command/prepare-commit-msg-win.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+# 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.
+
+CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+STORY_ID=$(git config branch.$CURRENT_BRANCH.pivotal-story-id)
+
+if [[ $2 != "commit" && -n $STORY_ID ]]; then
+ ORIG_MSG_FILE="$1"
+ TEMP="/tmp/git-$RANDOM"
+
+ (printf "\n\n[#$STORY_ID]" ; cat "$1") > "$TEMP"
+ cat "$TEMP" > "$ORIG_MSG_FILE"
+fi

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

@@ -34,7 +34,7 @@ class GitPivotalTrackerIntegration::Command::Release < GitPivotalTrackerIntegrat
   #   * +nil+
   # @return [void]
   def run(filter)
-    $LOG.debug("#{self.class} in project:#{@project.name} pwd:#{(GitPivotalTrackerIntegration::Util::Shell.exec 'pwd').chop} branch:#{GitPivotalTrackerIntegration::Util::Git.branch_name}")
+    $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)
     GitPivotalTrackerIntegration::Util::Story.pretty_print story
     $LOG.debug("story:#{story.name}")
@@ -42,15 +42,15 @@ class GitPivotalTrackerIntegration::Command::Release < GitPivotalTrackerIntegrat
     current_branch = GitPivotalTrackerIntegration::Util::Git.branch_name
 
     # checkout QA branch
-    # Update QA from origin    
+    # Update QA from origin
     puts GitPivotalTrackerIntegration::Util::Shell.exec "git checkout QA"
     puts GitPivotalTrackerIntegration::Util::Shell.exec "git fetch"
-    puts GitPivotalTrackerIntegration::Util::Shell.exec "git merge -s recursive --strategy-option theirs origin QA"
+    GitPivotalTrackerIntegration::Util::Shell.exec "git merge -s recursive --strategy-option theirs origin QA"
 
     # checkout master branch
     # Merge QA into master
     puts GitPivotalTrackerIntegration::Util::Shell.exec "git checkout master"
-       puts GitPivotalTrackerIntegration::Util::Shell.exec "git fetch"
+    puts GitPivotalTrackerIntegration::Util::Shell.exec "git pull"
     if (GitPivotalTrackerIntegration::Util::Shell.exec "git merge -s recursive --strategy-option theirs QA")
       puts "Merged 'QA' in to 'master'"
     else
@@ -58,27 +58,31 @@ class GitPivotalTrackerIntegration::Command::Release < GitPivotalTrackerIntegrat
     end
 
     # Update version and build numbers
-    version_number = story.name.dup
+    version_number    = story.name.dup
     version_number[0] = ""
+    working_directory = pwd
+
     puts "storyNAME:#{story.name}"
     puts "version_number:#{version_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 project number in project file
-    GitPivotalTrackerIntegration::Util::Shell.exec "pwd"   
-    puts GitPivotalTrackerIntegration::Util::Shell.exec "xcrun agvtool new-marketing-version #{version_number}"
+    if (OS.mac? && ["y","ios"].include?(@platform.downcase))
+      project_directory = ((GitPivotalTrackerIntegration::Util::Shell.exec 'find . -name "*.xcodeproj" 2>/dev/null').split /\/(?=[^\/]*$)/)[0]
+
+      # cd to the project_directory
+      Dir.chdir(project_directory)
 
-    # cd back to the working_directory
-    Dir.chdir(working_directory)
+      # set project number in project file
+      pwd
+      puts GitPivotalTrackerIntegration::Util::Shell.exec "xcrun agvtool new-marketing-version #{version_number}"
+
+      # cd back to the working_directory
+      Dir.chdir(working_directory)
+    end
 
     # Create a new build commit, push to QA, checkout develop
     puts GitPivotalTrackerIntegration::Util::Git.create_commit( "Update version number to #{version_number} for delivery to QA", story)
-    puts GitPivotalTrackerIntegration::Util::Shell.exec "git push" 
+    puts GitPivotalTrackerIntegration::Util::Shell.exec "git push"
     puts GitPivotalTrackerIntegration::Util::Shell.exec "git checkout #{current_branch}"
 
     s_labels_string = story.labels

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

@@ -28,7 +28,7 @@ class GitPivotalTrackerIntegration::Command::Report < GitPivotalTrackerIntegrati
     owned_by = "Jeff Wolski" # hard coded to Jeff Wolski for now
 
 
-    $LOG.debug("#{self.class} in project:#{@project.name} pwd:#{(GitPivotalTrackerIntegration::Util::Shell.exec 'pwd').chop} branch:#{GitPivotalTrackerIntegration::Util::Git.branch_name}")
+    $LOG.debug("#{self.class} in project:#{@project.name} pwd:#{pwd} branch:#{GitPivotalTrackerIntegration::Util::Git.branch_name}")
     bug_title = nil
     if args.length == 1
       bug_title = args[0]
@@ -43,19 +43,20 @@ class GitPivotalTrackerIntegration::Command::Report < GitPivotalTrackerIntegrati
       report_note = ask("Description of bug:")
     end
 
-    current_user = (GitPivotalTrackerIntegration::Util::Shell.exec "git config user.name").chomp
-    bug_title = "User Reported - #{current_user} - #{bug_title}"
-    current_user_email = (GitPivotalTrackerIntegration::Util::Shell.exec "git config user.email").chomp
-    bug_description = "#{current_user_email}\n#{report_note}"
+    current_user        = (GitPivotalTrackerIntegration::Util::Shell.exec "git config user.name").chomp
+    bug_title           = "User Reported - #{current_user} - #{bug_title}"
+    current_user_email  = (GitPivotalTrackerIntegration::Util::Shell.exec "git config user.email").chomp
+    bug_description     = "#{@project.name}\n#{current_user_email}\n#{report_note}"
 
     bug_story = PivotalTracker::Story.new
-    bug_story.project_id = "1067990"
-    bug_story.owned_by = owned_by
-    bug_story.story_type = "bug"
-    bug_story.name = bug_title
-    bug_story.description = bug_description
-    bug_story.labels = "userreported"
-    uploaded_story = bug_story.create
+    bug_story.project_id    = "1067990"
+    bug_story.owned_by      = owned_by
+    bug_story.story_type    = "bug"
+    bug_story.name          = bug_title
+    bug_story.description   = bug_description
+    bug_story.labels        = "userreported"
+    uploaded_story          = bug_story.create
+
     uploaded_story.upload_attachment(self.logger_filename)
   end
 

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

@@ -36,7 +36,7 @@ class GitPivotalTrackerIntegration::Command::Start < GitPivotalTrackerIntegratio
   def run(args)
     my_projects = PivotalTracker::Project.all
     filter = args[0]
-    $LOG.debug("#{self.class} in project:#{@project.name} pwd:#{(GitPivotalTrackerIntegration::Util::Shell.exec 'pwd').chop} branch:#{GitPivotalTrackerIntegration::Util::Git.branch_name} args:#{filter}")
+    $LOG.debug("#{self.class} in project:#{@project.name} pwd:#{pwd} branch:#{GitPivotalTrackerIntegration::Util::Git.branch_name} args:#{filter}")
     self.check_branch
     story = nil
     if (!args.nil? && args.any?{|arg| arg.include?("-n")})
@@ -47,13 +47,16 @@ class GitPivotalTrackerIntegration::Command::Start < GitPivotalTrackerIntegratio
     if story.nil?
       abort "There are no available stories."
     end
+    if story.story_type == "feature" && story.estimate < 0
+      estimate_story(story)
+    end
     $LOG.debug("story:#{story.name}")
     GitPivotalTrackerIntegration::Util::Story.pretty_print story
 
     development_branch_name = development_branch_name story
     GitPivotalTrackerIntegration::Util::Git.create_branch development_branch_name
     @configuration.story = story
-    GitPivotalTrackerIntegration::Util::Git.add_hook 'prepare-commit-msg', File.join(File.dirname(__FILE__), 'prepare-commit-msg.sh')
+    GitPivotalTrackerIntegration::Util::Git.add_hook 'prepare-commit-msg', File.join(File.dirname(__FILE__), !OS.windows? ? 'prepare-commit-msg.sh' : 'prepare-commit-msg-win.sh' )
 
     start_on_tracker story
   end
@@ -63,7 +66,7 @@ class GitPivotalTrackerIntegration::Command::Start < GitPivotalTrackerIntegratio
       current_branch = GitPivotalTrackerIntegration::Util::Git.branch_name
       # suggested_branch = (GitPivotalTrackerIntegration::Util::Shell.exec "git config --get git-pivotal-tracker-integration.feature-root 2>/dev/null", false).chomp
       suggested_branch = "develop"
-      
+
       if !suggested_branch.nil? && suggested_branch.length !=0 && current_branch != suggested_branch
           $LOG.warn("Currently checked out branch is '#{current_branch}'.")
           should_chage_branch = ask("Your currently checked out branch is '#{current_branch}'. Do you want to checkout '#{suggested_branch}' before starting?(Y/n)")

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

@@ -224,7 +224,7 @@ class GitPivotalTrackerIntegration::Util::Git
     common_ancestor = GitPivotalTrackerIntegration::Util::Shell.exec "git merge-base #{root_branch} #{development_branch}"
 
     if root_tip != common_ancestor
-      abort 'FAIL'
+      abort "\n#{root_branch} branch is ahead of your #{development_branch} branch. \nSo please merge #{root_branch} to #{development_branch} and resolve any conflicts if any. Run 'git merge #{root_branch}' and try git finish again."
     end
 
     puts 'OK'

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

@@ -113,7 +113,7 @@ class GitPivotalTrackerIntegration::Util::Story
   def self.find_story(project, type, limit)
     if (type == "b" || type == "v")
       release_type = type
-      type = "release"      
+      type = "release"
     end
     criteria = {
       :current_state => CANDIDATE_STATES,
@@ -131,16 +131,16 @@ class GitPivotalTrackerIntegration::Util::Story
 
     candidates.each {|val|
         val_is_valid = true
-        if (val.story_type == "feature" ) 
+        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 
+            # puts "#{val.estimate} < 0"
+            val_is_valid = false
           end
         elsif (val.story_type == "release")
           label_string = val.labels
           if label_string.nil?
-            label_string = "";            
+            label_string = "";
           end
           if (val.name[0] != release_type) || (label_string.include? val.name)
             val_is_valid = false
@@ -150,7 +150,7 @@ class GitPivotalTrackerIntegration::Util::Story
         if val_is_valid
           # puts "val_is_valid:#{val_is_valid}"
            estimated_candidates << val
-        end 
+        end
     }
     candidates = estimated_candidates
 
@@ -166,6 +166,10 @@ class GitPivotalTrackerIntegration::Util::Story
           name = type ? story.name : '%-7s %s' % [story.story_type.upcase, story.name]
           menu.choice(name) { story }
         end
+        menu.choice('Quit') do
+          say "Thank you for using v2gpti"
+          exit 0
+        end
       end
 
       puts
@@ -183,7 +187,7 @@ class GitPivotalTrackerIntegration::Util::Story
       end
     end
 
-    
+
 
     story
   end
@@ -194,9 +198,10 @@ class GitPivotalTrackerIntegration::Util::Story
     }
 
     candidates = project.stories.all criteria
-    candidates = candidates.select {|x| (x.name[0]==release_type) && !(x.labels.nil? || (!x.labels.include?x.name))}
+    candidates = candidates.select {|x| (x.name[0]==release_type) && !(x.labels.nil? || (!x.labels.include? x.name))}
+    candidates.sort! {|x,y| y.name <=> x.name }
 
-    candidates[-1]
+    candidates.first
   end
 
   def self.create_new_release (project, next_release_number)