flash_flow 1.3.2.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 338f724ecab800bc4a3bd13a8f4fbf91c7e9e57e
-  data.tar.gz: 49d3e823233fc4d1e65edb566d5a7fd47005b570
+  metadata.gz: a41f62720b6a1d95aac60bc4275d5711b4ab82e3
+  data.tar.gz: 88ca498a5fef9fbec2d48bb12ea0c973123cf15f
 SHA512:
-  metadata.gz: b97e6178e3e02eab5dac92edd5bfc2ef62285562091555aa69b7fe88999c81419c9ef1be84e11d0481a7f51a79d40187eb05a3f69ab28face2d2ffe00b0c67aa
-  data.tar.gz: d0a71e6374fa222596222ad29684303c5d8955c3a5da5ada1da79b763c64264a25d0a9d3871cf318a6d9ea1735adeaa6eeba959532443b95b7e48fae841bbb18
+  metadata.gz: 9d6d4dc8b130952e6c002af7d5f524f35464f2359e88b5c7b01cdae49f8fc63cb11a8c5e97b681c4be509ca9851a50d0040ff60129843c163e01ea1ee115b7ab
+  data.tar.gz: d6f2cf9bcd93e7cf2a169b138a3fadc56b9494702d4bd36a347e9fe9d2b6404022d05e92eb58d987ec53f84484e14f0b6cc11d900f60ab33e98b7a1012ae7492

data/Gemfile.lock

@@ -4,6 +4,7 @@ PATH
     flash_flow (1.3.2.1)
       hipchat (~> 1.5)
       octokit (~> 4.1)
+      percy-client
       pivotal-tracker (~> 0.5)
       ruby-graphviz (> 0)
 
@@ -20,7 +21,7 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     debugger-linecache (1.2.0)
-    domain_name (0.5.20160310)
+    domain_name (0.5.20160615)
       unf (>= 0.0.5, < 1.0.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
@@ -29,11 +30,12 @@ GEM
       mimemagic
     http-cookie (1.0.2)
       domain_name (~> 0.5)
-    httparty (0.13.7)
-      json (~> 1.8)
+    httparty (0.14.0)
       multi_xml (>= 0.5.2)
-    json (1.8.3)
-    mime-types (2.99.2)
+    httpclient (2.8.0)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
     mimemagic (0.3.1)
     mini_portile2 (2.1.0)
     minitest (5.3.5)
@@ -48,6 +50,9 @@ GEM
       nokogiri (~> 1.5)
     octokit (4.3.0)
       sawyer (~> 0.7.0, >= 0.5.3)
+    percy-client (1.6.0)
+      faraday (>= 0.9)
+      httpclient (>= 2.6)
     pivotal-tracker (0.5.13)
       builder
       crack
@@ -56,10 +61,10 @@ GEM
       rest-client (>= 1.8.0)
     pkg-config (1.1.7)
     rake (10.4.2)
-    rest-client (1.8.0)
+    rest-client (2.0.0)
       http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
     ruby-graphviz (1.2.2)
     safe_yaml (1.0.4)
     sawyer (0.7.0)

data/bin/flash_flow

@@ -25,12 +25,12 @@ case
   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
+    FlashFlow::Merge::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
+    FlashFlow::Merge::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
+    FlashFlow::Merge::Master.new(options).run
   else
-    FlashFlow::Deploy.new(options).run
+    FlashFlow::Merge::Acceptance.new(options).run
     FlashFlow::IssueTracker::Base.new(FlashFlow::Config.configuration.issue_tracker).stories_pushed
 end

data/flash_flow.gemspec

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

data/flash_flow.yml.erb.example

@@ -82,3 +82,10 @@ branch_info_file: 'your/random/file'
 #    unmergeable_label: unmergeable
 #    do_not_merge_label: 'do not merge'
 #    shippable_label: 'shippable'
+
+#release:
+#  class:
+#    name: 'FlashFlow::Release::Percy'
+#    token: <%= ENV['PERCY_TOKEN'] %>
+#    repo: # Your github repo. For example, the flash_flow repo is 'flashfunders/flash_flow'
+#    api_url: 'https://percy.io/api/v1/'

data/lib/flash_flow.rb

@@ -3,7 +3,7 @@ module FlashFlow; end
 require 'flash_flow/options'
 require 'flash_flow/install'
 require 'flash_flow/config'
-require 'flash_flow/deploy'
 require 'flash_flow/issue_tracker'
 require 'flash_flow/resolve'
-require 'flash_flow/merge_master'
+require 'flash_flow/merge'
+require 'flash_flow/release'

data/lib/flash_flow/config.rb

@@ -16,7 +16,7 @@ module FlashFlow
     end
 
     ATTRIBUTES = [
-        :git, :branch_info_file, :log_file, :notifier, :issue_tracker, :lock, :branches
+        :git, :branch_info_file, :log_file, :notifier, :issue_tracker, :lock, :branches, :release
     ]
 
     attr_reader *ATTRIBUTES
@@ -55,6 +55,7 @@ module FlashFlow
           issue_tracker: nil,
           lock: nil,
           branches: nil,
+          release: nil
       }
     end
 

data/lib/flash_flow/data/base.rb

@@ -13,6 +13,8 @@ module FlashFlow
                      :remove_from_merge, :add_to_merge, :failures, :successes, :removals, :set_resolutions,
                      :to_a, :code_reviewed?, :branch_link
 
+      attr_reader :collection
+
       def initialize(branch_config, filename, git, opts={})
         @git = git
         @store = Store.new(filename, git, opts)
@@ -20,14 +22,23 @@ module FlashFlow
       end
 
       def initialize_collection(branch_config, remotes)
-        collection = Collection.fetch(remotes, branch_config) ||
-            Collection.from_hash(remotes, backwards_compatible_store['branches'])
-        collection.mark_all_as_current
-        collection
+        stored_collection = Collection.from_hash(remotes, stored_branches)
+
+        if ! branch_config.empty?
+          collection = Collection.fetch(remotes, branch_config)
+          # Order matters. We are marking the PRs as current, not the branches stored in the json
+          collection.mark_all_as_current
+          collection.reverse_merge(stored_collection)
+
+        else
+          collection = stored_collection
+          collection.mark_all_as_current
+          collection
+        end
       end
 
       def version
-        backwards_compatible_store['version']
+        stored_data['version']
       end
 
       def save!
@@ -37,24 +48,29 @@ module FlashFlow
       def to_hash
         {
             'version'  => FlashFlow::VERSION,
-            'branches' => merged_branches.to_hash
+            'branches' => @collection.to_hash,
+            'releases' => releases
         }
       end
 
-      def merged_branches
-        @collection.reverse_merge(Collection.from_hash({}, backwards_compatible_store['branches']))
+      def stored_branches
+        @stored_branches ||= stored_data['branches'] || {}
       end
 
-      def backwards_compatible_store
-        @backwards_compatible_store ||= begin
-          hash = @store.get
+      def releases
+        @releases ||= stored_data['releases'] || []
+      end
 
-          hash.has_key?('branches') ? hash : { 'branches' => hash }
-        end
+      def merged_branches
+        @collection.reverse_merge(Collection.from_hash({}, stored_branches))
+      end
+
+      def stored_data
+        @stored_data ||= @store.get
       end
 
       def saved_branches
-        Collection.from_hash(@git.remotes, backwards_compatible_store['branches']).to_a
+        Collection.from_hash(@git.remotes, stored_branches).to_a
       end
     end
   end

data/lib/flash_flow/git.rb

@@ -63,9 +63,13 @@ module FlashFlow
       end
     end
 
-    def master_branch_contains?(ref)
+    def branch_contains?(branch, ref)
       run("branch --contains #{ref}", log: CmdRunner::LOG_CMD)
-      last_stdout.split("\n").detect { |str| str[2..-1] == master_branch }
+      last_stdout.split("\n").detect { |str| str[2..-1] == branch }
+    end
+
+    def master_branch_contains?(ref)
+      branch_contains?(master_branch, ref)
     end
 
     def in_original_merge_branch
@@ -197,7 +201,7 @@ module FlashFlow
       run("push #{'-f' if force} #{merge_remote} #{branch}")
     end
 
-    def copy_temp_to_branch(branch, squash_message = nil)
+    def   copy_temp_to_branch(branch, squash_message = nil)
       run("checkout #{temp_merge_branch}")
       run("merge --strategy=ours --no-edit #{branch}")
       run("checkout #{branch}")
@@ -232,6 +236,20 @@ module FlashFlow
       end
     end
 
+    def temp_merge_branch
+      "flash_flow/#{merge_branch}"
+    end
+
+    def get_sha(branch)
+      run("rev-parse #{branch}")
+      last_stdout.strip if last_success?
+    end
+
+    def branch_exists?(branch)
+      run("rev-parse --verify #{branch}")
+      last_success?
+    end
+
     private
 
     def squash_commits(branch, commit_message)
@@ -249,14 +267,5 @@ module FlashFlow
       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
-
   end
 end

data/lib/flash_flow/issue_tracker.rb

@@ -59,7 +59,7 @@ module FlashFlow
       end
 
       def get_branches
-        branch_info_store = Data::Base.new(Config.configuration.branches, Config.configuration.branch_info_file, git, logger: Config.configuration.logger)
+        branch_info_store = Data::Base.new({}, Config.configuration.branch_info_file, git, logger: Config.configuration.logger)
 
         branch_info_store.saved_branches
       end

data/lib/flash_flow/merge.rb

@@ -0,0 +1,8 @@
+module FlashFlow
+  module Merge
+  end
+end
+
+require 'flash_flow/merge/acceptance'
+require 'flash_flow/merge/master'
+require 'flash_flow/merge/status'

data/lib/flash_flow/merge/acceptance.rb

@@ -0,0 +1,156 @@
+require 'flash_flow/merge/base'
+
+module FlashFlow
+  module Merge
+    class Acceptance < Base
+
+      def initialize(opts={})
+        super(opts)
+
+        @data = Data::Base.new(Config.configuration.branches, Config.configuration.branch_info_file, @git, logger: logger)
+
+        @do_not_merge = opts[:do_not_merge]
+        @force = opts[:force]
+        @rerere_forget = opts[:rerere_forget]
+        @stories = [opts[:stories]].flatten.compact
+      end
+
+      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"
+
+        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(@data.mergeable) do |branch, merger|
+                process_result(branch, merger)
+              end
+              commit_branch_info
+              commit_rerere
+            end
+
+            @git.copy_temp_to_branch(@git.merge_branch, commit_message)
+            @git.delete_temp_merge_branch
+            @git.push(@git.merge_branch, true)
+          end
+
+          print_errors
+          logger.info "### Finished #{@local_git.merge_branch} merge ###"
+        rescue Lock::Error, OutOfSyncWithRemote => e
+          puts 'Failure!'
+          puts e.message
+        ensure
+          @local_git.run("checkout #{@local_git.working_branch}")
+        end
+      end
+
+      def commit_branch_info
+        @stories.each do |story_id|
+          @data.add_story(@git.merge_remote, @git.working_branch, story_id)
+        end
+        @data.save!
+      end
+
+      def commit_rerere
+        current_branches = @data.to_a.select { |branch| !@git.master_branch_contains?(branch.sha) && (Time.now - branch.updated_at < two_weeks) }
+        current_rereres = current_branches.map { |branch| branch.resolutions.to_h.values }.flatten
+
+        @git.commit_rerere(current_rereres)
+      end
+
+      def two_weeks
+        60 * 60 * 24 * 14
+      end
+
+      def process_result(branch, merger)
+        case merger.result
+          when :deleted
+            @data.mark_deleted(branch)
+            @notifier.deleted_branch(branch) unless is_working_branch(branch)
+
+          when :success
+            branch.sha = merger.sha
+            @data.mark_success(branch)
+            @data.set_resolutions(branch, merger.resolutions)
+
+          when :conflict
+            if is_working_branch(branch)
+              @data.mark_failure(branch, merger.conflict_sha)
+            else
+              @data.mark_failure(branch, nil)
+              @notifier.merge_conflict(branch)
+            end
+        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)
+        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(@local_git.merge_remote, @local_git.working_branch)
+        else
+          @data.add_to_merge(@local_git.merge_remote, @local_git.working_branch)
+        end
+      end
+
+      def print_errors
+        puts format_errors
+      end
+
+      def format_errors
+        errors = []
+        branch_not_merged = nil
+        @data.failures.each do |branch|
+          if branch.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 #{branch.remote}/#{branch.ref} to #{@local_git.merge_branch} due to conflicts."
+          end
+        end
+        errors << branch_not_merged if branch_not_merged
+
+        if errors.empty?
+          "Success!"
+        else
+          errors.join("\n")
+        end
+      end
+
+      def commit_message
+        message =<<-EOS
+Flash Flow run from branch: #{@local_git.working_branch}
+
+Merged branches:
+#{@data.successes.empty? ? 'None' : @data.successes.sort_by(&:merge_order).map(&:ref).join("\n")}
+
+Failed branches:
+#{@data.failures.empty? ? 'None' : @data.failures.map(&:ref).join("\n")}
+
+Removed branches:
+#{@data.removals.empty? ? 'None' : @data.removals.map(&:ref).join("\n")}
+        EOS
+        message.gsub(/'/, '')
+      end
+
+    end
+  end
+end