flash_flow 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ba7a7fe175b96cc420cab775f520719c7fc83f5
-  data.tar.gz: 7d49a193d1430a55a3b42a135e8ec35838bb47cc
+  metadata.gz: 26e9411883c55d49e496359a23debe7ce7cad73c
+  data.tar.gz: c08cd64b3c192f4073802a5b1254e5f821ee2d79
 SHA512:
-  metadata.gz: 2b11140dd538fef6a9b37e17d62ffe72174efe6efc723679f0b1982303a992c4de46ddd655fe1889a895dda67de6ca80bb6b6f27697e9a495692bbf81e1dfc0a
-  data.tar.gz: 29f7e831e2461baf974abf70fdff8ca3a21b34ff937ac993822c04da698963e6251cee1ae8abd791ef0f3493ed87924e97fb3e3316fe7e9b607b049fd835284e
+  metadata.gz: 1dfe5cb15b0e924fac257397528ef2b4b6dcc00ae213abf1b909445f4059e2407056778d6f30e199dfc10711fc62ec72e766f937f869f3c0750dd46958e5c657
+  data.tar.gz: 45e2f8c31f6900c51f84e9c9d74bf1662c43ef74fc4f91c64f1f267c6f9ba41c2eb5e6cdb687aab711bd701f316118622e6568cafae13ea14cb88d93246a87b5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flash_flow (1.2.3)
+    flash_flow (1.3.0)
       hipchat (~> 1.5)
       octokit (~> 4.1)
       pivotal-tracker (~> 0.5)
@@ -33,16 +33,16 @@ GEM
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     json (1.8.3)
-    mime-types (2.6.2)
+    mime-types (2.99)
     mimemagic (0.3.0)
-    mini_portile (0.6.2)
+    mini_portile2 (2.0.0)
     minitest (5.3.5)
     minitest-stub_any_instance (1.0.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     netrc (0.11.0)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
     nokogiri-happymapper (0.5.9)
       nokogiri (~> 1.5)
     octokit (4.1.1)

data/lib/flash_flow/data/branch.rb

@@ -5,7 +5,7 @@ module FlashFlow
 
     class Branch
       attr_accessor :remote, :remote_url, :ref, :sha, :status, :resolutions, :stories, :conflict_sha, :metadata,
-                    :current_record, :updated_at, :created_at
+                    :current_record, :merge_order, :updated_at, :created_at
 
       def initialize(_remote, _remote_url, _ref)
         @remote = _remote
@@ -21,6 +21,7 @@ module FlashFlow
         branch = new(hash['remote'], hash['remote_url'], hash['ref'])
         branch.sha = hash['sha']
         branch.status = hash['status']
+        branch.merge_order = hash['merge_order']
         branch.resolutions = hash['resolutions']
         branch.stories = hash['stories']
         branch.metadata = hash['metadata']
@@ -52,6 +53,7 @@ module FlashFlow
             'ref' => ref,
             'sha' => sha,
             'status' => status,
+            'merge_order' => merge_order,
             'resolutions' => resolutions,
             'stories' => stories,
             'conflict_sha' => conflict_sha,
@@ -70,6 +72,7 @@ module FlashFlow
         unless other.nil?
           self.sha = other.sha
           self.status = other.status
+          self.merge_order = other.merge_order
           self.resolutions = other.resolutions
           self.stories = self.stories.to_a | other.stories.to_a
           self.updated_at = Time.now

data/lib/flash_flow/data/collection.rb

@@ -65,6 +65,7 @@ module FlashFlow
             branch.created_at = info.created_at
             branch.resolutions = info.resolutions.to_h.merge(branch.resolutions.to_h)
             branch.stories = info.stories.to_a | merged_branches[full_ref].stories.to_a
+            branch.merge_order ||= info.merge_order
             if branch.fail?
               branch.conflict_sha ||= info.conflict_sha
             end

data/lib/flash_flow/data/github.rb

@@ -38,7 +38,8 @@ module FlashFlow
               'remote_url' => pr.head.repo.ssh_url,
               'ref' => pr.head.ref,
               'status' => status_from_labels(pr),
-              'metadata' => metadata(pr)
+              'metadata' => metadata(pr),
+              'sha' => pr.head.sha
           )
         end
       end
@@ -98,7 +99,7 @@ module FlashFlow
       end
 
       def pull_requests
-        @pull_requests ||= octokit.pull_requests(repo).sort_by(&:updated_at)
+        @pull_requests ||= octokit.pull_requests(repo).sort_by(&:created_at)
       end
 
       def remove_label(pull_request_number, label)
@@ -136,4 +137,4 @@ module FlashFlow
       end
     end
   end
-end
+end

data/lib/flash_flow/deploy.rb

@@ -5,6 +5,7 @@ require 'flash_flow/data'
 require 'flash_flow/lock'
 require 'flash_flow/notifier'
 require 'flash_flow/branch_merger'
+require 'flash_flow/merge_order'
 require 'flash_flow/shadow_repo'
 
 module FlashFlow
@@ -104,7 +105,10 @@ module FlashFlow
     end
 
     def merge_branches
-      @data.mergeable.each do |branch|
+      ordered_branches = MergeOrder.new(@git, @data.merged_branches.mergeable).get_order
+      ordered_branches.each_with_index do |branch, index|
+        branch.merge_order = index + 1
+
         remote = @git.fetch_remote_for_url(branch.remote_url)
         if remote.nil?
           raise RuntimeError.new("No remote found for #{branch.remote_url}. Please run 'git remote add *your_remote_name* #{branch.remote_url}' and try again.")
@@ -182,7 +186,7 @@ module FlashFlow
 Flash Flow run from branch: #{@local_git.working_branch}
 
 Merged branches:
-#{@data.successes.empty? ? 'None' : @data.successes.map(&:ref).join("\n")}
+#{@data.successes.empty? ? 'None' : @data.successes.sort_by(&:merge_order).map(&:ref).join("\n")}
 
 Failed branches:
 #{@data.failures.empty? ? 'None' : @data.failures.map(&:ref).join("\n")}

data/lib/flash_flow/issue_tracker/pivotal.rb

@@ -32,7 +32,8 @@ module FlashFlow
             deliver(story_id)
           end
         end
-        removed_branches.each do |branch|
+
+        removed_and_failed_branches.each do |branch|
           branch.stories.to_a.each do |story_id|
             undeliver(story_id)
           end
@@ -188,8 +189,8 @@ module FlashFlow
         @branches.select { |b| b.success? }
       end
 
-      def removed_branches
-        @branches.select { |b| b.removed? }
+      def removed_and_failed_branches
+        @branches.select { |b| b.removed? || b.fail? }
       end
 
       def merged_working_branch

data/lib/flash_flow/merge_order.rb

@@ -0,0 +1,27 @@
+module FlashFlow
+  class MergeOrder
+
+    def initialize(git, branches)
+      @git = git
+      @branches = branches
+    end
+
+    def get_order
+      branches = @branches.sort_by(&:merge_order)
+
+      unchanged, changed = branches.partition { |branch| current_sha(branch) == branch.sha }
+      my_branch_index = changed.find_index { |branch| branch.ref == @git.working_branch }
+      my_branch_changed = my_branch_index ? changed.delete_at(my_branch_index) : nil
+
+      [unchanged, changed, my_branch_changed].flatten.compact
+    end
+
+    private
+
+    def current_sha(branch)
+      @git.run("rev-parse #{branch.remote}/#{branch.ref}")
+      @git.last_stdout.strip if @git.last_success?
+    end
+
+  end
+end

data/lib/flash_flow/options.rb

@@ -21,7 +21,7 @@ module FlashFlow
         opts.on('-c', '--config-file FILE_PATH', 'The path to your config file. Defaults to config/flash_flow.yml.erb') { |v| options[:config_file] = v }
         opts.on('--resolve', 'Launch a bash shell to save your conflict resolutions') { |v| options[:resolve] = true }
         opts.on('--resolve-manual', 'Print instructions to use git to resolve conflicts') { |v| options[:resolve_manual] = true }
-        opts.on('--merge-status', 'Print instructions to use git to resolve conflicts') { |v| options[:merge_status] = true }
+        opts.on('--merge-status', 'Show status of all branches and their stories and exit') { |v| options[:merge_status] = true }
 
         opts.on_tail("-h", "--help", "Show this message") do
           puts opts

data/lib/flash_flow/version.rb

@@ -1,3 +1,3 @@
 module FlashFlow
-  VERSION = "1.2.3"
+  VERSION = "1.3.0"
 end

data/test/lib/data/test_branch.rb

@@ -202,6 +202,7 @@ module FlashFlow
             'remote' => 'origin',
             'sha' => 'random_sha',
             'status' => 'success',
+            'merge_order' => nil,
             'resolutions' => {},
             'stories' => ['123'],
             'conflict_sha' => 'conflict_sha',

data/test/lib/issue_tracker/test_pivotal.rb

@@ -28,6 +28,7 @@ module FlashFlow
         stub_tracker_gem(@project_mock) do
           mock_find(nil, '111')
           mock_find(nil, '222')
+          mock_find(nil, '333')
           mock_find(nil, '555')
 
           Pivotal.new(sample_branches, nil).stories_delivered
@@ -46,11 +47,15 @@ module FlashFlow
                             .expect(:id, '222')
                             .expect(:current_state, 'delivered')
           story3_mock = MiniTest::Mock.new
+                            .expect(:id, '333')
+                            .expect(:current_state, 'fail')
+          story4_mock = MiniTest::Mock.new
                             .expect(:id, '555')
                             .expect(:current_state, 'removed')
           mock_find(story1_mock)
           mock_find(story2_mock)
           mock_find(story3_mock)
+          mock_find(story4_mock)
 
           Pivotal.new(sample_branches, nil).stories_delivered
           story1_mock.verify

data/test/lib/test_deploy.rb

@@ -141,6 +141,18 @@ module FlashFlow
       end
     end
 
+    def test_commit_message_ordering
+      data
+        .expect(:successes, ['data_successes'])
+        .expect(:successes, sample_branches)
+        .expect(:failures, [])
+        .expect(:removals, [])
+
+      expected_message = sample_branches.sort_by(&:merge_order).map(&:ref).join("\n")
+      assert_output(/#{expected_message}/) { print @deploy.commit_message }
+      data.verify
+    end
+
     private
 
     def with_versions(current, written)
@@ -172,5 +184,10 @@ module FlashFlow
       @deploy.instance_variable_set('@data'.to_sym, @data)
     end
 
+    def sample_branches
+      @sample_branches ||= [Data::Branch.from_hash({'ref' => 'branch3', 'merge_order' => 2}),
+        Data::Branch.from_hash({'ref' => 'branch1', 'merge_order' => 3}),
+        Data::Branch.from_hash({'ref' => 'branch2', 'merge_order' => 1})]
+    end
   end
 end

data/test/lib/test_merge_order.rb

@@ -0,0 +1,72 @@
+require 'minitest_helper'
+require 'minitest/stub_any_instance'
+
+module FlashFlow
+  class TestMergeOrder < Minitest::Test
+
+    def setup
+      @git = Minitest::Mock.new
+    end
+
+    def test_get_order_unchanged_shas_get_ordered_as_previous
+      mock_working_branch(sample_branches[2])
+      mock_current_sha(sample_branches[1], sample_branches[1].sha)
+      mock_current_sha(sample_branches[0], sample_branches[0].sha)
+      mock_current_sha(sample_branches[2], sample_branches[2].sha)
+
+      ordered_branches = MergeOrder.new(@git, mergeable_order(1,0,2)).get_order
+      assert_equal(ordered_branches.map(&:sha), mergeable_order(1,0,2).map(&:sha))
+    end
+
+    def test_get_order_changed_working_branch_is_always_last
+      mock_working_branch(sample_branches[0])
+      mock_current_sha(sample_branches[1], sample_branches[1].sha)
+      mock_current_sha(sample_branches[0], sample_branches[0].sha)
+      mock_current_sha(sample_branches[2], sample_branches[2].sha)
+
+      sample_branches[0].sha = 'sha0-1'
+
+      ordered_branches = MergeOrder.new(@git, mergeable_order(1,0,2)).get_order
+      assert_equal(ordered_branches.map(&:sha), mergeable_order(1,2,0).map(&:sha))
+    end
+    #
+    def test_get_order_changed_shas_are_between_unchanged_shas_and_changed_working_branch
+      mock_working_branch(sample_branches[1])
+      mock_current_sha(sample_branches[2], sample_branches[2].sha)
+      mock_current_sha(sample_branches[1], sample_branches[1].sha)
+      mock_current_sha(sample_branches[0], sample_branches[0].sha)
+
+      sample_branches[1].sha = 'sha0-1'
+      sample_branches[2].sha = 'sha2-1'
+
+      ordered_branches = MergeOrder.new(@git, mergeable_order(2,1,0)).get_order
+      assert_equal(ordered_branches.map(&:sha), mergeable_order(0,2,1).map(&:sha))
+    end
+
+    private
+
+    def mock_current_sha(branch, sha)
+      @git.expect(:run, sha, ["rev-parse #{branch.remote}/#{branch.ref}"])
+        .expect(:last_success?, true)
+        .expect(:last_stdout, sha)
+    end
+
+    def mock_working_branch(branch)
+      sample_branches.count.times { @git.expect(:working_branch, branch.ref) }
+    end
+
+    def sample_branches
+      @sample_branches ||= [Data::Branch.from_hash({'ref' => 'branch0', 'remote' => 'origin', 'sha' => 'sha0', 'merge_order' => 1}),
+        Data::Branch.from_hash({'ref' => 'branch1', 'remote' => 'origin', 'sha' => 'sha1', 'merge_order' => 2}),
+        Data::Branch.from_hash({'ref' => 'branch2', 'remote' => 'origin', 'sha' => 'sha2', 'merge_order' => 3})]
+    end
+
+    def mergeable_order(*order)
+      order.map.with_index do |nth, merge_order|
+        sample_branches[nth].merge_order = merge_order
+        sample_branches[nth]
+      end
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flash_flow
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Flashfunders
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -176,6 +176,7 @@ files:
 - lib/flash_flow/merge_master/merge_status.html.erb
 - lib/flash_flow/merge_master/release_graph.rb
 - lib/flash_flow/merge_master/status.rb
+- lib/flash_flow/merge_order.rb
 - lib/flash_flow/notifier.rb
 - lib/flash_flow/notifier/hipchat.rb
 - lib/flash_flow/options.rb
@@ -198,6 +199,7 @@ files:
 - test/lib/test_deploy.rb
 - test/lib/test_git.rb
 - test/lib/test_issue_tracker.rb
+- test/lib/test_merge_order.rb
 - test/lib/test_notifier.rb
 - test/lib/test_resolve.rb
 - test/minitest_helper.rb
@@ -241,6 +243,7 @@ test_files:
 - test/lib/test_deploy.rb
 - test/lib/test_git.rb
 - test/lib/test_issue_tracker.rb
+- test/lib/test_merge_order.rb
 - test/lib/test_notifier.rb
 - test/lib/test_resolve.rb
 - test/minitest_helper.rb