daq_flow 1.0.4

data/test/lib/test_config.rb

@@ -0,0 +1,63 @@
+require 'minitest_helper'
+
+module FlashFlow
+  class TestConfig < Minitest::Test
+    def setup
+      @config_hash = {
+          'git' => {
+            'use_rerere' => true,
+            'remote' => 'arbitrary_remote',
+            'merge_branch' => 'acceptance',
+            'master_branch' => 'master'
+          },
+          'branch_info_file' => 'some_file.txt',
+          'branches' => {
+              'class' => {
+                  'name' => 'BranchClass'
+              }
+          }
+      }
+
+      reset_config!
+    end
+
+    def test_that_it_sets_all_attrs
+      File.stub(:read, @config_hash.to_yaml) do
+        Config.configure!('unused_file_name.yml')
+        assert('some_file.txt' == config.branch_info_file)
+        assert({
+                   'use_rerere' => true,
+                   'remote' => 'arbitrary_remote',
+                   'merge_branch' => 'acceptance',
+                   'master_branch' => 'master'
+               } == config.git)
+        assert({ 'class' => { 'name' => 'BranchClass' }} == config.branches)
+      end
+    end
+
+    def test_that_it_blows_up
+      @config_hash.delete('git')
+
+      File.stub(:read, @config_hash.to_yaml) do
+        assert_raises FlashFlow::Config::IncompleteConfiguration do
+          Config.configure!('unused_file_name.yml')
+        end
+      end
+    end
+
+    def test_that_it_sets_defaults
+      File.stub(:read, {'git' => {}}.to_yaml) do
+        Config.configure!('unused_file_name.yml')
+        assert('README.rdoc' == config.branch_info_file)
+        assert_nil(config.notifier)
+        assert_nil(config.lock)
+      end
+    end
+
+    private
+
+    def config
+      Config.configuration
+    end
+  end
+end

data/test/lib/test_git.rb

@@ -0,0 +1,73 @@
+require 'minitest_helper'
+
+module FlashFlow
+  class TestGit < Minitest::Test
+    def setup
+      @git_args = {
+          'merge_branch' => 'acceptance',
+          'remote' => 'origin',
+          'master_branch' => 'master',
+          'use_rerere' => true
+      }
+      @cmd_runner = setup_cmd_runner
+    end
+
+    def test_initialize_rerere_checks_flag
+      @git_args['use_rerere'] = false
+
+      instance.initialize_rerere
+
+      @cmd_runner.verify
+    end
+
+    def test_initialize_rerere_runs_commands
+      @cmd_runner.expect(:run, true, ['mkdir .git/rr-cache'])
+      @cmd_runner.expect(:run, true, ['cp -R rr-cache/* .git/rr-cache/'])
+
+      instance.initialize_rerere
+      @cmd_runner.verify
+    end
+
+    def test_commit_rerere_checks_flag
+      @git_args['use_rerere'] = false
+      instance.commit_rerere([])
+
+      @cmd_runner.verify
+    end
+
+    def test_commit_rerere_runs_commands
+      @cmd_runner.expect(:run, true, ['mkdir rr-cache'])
+      @cmd_runner.expect(:run, true, ['rm -rf rr-cache/*'])
+      @cmd_runner.expect(:run, true, ['cp -R .git/rr-cache/xyz rr-cache/'])
+      @cmd_runner.expect(:run, true, ['cp -R .git/rr-cache/abc rr-cache/'])
+      @cmd_runner.expect(:run, true, ['git add rr-cache/', {}])
+      @cmd_runner.expect(:run, true, ["git commit -m 'Update rr-cache'", {}])
+
+      instance.commit_rerere(['xyz', 'abc'])
+      @cmd_runner.verify
+    end
+
+    def test_read_file_from_merge_branch
+      @cmd_runner.expect(:run, true, ["git show origin/acceptance:SomeFilename.txt", log: CmdRunner::LOG_CMD])
+      @cmd_runner.expect(:last_stdout, 'some_json', [])
+      @git_args['use_rerere'] = false
+
+      assert_equal(instance.read_file_from_merge_branch('SomeFilename.txt'), 'some_json')
+      @cmd_runner.verify
+    end
+
+  private
+    def instance
+      CmdRunner.stub(:new, @cmd_runner) do
+        _instance = Git.new(@git_args)
+      end
+    end
+
+    def setup_cmd_runner
+      cmd_runner = Minitest::Mock.new
+      cmd_runner.expect(:run, true, ['git rev-parse --abbrev-ref HEAD', {}])
+      cmd_runner.expect(:last_stdout, 'current_branch', [])
+      cmd_runner
+    end
+  end
+end

data/test/lib/test_merge_order.rb

@@ -0,0 +1,71 @@
+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(:remote, 'origin')
+      @git.expect(:get_sha, sha, ["origin/#{branch.ref}"])
+    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', 'sha' => 'sha0', 'merge_order' => 1}),
+        Data::Branch.from_hash({'ref' => 'branch1', 'sha' => 'sha1', 'merge_order' => 2}),
+        Data::Branch.from_hash({'ref' => 'branch2', '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 == 2 ? nil : merge_order)
+        sample_branches[nth]
+      end
+    end
+
+  end
+end

data/test/lib/test_notifier.rb

@@ -0,0 +1,33 @@
+require 'minitest_helper'
+require 'flash_flow/notifier'
+
+module FlashFlow
+  module Notifier
+    class TestBase < Minitest::Test
+
+      class FakeNotifier
+        def initialize(_=nil); end
+
+        def merge_conflict(_=nil); 'merge conflict';end
+        def deleted_branch(_=nil); 'deleted_branch';end
+      end
+
+      def test_notifier_class_not_set
+        assert_nil(Notifier::Base.new.merge_conflict(nil))
+        assert_nil(Notifier::Base.new.deleted_branch(nil))
+      end
+
+      def test_notifier_class_set
+        assert_equal(FakeNotifier.new.merge_conflict, notifier.merge_conflict(nil))
+        assert_equal(FakeNotifier.new.deleted_branch, notifier.deleted_branch(nil))
+      end
+
+      private
+
+      def notifier
+        Notifier::Base
+            .new('class' => {'name' => 'FlashFlow::Notifier::TestBase::FakeNotifier'})
+      end
+    end
+  end
+end

data/test/lib/test_resolve.rb

@@ -0,0 +1,69 @@
+require 'minitest_helper'
+
+module FlashFlow
+  class TestResolve< Minitest::Test
+
+    class ResolveTester < Resolve
+      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',
+                               'remote' => 'test_remote',
+                               'master_branch' => 'test_master',
+                               'use_rerere' => true
+                             }, 'some_file')
+
+      @resolve = Resolve.new({ 'merge_branch' => 'test_acceptance',
+                                            'remote' => 'test_remote',
+                                            'master_branch' => 'test_master',
+                                            '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
+
+  end
+end

data/test/minitest_helper.rb

@@ -0,0 +1,41 @@
+require 'minitest'
+require 'minitest/autorun'
+require 'flash_flow'
+
+ENV['GH_TOKEN'] = 'fake_token'
+
+class Minitest::Test
+
+  class TestCmdRunner < Minitest::Mock
+    LOG_NONE = :log_none
+    LOG_CMD = :log_cmd
+
+    def initialize(opts={}); super(); end
+    def run(_, opts={}); end
+    def last_success?; true; end
+    def dir=(other); other; end
+    def last_stdout; ''; end
+    def last_stderr; ''; end
+    def last_command; ''; end
+  end
+
+  FlashFlow.send(:remove_const, :CmdRunner) if FlashFlow.const_defined?(:CmdRunner)
+  FlashFlow::CmdRunner = TestCmdRunner
+
+  def reset_config!
+    config = FlashFlow::Config.send(:instance)
+
+    config.instance_variables.each do |i|
+      config.remove_instance_variable(i)
+    end
+  end
+
+  def config!(config_hash)
+    reset_config!
+
+    File.stub(:read, config_hash.to_yaml) do
+      FlashFlow::Config.configure!('fake_file.txt')
+    end
+  end
+
+end

data/update_gem.sh

@@ -0,0 +1,5 @@
+gem uninstall -x flash_flow
+gem build flash_flow.gemspec
+export VERSION=`ruby -r./lib/flash_flow/version -e "puts FlashFlow::VERSION"`
+gem install flash_flow-$VERSION.gem --no-ri --no-rdoc
+rbenv rehash

metadata

@@ -0,0 +1,192 @@
+--- !ruby/object:Gem::Specification
+name: daq_flow
+version: !ruby/object:Gem::Version
+  version: 1.0.4
+platform: ruby
+authors:
+- Brad Bennett
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2019-05-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: tb-bjb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.2
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-stub_any_instance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Flash flow is a command line tool for keeping your acceptance environment
+  up to date
+email:
+- bradleyjaybennett@gmail.com
+executables:
+- daq_flow
+extensions: []
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- ".ruby-version"
+- Gemfile
+- Gemfile.lock
+- LICENSE.txt
+- README.md
+- Rakefile
+- bin/daq_flow
+- flash_flow.gemspec
+- flash_flow.yml.erb.example
+- lib/flash_flow.rb
+- lib/flash_flow/branch_merger.rb
+- lib/flash_flow/cmd_runner.rb
+- lib/flash_flow/config.rb
+- lib/flash_flow/data.rb
+- lib/flash_flow/data/base.rb
+- lib/flash_flow/data/bitbucket.rb
+- lib/flash_flow/data/branch.rb
+- lib/flash_flow/data/collection.rb
+- lib/flash_flow/data/github.rb
+- lib/flash_flow/data/store.rb
+- lib/flash_flow/git.rb
+- lib/flash_flow/install.rb
+- lib/flash_flow/lock.rb
+- lib/flash_flow/merge.rb
+- lib/flash_flow/merge/acceptance.rb
+- lib/flash_flow/merge/base.rb
+- lib/flash_flow/merge_order.rb
+- lib/flash_flow/notifier.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
+- log/.keep
+- test/lib/data/test_base.rb
+- test/lib/data/test_branch.rb
+- test/lib/data/test_collection.rb
+- test/lib/data/test_store.rb
+- test/lib/lock/test_github.rb
+- test/lib/merge/test_acceptance.rb
+- test/lib/test_branch_merger.rb
+- test/lib/test_config.rb
+- test/lib/test_git.rb
+- test/lib/test_merge_order.rb
+- test/lib/test_notifier.rb
+- test/lib/test_resolve.rb
+- test/minitest_helper.rb
+- update_gem.sh
+homepage: https://github.com/bradleyjucsc/flash_flow
+licenses:
+- MIT
+metadata: {}
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 2.7.6
+signing_key: 
+specification_version: 4
+summary: Merge your open prs together
+test_files:
+- test/lib/data/test_base.rb
+- test/lib/data/test_branch.rb
+- test/lib/data/test_collection.rb
+- test/lib/data/test_store.rb
+- test/lib/lock/test_github.rb
+- test/lib/merge/test_acceptance.rb
+- test/lib/test_branch_merger.rb
+- test/lib/test_config.rb
+- test/lib/test_git.rb
+- test/lib/test_merge_order.rb
+- test/lib/test_notifier.rb
+- test/lib/test_resolve.rb
+- test/minitest_helper.rb