flash_flow 1.2.2.a → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3aab35b80fc7adc67ef12b0833d6434f49c6ec52
-  data.tar.gz: 4c400dc91f4caf0c10c2f15adbec98d00861fa6a
+  metadata.gz: 480c4ebd2a6e87fca847937c52df8d2bcce3fe1b
+  data.tar.gz: 17458d805ba1ff604dcab78567ff3c2d6b774db7
 SHA512:
-  metadata.gz: 324c1d564582f90976a185bc6fc5491b6b4f7003694609c17b73cb42ebb5fc9533d78e4c04618b2bbebccc1e540c3ba04cfb4f3776b385f2c754abdb24b12d8e
-  data.tar.gz: 4d96b4211dea4aed6d7b6c7bb89a0b2c39bd61f0e33cfdbd701e60b30930f58231782e53f80fcf1728220c3c93e48938765098960a1b899467c63c41f1cfbff1
+  metadata.gz: f9c5c8288f8c367a4ec7bbe0b74f62bab3c3a446b1ade5a8d17486b2ff3c67463c4dcb496e2b1eeba8681391370a408c12642efdf5c01d271873c122e7c2be03
+  data.tar.gz: 46b479386cd464a43668c16e231141754db19f49c5477bfe7daf44681d4b0aa3f15a9db0f65288c54ae7cf9a99297acfb55bc4c6e9ddbd001764de0875d1f901

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flash_flow (1.2.2.a)
+    flash_flow (1.2.2)
       hipchat (~> 1.5)
       octokit (~> 4.1)
       pivotal-tracker (~> 0.5)

data/lib/flash_flow/cmd_runner.rb

@@ -3,11 +3,7 @@ require 'open3'
 
 module FlashFlow
   class CmdRunner
-    LOG_NONE = :log_none
-    LOG_CMD = :log_cmd
-
-    attr_reader :dry_run, :last_command, :last_stderr, :last_stdout
-    attr_accessor :dir
+    attr_reader :dry_run, :dir, :last_command, :last_stderr, :last_stdout
 
     def initialize(opts={})
       @dir = opts[:dir] || '.'
@@ -15,7 +11,7 @@ module FlashFlow
       @logger = opts[:logger] || Logger.new('/dev/null')
     end
 
-    def run(cmd, opts={})
+    def run(cmd)
       @last_command = cmd
       if dry_run
         puts "#{dir}$ #{cmd}"
@@ -28,26 +24,14 @@ module FlashFlow
             @success = wait_thr.value.success?
           end
         end
-        log(cmd, opts[:log])
+        @logger.debug("#{dir}$ #{cmd}")
+        last_stdout.split("\n").each { |line| @logger.debug(line) }
+        last_stderr.split("\n").each { |line| @logger.debug(line) }
       end
     end
 
     def last_success?
       @success
     end
-
-    private
-
-    def log(cmd, log_what)
-      if log_what == LOG_NONE
-          # Do nothing
-      else
-          @logger.debug("#{dir}$ #{cmd}")
-        unless log_what == LOG_CMD
-          last_stdout.split("\n").each { |line| @logger.debug(line) }
-          last_stderr.split("\n").each { |line| @logger.debug(line) }
-        end
-      end
-    end
   end
 end

data/lib/flash_flow/data/base.rb

@@ -46,7 +46,9 @@ module FlashFlow
 
       def backwards_compatible_store
         @backwards_compatible_store ||= begin
-          hash = @store.get
+          hash = in_shadow_repo do
+            @store.get
+          end
 
           hash.has_key?('branches') ? hash : { 'branches' => hash }
         end
@@ -55,6 +57,14 @@ module FlashFlow
       def saved_branches
         Collection.from_hash(@git.remotes, backwards_compatible_store['branches']).to_a
       end
+
+      private
+
+      def in_shadow_repo
+        ShadowRepo.new(@git).in_dir do
+          yield
+        end
+      end
     end
   end
 end

data/lib/flash_flow/data/store.rb

@@ -20,14 +20,12 @@ module FlashFlow
       end
 
       def write(branches, file=nil)
-        @git.in_dir do
+        @git.in_temp_merge_branch do
           file ||= File.open(@filename, 'w')
           file.puts JSON.pretty_generate(sort_branches(branches))
           file.close
-        end
 
-        @git.in_temp_merge_branch do
-          @git.add_and_commit(@filename, 'Branch Info', add: {force: true})
+          @git.add_and_commit(@filename, 'Branch Info', add: { force: true })
         end
       end
 

data/lib/flash_flow/deploy.rb

@@ -18,8 +18,7 @@ module FlashFlow
       @rerere_forget = opts[:rerere_forget]
       @stories = [opts[:stories]].flatten.compact
 
-      @local_git = Git.new(Config.configuration.git, logger)
-      @git = ShadowGit.new(Config.configuration.git, logger)
+      @git = Git.new(Config.configuration.git, logger)
       @lock = Lock::Base.new(Config.configuration.lock)
       @notifier = Notifier::Base.new(Config.configuration.notifier)
       @data = Data::Base.new(Config.configuration.branches, Config.configuration.branch_info_file, @git, logger: logger)
@@ -32,42 +31,45 @@ module FlashFlow
     def run
       check_version
       check_repo
-      puts "Building #{@local_git.merge_branch}... Log can be found in #{FlashFlow::Config.configuration.log_file}"
-      logger.info "\n\n### Beginning #{@local_git.merge_branch} merge ###\n\n"
+      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"
+
 
       begin
         open_pull_request
 
-        @lock.with_lock do
-          @git.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
+        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
-        logger.info "### Finished #{@local_git.merge_branch} merge ###"
+        logger.info "### Finished #{@git.merge_branch} merge ###"
       rescue Lock::Error, OutOfSyncWithRemote => e
         puts 'Failure!'
         puts e.message
       ensure
-        @local_git.run("checkout #{@local_git.working_branch}")
+        @git.run("checkout #{@git.working_branch}")
       end
     end
 
     def check_repo
-      if @local_git.staged_and_working_dir_files.any?
+      if @git.staged_and_working_dir_files.any?
         raise RuntimeError.new('You have changes in your working directory. Please stash and try again')
       end
     end
@@ -110,7 +112,7 @@ module FlashFlow
           raise RuntimeError.new("No remote found for #{branch.remote_url}. Please run 'git remote add *your_remote_name* #{branch.remote_url}' and try again.")
         end
 
-        @git.fetch(branch.remote)
+        fetch(branch.remote)
         git_merge(branch, branch.ref == @git.working_branch)
       end
     end
@@ -140,17 +142,17 @@ module FlashFlow
     end
 
     def open_pull_request
-      return false if [@local_git.master_branch, @local_git.merge_branch].include?(@local_git.working_branch)
+      return false if [@git.master_branch, @git.merge_branch].include?(@git.working_branch)
 
       # TODO - This should use the actual remote for the branch we're on
-      @local_git.push(@local_git.working_branch, force: @force)
-      raise OutOfSyncWithRemote.new("Your branch is out of sync with the remote. If you want to force push, run 'flash_flow -f'") unless @local_git.last_success?
+      @git.push(@git.working_branch, force: @force)
+      raise OutOfSyncWithRemote.new("Your branch is out of sync with the remote. If you want to force push, run 'flash_flow -f'") unless @git.last_success?
 
       # TODO - This should use the actual remote for the branch we're on
       if @do_not_merge
-        @data.remove_from_merge(@local_git.merge_remote, @local_git.working_branch)
+        @data.remove_from_merge(@git.merge_remote, @git.working_branch)
       else
-        @data.add_to_merge(@local_git.merge_remote, @local_git.working_branch)
+        @data.add_to_merge(@git.merge_remote, @git.working_branch)
       end
     end
 
@@ -162,10 +164,10 @@ module FlashFlow
       errors = []
       branch_not_merged = nil
       @data.failures.each do |full_ref, failure|
-        if failure.ref == @local_git.working_branch
-          branch_not_merged = "ERROR: Your branch did not merge to #{@local_git.merge_branch}. Run 'flash_flow --resolve', fix the merge conflict(s) and then re-run this script\n"
+        if failure.ref == @git.working_branch
+          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 #{@local_git.merge_branch} due to conflicts."
+          errors << "WARNING: Unable to merge branch #{failure.remote}/#{failure.ref} to #{@git.merge_branch} due to conflicts."
         end
       end
       errors << branch_not_merged if branch_not_merged
@@ -177,5 +179,20 @@ module FlashFlow
       end
     end
 
+    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]
+        @git.fetch(remote)
+        @fetched_remotes[remote] = true
+      end
+    end
   end
 end

data/lib/flash_flow/git.rb

@@ -1,5 +1,4 @@
 require 'flash_flow/cmd_runner'
-require 'shellwords'
 
 module FlashFlow
   class Git
@@ -23,12 +22,6 @@ module FlashFlow
       @working_branch = current_branch
     end
 
-    def in_dir
-      Dir.chdir(@cmd_runner.dir) do
-        yield
-      end
-    end
-
     def last_stdout
       @cmd_runner.last_stdout
     end
@@ -41,8 +34,8 @@ module FlashFlow
       @cmd_runner.last_success?
     end
 
-    def run(cmd, opts={})
-      @cmd_runner.run("git #{cmd}", opts)
+    def run(cmd)
+      @cmd_runner.run("git #{cmd}")
     end
 
     def add_and_commit(files, message, opts={})
@@ -60,11 +53,7 @@ module FlashFlow
     end
 
     def fetch(remote)
-      @fetched_remotes ||= {}
-      unless @fetched_remotes[remote]
-        run("fetch #{remote}")
-        @fetched_remotes[remote] = true
-      end
+      run("fetch #{remote}")
     end
 
     def master_branch_contains?(ref)
@@ -84,7 +73,7 @@ module FlashFlow
     end
 
     def read_file_from_merge_branch(filename)
-      run("show #{merge_remote}/#{merge_branch}:#{filename}", log: CmdRunner::LOG_CMD)
+      run("show #{merge_remote}/#{merge_branch}:#{filename}")
       last_stdout
     end
 
@@ -124,11 +113,9 @@ module FlashFlow
     end
 
     def unresolved_conflicts
-      in_dir do
-        conflicted_files.map do |file|
-          File.open(file) { |f| f.grep(/>>>>/) }.empty? ? nil : file
-        end.compact
-      end
+      conflicted_files.map do |file|
+        File.open(file) { |f| f.grep(/>>>>/) }.empty? ? nil : file
+      end.compact
     end
 
     def resolutions(files)
@@ -141,10 +128,10 @@ module FlashFlow
 
     # git rerere doesn't give you a deterministic way to determine which resolution was used
     def resolution_candidates(file)
-      @cmd_runner.run("diff -q --from-file #{file} .git/rr-cache/*/postimage", log: CmdRunner::LOG_CMD)
+      @cmd_runner.run("diff -q --from-file #{file} .git/rr-cache/*/postimage")
       different_files = split_diff_lines(@cmd_runner.last_stdout)
 
-      @cmd_runner.run('ls -la .git/rr-cache/*/postimage', log: CmdRunner::LOG_CMD)
+      @cmd_runner.run('ls -la .git/rr-cache/*/postimage')
       all_files = split_diff_lines(@cmd_runner.last_stdout)
 
       all_files - different_files
@@ -250,15 +237,14 @@ module FlashFlow
 
     def squash_commits
       # There are three commits created by flash flow that we don't need in the message
-      run("log #{merge_remote}/#{merge_branch}..#{merge_branch}~3", log: CmdRunner::LOG_CMD)
+      run("log #{merge_remote}/#{merge_branch}..#{merge_branch}~3")
       log = last_stdout
 
       # Get all the files that differ between existing acceptance and new acceptance
       run("diff --name-only #{merge_remote}/#{merge_branch} #{merge_branch}")
       files = last_stdout.split("\n")
       run("reset #{merge_remote}/#{merge_branch}")
-
-      run("add -f #{files.map { |f| "\"#{Shellwords.escape(f)}\"" }.join(" ")}")
+      run("add #{files.map { |f| "'#{f}'" }.join(" ")}")
 
       run("commit -m '#{commit_message(log)}'")
     end

data/lib/flash_flow/issue_tracker.rb

@@ -55,7 +55,7 @@ module FlashFlow
       private
 
       def git
-        @git ||= ShadowGit.new(Config.configuration.git, Config.configuration.logger)
+        @git ||= Git.new(Config.configuration.git, Config.configuration.logger)
       end
 
       def get_branches

data/lib/flash_flow/merge_master/status.rb

@@ -7,7 +7,7 @@ module FlashFlow
 
       def initialize(issue_tracker_config, branches_config, branch_info_file, git_config, opts={})
         @issue_tracker = IssueTracker::Base.new(issue_tracker_config)
-        @collection = Data::Base.new(branches_config, branch_info_file, ShadowGit.new(git_config)).merged_branches
+        @collection = Data::Base.new(branches_config, branch_info_file, Git.new(git_config)).merged_branches
       end
 
       def status(filename=nil)

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 = ShadowGit.new(git_config, @logger)
+      @git = Git.new(git_config, @logger)
     end
 
     def manual_instructions
@@ -23,22 +23,24 @@ module FlashFlow
     def start
       check_for_conflict
 
-      in_working_branch do
-        merge_conflicted
+      in_shadow_repo do
+        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"
+            unless unresolved_conflicts.empty?
+              puts "There are still unresolved conflicts in these files:\n#{unresolved_conflicts.join("\n")}\n\n"
+            end
           end
-        end
 
-        git_reset
+          git_reset
+        end
       end
     end
 
@@ -100,27 +102,42 @@ Run the following commands to fix the merge conflict and then re-run flash_flow:
     private
 
     def data
-      @data ||= Data::Base.new({}, @branch_info_file, @git, logger: @logger)
+      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_dir do
-        @git.in_branch(working_branch) do
-          yield
-        end
+      @git.in_branch(working_branch) do
+        yield
       end
     end
 
     def flash_flow_directory
-      @git.flash_flow_dir
+      shadow_repo.flash_flow_dir
     end
 
     def init_file_contents

data/lib/flash_flow/shadow_repo.rb

@@ -3,17 +3,24 @@ require 'logger'
 require 'flash_flow/git'
 
 module FlashFlow
-  class ShadowGit < Git
+  class ShadowRepo
 
-    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
 
-      run("clean -x -f")
-      fetch(merge_remote)
-      run("reset --hard HEAD")
+      Dir.chdir(flash_flow_dir) do
+        @git.fetch(@git.merge_remote)
+        @git.run("reset --hard HEAD") if opts[:reset]
+
+        yield
+      end
     end
 
     def create_shadow_repo

data/lib/flash_flow/version.rb

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

data/test/lib/data/test_store.rb

@@ -63,9 +63,6 @@ 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/test_deploy.rb

@@ -59,7 +59,7 @@ module FlashFlow
 
       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('@local_git'.to_sym).stub(:working_branch, 'pushing_branch') do
+      @deploy.instance_variable_get('@git'.to_sym).stub(:working_branch, 'pushing_branch') do
         assert_equal(current_branch_error, @deploy.format_errors)
       end
     end
@@ -73,10 +73,12 @@ module FlashFlow
     end
 
     def test_check_out_to_working_branch
-      @deploy.stub(:check_repo, true) do
-        @deploy.stub(:check_version, 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
+          @deploy.stub(:check_version, true) do
+            Lock::Base.stub_any_instance(:with_lock, -> { raise Lock::Error }) do
+              assert_output(/Failure!/) { @deploy.run }
+            end
           end
         end
       end
@@ -135,7 +137,7 @@ module FlashFlow
 
     def test_ignore_pushing_master_or_acceptance
       ['test_master', 'test_acceptance'].each do |branch|
-        @deploy.instance_variable_get('@local_git'.to_sym).stub(:working_branch, branch) do
+        @deploy.instance_variable_get('@git'.to_sym).stub(:working_branch, branch) do
           refute(@deploy.open_pull_request)
         end
       end

data/test/lib/test_git.rb

@@ -40,15 +40,15 @@ module FlashFlow
       @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'", {}])
+      @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(:run, true, ["git show origin/acceptance:SomeFilename.txt"])
       @cmd_runner.expect(:last_stdout, 'some_json', [])
       @git_args['use_rerere'] = false
 
@@ -65,7 +65,7 @@ module FlashFlow
 
     def setup_cmd_runner
       cmd_runner = Minitest::Mock.new
-      cmd_runner.expect(:run, true, ['git rev-parse --abbrev-ref HEAD', {}])
+      cmd_runner.expect(:run, true, ['git rev-parse --abbrev-ref HEAD'])
       cmd_runner.expect(:last_stdout, 'current_branch', [])
       cmd_runner
     end

data/test/lib/test_resolve.rb

@@ -4,6 +4,10 @@ module FlashFlow
   class TestResolve< Minitest::Test
 
     class ResolveTester < Resolve
+      def in_shadow_repo
+        yield
+      end
+
       def in_working_branch
         yield
       end
@@ -67,5 +71,30 @@ module FlashFlow
       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

@@ -7,13 +7,11 @@ 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 run(_); end
+    def last_success?
+      true
+    end
     def last_stdout; ''; end
     def last_stderr; ''; end
     def last_command; ''; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flash_flow
 version: !ruby/object:Gem::Version
-  version: 1.2.2.a
+  version: 1.2.2
 platform: ruby
 authors:
 - Flashfunders
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -201,7 +201,6 @@ files:
 - test/lib/test_notifier.rb
 - test/lib/test_resolve.rb
 - test/minitest_helper.rb
-- update_gem.sh
 homepage: https://github.com/FlashFunders/flash_flow
 licenses:
 - MIT
@@ -217,9 +216,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2

data/update_gem.sh

@@ -1,5 +0,0 @@
-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