flash_flow 1.2.1 → 1.2.2.a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49d73fb6eb9880932364ebc295d6ad33ca786fa1
-  data.tar.gz: 4c573c7241c9df3e771f09bb04a7eeab3294f65d
+  metadata.gz: 3aab35b80fc7adc67ef12b0833d6434f49c6ec52
+  data.tar.gz: 4c400dc91f4caf0c10c2f15adbec98d00861fa6a
 SHA512:
-  metadata.gz: 508ada836ac3ca4a1eda158034af4190dd841e448d251b6a75ed15fbc005f1cf849254e55c1d11bbf473378722830afac5725c41be982d1d33d4468310e6fb1b
-  data.tar.gz: df18ba6a3399e38fda31dd14d9a1f0a0f401a8f21eaa989d9acca7558cb043c6036303e80e7d423889819f73f03a2cd14c0355dea839268090393dc095e835bd
+  metadata.gz: 324c1d564582f90976a185bc6fc5491b6b4f7003694609c17b73cb42ebb5fc9533d78e4c04618b2bbebccc1e540c3ba04cfb4f3776b385f2c754abdb24b12d8e
+  data.tar.gz: 4d96b4211dea4aed6d7b6c7bb89a0b2c39bd61f0e33cfdbd701e60b30930f58231782e53f80fcf1728220c3c93e48938765098960a1b899467c63c41f1cfbff1

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    flash_flow (1.2.1)
+    flash_flow (1.2.2.a)
       hipchat (~> 1.5)
       octokit (~> 4.1)
       pivotal-tracker (~> 0.5)
+      ruby-graphviz (> 0)
 
 GEM
   remote: https://rubygems.org/
@@ -57,6 +58,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
+    ruby-graphviz (1.2.2)
     safe_yaml (1.0.4)
     sawyer (0.6.0)
       addressable (~> 2.3.5)

data/bin/flash_flow

@@ -24,6 +24,8 @@ case
     FlashFlow::Resolve.new(FlashFlow::Config.configuration.git, FlashFlow::Config.configuration.branch_info_file, logger: FlashFlow::Config.configuration.logger).start
   when options[:resolve_manual]
     FlashFlow::Resolve.new(FlashFlow::Config.configuration.git, FlashFlow::Config.configuration.branch_info_file, logger: FlashFlow::Config.configuration.logger).manual_instructions
+  when options[:merge_status]
+    FlashFlow::MergeMaster::Status.new(FlashFlow::Config.configuration.issue_tracker, FlashFlow::Config.configuration.branches, FlashFlow::Config.configuration.branch_info_file, FlashFlow::Config.configuration.git, logger: FlashFlow::Config.configuration.logger).status
   else
     FlashFlow::Deploy.new(options).run
     FlashFlow::IssueTracker::Base.new(FlashFlow::Config.configuration.issue_tracker).stories_pushed

data/flash_flow.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'octokit', "~> 4.1"
   spec.add_dependency 'hipchat', "~> 1.5"
   spec.add_dependency 'pivotal-tracker', "~> 0.5"
+  spec.add_dependency 'ruby-graphviz', "> 0"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "> 0"

data/lib/flash_flow.rb

@@ -6,3 +6,4 @@ require 'flash_flow/config'
 require 'flash_flow/deploy'
 require 'flash_flow/issue_tracker'
 require 'flash_flow/resolve'
+require 'flash_flow/merge_master'

data/lib/flash_flow/cmd_runner.rb

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

@@ -9,8 +9,8 @@ module FlashFlow
     class Base
       extend Forwardable
 
-      def_delegators :@collection, :add_story, :mergeable, :mark_deleted, :mark_success,
-                     :mark_failure, :remove_from_merge, :add_to_merge, :failures, :set_resolutions
+      def_delegators :@collection, :add_story, :mergeable, :mark_deleted, :mark_success, :mark_failure,
+                     :remove_from_merge, :add_to_merge, :failures, :set_resolutions, :to_a, :can_ship?, :branch_link
 
       def initialize(branch_config, filename, git, opts={})
         @git = git
@@ -19,8 +19,10 @@ module FlashFlow
       end
 
       def initialize_collection(branch_config, remotes)
-        Collection.fetch(remotes, branch_config) ||
+        collection = Collection.fetch(remotes, branch_config) ||
             Collection.from_hash(remotes, backwards_compatible_store['branches'])
+        collection.mark_all_as_current
+        collection
       end
 
       def version
@@ -44,9 +46,7 @@ module FlashFlow
 
       def backwards_compatible_store
         @backwards_compatible_store ||= begin
-          hash = in_shadow_repo do
-            @store.get
-          end
+          hash = @store.get
 
           hash.has_key?('branches') ? hash : { 'branches' => hash }
         end
@@ -55,14 +55,6 @@ 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/branch.rb

@@ -4,7 +4,8 @@ module FlashFlow
   module Data
 
     class Branch
-      attr_accessor :remote, :remote_url, :ref, :sha, :status, :resolutions, :stories, :conflict_sha, :metadata, :updated_at, :created_at
+      attr_accessor :remote, :remote_url, :ref, :sha, :status, :resolutions, :stories, :conflict_sha, :metadata,
+                    :current_record, :updated_at, :created_at
 
       def initialize(_remote, _remote_url, _ref)
         @remote = _remote

data/lib/flash_flow/data/collection.rb

@@ -24,9 +24,10 @@ module FlashFlow
         collection
       end
 
-      def self.from_hash(remotes, hash)
+      def self.from_hash(remotes, hash, collection_instance=nil)
         collection = new(remotes)
         collection.branches = branches_from_hash(hash.dup)
+        collection.instance_variable_set(:@collection_instance, collection_instance)
         collection
       end
 
@@ -73,7 +74,7 @@ module FlashFlow
           end
         end
 
-        self.class.from_hash(remotes, merged_branches)
+        self.class.from_hash(remotes, merged_branches, @collection_instance)
       end
 
       def to_a
@@ -84,8 +85,12 @@ module FlashFlow
         to_a.each
       end
 
+      def current_branches
+        to_a.select { |branch| branch.current_record }
+      end
+
       def mergeable
-        to_a.select { |branch| branch.success? || branch.fail? || branch.unknown? }
+        current_branches.select { |branch| (branch.success? || branch.fail? || branch.unknown?) }
       end
 
       def failures
@@ -100,6 +105,12 @@ module FlashFlow
         end
       end
 
+      def mark_all_as_current
+        @branches.each do |_, branch|
+          branch.current_record = true
+        end
+      end
+
       def add_to_merge(remote, ref)
         branch = record(remote, nil, ref)
         @collection_instance.add_to_merge(branch) if @collection_instance.respond_to?(:add_to_merge)
@@ -143,6 +154,14 @@ module FlashFlow
         branch
       end
 
+      def can_ship?(branch)
+        @collection_instance.respond_to?(:can_ship?) ? @collection_instance.can_ship?(branch) : true
+      end
+
+      def branch_link(branch)
+        @collection_instance.branch_link(branch) if @collection_instance.respond_to?(:branch_link)
+      end
+
       def set_resolutions(branch, resolutions)
         update_or_add(branch)
         branch.set_resolutions(resolutions)

data/lib/flash_flow/data/github.rb

@@ -13,6 +13,7 @@ module FlashFlow
         @master_branch = config['master_branch'] || master
         @unmergeable_label = config['unmergeable_label'] || 'unmergeable'
         @do_not_merge_label = config['do_not_merge_label'] || 'do not merge'
+        @code_reviewed_label = config['code_reviewed_label'] || 'code reviewed'
       end
 
       def initialize_connection!(token)
@@ -61,6 +62,14 @@ module FlashFlow
         add_label(branch.metadata['pr_number'], @unmergeable_label)
       end
 
+      def can_ship?(branch)
+        has_label?(branch.metadata['pr_number'], @code_reviewed_label)
+      end
+
+      def branch_link(branch)
+        branch.metadata['pr_url']
+      end
+
       private
 
       def status_from_labels(pull_request)
@@ -105,19 +114,20 @@ module FlashFlow
       end
 
       def has_label?(pull_request_number, label_name)
-        labels(pull_request_number).detect { |label| label.name == label_name }
+        !!labels(pull_request_number).detect { |label| label == label_name }
       end
 
       def labels(pull_request_number)
         @labels ||= {}
-        @labels[pull_request_number] ||= octokit.labels_for_issue(repo, pull_request_number)
+        @labels[pull_request_number] ||= octokit.labels_for_issue(repo, pull_request_number).map(&:name)
       end
 
       def metadata(pr)
         {
             'pr_number' => pr.number,
-            'user_url' => pr.user.html_url,
-            'repo_url' => pr.head.repo.html_url
+            'pr_url'    => pr.html_url,
+            'user_url'  => pr.user.html_url,
+            'repo_url'  => pr.head.repo.html_url
         }
       end
 

data/lib/flash_flow/data/store.rb

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

data/lib/flash_flow/deploy.rb

@@ -18,7 +18,8 @@ module FlashFlow
       @rerere_forget = opts[:rerere_forget]
       @stories = [opts[:stories]].flatten.compact
 
-      @git = Git.new(Config.configuration.git, logger)
+      @local_git = Git.new(Config.configuration.git, logger)
+      @git = ShadowGit.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)
@@ -31,45 +32,42 @@ module FlashFlow
     def run
       check_version
       check_repo
-      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"
-
+      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"
 
       begin
         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
+        @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
           end
+
+          @git.copy_temp_to_merge_branch
+          @git.delete_temp_merge_branch
+          @git.push_merge_branch
         end
 
         print_errors
-        logger.info "### Finished #{@git.merge_branch} merge ###"
+        logger.info "### Finished #{@local_git.merge_branch} merge ###"
       rescue Lock::Error, OutOfSyncWithRemote => e
         puts 'Failure!'
         puts e.message
       ensure
-        @git.run("checkout #{@git.working_branch}")
+        @local_git.run("checkout #{@local_git.working_branch}")
       end
     end
 
     def check_repo
-      if @git.staged_and_working_dir_files.any?
+      if @local_git.staged_and_working_dir_files.any?
         raise RuntimeError.new('You have changes in your working directory. Please stash and try again')
       end
     end
@@ -112,7 +110,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
 
-        fetch(branch.remote)
+        @git.fetch(branch.remote)
         git_merge(branch, branch.ref == @git.working_branch)
       end
     end
@@ -142,17 +140,17 @@ module FlashFlow
     end
 
     def open_pull_request
-      return false if [@git.master_branch, @git.merge_branch].include?(@git.working_branch)
+      return false if [@local_git.master_branch, @local_git.merge_branch].include?(@local_git.working_branch)
 
       # TODO - This should use the actual remote for the branch we're on
-      @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?
+      @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?
 
       # TODO - This should use the actual remote for the branch we're on
       if @do_not_merge
-        @data.remove_from_merge(@git.merge_remote, @git.working_branch)
+        @data.remove_from_merge(@local_git.merge_remote, @local_git.working_branch)
       else
-        @data.add_to_merge(@git.merge_remote, @git.working_branch)
+        @data.add_to_merge(@local_git.merge_remote, @local_git.working_branch)
       end
     end
 
@@ -164,10 +162,10 @@ module FlashFlow
       errors = []
       branch_not_merged = nil
       @data.failures.each do |full_ref, failure|
-        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"
+        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"
         else
-          errors << "WARNING: Unable to merge branch #{failure.remote}/#{failure.ref} to #{@git.merge_branch} due to conflicts."
+          errors << "WARNING: Unable to merge branch #{failure.remote}/#{failure.ref} to #{@local_git.merge_branch} due to conflicts."
         end
       end
       errors << branch_not_merged if branch_not_merged
@@ -179,20 +177,5 @@ 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,4 +1,5 @@
 require 'flash_flow/cmd_runner'
+require 'shellwords'
 
 module FlashFlow
   class Git
@@ -22,6 +23,12 @@ 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
@@ -34,8 +41,8 @@ module FlashFlow
       @cmd_runner.last_success?
     end
 
-    def run(cmd)
-      @cmd_runner.run("git #{cmd}")
+    def run(cmd, opts={})
+      @cmd_runner.run("git #{cmd}", opts)
     end
 
     def add_and_commit(files, message, opts={})
@@ -53,7 +60,11 @@ module FlashFlow
     end
 
     def fetch(remote)
-      run("fetch #{remote}")
+      @fetched_remotes ||= {}
+      unless @fetched_remotes[remote]
+        run("fetch #{remote}")
+        @fetched_remotes[remote] = true
+      end
     end
 
     def master_branch_contains?(ref)
@@ -73,7 +84,7 @@ module FlashFlow
     end
 
     def read_file_from_merge_branch(filename)
-      run("show #{merge_remote}/#{merge_branch}:#{filename}")
+      run("show #{merge_remote}/#{merge_branch}:#{filename}", log: CmdRunner::LOG_CMD)
       last_stdout
     end
 
@@ -113,9 +124,11 @@ module FlashFlow
     end
 
     def unresolved_conflicts
-      conflicted_files.map do |file|
-        File.open(file) { |f| f.grep(/>>>>/) }.empty? ? nil : file
-      end.compact
+      in_dir do
+        conflicted_files.map do |file|
+          File.open(file) { |f| f.grep(/>>>>/) }.empty? ? nil : file
+        end.compact
+      end
     end
 
     def resolutions(files)
@@ -128,10 +141,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")
+      @cmd_runner.run("diff -q --from-file #{file} .git/rr-cache/*/postimage", log: CmdRunner::LOG_CMD)
       different_files = split_diff_lines(@cmd_runner.last_stdout)
 
-      @cmd_runner.run('ls -la .git/rr-cache/*/postimage')
+      @cmd_runner.run('ls -la .git/rr-cache/*/postimage', log: CmdRunner::LOG_CMD)
       all_files = split_diff_lines(@cmd_runner.last_stdout)
 
       all_files - different_files
@@ -237,14 +250,15 @@ 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")
+      run("log #{merge_remote}/#{merge_branch}..#{merge_branch}~3", log: CmdRunner::LOG_CMD)
       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 #{files.map { |f| "'#{f}'" }.join(" ")}")
+
+      run("add -f #{files.map { |f| "\"#{Shellwords.escape(f)}\"" }.join(" ")}")
 
       run("commit -m '#{commit_message(log)}'")
     end