flash_flow 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a90282f76b1ac98c205366c66d51e2466b8f725
-  data.tar.gz: f882884dda4d2baa6a9dd8b89262d3420bf7cef9
+  metadata.gz: de553df31b0a6a9dfd5740c63c8319d9709df4fb
+  data.tar.gz: 49eabf79d3b1d31d3df371ee18eedbe324fca399
 SHA512:
-  metadata.gz: 34b9d57af05dcec0cffdd1983df11660803e0d7abd0391942fc1e5ca8ee848e6ac0082319015e80fd0d31bc116e38cb1ef15e1457ae715ff5b0e0db8c8e4468e
-  data.tar.gz: f8ac58bdd94bbd0e0bac5566b086ae44cbdeeb53a2fe4cf7d224e86f88d6fbb3e55bcf8aa689978e8b5172b7d3504b715ac3d83b1e40ce2329664f2184e1832c
+  metadata.gz: a27253b1eb9e7bbc74347728049b29125ff4ebd92280fdcfb339f6e89bbc502fdbaca44093ef38fe977c36c4f70fb7e265b251a311c3825240be4d8d5d5e81c7
+  data.tar.gz: 11f3fe54cf130178f9a4e66fc78b3ed71f883f148946391303500c3cc5622b789d4a7fafd2ea5c700c84b9124605caee9af68133f5cee7f9c18d2536110b7c81

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.3.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flash_flow (1.3.1)
+    flash_flow (1.3.2)
       hipchat (~> 1.5)
       octokit (~> 4.1)
       pivotal-tracker (~> 0.5)
@@ -10,21 +10,21 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.8)
+    addressable (2.4.0)
     builder (3.2.2)
     byebug (3.5.1)
       columnize (~> 0.8)
       debugger-linecache (~> 1.2)
       slop (~> 3.6)
     columnize (0.9.0)
-    crack (0.4.2)
+    crack (0.4.3)
       safe_yaml (~> 1.0.0)
     debugger-linecache (1.2.0)
-    domain_name (0.5.25)
+    domain_name (0.5.20160310)
       unf (>= 0.0.5, < 1.0.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    hipchat (1.5.2)
+    hipchat (1.5.3)
       httparty
       mimemagic
     http-cookie (1.0.2)
@@ -33,26 +33,28 @@ GEM
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     json (1.8.3)
-    mime-types (2.99)
-    mimemagic (0.3.0)
-    mini_portile2 (2.0.0)
+    mime-types (2.99.2)
+    mimemagic (0.3.1)
+    mini_portile2 (2.1.0)
     minitest (5.3.5)
     minitest-stub_any_instance (1.0.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     netrc (0.11.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     nokogiri-happymapper (0.5.9)
       nokogiri (~> 1.5)
-    octokit (4.1.1)
-      sawyer (~> 0.6.0, >= 0.5.3)
+    octokit (4.3.0)
+      sawyer (~> 0.7.0, >= 0.5.3)
     pivotal-tracker (0.5.13)
       builder
       crack
       nokogiri (>= 1.5.5)
       nokogiri-happymapper (>= 0.5.4)
       rest-client (>= 1.8.0)
+    pkg-config (1.1.7)
     rake (10.4.2)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -60,13 +62,13 @@ GEM
       netrc (~> 0.7)
     ruby-graphviz (1.2.2)
     safe_yaml (1.0.4)
-    sawyer (0.6.0)
-      addressable (~> 2.3.5)
+    sawyer (0.7.0)
+      addressable (>= 2.3.5, < 2.5)
       faraday (~> 0.8, < 0.10)
     slop (3.6.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.1)
+    unf_ext (0.0.7.2)
 
 PLATFORMS
   ruby
@@ -80,4 +82,4 @@ DEPENDENCIES
   rake (> 0)
 
 BUNDLED WITH
-   1.10.6
+   1.12.5

data/README.md

@@ -147,7 +147,7 @@ When we first started using flash_flow, if your branch had a merge conflict you
 the branch that you were conflicting with to be merged to master, merge master into your branch, and then try again to
 get your code into the merge branch.
 
-Then we discovered git rerere, which is the coolest feature of git that almost no one seems to have heard of. Basically
+Then we discovered `git rerere`, which is [the coolest feature of git that almost no one seems to have heard of](https://git-scm.com/blog/2010/03/08/rerere.html). Basically
 what rerere does is remember how you resolved conflicts and auto-apply those patches when it notices the same conflicts.
 
 If your branch has a conflict with the `merge_branch` flash_flow will look for a rerere patch and apply that if it

data/bin/flash_flow

@@ -26,6 +26,10 @@ case
     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
+  when options[:merge_status_html]
+    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_html
+  when options[:release_branches]
+    FlashFlow::Deploy.new(options).run_release
   else
     FlashFlow::Deploy.new(options).run
     FlashFlow::IssueTracker::Base.new(FlashFlow::Config.configuration.issue_tracker).stories_pushed

data/flash_flow.yml.erb.example

@@ -81,3 +81,4 @@ branch_info_file: 'your/random/file'
 #    master_branch: master
 #    unmergeable_label: unmergeable
 #    do_not_merge_label: 'do not merge'
+#    shippable_label: 'shippable'

data/lib/flash_flow/branch_merger.rb

@@ -1,7 +1,7 @@
 module FlashFlow
   class BranchMerger
 
-    attr_reader :conflict_sha, :resolutions
+    attr_reader :conflict_sha, :resolutions, :result
 
     def initialize(git, branch)
       @git = git
@@ -9,15 +9,18 @@ module FlashFlow
     end
 
     def do_merge(rerere_forget)
-      return :deleted if sha.nil?
+      if sha.nil?
+        @result = :deleted
+        return
+      end
 
       @git.run("merge --no-ff #{@branch.remote}/#{@branch.ref}")
 
       if @git.last_success? || try_rerere(rerere_forget)
-        return :success
+        @result = :success
       else
         @conflict_sha = merge_rollback
-        return :conflict
+        @result = :conflict
       end
     end
 

data/lib/flash_flow/cmd_runner.rb

@@ -39,6 +39,7 @@ module FlashFlow
     private
 
     def log(cmd, log_what)
+      log_what = nil
       if log_what == LOG_NONE
           # Do nothing
       else

data/lib/flash_flow/data/base.rb

@@ -11,7 +11,7 @@ module FlashFlow
 
       def_delegators :@collection, :add_story, :mergeable, :mark_deleted, :mark_success, :mark_failure,
                      :remove_from_merge, :add_to_merge, :failures, :successes, :removals, :set_resolutions,
-                     :to_a, :can_ship?, :branch_link
+                     :to_a, :code_reviewed?, :branch_link
 
       def initialize(branch_config, filename, git, opts={})
         @git = git
@@ -58,4 +58,4 @@ module FlashFlow
       end
     end
   end
-end
+end

data/lib/flash_flow/data/branch.rb

@@ -13,6 +13,7 @@ module FlashFlow
         @ref = _ref
         @resolutions = {}
         @stories = []
+        @metadata = {}
         @updated_at = Time.now
         @created_at = Time.now
       end

data/lib/flash_flow/data/collection.rb

@@ -165,6 +165,10 @@ module FlashFlow
         branch
       end
 
+      def code_reviewed?(branch)
+        @collection_instance.respond_to?(:code_reviewed?) ? @collection_instance.code_reviewed?(branch) : true
+      end
+
       def can_ship?(branch)
         @collection_instance.respond_to?(:can_ship?) ? @collection_instance.can_ship?(branch) : true
       end

data/lib/flash_flow/data/github.rb

@@ -14,6 +14,7 @@ module FlashFlow
         @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'
+        @shippable_label = config['shippable_label'] || 'shippable'
       end
 
       def initialize_connection!(token)
@@ -63,10 +64,14 @@ module FlashFlow
         add_label(branch.metadata['pr_number'], @unmergeable_label)
       end
 
-      def can_ship?(branch)
+      def code_reviewed?(branch)
         has_label?(branch.metadata['pr_number'], @code_reviewed_label)
       end
 
+      def can_ship?(branch)
+        has_label?(branch.metadata['pr_number'], @shippable_label)
+      end
+
       def branch_link(branch)
         branch.metadata['pr_url']
       end

data/lib/flash_flow/deploy.rb

@@ -11,7 +11,9 @@ require 'flash_flow/shadow_repo'
 module FlashFlow
   class Deploy
 
+    class GitPushFailure < RuntimeError ; end
     class OutOfSyncWithRemote < RuntimeError ; end
+    class UnmergeableBranch < RuntimeError ; end
 
     def initialize(opts={})
       @do_not_merge = opts[:do_not_merge]
@@ -24,12 +26,69 @@ module FlashFlow
       @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)
+
+      @release_branches = parse_branches(opts[:release_branches])
     end
 
     def logger
       @logger ||= FlashFlow::Config.configuration.logger
     end
 
+    def parse_branches(user_branches)
+      branch_list = user_branches == ['ready'] ? shippable_branch_names : [user_branches].flatten.compact
+
+      branch_list.map { |b| Data::Branch.new('origin', @git.remotes_hash['origin'], b) }
+    end
+
+    def run_release
+      check_version
+      check_repo
+      check_branches
+      puts "Merging these branches into #{@git.release_branch}:\n  #{@release_branches.map(&:ref).join("\n  ")}"
+      logger.info "\n\n### Beginning #{@local_git.merge_branch} merge ###\n\n"
+
+      begin
+        mergers, errors = [], []
+
+        @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(@release_branches) do |branch, merger|
+              mergers << [branch, merger]
+            end
+          end
+
+          errors = mergers.select { |m| m.last.result != :success }
+
+          if errors.empty?
+            @git.copy_temp_to_branch(@git.release_branch)
+            @git.delete_temp_merge_branch
+            unless @git.push(@git.release_branch, false)
+              raise GitPushFailure.new("Unable to push to #{@git.release_branch}. See log for details.")
+            end
+          end
+        end
+
+        if errors.empty?
+          puts 'Success!'
+        else
+          raise UnmergeableBranch.new("The following branches didn't merge successfully:\n  #{errors.map {|e| e.first.ref }.join("\n  ")}")
+        end
+
+        logger.info "### Finished #{@git.release_branch} merge ###"
+      rescue Lock::Error, OutOfSyncWithRemote, UnmergeableBranch, GitPushFailure => e
+        puts 'Failure!'
+        puts e.message
+      ensure
+        @local_git.run("checkout #{@local_git.working_branch}")
+      end
+    end
+
     def run
       check_version
       check_repo
@@ -47,14 +106,16 @@ module FlashFlow
 
           @git.reset_temp_merge_branch
           @git.in_temp_merge_branch do
-            merge_branches
+            merge_branches(@data.merged_branches.mergeable) do |branch, merger|
+              process_result(branch, merger)
+            end
             commit_branch_info
             commit_rerere
           end
 
-          @git.copy_temp_to_merge_branch(commit_message)
+          @git.copy_temp_to_branch(@git.merge_branch, commit_message)
           @git.delete_temp_merge_branch
-          @git.push_merge_branch
+          @git.push(@git.merge_branch, true)
         end
 
         print_errors
@@ -67,6 +128,20 @@ module FlashFlow
       end
     end
 
+    def check_branches
+      requested_not_ready_branches = (@release_branches.map(&:ref) - shippable_branch_names)
+      raise RuntimeError.new("The following branches are not ready to ship:\n#{requested_not_ready_branches.join("\n")}") unless requested_not_ready_branches.empty?
+    end
+
+    def shippable_branch_names
+      @shippable_branch_names ||= begin
+        status = MergeMaster::Status.new(Config.configuration.issue_tracker, Config.configuration.branches, Config.configuration.branch_info_file, Config.configuration.git, logger: logger)
+
+        all_branches = status.branches
+        all_branches.values.select { |b| b[:shippable?] }.map { |b| b[:name] }
+      end
+    end
+
     def check_repo
       if @local_git.staged_and_working_dir_files.any?
         raise RuntimeError.new('You have changes in your working directory. Please stash and try again')
@@ -104,8 +179,8 @@ module FlashFlow
       60 * 60 * 24 * 14
     end
 
-    def merge_branches
-      ordered_branches = MergeOrder.new(@git, @data.merged_branches.mergeable).get_order
+    def merge_branches(branches)
+      ordered_branches = MergeOrder.new(@git, branches).get_order
       ordered_branches.each_with_index do |branch, index|
         branch.merge_order = index + 1
 
@@ -115,18 +190,26 @@ module FlashFlow
         end
 
         @git.fetch(branch.remote)
-        git_merge(branch, branch.ref == @git.working_branch)
+        merger = git_merge(branch)
+
+        yield(branch, merger)
       end
     end
 
-    def git_merge(branch, is_working_branch)
+    def git_merge(branch)
       merger = BranchMerger.new(@git, branch)
-      forget_rerere = is_working_branch && @rerere_forget
+      forget_rerere = is_working_branch(branch) && @rerere_forget
+
+      merger.do_merge(forget_rerere)
 
-      case merger.do_merge(forget_rerere)
+      merger
+    end
+
+    def process_result(branch, merger)
+      case merger.result
         when :deleted
           @data.mark_deleted(branch)
-          @notifier.deleted_branch(branch) unless is_working_branch
+          @notifier.deleted_branch(branch) unless is_working_branch(branch)
 
         when :success
           branch.sha = merger.sha
@@ -134,7 +217,7 @@ module FlashFlow
           @data.set_resolutions(branch, merger.resolutions)
 
         when :conflict
-          if is_working_branch
+          if is_working_branch(branch)
             @data.mark_failure(branch, merger.conflict_sha)
           else
             @data.mark_failure(branch, nil)
@@ -143,11 +226,15 @@ module FlashFlow
       end
     end
 
+    def is_working_branch(branch)
+      branch.ref == @git.working_branch
+    end
+
     def open_pull_request
       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
-      @local_git.push(@local_git.working_branch, force: @force)
+      @local_git.push(@local_git.working_branch, @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
@@ -181,6 +268,14 @@ module FlashFlow
       end
     end
 
+    def release_commit_message
+      message =<<-EOS
+Flash Flow merged these branches:
+#{@release_branches.map(&:ref).join("\n")}
+      EOS
+      message.gsub(/'/, '')
+    end
+
     def commit_message
       message =<<-EOS
 Flash Flow run from branch: #{@local_git.working_branch}
@@ -198,4 +293,4 @@ Removed branches:
     end
 
   end
-end
+end

data/lib/flash_flow/git.rb

@@ -3,7 +3,7 @@ require 'shellwords'
 
 module FlashFlow
   class Git
-    ATTRIBUTES = [:merge_remote, :merge_branch, :master_branch, :use_rerere]
+    ATTRIBUTES = [:merge_remote, :merge_branch, :master_branch, :release_branch, :use_rerere]
     attr_reader *ATTRIBUTES
     attr_reader :working_branch
 
@@ -11,7 +11,7 @@ module FlashFlow
 
     def initialize(config, logger=nil)
       @cmd_runner = CmdRunner.new(logger: logger)
-
+      config['release_branch'] ||= config['master_branch']
       ATTRIBUTES.each do |attr|
         unless config.has_key?(attr.to_s)
           raise RuntimeError.new("git configuration missing. Required config parameters: #{ATTRIBUTES}")
@@ -51,10 +51,6 @@ module FlashFlow
       run("commit -m '#{message}'")
     end
 
-    def push(branch, options)
-      run("push #{'-f' if options[:force]} #{merge_remote} #{branch}")
-    end
-
     def merge(branch)
       run("merge #{branch}")
     end
@@ -73,14 +69,7 @@ module FlashFlow
     end
 
     def in_original_merge_branch
-      begin
-        starting_branch = current_branch
-        run("checkout #{merge_remote}/#{merge_branch}")
-
-        yield
-      ensure
-        run("checkout #{starting_branch}")
-      end
+      in_branch("#{merge_remote}/#{merge_branch}") { yield }
     end
 
     def read_file_from_merge_branch(filename)
@@ -204,21 +193,22 @@ module FlashFlow
       end
     end
 
-    def push_merge_branch
-      run("push -f #{merge_remote} #{merge_branch}")
+    def push(branch, force=false)
+      run("push #{'-f' if force} #{merge_remote} #{branch}")
     end
 
-    def copy_temp_to_merge_branch(commit_message)
+    def copy_temp_to_branch(branch, squash_message = nil)
       run("checkout #{temp_merge_branch}")
-      run("merge --strategy=ours --no-edit #{merge_branch}")
-      run("checkout #{merge_branch}")
+      run("merge --strategy=ours --no-edit #{branch}")
+      run("checkout #{branch}")
       run("merge #{temp_merge_branch}")
 
-      squash_commits(commit_message)
+
+      squash_commits(branch, squash_message) if squash_message
     end
 
     def delete_temp_merge_branch
-      in_merge_branch do
+      in_branch(master_branch) do
         run("branch -d #{temp_merge_branch}")
       end
     end
@@ -244,17 +234,26 @@ module FlashFlow
 
     private
 
-    def squash_commits(commit_message)
+    def squash_commits(branch, commit_message)
+      unless branch_exists?("#{merge_remote}/#{branch}")
+        run("push #{merge_remote} #{master_branch}:#{branch}")
+      end
+
       # Get all the files that differ between existing acceptance and new acceptance
-      run("diff --name-only #{merge_remote}/#{merge_branch} #{merge_branch}")
+      run("diff --name-only #{merge_remote}/#{branch} #{branch}")
       files = last_stdout.split("\n")
-      run("reset #{merge_remote}/#{merge_branch}")
+      run("reset #{merge_remote}/#{branch}")
 
       run("add -f #{files.map { |f| "\"#{Shellwords.escape(f)}\"" }.join(" ")}")
 
       run("commit -m '#{commit_message}'")
     end
 
+    def branch_exists?(branch)
+      run("rev-parse --verify #{branch}")
+      last_success?
+    end
+
     def temp_merge_branch
       "flash_flow/#{merge_branch}"
     end

data/lib/flash_flow/issue_tracker/pivotal.rb

@@ -61,7 +61,7 @@ module FlashFlow
       def story_deployable?(story_id)
         story = get_story(story_id)
 
-        story.current_state == 'accepted'
+        story && story.current_state == 'accepted'
       end
 
       def story_link(story_id)
@@ -79,7 +79,7 @@ module FlashFlow
       def release_keys(story_id)
         story = get_story(story_id)
 
-        return [] if story.labels.nil?
+        return [] unless story && story.labels
 
         story.labels.split(",").map(&:strip).select { |label| label =~ @release_label_prefix }.map(&:strip)
       end

data/lib/flash_flow/merge_master/merge_status.html.erb

@@ -55,7 +55,7 @@
       </h2>
 
       <h2>
-        <span class="status <%= branch_hash[:branch_can_ship?] ? 'shippable' : 'not-shippable' %>"><%= branch_hash[:branch_can_ship?] ? 'Code ready' : 'Code not ready' %></span>
+        <span class="status <%= branch_hash[:code_reviewed?] ? 'shippable' : 'not-shippable' %>"><%= branch_hash[:code_reviewed?] ? 'Code ready' : 'Code not ready' %></span>
         <a href='<%= branch_hash[:branch_url] %>'><%= branch_hash[:name] %></a>
       </h2>
 
@@ -79,7 +79,7 @@
             <% branch_hash[:my_stories].each do |story_id| %>
                 <% story = @stories[story_id] %>
                 <div class="story">
-                  <span class="status <%= story[:can_ship?] ? 'shippable' : 'not-shippable' %>"><%= story[:can_ship?] ? 'Story ready' : 'Story not ready' %></span>
+                  <span class="status <%= story[:accepted?] ? 'shippable' : 'not-shippable' %>"><%= story[:accepted?] ? 'Story ready' : 'Story not ready' %></span>
                   <a href='<%= story[:url] %>'><%= story[:title] %></a>
                   <span><%= story[:release_keys].empty? ? '' : "Related releases: #{story[:release_keys].join(", ")}" %></span>
                 </div>
@@ -92,7 +92,7 @@
                 <% (branch_hash[:stories] - branch_hash[:my_stories]).each do |story_id| %>
                     <% story = @stories[story_id] %>
                     <div class="story">
-                      <span class="status <%= story[:can_ship?] ? 'shippable' : 'not-shippable' %>"><%= story[:can_ship?] ? 'Story ready' : 'Story not ready' %></span>
+                      <span class="status <%= story[:accepted?] ? 'shippable' : 'not-shippable' %>"><%= story[:accepted?] ? 'Story ready' : 'Story not ready' %></span>
                       <a href='<%= story[:url] %>'><%= story[:title] %></a>
                       <span><%= story[:release_keys].empty? ? '' : "Related releases: #{story[:release_keys].join(", ")}" %></span>
                     </div>
@@ -116,7 +116,7 @@
                   <% @releases[release_key][:stories].each do |story_id| %>
                       <% story = @stories[story_id] %>
                       <div class="story">
-                        <span class="status <%= story[:can_ship?] ? 'shippable' : 'not-shippable' %>"><%= story[:can_ship?] ? 'Story ready' : 'Story not ready' %></span>
+                        <span class="status <%= story[:accepted?] ? 'shippable' : 'not-shippable' %>"><%= story[:accepted?] ? 'Story ready' : 'Story not ready' %></span>
                         <a href='<%= story[:url] %>'><%= story[:title] %></a>
                         <span><%= story[:release_keys].empty? ? '' : "Related releases: #{story[:release_keys].join(", ")}" %></span>
                       </div>
@@ -141,4 +141,4 @@
 
 <% end %>
 </body>
-</html>
+</html>

data/lib/flash_flow/merge_master/status.rb

@@ -10,7 +10,27 @@ module FlashFlow
         @collection = Data::Base.new(branches_config, branch_info_file, ShadowGit.new(git_config)).merged_branches
       end
 
-      def status(filename=nil)
+      def status
+        filename = File.dirname(__FILE__) + '/merge_status.csv'
+        checkmark = "\u2713".encode('utf-8')
+
+        CSV.open(filename, 'w') do |f|
+          f << ['Ready', 'Branch', 'Stories', 'Review', 'Can ship?']
+          branches.each do |_, branch_hash|
+            f << [
+              branch_hash[:shippable?] ? checkmark : 'x',
+              branch_hash[:name],
+              unshippable_stories(branch_hash[:stories]).empty? ? checkmark : 'x',
+              branch_hash[:code_reviewed?] ? checkmark : 'x',
+              branch_hash[:can_ship?] ? checkmark : 'x'
+            ]
+          end
+        end
+
+        CSV.foreach(filename) { |row| puts '%-10s %-70s %-10s %-10s %-10s' % row }
+      end
+
+      def status_html(filename=nil)
         filename = File.dirname(__FILE__) + '/merge_status.html'
         @branches = branches
 
@@ -39,7 +59,8 @@ module FlashFlow
               Hash.new.tap do |hash|
                 hash[:name] = branch.ref
                 hash[:branch_url] = collection.branch_link(branch)
-                hash[:branch_can_ship?] = collection.can_ship?(branch)
+                hash[:code_reviewed?] = collection.code_reviewed?(branch)
+                hash[:can_ship?] = collection.can_ship?(branch)
                 hash[:connected_branches] = connected_branches
                 hash[:image] = graph_file
                 hash[:my_stories] = branch.stories.to_a
@@ -70,7 +91,7 @@ module FlashFlow
 
       def mark_as_shippable(branches)
         branches.each do |_, b|
-          b[:shippable?] = b[:branch_can_ship?] &&
+          b[:shippable?] = b[:code_reviewed?] && b[:can_ship?] &&
               unshippable_stories(b[:stories]).empty? &&
               unshippable_releases(b[:releases]).empty?
         end
@@ -86,11 +107,14 @@ module FlashFlow
         arr.select do |release_key|
           !unshippable_stories(@releases[release_key][:stories]).empty?
         end
-
       end
 
       def unshippable_stories(arr)
-        arr.select { |story| !@stories[story][:can_ship?] }
+        arr.select { |story| !@stories[story][:accepted?] }
+      end
+
+      def stories_accepted_branches
+        branches.select { |_, b| unshippable_stories(b[:stories]).empty? }
       end
 
       def story_info_hash(story_id)
@@ -98,7 +122,7 @@ module FlashFlow
             id: story_id,
             url: issue_tracker.story_link(story_id),
             title: issue_tracker.story_title(story_id),
-            can_ship?: issue_tracker.story_deployable?(story_id),
+            accepted?: issue_tracker.story_deployable?(story_id),
             release_keys: issue_tracker.release_keys(story_id)
         }
       end

data/lib/flash_flow/notifier/hipchat.rb

@@ -10,9 +10,15 @@ module FlashFlow
       end
 
       def merge_conflict(branch)
-        user_name = branch.metadata['user_url'].split('/').last
-        user_url_link = %{<a href="#{branch.metadata['user_url']}">#{user_name}</a>}
-        ref_link = %{<a href="#{branch.metadata['repo_url']}/tree/#{branch.ref}">#{branch.ref}</a>}
+        begin
+          user_name = branch.metadata['user_url'].split('/').last
+          user_url_link = %{<a href="#{branch.metadata['user_url']}">#{user_name}</a>}
+          ref_link = %{<a href="#{branch.metadata['repo_url']}/tree/#{branch.ref}">#{branch.ref}</a>}
+        rescue => e
+          puts "An error occurred in the hipchat notifier: #{e.message}."
+          user_url_link = 'Unknown'
+          ref_link = branch.ref
+        end
 
         message = %{#{user_url_link}'s branch (#{ref_link}) did not merge successfully}
         @client[@room].send("FlashFlow", message)

data/lib/flash_flow/options.rb

@@ -22,6 +22,8 @@ module FlashFlow
         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', 'Show status of all branches and their stories and exit') { |v| options[:merge_status] = true }
+        opts.on('--merge-status-html', 'Show status of all branches and their stories in html format and exit') { |v| options[:merge_status_html] = true }
+        opts.on('--merge-master branch1,branch2', 'Comma-delimited list of branches to merge to master. Master gets pushed to origin. Run "--merge-master ready" to merge all ready to ship branches') { |v| options[:release_branches] = v.split(',') }
 
         opts.on_tail("-h", "--help", "Show this message") do
           puts opts

data/lib/flash_flow/version.rb

@@ -1,3 +1,3 @@
 module FlashFlow
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

data/test/lib/data/test_collection.rb

@@ -214,14 +214,14 @@ module FlashFlow
         @fake_branches.verify
       end
 
-      def test_can_ship_returns_true
+      def test_code_reviewd_returns_true
         collection = Collection.new({})
-        assert(collection.can_ship?(@branch))
+        assert(collection.code_reviewed?(@branch))
       end
 
-      def test_can_ship_calls_branches_class
-        @fake_branches.expect(:can_ship?, true, [@branch])
-        @collection.can_ship?(@branch)
+      def test_code_reviewd_calls_branches_class
+        @fake_branches.expect(:code_reviewed?, true, [@branch])
+        @collection.code_reviewed?(@branch)
         @fake_branches.verify
       end
 

data/test/lib/merge_master/test_status.rb

@@ -20,6 +20,7 @@ module FlashFlow
         STORY_ID4 = '444'
         STORY_ID5 = '555'
         STORY_ID6 = '666'
+        STORY_ID7 = '777'
 
         def story_deployable?(story_id)
           {
@@ -29,6 +30,7 @@ module FlashFlow
               STORY_ID4 => true,
               STORY_ID5 => false,
               STORY_ID6 => true,
+              STORY_ID7 => true
           }[story_id]
         end
 
@@ -40,6 +42,7 @@ module FlashFlow
               STORY_ID4 => ['release3', 'release4'],
               STORY_ID5 => [],
               STORY_ID6 => ['release4'],
+              STORY_ID7 => [],
           }[story_id]
         end
 
@@ -64,21 +67,32 @@ module FlashFlow
         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'])
+        BRANCH4 = Data::Branch.from_hash('ref' => 'branch4', 'stories' => ['777'])
 
         def branch_link(branch)
           return "link-#{branch.ref}"
         end
 
-        def can_ship?(branch)
+        def code_reviewed?(branch)
           {
               BRANCH1 => true,
               BRANCH2 => true,
               BRANCH3 => false,
+              BRANCH4 => true,
+          }[branch]
+        end
+
+        def can_ship?(branch)
+          {
+              BRANCH1 => true,
+              BRANCH2 => true,
+              BRANCH3 => true,
+              BRANCH4 => false,
           }[branch]
         end
 
         def current_branches
-          [BRANCH1, BRANCH2, BRANCH3]
+          [BRANCH1, BRANCH2, BRANCH3, BRANCH4]
         end
       end
 
@@ -96,7 +110,7 @@ module FlashFlow
         branch1 = branches[FakeCollection::BRANCH1]
         branch2 = branches[FakeCollection::BRANCH2]
 
-        assert(branch1[:stories].all? { |s| @merge_master.stories[s][:can_ship?] })
+        assert(branch1[:stories].all? { |s| @merge_master.stories[s][:accepted?] })
         assert_equal(branch1[:stories], branch2[:stories])
         assert(branch1[:shippable?])
       end
@@ -104,11 +118,17 @@ module FlashFlow
       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])
+        assert_equal(branch3[:stories].map { |s| @merge_master.stories[s][:accepted?] }, [true, false, true])
         refute(branch3[:shippable?])
       end
 
+      def test_not_shippable_branch_without_shippable_label
+        branches = @merge_master.branches
+        branch4 = branches[FakeCollection::BRANCH4]
+        assert_equal(branch4[:stories].map { |s| @merge_master.stories[s][:accepted?] }, [true])
+        refute(branch4[:shippable?])
+      end
+
       private
 
       def find_branch(status_list, branch)

data/test/lib/test_branch_merger.rb

@@ -9,7 +9,8 @@ module FlashFlow
 
     def test_deleted_branch
       merger.stub(:sha, nil) do
-        assert_equal(merger.do_merge(true), :deleted)
+        merger.do_merge(true)
+        assert_equal(merger.result, :deleted)
       end
     end
 

data/test/lib/test_deploy.rb

@@ -87,11 +87,9 @@ module FlashFlow
 
       notifier.expect(:deleted_branch, true, [@branch])
 
-      merger.expect(:do_merge, :deleted, [ false ])
+      merger.expect(:result, :deleted)
 
-      BranchMerger.stub(:new, merger) do
-        @deploy.git_merge(@branch, false)
-      end
+      @deploy.process_result(@branch, merger)
 
       notifier.verify
       data.verify
@@ -103,12 +101,9 @@ module FlashFlow
 
       notifier.expect(:merge_conflict, true, [@branch])
 
-      merger
-          .expect(:do_merge, :conflict, [ false ])
+      merger.expect(:result, :conflict)
 
-      BranchMerger.stub(:new, merger) do
-        @deploy.git_merge(@branch, false)
-      end
+      @deploy.process_result(@branch, merger)
 
       notifier.verify
       data.verify
@@ -120,13 +115,11 @@ module FlashFlow
       data.expect(:set_resolutions, true, [ @branch, { 'filename' => ["resolution_sha"] } ])
 
       merger.
-          expect(:do_merge, :success, [ false ]).
+          expect(:result, :success).
           expect(:sha, 'sha').
           expect(:resolutions, { 'filename' => ["resolution_sha"] })
 
-      BranchMerger.stub(:new, merger) do
-        @deploy.git_merge(@branch, false)
-      end
+      @deploy.process_result(@branch, merger)
 
       data.verify
       merger.verify

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flash_flow
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Flashfunders
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Implementation of the flashfunders workflow