heroku_deployer 0.7.20 → 0.7.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 283f7123f1226998c26c440aa8e492445abf20a9
-  data.tar.gz: fc1351fa7c82ede930111417116a7920328b357e
+  metadata.gz: 752fb24f5602e61b9b79d088e4af84ab4ce44894
+  data.tar.gz: 228deb30594b9686cf969d782e175504aa23788d
 SHA512:
-  metadata.gz: afe580321eff5319bc7cfbc90ca08d14a93f9c06a34ac3fedd0f92e5fdde999e8effe78965e6f9eebd1eff17e1f29ee9e17a0c4c5fb411db01258bf0e5f9c836
-  data.tar.gz: ffae0e8881c910b84c6623901e9508f92d6eace8d57aa10db759611574272bb5210f5fde1c9eeea39496be4381446cd269e930fa9f344675720ce1f332a1a560
+  metadata.gz: f3acc34e43638026b0204469bbe73ec96cd3f63e51279c2f6330c9d1a9b6524a1d88a7ebe850b76888a187f71b21de40b1d07b455c650d71077bdc3649d897a8
+  data.tar.gz: f84360ef509828550feafe0eedfb6dabb10c63b6c7eadd7ac41e06d9ba47d723f2dd76e214f4bda00a5bbd3163b2e2f7a775bfb386c329ddd8852ab24b545e44

data/lib/amitree/git_client/not_found_error.rb

@@ -0,0 +1,7 @@
+module Amitree
+  class GitClient
+    class NotFoundError < StandardError
+    end
+  end
+end
+

data/lib/amitree/git_client/range.rb

@@ -0,0 +1,38 @@
+module Amitree
+  class GitClient
+    class EmptyRangeError < StandardError
+    end
+
+    class Range
+      attr_reader :commits
+
+      def initialize commits
+        @commits = commits
+      end
+
+      def story_ids
+        commit_messages.map do |msg|
+          msg.scan(/(?<=\[).*?(?=\])/).map{|expr| expr.scan /(?<=#)\d+/}
+        end.flatten.map(&:to_i).uniq
+      end
+
+      def commit_messages
+        commits.map(&:commit).map(&:message)
+      end
+
+      def since(rev)
+        Range.new(commits[(index(rev)+1)..-1])
+      end
+
+      def up_to(rev)
+        Range.new(commits[0..index(rev)])
+      end
+
+    private
+
+      def index rev
+        commits.index{|commit| commit.sha.start_with?(rev)} or raise NotFoundError, "Failed to find #{rev} in range"
+      end
+    end
+  end
+end

data/lib/amitree/git_client.rb

@@ -1,4 +1,6 @@
 require 'octokit'
+require 'amitree/git_client/range'
+require 'amitree/git_client/not_found_error'
 
 module Amitree
   class GitClient
@@ -15,22 +17,38 @@ module Amitree
         password: password,
         middleware: (self.class.verbose_middleware if options[:verbose]),
         connection_options: Octokit::Default.options[:connection_options].merge(request: {timeout: 60, open_timeout: 60})
+      @max_commit_range = options[:max_commit_range] || 1000
     end
 
-    def commits_between(rev1, rev2)
-      result = @client.compare @repository, rev1, rev2
-      result.commits
-    end
+    def commits_since(rev)
+      result = []
+
+      @client.commits(@repository, per_page: 100)
+      response = @client.last_response
+
+      loop do
+        if response.data.length == 0
+          raise "Empty response received from GitHub!"
+        end
 
-    def commit_messages_between(rev1, rev2)
-      commits_between(rev1, rev2).map(&:commit).map(&:message)
+        result.concat response.data
+
+        if index = result.index{|commit| commit.sha.start_with?(rev)}
+          return result[0...index].reverse
+        end
+        if result.length >= @max_commit_range
+          raise NotFoundError, "Failed to find #{rev} in the most recent #{@max_commit_range} commits. Consider increasing max_commit_range."
+        end
+        unless page = response.rels[:next]
+          raise NotFoundError, "Failed to find #{rev} in entire commit history."
+        end
+
+        response = page.get
+      end
     end
 
-    def stories_worked_on_between(rev1, rev2)
-      messages = commit_messages_between(rev1, rev2)
-      messages.map do |msg|
-        msg.scan(/(?<=\[).*?(?=\])/).map{|expr| expr.scan /(?<=#)\d+/}
-      end.flatten.map(&:to_i).uniq
+    def range_since(rev)
+      Range.new(commits_since(rev))
     end
 
     def link_to(rev)

data/lib/amitree/heroku_deployer.rb

@@ -6,7 +6,7 @@ require 'pivotal-tracker'
 module Amitree
   class HerokuDeployer
     class ReleaseDetails
-      attr_accessor :production_release, :staging_release_to_deploy, :stories
+      attr_accessor :production_release, :staging_release_to_deploy, :stories, :git_range
 
       def initialize
         @stories = []
@@ -51,7 +51,8 @@ module Amitree
       prod_commit = @heroku.get_production_commit(result.production_release)
       puts "Production release is #{prod_commit}" if options[:verbose]
 
-      result.stories = stories_worked_on_between(prod_commit, 'HEAD')
+      git_range = @git.range_since(prod_commit)
+      result.stories = all_stories(git_range)
       all_stories = Hash[result.stories.map{|story| [story.id, story]}]
 
       staging_releases.reverse.each do |staging_release|
@@ -60,7 +61,8 @@ module Amitree
 
           puts "- Trying staging release #{@heroku.version(staging_release)} with commit #{staging_commit}" if options[:verbose]
 
-          stories = all_stories.values_at(*@git.stories_worked_on_between(prod_commit, staging_commit)).compact
+          candidate_git_range = git_range.up_to(staging_commit)
+          stories = all_stories.values_at(*candidate_git_range.story_ids).compact
           story_ids = stories.map(&:id)
 
           puts "  - Stories: #{story_ids.inspect}" if options[:verbose]
@@ -75,7 +77,7 @@ module Amitree
           elsif story_ids.length == 0 && !options[:allow_empty]
             puts "    - Refusing to deploy empty release" if options[:verbose]
           else
-            story_ids_referenced_later = story_ids & @git.stories_worked_on_between(staging_commit, 'HEAD')
+            story_ids_referenced_later = story_ids & git_range.since(staging_commit).story_ids
             if story_ids_referenced_later.length > 0
               puts "    - Some stories have been worked on in a later commit: #{story_ids_referenced_later}" if options[:verbose]
             else
@@ -84,6 +86,7 @@ module Amitree
               end
               puts "    - This release is good to go!" if options[:verbose]
               result.staging_release_to_deploy = staging_release
+              result.git_range = candidate_git_range
               break
             end
           end
@@ -106,8 +109,8 @@ module Amitree
       end
     end
 
-    def stories_worked_on_between(rev1, rev2)
-      @git.stories_worked_on_between(rev1, rev2).map do |story_id|
+    def all_stories(git_range)
+      git_range.story_ids.map do |story_id|
         if story = tracker_data(story_id)
           ReleaseDetails::Story.new(story)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku_deployer
 version: !ruby/object:Gem::Version
-  version: 0.7.20
+  version: 0.7.21
 platform: ruby
 authors:
 - Nick Wargnier
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -25,6 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.2
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +103,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/amitree/git_client.rb
+- lib/amitree/git_client/not_found_error.rb
+- lib/amitree/git_client/range.rb
 - lib/amitree/heroku_client.rb
 - lib/amitree/heroku_deployer.rb
 - lib/amitree/utils.rb