v2gpti 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6eadb624d73925e67a5fb147914fea676450d34f
-  data.tar.gz: d66d521a9a48b4cdae919df8799697870e14be58
+  metadata.gz: ddfe68a5f08f7c46ebd79f8b1277fb6ced6533be
+  data.tar.gz: d23cdf958c43817260520461db06a09c329beb18
 SHA512:
-  metadata.gz: b2883223d685164d4457622f12c17c45a7af4979dfae49635ec9a0abdec95c1fb9c93956f799011b97e9491aaa7266509faa101c9fa4d1523f83f795eb7012c3
-  data.tar.gz: 4fd70150da89b9e0018347a57f902fecde2c8d5661b5e1ffc4676efb81afeb54006938f72c23394072454b2ac6e41c1aded388b02e46f09840f421e4345dd1b9
+  metadata.gz: 7d843750f7bb7c647632d544743593e01a4d48b2bf5a965cac62df86a4247e5f3b01133af486553e82f2214f89b1ef488fda9e7b1d17051dc07b5343f2f77612
+  data.tar.gz: 05880930ebe371fec450857aca6979bf2cb3a6d82ee563d08d052edce2a33d84716e5beb53c916a658f9e063f342bf13373f44c688a6820f1ab4a709948bd104

data/bin/git-newbug

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby -U
+# 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/newbug'
+
+GitPivotalTrackerIntegration::Command::Newbug.new().run ARGV

data/bin/git-newfeature

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby -U
+# 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/newfeature'
+
+GitPivotalTrackerIntegration::Command::Newfeature.new().run ARGV

data/bin/git-qa

@@ -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/bin/git-uat

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby -U
+# 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/release'
+
+GitPivotalTrackerIntegration::Command::Release.new().run ARGV[0]

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

@@ -19,6 +19,7 @@ require 'git-pivotal-tracker-integration/util/git'
 require 'pivotal-tracker'
 require 'parseconfig'
 require 'logger'
+require 'os'
 
 # An abstract base class for all commands
 # @abstract Subclass and override {#run} to implement command functionality
@@ -41,25 +42,46 @@ class GitPivotalTrackerIntegration::Command::Base
     end
 
     @repository_root = GitPivotalTrackerIntegration::Util::Git.repository_root
-    @configuration = GitPivotalTrackerIntegration::Command::Configuration.new
-    @toggl = Toggl.new
+    @configuration   = GitPivotalTrackerIntegration::Command::Configuration.new
+    @toggl           = Toggl.new
 
-    PivotalTracker::Client.token = @configuration.api_token
-    PivotalTracker::Client.use_ssl = true
+    PivotalTracker::Client.token    = @configuration.api_token
+    PivotalTracker::Client.use_ssl  = true
 
-    @project = PivotalTracker::Project.find @configuration.project_id
-    
-    my_projects = PivotalTracker::Project.all
+    @project  = PivotalTracker::Project.find @configuration.project_id
+    @platform = @configuration.platform_name
+
+    my_projects         = PivotalTracker::Project.all
     my_all_projects_ids = Array.new
     my_projects.collect{|project| my_all_projects_ids.push project.id.to_i }
-    current_project_id = @configuration.project_id.to_i
-    abort "You are not authorized for current project" unless my_all_projects_ids.include?(current_project_id)
+    current_project_id    = @configuration.project_id.to_i
+    project_manager_name  = @configuration.pconfig["project"]["project-manager"]
+    project_manager_email = @configuration.pconfig["project"]["project-manager-email"]
+    project_name          = @configuration.pconfig["project"]["project-name"]
+    abort "This project requires access to the Pivotal Tracker project [#{project_name} - #{current_project_id}]. Please speak with project manager [#{project_manager_name} - #{project_manager_email}] and ask him to add you to the project in Pivotal Tracker." unless my_all_projects_ids.include?(current_project_id)
   end
+
   def finish_toggle(configuration, time_spent)
     current_story = @configuration.story(@project)
-    @toggl.create_task(parameters(configuration, time_spent))
-    @toggl.create_time_entry(parameters(configuration, time_spent))
+
+    # If a story gets rejected and the developer works on it, then we need to check if the task is already created or not.
+    params =  parameters(configuration, time_spent)
+    if params[:tid].nil?
+      begin
+        @toggl.create_task(parameters(params))
+      rescue TogglException => te
+        puts ""
+      end
+    end
+
+    #If for some reason time entry cannot be done, then catch exception and continue.
+    begin
+      @toggl.create_time_entry(parameters(configuration, time_spent))
+    rescue TogglException => te
+      puts "Unable to log the time."
+    end
   end
+
   def start_logging
     $LOG = Logger.new("#{logger_filename}", 'weekly')
   end
@@ -69,15 +91,17 @@ class GitPivotalTrackerIntegration::Command::Base
   end
 
   def check_version
-    gem_latest_version = (GitPivotalTrackerIntegration::Util::Shell.exec "gem list v2gpti --remote")[/\(.*?\)/].delete "()"
+    gem_latest_version    = (GitPivotalTrackerIntegration::Util::Shell.exec "gem list v2gpti --remote")[/\(.*?\)/].delete "()"
     gem_installed_version = Gem.loaded_specs["v2gpti"].version.version
     if (gem_installed_version == gem_latest_version)
         $LOG.info("v2gpti verison #{gem_installed_version} is up to date.")
     else
         $LOG.fatal("Out of date")
-        abort "\n\nYou are using v2gpti version #{gem_installed_version}, but the current version is #{gem_latest_version}.\nPlease update your gem with the following command.\n\n    sudo gem update v2gpti\n\n"  
-        
+        abort "\n\nYou are using v2gpti version #{gem_installed_version}, but the current version is #{gem_latest_version}.\nPlease update your gem with the following command.\n\n    sudo gem update v2gpti\n\n"
+
     end
+  rescue StandardError => se
+    puts ""
   end
 
   # The main entry point to the command's execution
@@ -103,19 +127,19 @@ class GitPivotalTrackerIntegration::Command::Base
       "d" => (60 * 60 * 8) # a work day is 8 hours
   }
   def parameters(configuration, time_spent)
-    current_story = configuration.story(@project)
-    params = Hash.new
-    params[:name] = "#{current_story.id}" + " - " + "#{current_story.name}"
+    current_story              = configuration.story(@project)
+    params                     = Hash.new
+    params[:name]              = "#{current_story.id}" + " - " + "#{current_story.name}"
     params[:estimated_seconds] = estimated_seconds current_story
-    params[:pid] = configuration.toggl_project_id
-    params[:uid] = @toggl.me["id"]
-    params[:tags] = [current_story.story_type]
-    params[:active] = false
-    params[:description] = "#{current_story.id}" + " commit:" + "#{(GitPivotalTrackerIntegration::Util::Shell.exec "git rev-parse HEAD").chomp[0..6]}"
-    params[:created_with] = "v2gpti"
-    params[:duration] = seconds_spent(time_spent)
-    params[:start] = (Time.now - params[:duration]).iso8601
-    task = @toggl.get_project_task_with_name(configuration.toggl_project_id, "#{current_story.id}")
+    params[:pid]               = configuration.toggl_project_id
+    params[:uid]               = @toggl.me["id"]
+    params[:tags]              = [current_story.story_type]
+    params[:active]            = false
+    params[:description]       = "#{current_story.id}" + " commit:" + "#{(GitPivotalTrackerIntegration::Util::Shell.exec "git rev-parse HEAD").chomp[0..6]}"
+    params[:created_with]      = "v2gpti"
+    params[:duration]          = seconds_spent(time_spent)
+    params[:start]             = (Time.now - params[:duration]).iso8601
+    task                       = @toggl.get_project_task_with_name(configuration.toggl_project_id, "#{current_story.id}")
      if !task.nil?
        params[:tid] = task['id']
      end
@@ -172,11 +196,11 @@ class GitPivotalTrackerIntegration::Command::Base
       end
     end
 
-    new_story = PivotalTracker::Story.new
-    new_story.project_id = @project.id
-    new_story.story_type = new_story_type
+    new_story               = PivotalTracker::Story.new
+    new_story.project_id    = @project.id
+    new_story.story_type    = new_story_type
     new_story.current_state = "unstarted"
-    new_story.name = new_story_title
+    new_story.name          = new_story_title
     if new_story_type == "feature"
       new_story.estimate = new_story_estimate
     end
@@ -185,4 +209,164 @@ class GitPivotalTrackerIntegration::Command::Base
 
   end
 
-end
+  def create_icebox_bug_story(args)
+      new_bug_story_title = nil
+      args.each do |arg|
+          new_bug_story_title = arg if arg[0] != "-"
+      end
+      while (new_bug_story_title.nil? || new_bug_story_title.empty?)
+          new_bug_story_title = ask("Please enter the title for this bug story")
+      end
+      icebox_stories = Array.new
+      @project.stories.all.collect{|story| icebox_stories.push story if story.current_state == "unscheduled"}
+      new_bug_story               = PivotalTracker::Story.new
+      new_bug_story.project_id    = @project.id
+      new_bug_story.story_type    = "bug"
+      new_bug_story.current_state = "unscheduled"
+      new_bug_story.name          = new_bug_story_title
+
+      if args.any?{|arg| arg.include?("-tl") } && !(icebox_stories.empty? || icebox_stories.nil?)
+          icebox_first_story = icebox_stories.first
+          (new_bug_story.create).move(:before, icebox_first_story)
+          elsif args.any?{|arg| arg.include?("-bl")} && !(icebox_stories.empty? || icebox_stories.nil?)
+          icebox_last_story = icebox_stories.last
+          (new_bug_story.create).move(:after, icebox_last_story)
+          else
+          new_bug_story.create
+      end
+  end
+
+  def create_backlog_bug_story(args)
+      new_bug_story_title = nil
+      args.each do |arg|
+          new_bug_story_title = arg if arg[0] != "-"
+      end
+      while (new_bug_story_title.nil? || new_bug_story_title.empty?)
+          new_bug_story_title = ask("Please enter the title for this bug story")
+      end
+      backlog_stories = Array.new
+      @project.stories.all.collect{|story| backlog_stories.push story if story.current_state == "unstarted" && story.story_type != "release"}
+      new_bug_story               = PivotalTracker::Story.new
+      new_bug_story.project_id    = @project.id
+      new_bug_story.story_type    = "bug"
+      new_bug_story.current_state = "unstarted"
+      new_bug_story.name          = new_bug_story_title
+      if args.any?{|arg| arg.include?("-tl")} && !(backlog_stories.empty? || backlog_stories.nil?)
+          backlog_first_story = backlog_stories.first
+          (new_bug_story.create).move(:before, backlog_first_story)
+          elsif args.any?{|arg| arg.include?("-bl")} && !(backlog_stories.empty? || backlog_stories.nil?)
+          backlog_last_story = backlog_stories.last
+          (new_bug_story.create).move(:after, backlog_last_story)
+          else
+          new_bug_story.create
+      end
+  end
+
+  def create_icebox_feature_story(args)
+      new_feature_story_title = nil
+      new_feature_story_points = nil
+      args.each do |arg|
+          new_feature_story_title = arg if arg[0] != "-"
+      end
+      while (new_feature_story_title.nil? || new_feature_story_title.empty?)
+          new_feature_story_title = ask("\nPlease enter the title for this feature story")
+      end
+      icebox_stories = Array.new
+      @project.stories.all.collect{|story| icebox_stories.push story if story.current_state == "unscheduled"}
+      new_feature_story               = PivotalTracker::Story.new
+      new_feature_story.project_id    = @project.id
+      new_feature_story.story_type    = "feature"
+      new_feature_story.current_state = "unscheduled"
+      new_feature_story.name          = new_feature_story_title
+
+      args.each do |arg|
+          new_feature_story_points = arg[2] if arg[0] == "-" && arg[1].downcase == "p"
+      end
+      while (new_feature_story_points.nil? || new_feature_story_points.empty?)
+          new_feature_story_points = ask("\nPlease enter the estimate points(0/1/2/3) for this feature story.\nIf you don't want to estimate then enter n")
+      end
+      while (!["0","1","2","3","n"].include?(new_feature_story_points.downcase))
+          new_feature_story_points = ask("\nInvalid entry...Please enter the estimate points(0/1/2/3) for this feature story.\nIf you don't want to estimate then enter n")
+      end
+      if new_feature_story_points.downcase == "n"
+          new_feature_story.estimate = -1
+          else
+          new_feature_story.estimate = new_feature_story_points
+      end
+
+
+      if args.any?{|arg| arg.include?("-tl") } && !(icebox_stories.empty? || icebox_stories.nil?)
+          icebox_first_story = icebox_stories.first
+          (new_feature_story.create).move(:before, icebox_first_story)
+          elsif args.any?{|arg| arg.include?("-bl")} && !(icebox_stories.empty? || icebox_stories.nil?)
+          icebox_last_story = icebox_stories.last
+          (new_feature_story.create).move(:after, icebox_last_story)
+          else
+          icebox_first_story = icebox_stories.first
+          (new_feature_story.create).move(:before, icebox_first_story)
+      end
+  end
+
+  def create_backlog_feature_story(args)
+      new_feature_story_title = nil
+      new_feature_story_points = nil
+      args.each do |arg|
+          new_feature_story_title = arg if arg[0] != "-"
+      end
+      while (new_feature_story_title.nil? || new_feature_story_title.empty?)
+          new_feature_story_title = ask("\nPlease enter the title for this feature story")
+      end
+      backlog_stories = Array.new
+      @project.stories.all.collect{|story| backlog_stories.push story if story.current_state == "unstarted" && story.story_type != "release"}
+      new_feature_story               = PivotalTracker::Story.new
+      new_feature_story.project_id    = @project.id
+      new_feature_story.story_type    = "feature"
+      new_feature_story.current_state = "unstarted"
+      new_feature_story.name          = new_feature_story_title
+
+      args.each do |arg|
+          new_feature_story_points = arg[2] if arg[0] == "-" && arg[1].downcase == "p"
+      end
+      while (new_feature_story_points.nil? || new_feature_story_points.empty?)
+          new_feature_story_points = ask("\nPlease enter the estimate points(0/1/2/3) for this feature story.\nIf you don't want to estimate then enter n")
+      end
+      while (!["0","1","2","3","n"].include?(new_feature_story_points.downcase))
+          new_feature_story_points = ask("\nInvalid entry...Please enter the estimate points(0/1/2/3) for this feature story.\nIf you don't want to estimate then enter n")
+      end
+      if new_feature_story_points.downcase == "n"
+          new_feature_story.estimate = -1
+          else
+          new_feature_story.estimate = new_feature_story_points
+      end
+
+      if args.any?{|arg| arg.include?("-tl")} && !(backlog_stories.empty? || backlog_stories.nil?)
+          backlog_first_story = backlog_stories.first
+          (new_feature_story.create).move(:before, backlog_first_story)
+          elsif args.any?{|arg| arg.include?("-bl")} && !(backlog_stories.empty? || backlog_stories.nil?)
+          backlog_last_story = backlog_stories.last
+          (new_feature_story.create).move(:after, backlog_last_story)
+          else
+          backlog_first_story = backlog_stories.first
+          (new_feature_story.create).move(:before, backlog_first_story)
+      end
+  end
+
+  private
+
+  def pwd
+    command = OS.windows? ? 'echo %cd%': 'pwd'
+    GitPivotalTrackerIntegration::Util::Shell.exec(command).chop
+  end
+
+  def estimate_story(story)
+    story_points = nil
+    while (story_points.nil? || story_points.empty?)
+      story_points = ask("\nPlease enter the estimate points(0/1/2/3) for this story.")
+    end
+    while (!["0","1","2","3"].include?(story_points))
+      story_points = ask("\nInvalid entry...Please enter the estimate points(0/1/2/3) for this story.")
+    end
+    story.update(:estimate => story_points)
+  end
+
+end

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

@@ -87,6 +87,23 @@ class GitPivotalTrackerIntegration::Command::Configuration
 
     project_id
   end
+  
+  def platform_name
+    platform_name = GitPivotalTrackerIntegration::Util::Git.get_config KEY_PLATFORM_NAME, :inherited
+
+    if platform_name.empty?
+		platforms = ["ios", "non-ios"]
+		platform_name = choose do |menu|
+			menu.prompt = 'Please choose your project platform:'
+			menu.choices(*platforms) do |chosen|
+				chosen
+			end
+		end
+		GitPivotalTrackerIntegration::Util::Git.set_config KEY_PLATFORM_NAME, platform_name, :local
+    end
+    puts "Your project platform is:#{platform_name}"
+    platform_name
+  end
 
   # Returns the story associated with the current development branch
   #
@@ -112,6 +129,8 @@ class GitPivotalTrackerIntegration::Command::Configuration
   KEY_API_TOKEN = 'pivotal.api-token'.freeze
 
   KEY_PROJECT_ID = 'pivotal.project-id'.freeze
+  
+  KEY_PLATFORM_NAME = 'platform.platform-name'.freeze
 
   KEY_STORY_ID = 'pivotal-story-id'.freeze
 

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

@@ -34,53 +34,55 @@ class GitPivotalTrackerIntegration::Command::Deliver < 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}")
     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
+    current_branch = GitPivotalTrackerIntegration::Util::Git.branch_name
 
-   puts "Merging from orgin develop..."
-   GitPivotalTrackerIntegration::Util::Shell.exec "git pull"
+    puts "Merging from orgin develop..."
+    GitPivotalTrackerIntegration::Util::Shell.exec "git pull"
 
-   # checkout QA branch
-   # Merge develop into QA
+    # checkout QA branch
+    # Merge develop into QA
     GitPivotalTrackerIntegration::Util::Shell.exec "git checkout QA"
-       GitPivotalTrackerIntegration::Util::Shell.exec "git pull"
+    GitPivotalTrackerIntegration::Util::Shell.exec "git pull"
     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}"
-
     # Update version and build numbers
-    build_number = story.name.dup
-    build_number[0] = ""
+    build_number      = story.name.dup
+    build_number[0]   = ""
+    working_directory = pwd
+
     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"
+    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 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 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 push"
     puts GitPivotalTrackerIntegration::Util::Shell.exec "git checkout develop"
 
     i_stories = included_stories @project, story
@@ -89,54 +91,50 @@ class GitPivotalTrackerIntegration::Command::Deliver < GitPivotalTrackerIntegrat
 
   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}'. You must be on the #{suggested_branch} branch to run this command.\n\n 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
+    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}'. You must be on the #{suggested_branch} branch to run this command.\n\n 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
+  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)
 
@@ -145,7 +143,7 @@ end
       :limit => 1000,
       :story_type => CANDIDATE_TYPES
     }
-    
+
 
     candidates = project.stories.all criteria
 
@@ -153,43 +151,43 @@ end
     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.each do |val|
+      val_is_valid = true
+      if (val.id == build_story.id)
+        next
+      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
+    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, '_')
+    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)
@@ -208,13 +206,15 @@ end
       last_release = stories[0]
       stories.shift
     end
+    abort "\nThere are no last release stories or finished stories to deliver" if last_release.nil?
     stories << release_story
     previous_story = last_release.dup
 
     puts "Last release:#{previous_story.name}"
-    stories.each {|story|
+    stories.each do |story|
       story.move(:after, previous_story)
       previous_story = story.dup
-    }
+    end
   end
+
 end