flash_flow 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a836475713f58f0a511b59b28b404af5d43b20bd
-  data.tar.gz: f301d93bfcab8720f1a9f76b6e60d69fb8da0530
+  metadata.gz: 8006bd8e5430d1b82498e75a5ee3d0990804d19f
+  data.tar.gz: 168531a6539335bf8a5b5bc8bf00e3097ca1c134
 SHA512:
-  metadata.gz: 57776f50518921b2f3c16407b11bb54cc294d141d11e1936509ecd72d1ee0343ca2931e319561395c68c3eaa644393bd29611d52dd87e7eb3d787f3b3533af04
-  data.tar.gz: e60cd7cb7dcd124dfdb62ee1900f5fae8785e04d02c4179f91f814971ef7e5be32200b6dee1ab88ef539415f3f760027a4e426cd68f3637227e9a9951bfbca0f
+  metadata.gz: c3349383a3fe10ef4924c2c99273922408572b18ec2169b853a630f19649d43ef0ecdfd5ac3150901c7c241c1b923f180d1775aef61d6bd3336da1a29620a93c
+  data.tar.gz: 8630a2e23c234677f2379d90376bac227099f0c9cddde3c72a4f4f50f3c74ab33275a2496c6d1d2844d399f14a090100ab003075a0f24f5948446604b5e4aee5

data/bin/flash_flow

@@ -17,6 +17,10 @@ case
     FlashFlow::IssueTracker::Base.new(FlashFlow::Config.configuration.issue_tracker).stories_delivered
   when options[:release_notes]
     FlashFlow::IssueTracker::Base.new(FlashFlow::Config.configuration.issue_tracker).release_notes(options[:release_notes])
+  when options[:resolve]
+    FlashFlow::Resolve.new(Config.configuration.git, Config.configuration.branch_info_file, logger: Config.configuration.logger).start
+  when options[:resolve_manual]
+    FlashFlow::Resolve.new(Config.configuration.git, Config.configuration.branch_info_file, logger: Config.configuration.logger).manual_instructions
   else
     FlashFlow::Deploy.new(options).run
     FlashFlow::IssueTracker::Base.new(FlashFlow::Config.configuration.issue_tracker).stories_pushed

data/lib/flash_flow.rb

@@ -5,3 +5,4 @@ require 'flash_flow/install'
 require 'flash_flow/config'
 require 'flash_flow/deploy'
 require 'flash_flow/issue_tracker'
+require 'flash_flow/resolve'

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/shadow_repo'
 
 module FlashFlow
   class Deploy
@@ -33,25 +34,28 @@ module FlashFlow
       puts "Building #{@git.merge_branch}... Log can be found in #{FlashFlow::Config.configuration.log_file}"
       logger.info "\n\n### Beginning #{@git.merge_branch} merge ###\n\n"
 
-      fetch(@git.merge_remote)
-      @git.in_original_merge_branch do
-        @git.initialize_rerere
-      end
 
       begin
-        @lock.with_lock do
-          open_pull_request
-
-          @git.reset_temp_merge_branch
-          @git.in_temp_merge_branch do
-            merge_branches
-            commit_branch_info
-            commit_rerere
+        open_pull_request
+
+        in_shadow_repo do
+          @lock.with_lock do
+            fetch(@git.merge_remote)
+            @git.in_original_merge_branch do
+              @git.initialize_rerere
+            end
+
+            @git.reset_temp_merge_branch
+            @git.in_temp_merge_branch do
+              merge_branches
+              commit_branch_info
+              commit_rerere
+            end
+
+            @git.copy_temp_to_merge_branch
+            @git.delete_temp_merge_branch
+            @git.push_merge_branch
           end
-
-          @git.copy_temp_to_merge_branch
-          @git.delete_temp_merge_branch
-          @git.push_merge_branch
         end
 
         print_errors
@@ -157,7 +161,7 @@ module FlashFlow
       branch_not_merged = nil
       @data.failures.each do |full_ref, failure|
         if failure.ref == @git.working_branch
-          branch_not_merged = "\nERROR: Your branch did not merge to #{@git.merge_branch}. Run the following commands to fix the merge conflict and then re-run this script:\n\n  git checkout #{failure.metadata['conflict_sha']}\n  git merge #{@git.working_branch}\n  # Resolve the conflicts\n  git add <conflicted files>\n  git commit --no-edit"
+          branch_not_merged = "ERROR: Your branch did not merge to #{@git.merge_branch}. Run 'flash_flow --resolve', fix the merge conflict(s) and then re-run this script\n"
         else
           errors << "WARNING: Unable to merge branch #{failure.remote}/#{failure.ref} to #{@git.merge_branch} due to conflicts."
         end
@@ -173,6 +177,12 @@ module FlashFlow
 
     private
 
+    def in_shadow_repo
+      ShadowRepo.new(@git, logger: logger).in_dir do
+        yield
+      end
+    end
+
     def fetch(remote)
       @fetched_remotes ||= {}
       unless @fetched_remotes[remote]

data/lib/flash_flow/git.rb

@@ -99,22 +99,25 @@ module FlashFlow
     def rerere_resolve!
       return false unless use_rerere
 
-      merging_files = staged_and_working_dir_files.select { |s| UNMERGED_STATUSES.include?(s[0..1]) }.map { |s| s[3..-1] }
+      if unresolved_conflicts.empty?
+        merging_files = staged_and_working_dir_files.select { |s| UNMERGED_STATUSES.include?(s[0..1]) }.map { |s| s[3..-1] }
+        conflicts = conflicted_files
 
-      conflicts = merging_files.map do |file|
-        File.open(file) { |f| f.grep(/>>>>/) }
-      end
-
-      if conflicts.all? { |c| c.empty? }
         run("add #{merging_files.join(" ")}")
         run('commit --no-edit')
 
-        resolutions(merging_files)
+        resolutions(conflicts)
       else
         false
       end
     end
 
+    def unresolved_conflicts
+      conflicted_files.map do |file|
+        File.open(file) { |f| f.grep(/>>>>/) }.empty? ? nil : file
+      end.compact
+    end
+
     def resolutions(files)
       {}.tap do |hash|
         files.map do |file|
@@ -165,6 +168,11 @@ module FlashFlow
       last_stdout.split("\n").reject { |line| line[0..1] == '??' }
     end
 
+    def conflicted_files
+      run("diff --name-only --diff-filter=U")
+      last_stdout.split("\n")
+    end
+
     def current_branch
       run("rev-parse --abbrev-ref HEAD")
       last_stdout.strip
@@ -214,6 +222,17 @@ module FlashFlow
       in_branch(merge_branch, &block)
     end
 
+    def in_branch(branch)
+      begin
+        starting_branch = current_branch
+        run("checkout #{branch}")
+
+        yield
+      ensure
+        run("checkout #{starting_branch}")
+      end
+    end
+
     private
 
     def squash_commits
@@ -234,15 +253,5 @@ module FlashFlow
       "flash_flow/#{merge_branch}"
     end
 
-    def in_branch(branch)
-      begin
-        starting_branch = current_branch
-        run("checkout #{branch}")
-
-        yield
-      ensure
-        run("checkout #{starting_branch}")
-      end
-    end
   end
 end

data/lib/flash_flow/options.rb

@@ -18,6 +18,8 @@ module FlashFlow
         opts.on('--stories id1,id2', 'comma-delimited list of story ids for this branch') { |v| options[:stories] = v.split(',') }
         opts.on('-f', '--force-push', 'Force push your branch') { |v| options[:force] = v }
         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_tail("-h", "--help", "Show this message") do
           puts opts

data/lib/flash_flow/resolve.rb

@@ -0,0 +1,158 @@
+require 'logger'
+
+require 'flash_flow/git'
+require 'flash_flow/data'
+
+module FlashFlow
+  class Resolve
+
+    class NothingToResolve < StandardError; end
+
+    def initialize(git_config, branch_info_file, opts={})
+      @logger = opts[:logger]
+      @branch_info_file = branch_info_file
+      @cmd_runner = CmdRunner.new(logger: @logger)
+      @git = Git.new(git_config, @logger)
+    end
+
+    def manual_instructions
+      branch = check_for_conflict
+      puts manual_not_merged_instructions(branch)
+    end
+
+    def start
+      check_for_conflict
+
+      in_shadow_repo do
+        in_working_branch do
+          merge_conflicted
+
+          if unresolved_conflicts.empty?
+            puts "You have already resolved all conflicts."
+          else
+            launch_bash
+
+            rerere
+
+            unless unresolved_conflicts.empty?
+              puts "There are still unresolved conflicts in these files:\n#{unresolved_conflicts.join("\n")}\n\n"
+            end
+          end
+
+          git_reset
+        end
+      end
+    end
+
+    def unresolved_conflicts
+      @git.unresolved_conflicts
+    end
+
+    def merge_conflicted
+      @git.run("checkout #{branch.metadata['conflict_sha']}")
+      @git.run("merge origin/#{working_branch}")
+    end
+
+    def git_reset
+      @git.run("reset --hard HEAD")
+    end
+
+    def rerere
+      @git.run("rerere")
+    end
+
+    def bash_message
+      puts "\nPlease fix the following conflicts and then 'exit':\n#{unresolved_conflicts.join("\n")}\n\n"
+    end
+
+    def launch_bash
+      with_init_file do |file|
+        system("bash --init-file #{file} -i")
+      end
+    end
+
+    def with_init_file
+      filename = '.flash_flow_init'
+      File.open(filename, 'w') do |f|
+        f.puts(init_file_contents)
+      end
+
+      yield filename
+
+      File.delete(filename)
+    end
+
+    def manual_not_merged_instructions(branch)
+      <<-EOS
+
+Run the following commands to fix the merge conflict and then re-run flash_flow:
+  pushd #{flash_flow_directory}
+  git checkout #{branch.metadata['conflict_sha']}
+  git merge #{working_branch}
+  # Resolve the conflicts
+  git add <conflicted files>
+  git commit --no-edit
+  popd
+
+      EOS
+    end
+
+    private
+
+    def data
+      return @data if @data
+
+      in_shadow_repo do
+        @data = Data::Base.new({}, @branch_info_file, @git, logger: logger)
+      end
+
+      @data
+
+    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
+      end
+    end
+
+    def flash_flow_directory
+      shadow_repo.flash_flow_dir
+    end
+
+    def init_file_contents
+      <<-EOS
+        # Commented this one out because it was causing lots of spurious "saving session..." type messages
+        # [[ -s /etc/profile ]] && source /etc/profile
+        [[ -s ~/.bash_profile ]] && source ~/.bash_profile
+        [[ -s ~/.bash_login ]] && source ~/.bash_login
+        [[ -s ~/.profile ]] && source ~/.profile
+        [[ -s ~/.bashrc ]] && source ~/.bashrc
+
+        PS1='flash_flow resolve: (type "exit" after your conflicts are resolved)$ '
+      EOS
+    end
+
+    def check_for_conflict
+      raise NothingToResolve.new("The current branch (#{working_branch}) does not appear to be in conflict.") unless branch.metadata['conflict_sha']
+    end
+  end
+end

data/lib/flash_flow/shadow_repo.rb

@@ -0,0 +1,45 @@
+require 'logger'
+
+require 'flash_flow/git'
+
+module FlashFlow
+  class ShadowRepo
+
+
+    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
+
+      Dir.chdir(flash_flow_dir) do
+        @git.run("reset --hard HEAD") if opts[:reset]
+
+        yield
+      end
+    end
+
+    def create_shadow_repo
+      unless Dir.exists?(flash_flow_dir)
+        @cmd_runner.run("mkdir -p #{flash_flow_dir}")
+        @cmd_runner.run("cp -R #{current_dir} #{flash_flow_base_dir}")
+      end
+    end
+
+    def flash_flow_base_dir
+      @flash_flow_base_dir ||= current_dir + "/../.flash_flow"
+    end
+
+    def current_dir
+      @current_dir ||= Dir.getwd
+    end
+
+    def flash_flow_dir
+      @flash_flow_dir ||= flash_flow_base_dir + "/#{File.basename(current_dir)}"
+    end
+  end
+end
+

data/lib/flash_flow/version.rb

@@ -1,3 +1,3 @@
 module FlashFlow
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/test/lib/test_deploy.rb

@@ -18,17 +18,6 @@ module FlashFlow
       @deploy = Deploy.new
     end
 
-    def with_versions(current, written)
-      original_version = FlashFlow::VERSION
-      FlashFlow.send(:remove_const, :VERSION)
-      FlashFlow.const_set(:VERSION, current)
-      data.expect(:version, written)
-      yield
-      data.verify
-      FlashFlow.send(:remove_const, :VERSION)
-      FlashFlow.const_set(:VERSION, original_version)
-    end
-
     def test_version_is_nil
       with_versions('1.1.1', nil) do
         assert_nil(@deploy.check_version)
@@ -68,7 +57,7 @@ module FlashFlow
       data.expect(:failures, {'origin/pushing_branch' => @branch})
       @branch.fail!('some_random_sha')
 
-      current_branch_error = "\nERROR: Your branch did not merge to test_acceptance. Run the following commands to fix the merge conflict and then re-run this script:\n\n  git checkout some_random_sha\n  git merge pushing_branch\n  # Resolve the conflicts\n  git add <conflicted files>\n  git commit --no-edit"
+      current_branch_error = "ERROR: Your branch did not merge to test_acceptance. Run 'flash_flow --resolve', fix the merge conflict(s) and then re-run this script\n"
 
       @deploy.instance_variable_get('@git'.to_sym).stub(:working_branch, 'pushing_branch') do
         assert_equal(current_branch_error, @deploy.format_errors)
@@ -84,9 +73,11 @@ module FlashFlow
     end
 
     def test_check_out_to_working_branch
-      @deploy.stub(:check_repo, true) do
-        Lock::Base.stub_any_instance(:with_lock, -> { raise Lock::Error }) do
-          assert_output(/Failure!/) { @deploy.run }
+      @deploy.stub(:in_shadow_repo, true) do
+        @deploy.stub(:check_repo, true) do
+          Lock::Base.stub_any_instance(:with_lock, -> { raise Lock::Error }) do
+            assert_output(/Failure!/) { @deploy.run }
+          end
         end
       end
     end
@@ -153,6 +144,17 @@ module FlashFlow
 
     private
 
+    def with_versions(current, written)
+      original_version = FlashFlow::VERSION
+      FlashFlow.send(:remove_const, :VERSION)
+      FlashFlow.const_set(:VERSION, current)
+      data.expect(:version, written)
+      yield
+      data.verify
+      FlashFlow.send(:remove_const, :VERSION)
+      FlashFlow.const_set(:VERSION, original_version)
+    end
+
     def merger
       @merger ||= Minitest::Mock.new
     end

data/test/lib/test_resolve.rb

@@ -0,0 +1,100 @@
+require 'minitest_helper'
+
+module FlashFlow
+  class TestResolve< Minitest::Test
+
+    class ResolveTester < Resolve
+      def in_shadow_repo
+        yield
+      end
+
+      def in_working_branch
+        yield
+      end
+
+      def working_branch
+        'working_branch'
+      end
+
+      def merge_conflicted
+        true
+      end
+
+      def launch_bash
+        puts 'launch_bash'
+      end
+
+      def rerere
+        puts 'rerere'
+      end
+
+      def git_reset
+        puts 'git_reset'
+      end
+
+      def branch
+        Data::Branch.from_hash({ 'metadata' => { 'conflict_sha' => '123' }})
+      end
+    end
+
+    def setup
+      @resolve_tester = ResolveTester.new({ 'merge_branch' => 'test_acceptance',
+                               'merge_remote' => 'test_remote',
+                               'master_branch' => 'test_master',
+                               'remotes' => ['fake_origin'],
+                               'use_rerere' => true
+                             }, 'some_file')
+
+      @resolve = Resolve.new({ 'merge_branch' => 'test_acceptance',
+                                            'merge_remote' => 'test_remote',
+                                            'master_branch' => 'test_master',
+                                            'remotes' => ['fake_origin'],
+                                            'use_rerere' => true
+                                          }, 'some_file')
+    end
+
+    def test_no_conflict_sha
+      @resolve_tester.stub(:branch, Data::Branch.from_hash({ 'metadata' => { }})) do
+        assert_raises(Resolve::NothingToResolve) { @resolve_tester.start }
+      end
+    end
+
+    def test_conflicts_already_resolved
+      @resolve_tester.stub(:unresolved_conflicts, []) do
+        assert_output(/You have already resolved all conflicts/) { @resolve_tester.start }
+      end
+    end
+
+    def test_user_did_not_resolve_conflicts
+      @resolve_tester.stub(:unresolved_conflicts, ['conflict']) do
+        assert_output(/launch_bash.*rerere.*There are still.*git_reset/m) { @resolve_tester.start }
+      end
+    end
+
+    
+    
+# def start
+#           if unresolved_conflicts.empty?
+#             puts "You have already resolved all conflicts."
+#           else
+#             launch_bash
+#             @git.run("rerere")
+#
+#             unless unresolved_conflicts.empty?
+#               puts "There are still unresolved conflicts in these files:\n#{unresolved_conflicts.join("\n")}\n\n"
+#             end
+#           end
+#
+#           @git.run("reset --hard HEAD")
+#         end
+#       end
+#     end
+
+
+    private
+
+    def shadow_repo
+      Minitest::Mock.new.expect(:in_dir, true)
+    end
+  end
+end

data/test/minitest_helper.rb

@@ -17,6 +17,7 @@ class Minitest::Test
     def last_command; ''; end
   end
 
+  FlashFlow.send(:remove_const, :CmdRunner) if FlashFlow.const_defined?(:CmdRunner)
   FlashFlow::CmdRunner = TestCmdRunner
 
   def reset_config!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flash_flow
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Flashfunders
@@ -160,6 +160,8 @@ files:
 - lib/flash_flow/notifier.rb
 - lib/flash_flow/notifier/hipchat.rb
 - lib/flash_flow/options.rb
+- lib/flash_flow/resolve.rb
+- lib/flash_flow/shadow_repo.rb
 - lib/flash_flow/time_helper.rb
 - lib/flash_flow/version.rb
 - test/lib/data/test_base.rb
@@ -175,6 +177,7 @@ files:
 - test/lib/test_git.rb
 - test/lib/test_issue_tracker.rb
 - test/lib/test_notifier.rb
+- test/lib/test_resolve.rb
 - test/minitest_helper.rb
 homepage: ''
 licenses:
@@ -214,4 +217,5 @@ test_files:
 - test/lib/test_git.rb
 - test/lib/test_issue_tracker.rb
 - test/lib/test_notifier.rb
+- test/lib/test_resolve.rb
 - test/minitest_helper.rb