v2gpti 0.2.0.4 → 0.2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb7fe1c58e20da7e1d498fca6800378197b4314a
-  data.tar.gz: b5746858ddfffd3fca9fb1c442ae54c8e32432ac
+  metadata.gz: 96653de0af6eb4d4e0628e737d3c8168214b911b
+  data.tar.gz: 91098fcbb204c3800fced28249be0cb108007fa0
 SHA512:
-  metadata.gz: 30613ae7a32c8d67e49f8e26f484d273594c63a5e65bbdaf35f1fe46d800bfe6fe2ce7b92e126e0fa561f411ab6e5f2d00132f2c6730b5ed65edc9fda736c5a8
-  data.tar.gz: 88c18c003d1aca06435a64d90291345f1b300ed41bba0de774fae8ded0f0e80030243fce1c00d011c885a2af026fa97a05517fcf53562b8311ed784c0876588d
+  metadata.gz: 5886d17e06fc962fd0966a2bbed181ee8f7039ae89066ae469dd02898d94761571af54881edf4821be6e12a82d1b56cf2926548eea37196fdc952063d10a2d1e
+  data.tar.gz: 9e3e55b767b43ed87c808752c8b7d9bcb2ebe72d84f3efdd03585d6c8a4c66dc95c2cead134ae3125348d55ac7691ebb8b54a48bcbda6c1d00e1b4bcf2815fd9

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

@@ -41,7 +41,13 @@ class GitPivotalTrackerIntegration::Command::Deliver < GitPivotalTrackerIntegrat
 
    current_branch = GitPivotalTrackerIntegration::Util::Git.branch_name
 
+   puts "Merging from orgin develop..."
+   GitPivotalTrackerIntegration::Util::Shell.exec "git pull"
+
+   # checkout QA branch
+   # Merge develop into QA
     GitPivotalTrackerIntegration::Util::Shell.exec "git checkout QA"
+       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
@@ -50,6 +56,7 @@ class GitPivotalTrackerIntegration::Command::Deliver < GitPivotalTrackerIntegrat
 
         puts "storyNAME:#{story.name}"
 
+    # Update version and build numbers
     build_number = story.name.dup
     build_number[0] = ""
     puts "storyNAME:#{story.name}"
@@ -86,7 +93,7 @@ class GitPivotalTrackerIntegration::Command::Deliver < GitPivotalTrackerIntegrat
       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)")
+          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}"
@@ -167,7 +174,6 @@ end
   end
 
 
-
   def development_branch_name(story)
       prefix = "#{story.id}-"
       story_name = "#{story.name.gsub(/[^0-9a-z\\s]/i, '_')}"

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

@@ -34,23 +34,55 @@ class GitPivotalTrackerIntegration::Command::Release < GitPivotalTrackerIntegrat
   #   * +nil+
   # @return [void]
   def run(filter)
-    story = GitPivotalTrackerIntegration::Util::Story.select_story(@project, filter.nil? ? 'release' : filter, 1)
+    story = GitPivotalTrackerIntegration::Util::Story.select_release(@project, filter.nil? ? 'v' : filter)
     GitPivotalTrackerIntegration::Util::Story.pretty_print story
 
-    updater = [
-      GitPivotalTrackerIntegration::VersionUpdate::Gradle.new(@repository_root)
-    ].find { |candidate| candidate.supports? }
+    current_branch = GitPivotalTrackerIntegration::Util::Git.branch_name
+
+    # checkout QA branch
+    # Update QA from origin    
+    GitPivotalTrackerIntegration::Util::Shell.exec "git checkout QA"
+    GitPivotalTrackerIntegration::Util::Shell.exec "git fetch"
+    GitPivotalTrackerIntegration::Util::Shell.exec "git merge -s recursive --strategy-option theirs QA"
+
+    # checkout master branch
+    # Merge QA into master
+    GitPivotalTrackerIntegration::Util::Shell.exec "git checkout master"
+       GitPivotalTrackerIntegration::Util::Shell.exec "git fetch"
+    if (GitPivotalTrackerIntegration::Util::Shell.exec "git merge -s recursive --strategy-option theirs master")
+      puts "Merged 'QA' in to 'master'"
+    else
+      abort "FAILED to merge 'QA' in to 'master'"
+    end
+
+    # Update version and build numbers
+    version_number = story.name.dup
+    version_number[0] = ""
+    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}"
+
+    # 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 #{version_number} for delivery to QA", story)
+    puts GitPivotalTrackerIntegration::Util::Shell.exec "git push" 
+    puts GitPivotalTrackerIntegration::Util::Shell.exec "git checkout #{current_branch}"
 
-    current_version = updater.current_version
-    release_version = ask("Enter release version (current: #{current_version}): ")
-    next_version = ask("Enter next development version (current: #{current_version}): ")
 
-    updater.update_version release_version
-    GitPivotalTrackerIntegration::Util::Git.create_release_tag release_version, story
-    updater.update_version next_version
-    GitPivotalTrackerIntegration::Util::Git.create_commit "#{next_version} Development", story
 
-    GitPivotalTrackerIntegration::Util::Git.push GitPivotalTrackerIntegration::Util::Git.branch_name, "v#{release_version}"
   end
 
+
+
 end

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

@@ -126,6 +126,7 @@ class GitPivotalTrackerIntegration::Util::Story
     # only include stories that have been estimated
     estimated_candidates = Array.new
     val_is_valid = true
+
     candidates.each {|val|
         val_is_valid = true
         if (val.story_type == "feature" ) 
@@ -135,7 +136,11 @@ class GitPivotalTrackerIntegration::Util::Story
             val_is_valid = false 
           end
         elsif (val.story_type == "release")
-          if (val.name[0] != release_type)
+          label_string = val.labels
+          if label_string.nil?
+            label_string = "";            
+          end
+          if (val.name[0] != release_type) || (label_string.include? val.name)
             val_is_valid = false
           end
         end

metadata

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