flash_flow 1.2.1 → 1.2.2.a

data/lib/flash_flow/options.rb

@@ -21,6 +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_tail("-h", "--help", "Show this message") do
           puts opts

data/lib/flash_flow/resolve.rb

@@ -12,7 +12,7 @@ module FlashFlow
       @logger = opts[:logger]
       @branch_info_file = branch_info_file
       @cmd_runner = CmdRunner.new(logger: @logger)
-      @git = Git.new(git_config, @logger)
+      @git = ShadowGit.new(git_config, @logger)
     end
 
     def manual_instructions
@@ -23,24 +23,22 @@ module FlashFlow
     def start
       check_for_conflict
 
-      in_shadow_repo do
-        in_working_branch do
-          merge_conflicted
+      in_working_branch do
+        merge_conflicted
 
-          if unresolved_conflicts.empty?
-            puts "You have already resolved all conflicts."
-          else
-            launch_bash
+        if unresolved_conflicts.empty?
+          puts "You have already resolved all conflicts."
+        else
+          launch_bash
 
-            rerere
+          rerere
 
-            unless unresolved_conflicts.empty?
-              puts "There are still unresolved conflicts in these files:\n#{unresolved_conflicts.join("\n")}\n\n"
-            end
+          unless unresolved_conflicts.empty?
+            puts "There are still unresolved conflicts in these files:\n#{unresolved_conflicts.join("\n")}\n\n"
           end
-
-          git_reset
         end
+
+        git_reset
       end
     end
 
@@ -102,42 +100,27 @@ Run the following commands to fix the merge conflict and then re-run flash_flow:
     private
 
     def data
-      return @data if @data
-
-      in_shadow_repo do
-        @data = Data::Base.new({}, @branch_info_file, @git, logger: @logger)
-      end
-
-      @data
-
+      @data ||= Data::Base.new({}, @branch_info_file, @git, logger: @logger)
     end
 
     def branch
       @branch ||= data.saved_branches.detect { |branch| branch.ref == working_branch }
     end
 
-    def shadow_repo
-      @shadow_repo ||= ShadowRepo.new(@git, logger: @logger)
-    end
-
-    def in_shadow_repo
-      shadow_repo.in_dir do
-        yield
-      end
-    end
-
     def working_branch
       @git.working_branch
     end
 
     def in_working_branch
-      @git.in_branch(working_branch) do
-        yield
+      @git.in_dir do
+        @git.in_branch(working_branch) do
+          yield
+        end
       end
     end
 
     def flash_flow_directory
-      shadow_repo.flash_flow_dir
+      @git.flash_flow_dir
     end
 
     def init_file_contents

data/lib/flash_flow/shadow_repo.rb

@@ -3,24 +3,17 @@ require 'logger'
 require 'flash_flow/git'
 
 module FlashFlow
-  class ShadowRepo
+  class ShadowGit < Git
 
+    def initialize(config, logger=nil)
+      super
 
-    def initialize(git, opts={})
-      @git = git
-      @cmd_runner = CmdRunner.new(logger: opts[:logger])
-    end
-
-    def in_dir(opts={})
-      opts = { reset: true, go_back: true }.merge(opts)
       create_shadow_repo
+      @cmd_runner.dir = flash_flow_dir
 
-      Dir.chdir(flash_flow_dir) do
-        @git.fetch(@git.merge_remote)
-        @git.run("reset --hard HEAD") if opts[:reset]
-
-        yield
-      end
+      run("clean -x -f")
+      fetch(merge_remote)
+      run("reset --hard HEAD")
     end
 
     def create_shadow_repo

data/lib/flash_flow/version.rb

@@ -1,3 +1,3 @@
 module FlashFlow
-  VERSION = "1.2.1"
+  VERSION = "1.2.2.a"
 end

data/test/lib/data/test_collection.rb

@@ -214,6 +214,56 @@ module FlashFlow
         @fake_branches.verify
       end
 
+      def test_can_ship_returns_true
+        collection = Collection.new({})
+        assert(collection.can_ship?(@branch))
+      end
+
+      def test_can_ship_calls_branches_class
+        @fake_branches.expect(:can_ship?, true, [@branch])
+        @collection.can_ship?(@branch)
+        @fake_branches.verify
+      end
+
+      def test_branch_link_returns_nil
+        collection = Collection.new({})
+        assert_nil(collection.branch_link(@branch))
+      end
+
+      def test_branch_link_calls_branches_class
+        @fake_branches.expect(:branch_link, 'http://link_to_branch.com', [@branch])
+        assert_equal('http://link_to_branch.com', @collection.branch_link(@branch))
+        @fake_branches.verify
+      end
+
+      def test_current_branches
+        branch1 = Branch.new('111', '111', '111')
+        branch2 = Branch.new('222', '222', '222')
+        branch3 = Branch.new('333', '333', '333')
+        branch2.current_record = true
+        @collection.mark_success(branch1)
+        @collection.mark_success(branch2)
+        @collection.mark_success(branch3)
+
+        assert_equal(@collection.current_branches, [branch2])
+      end
+
+      def test_mark_all_as_current
+        branch1 = Branch.new('111', '111', '111')
+        branch2 = Branch.new('222', '222', '222')
+        branch3 = Branch.new('333', '333', '333')
+        branch2.current_record = true
+        @collection.mark_success(branch1)
+        @collection.mark_success(branch2)
+        @collection.mark_success(branch3)
+
+        assert_equal(@collection.current_branches, [branch2])
+
+        @collection.mark_all_as_current
+
+        assert_equal(@collection.current_branches, [branch1, branch2, branch3])
+      end
+
       def test_failures
         branch1 = Branch.new('111', '111', '111')
         branch2 = Branch.new('222', '222', '222')

data/test/lib/data/test_store.rb

@@ -63,6 +63,9 @@ module FlashFlow
       def read_file_from_merge_branch; end
       def add_and_commit(_,_,_=nil); end
 
+      def in_dir
+        yield
+      end
       def in_temp_merge_branch
         yield
       end

data/test/lib/issue_tracker/test_pivotal.rb

@@ -172,6 +172,73 @@ module FlashFlow
         fake_file.verify
       end
 
+      def test_story_deployable
+        story_mock = MiniTest::Mock.new
+                         .expect(:id, '111')
+                         .expect(:current_state, 'accepted')
+
+        stub_tracker_gem(@project_mock) do
+          mock_find(story_mock)
+          assert(Pivotal.new(sample_branches, mock_git).story_deployable?('111'))
+        end
+      end
+
+      def test_story_deployable_false
+        story_mock = MiniTest::Mock.new
+                         .expect(:id, '111')
+                         .expect(:current_state, 'delivered')
+
+        stub_tracker_gem(@project_mock) do
+          mock_find(story_mock)
+          refute(Pivotal.new(sample_branches, mock_git).story_deployable?('111'))
+        end
+      end
+
+      def test_story_link
+        story_mock = MiniTest::Mock.new
+                         .expect(:id, '111')
+                         .expect(:url, 'http://some_url')
+
+        stub_tracker_gem(@project_mock) do
+          mock_find(story_mock)
+          assert_equal('http://some_url', Pivotal.new(sample_branches, mock_git).story_link('111'))
+        end
+      end
+
+      def test_story_title
+        story_mock = MiniTest::Mock.new
+                         .expect(:id, '111')
+                         .expect(:name, 'Some Title')
+
+        stub_tracker_gem(@project_mock) do
+          mock_find(story_mock)
+          assert_equal('Some Title', Pivotal.new(sample_branches, mock_git).story_title('111'))
+        end
+      end
+
+      def test_release_keys
+        story_mock = MiniTest::Mock.new
+                         .expect(:id, '111')
+                         .expect(:labels, 'Release-1, Not-A-Release-2, release-3')
+                         .expect(:labels, 'Release-1, Not-A-Release-2, release-3')
+
+        stub_tracker_gem(@project_mock) do
+          mock_find(story_mock)
+          assert_equal(['Release-1', 'release-3'], Pivotal.new(sample_branches, mock_git, 'release_label_prefix' => 'release').release_keys('111'))
+        end
+      end
+
+      def test_stories_for_release
+        story_mock = MiniTest::Mock.new
+                         .expect(:id, '111')
+
+        stub_tracker_gem(@project_mock) do
+          mock_all([story_mock], label: 'release')
+          assert_equal(['111'], Pivotal.new(sample_branches, mock_git).stories_for_release('release'))
+        end
+
+      end
+
       private
 
       def stub_tracker_gem(project)
@@ -208,6 +275,10 @@ module FlashFlow
         @project_mock.expect(:stories, @stories.expect(:find, story, [story_id]))
       end
 
+      def mock_all(stories, opts={})
+        @project_mock.expect(:stories, @stories.expect(:all, stories, [opts]))
+      end
+
       def sample_branches
         @sample_branches ||= [Data::Branch.from_hash({'ref' => 'branch1', 'remote' => 'origin', 'sha' => 'sha1', 'status' => 'success', 'created_at' => (Time.now - 3600), 'stories' => ['111']}),
             Data::Branch.from_hash({'ref' => 'branch2', 'remote' => 'origin', 'sha' => 'sha2', 'status' => 'success', 'created_at' => (Time.now - 1800), 'stories' => ['222']}),

data/test/lib/merge_master/test_release_graph.rb

@@ -0,0 +1,74 @@
+require 'minitest_helper'
+require 'flash_flow/merge_master'
+
+module FlashFlow
+  module MergeMaster
+    class TestReleaseGraph < Minitest::Test
+
+      class FakeIssueTracker
+        STORY_ID1 = '111'
+        STORY_ID2 = '222'
+        STORY_ID3 = '333'
+        STORY_ID4 = '444'
+        STORY_ID5 = '555'
+        STORY_ID6 = '666'
+
+        def release_keys(story_id)
+          {
+              STORY_ID1 => ['release1', 'release2'],
+              STORY_ID2 => [],
+              STORY_ID3 => ['release2'],
+              STORY_ID4 => ['release3', 'release4'],
+              STORY_ID5 => [],
+              STORY_ID6 => ['release3'],
+          }[story_id]
+        end
+
+        def stories_for_release(release_keys)
+          hash = Hash.new([])
+          hash['release1'] = [STORY_ID1]
+          hash['release2'] = [STORY_ID1, STORY_ID3]
+
+          hash[release_keys]
+        end
+
+      end
+
+      BRANCH1 = Data::Branch.from_hash('ref' => 'branch1', 'stories' => ['111', '222'])
+      BRANCH2 = Data::Branch.from_hash('ref' => 'branch2', 'stories' => ['333'])
+      BRANCH3 = Data::Branch.from_hash('ref' => 'branch3', 'stories' => ['444', '555', '666'])
+
+      ################
+      ## Begin actual tests
+
+      def setup
+        @graph = ReleaseGraph.build([BRANCH1, BRANCH2, BRANCH3], FakeIssueTracker.new)
+      end
+
+      def test_connected_branches
+        assert_equal(@graph.connected_branches(BRANCH1.ref), [BRANCH1, BRANCH2])
+        assert_equal(@graph.connected_branches(BRANCH2.ref), [BRANCH1, BRANCH2])
+        assert_equal(@graph.connected_branches(BRANCH3.ref), [BRANCH3])
+      end
+
+      def test_connected_stories
+        assert_equal(@graph.connected_stories(BRANCH1.ref), ['111', '222', '333'])
+        assert_equal(@graph.connected_stories(BRANCH2.ref), ['111', '222', '333'])
+        assert_equal(@graph.connected_stories(BRANCH3.ref), ['444', '555', '666'])
+      end
+
+      def test_connected_releases
+        assert_equal(@graph.connected_releases(BRANCH1.ref), ['release1', 'release2'])
+        assert_equal(@graph.connected_releases(BRANCH2.ref), ['release1', 'release2'])
+        assert_equal(@graph.connected_releases(BRANCH3.ref), ['release3', 'release4'])
+      end
+
+      def test_no_branches
+        g = ReleaseGraph.build([], FakeIssueTracker.new)
+        assert(g.connected_branches(BRANCH1.ref).empty?)
+        assert(g.connected_stories(BRANCH1.ref).empty?)
+        assert(g.connected_releases(BRANCH1.ref).empty?)
+      end
+    end
+  end
+end

data/test/lib/merge_master/test_status.rb

@@ -0,0 +1,119 @@
+require 'minitest_helper'
+require 'flash_flow/merge_master'
+
+module FlashFlow
+  module MergeMaster
+    class TestStatus < Minitest::Test
+
+      class TestableMergeMaster < Status
+        def initialize;
+        end
+
+        attr_accessor :issue_tracker, :collection
+
+      end
+
+      class FakeIssueTracker
+        STORY_ID1 = '111'
+        STORY_ID2 = '222'
+        STORY_ID3 = '333'
+        STORY_ID4 = '444'
+        STORY_ID5 = '555'
+        STORY_ID6 = '666'
+
+        def story_deployable?(story_id)
+          {
+              STORY_ID1 => true,
+              STORY_ID2 => true,
+              STORY_ID3 => true,
+              STORY_ID4 => true,
+              STORY_ID5 => false,
+              STORY_ID6 => true,
+          }[story_id]
+        end
+
+        def release_keys(story_id)
+          {
+              STORY_ID1 => ['release1', 'release2'],
+              STORY_ID2 => [],
+              STORY_ID3 => ['release2'],
+              STORY_ID4 => ['release3', 'release4'],
+              STORY_ID5 => [],
+              STORY_ID6 => ['release4'],
+          }[story_id]
+        end
+
+        def stories_for_release(release_keys)
+          hash = Hash.new([])
+          hash['release1'] = [STORY_ID1]
+          hash['release2'] = [STORY_ID1, STORY_ID3]
+
+          hash[release_keys]
+        end
+
+        def story_link(story_id)
+          ; "link: #{story_id}";
+        end
+
+        def story_title(story_id)
+          ; "title: #{story_id}";
+        end
+      end
+
+      class FakeCollection
+        BRANCH1 = Data::Branch.from_hash('ref' => 'branch1', 'stories' => ['111', '222'])
+        BRANCH2 = Data::Branch.from_hash('ref' => 'branch2', 'stories' => ['333'])
+        BRANCH3 = Data::Branch.from_hash('ref' => 'branch3', 'stories' => ['444', '555', '666'])
+
+        def branch_link(branch)
+          return "link-#{branch.ref}"
+        end
+
+        def can_ship?(branch)
+          {
+              BRANCH1 => true,
+              BRANCH2 => true,
+              BRANCH3 => false,
+          }[branch]
+        end
+
+        def current_branches
+          [BRANCH1, BRANCH2, BRANCH3]
+        end
+      end
+
+      ################
+      ## Begin actual tests
+
+      def setup
+        @merge_master = TestableMergeMaster.new
+        @merge_master.issue_tracker = FakeIssueTracker.new
+        @merge_master.collection = FakeCollection.new
+      end
+
+      def test_shippable_branch
+        branches = @merge_master.branches
+        branch1 = branches[FakeCollection::BRANCH1]
+        branch2 = branches[FakeCollection::BRANCH2]
+
+        assert(branch1[:stories].all? { |s| @merge_master.stories[s][:can_ship?] })
+        assert_equal(branch1[:stories], branch2[:stories])
+        assert(branch1[:shippable?])
+      end
+
+      def test_not_shippable_branch
+        branches = @merge_master.branches
+        branch3 = branches[FakeCollection::BRANCH3]
+
+        assert_equal(branch3[:stories].map { |s| @merge_master.stories[s][:can_ship?] }, [true, false, true])
+        refute(branch3[:shippable?])
+      end
+
+      private
+
+      def find_branch(status_list, branch)
+        status_list[branch]
+      end
+    end
+  end
+end