v2gpti 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbca65a36ba99402c938e32fdc43448a87dec18c
-  data.tar.gz: 55bdabc5b52f1802edcb0f9282110af6a39c0566
+  metadata.gz: d0f97f1aaf9f5ee155d01d98bfcbbf723c3f0198
+  data.tar.gz: ca83cbe5cb66c8e31f2a5a20088ef81ac3e8ca86
 SHA512:
-  metadata.gz: 9d588cd11852a38ec40262fd5a96b053168d2b6d91aab309b65a19ac10e0b58a1de97f2d9b70885d488adf393f283eb54fbce68759ed55018183069447b927d4
-  data.tar.gz: 23cea4846171223146edc65dfbd8014a244f17237a5268f5a4c6a25c9f167b60a32ede918f516df3934923bc1349e880174c56af18af35db2dcf2ec1d556e3c5
+  metadata.gz: 878a17d45ab81f5c5df7945e808370e482458c196e1275ddc8229424ad5ba11283f49b2e776337de2053bd194fce4c60cad5a07d609e74a5a06e95d59fc09b32
+  data.tar.gz: 763d6993ac3777fbdb8b815ffa883229242e875816c2b85edba7a3c3c08fa9cb9e0fdc9713fa591c698c4e28c6ff069166e840a011c05cbb086ad9196ba30cac

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

@@ -43,7 +43,7 @@ module GitPivotalTrackerIntegration
         @configuration.check_for_config_file
         @configuration.check_for_config_contents
 
-        @client           = TrackerApi::Client.new(:token => @configuration.api_token)
+        @client           = TrackerApi::Client.new(:token => @configuration.api_token, :logger => Logger.new('faraday.log'))
         @platform         = @configuration.platform_name
 
         current_project_id  = @configuration.project_id.to_i

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

@@ -113,11 +113,8 @@ module GitPivotalTrackerIntegration
         all_stories << build_story
 
         all_stories.each do |story|
-          labels = story.labels.map(&:name)
-          labels << build_story.name
-          labels.uniq!
 
-          story.add_labels(*labels)
+          story.add_label(build_story.name)
 
           case story.story_type
           when 'feature', 'bug'

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

@@ -56,9 +56,7 @@ module GitPivotalTrackerIntegration
         Util::Git.merge(@configuration.story(@project), no_complete)
         Util::Git.push Util::Git.branch_name
 
-        labels = story.labels.map(&:name)
-        labels << "Need code review"
-        story.add_labels(*labels)
+        story.add_label('Need code review')
       end
 
 
@@ -87,7 +85,7 @@ module GitPivotalTrackerIntegration
 
           # cd back to the working_directory
           Dir.chdir(working_directory)
-        elsif @platform == 'android'
+        elsif @platform.downcase == 'android'
           updater = VersionUpdate::Gradle.new(@repository_root)
           updater.update_dev_version(build_number)
         end

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

@@ -118,10 +118,7 @@ module GitPivotalTrackerIntegration
         puts Util::Shell.exec "git checkout #{current_branch}"
 
         #add story name as one of the labels for the story
-        labels = story.labels.map(&:name)
-        labels << story.name unless labels.include?(story.name)
-        puts "labels: #{labels.join(', ')}"
-        story.add_labels(*labels) unless labels.include?(story.name)
+        story.add_label(story.name)
 
         i_stories = included_stories @project, story
         add_version_tag_to_stories i_stories, story
@@ -134,19 +131,10 @@ module GitPivotalTrackerIntegration
         all_stories = stories.dup
         all_stories << release_story
         puts "Included stories:\n"
-        all_stories.each {|story|
-          labels = story.labels.map(&:name)
-          origin_labels = labels.dup
-          labels << release_story.name
-          labels.uniq!
-
-          unless origin_labels.empty?
-            if origin_labels.to_s.scan(/b\d{1}/).size > origin_labels.to_s.scan(/v\d{1}/).size
-              story.add_labels(*labels)
-              puts "#{story.id} - #{story.name}"
-            end
-          end
-        }
+        all_stories.each do |story|
+          story.add_label(release_story.name)
+          puts "#{story.id} - #{story.name}"
+        end
       end
 
       def included_stories(project, release_story)

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

@@ -68,7 +68,7 @@ module GitPivotalTrackerIntegration
           # story type from (feature, bug, chore)
           # state from (rejected unstarted unscheduled)
           # if story type is "feature", then retrieve only estimated ones.
-          criteria = " state:unstarted,rejected,unscheduled"
+          criteria = " state:unstarted,rejected,unscheduled,planned"
 
           if %w(feature bug chore).include?(filter)
             criteria << " type:#{filter}"
@@ -145,7 +145,7 @@ module GitPivotalTrackerIntegration
         release_type = (type == "b") ? "build" : "version"
 
         criteria =  "type:release"
-        criteria << " state:unstarted,rejected,unscheduled"
+        criteria << " state:unstarted,rejected,planned"
         criteria << " name:/#{type}*/"    #story name starts with  b or v
 
         candidates = project.stories(filter: criteria, limit: limit)
@@ -163,10 +163,15 @@ module GitPivotalTrackerIntegration
 
           if last_release
             puts " The last #{release_type} release was #{last_release.name}."
-            next_release_number = set_next_release_number(last_release, release_type)
+            if release_type == "version"
+              next_release_number = ask("To create a new #{release_type}, enter a name for the new release story:")
+            else
+              next_release_number = set_next_release_number(last_release, release_type)
+            end
           else
             next_release_number = ask("To create a new #{release_type}, enter a name for the new release story:")
           end
+
           puts "New #{release_type} release number is: #{next_release_number}"
           story = self.create_new_release(project, next_release_number)
         end

data/lib/git-pivotal-tracker-integration/version-update/gradle.rb

@@ -34,34 +34,44 @@ module GitPivotalTrackerIntegration
       # @param [String] new_version the version to update the project to
       # @return [void]
       def update_dev_version(new_version)
-        update_version('DEV', 'SNAPSHOT', new_version)
+        update_version_in_sec('DEV', new_version, 'SNAPSHOT')
       end
 
       def update_qa_version(new_version)
-        update_version('QA', 'SNAPSHOT', new_version)
+        update_version_in_sec('QA', new_version, 'SNAPSHOT')
       end
 
       def update_uat_version(new_version)
-        update_version('UAT', new_version, new_version)
+        update_version_in_sec('UAT', qa_version_code, new_version)
       end
 
       def update_prod_version(new_version)
-        update_version('PROD', new_version, new_version)
+        update_version_in_sec('PROD', qa_version_code, new_version)
       end
 
       private
 
-      def update_version(version_type, new_name, new_version)
+      def update_version_in_sec(section, new_code, new_version)
         content     = File.read(@gradle_file)
-        new_content = content.gsub(/productFlavors.*?#{version_type}.*?versionCode( )*=?( )*(.*?)versionName( )*=?( )*(.*?\s)/m) do |match|
-            version_code = $3.strip
-            version_name = $6.strip
-            match.gsub(version_code, new_version).gsub(version_name, "\"#{new_name}\"")
-        end
+
+        new_content = update_version(content, section, 'Code', new_code)  #update versionCode
+        new_content = update_version(new_content, section, 'Name', "\"#{new_version}\"") #update versionName
 
         File.open(@gradle_file, 'w') { |file| file.write(new_content) }
       end
 
+      def qa_version_code
+        content     = File.read(@gradle_file)
+        match       = content.match(/productFlavors.*?QA.*?versionCode( )*=?( )*(.*?\s)/m)
+        match[3].strip
+      end
+
+      def update_version(file_content, section, type, new_value)
+        file_content.gsub(/productFlavors.*?#{section}.*?version#{type}( )*=?( )*(.*?\s)/m) do |match|
+          match.gsub($3.strip, new_value)
+        end
+      end
+
     end
 
   end

data/tracker_api/lib/tracker_api/client.rb

@@ -72,6 +72,15 @@ module TrackerApi
       request(:put, parse_query_and_convenience_headers(path, options))
     end
 
+    # Make a HTTP DELETE request
+    #
+    # @param path [String] The path, relative to api endpoint
+    # @param options [Hash] Query and header params for request
+    # @return [Faraday::Response]
+    def delete(path, options = {})
+      request(:delete, parse_query_and_convenience_headers(path, options))
+    end
+
     # Make one or more HTTP GET requests, optionally fetching
     # the next page of results from information passed back in headers
     # based on value in {#auto_paginate}.
@@ -193,15 +202,25 @@ module TrackerApi
         params = {}
       end
 
-      @last_response = response = connection.send(method) do |req|
-        req.url(url)
-        req.headers.merge!(headers)
-        req.params.merge!(params)
-        req.body = body
+      response = nil
+      sleep 0.5   # Per PT we might be hitting their API too frequently.  So adding a 0.5 Sec pause.
+      begin
+        tries ||= 3
+        @last_response = response = connection.send(method) do |req|
+          req.url(url)
+          req.headers.merge!(headers)
+          req.params.merge!(params)
+          req.body = body
+        end
+        response
+
+      rescue Faraday::Error::ClientError => e
+        if e.response[:status].between?(500, 520)  # retry calling the api if the response is any of 500 errors
+          sleep 1
+          retry unless (tries -= 1).zero?
+        end
+        raise TrackerApi::Error.new(e)
       end
-      response
-    rescue Faraday::Error::ClientError => e
-      raise TrackerApi::Error.new(e)
     end
 
     class Pagination

data/tracker_api/lib/tracker_api/endpoints/project.rb

@@ -12,6 +12,23 @@ module TrackerApi
 
         Resources::Project.new({ client: client }.merge(data))
       end
+
+      def create(params={})
+        data = client.post("/projects", params: params).body
+
+        Resources::Project.new({ client: client }.merge(data))
+      end
+
+      def update(id, params={})
+        data = client.put("/projects/#{id}", params: params).body
+
+        Resources::Project.new({ client: client }.merge(data))
+      end
+
+      def delete(id)
+        client.delete("/projects/#{id}").body
+      end
+
     end
   end
 end

data/tracker_api/lib/tracker_api/endpoints/story.rb

@@ -32,6 +32,11 @@ module TrackerApi
 
         story.attributes = data
       end
+
+      def add_label(story, params = {})
+        raise ArgumentError, 'Valid story required to update.' unless story.instance_of?(Resources::Story)
+        data = client.post("/projects/#{story.project_id}/stories/#{story.id}/labels", params: params).body
+      end
     end
   end
 end

data/tracker_api/lib/tracker_api/resources/story.rb

@@ -78,12 +78,12 @@ module TrackerApi
         changes_applied
       end
 
-      # update labels.This method can also be used to remove labels.
-      def add_labels(*new_labels)
+      # Add a new label to a story
+      def add_label(label)
         raise ArgumentError, 'Can not update a story with an unknown project_id.' if project_id.nil?
-        raise ArgumentError, 'Provide at lease one label name' if new_labels.empty?
+        raise ArgumentError, 'Provide at lease one label name' if label.empty?
 
-        Endpoints::Story.new(client).update(self, {:labels => new_labels.map{|l| {:name => l.to_s}}})
+        Endpoints::Story.new(client).add_label(self, {:name => label.to_s})
 
         changes_applied
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: v2gpti
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Jeff Wolski
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline