flash_flow 1.4.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a41f62720b6a1d95aac60bc4275d5711b4ab82e3
-  data.tar.gz: 88ca498a5fef9fbec2d48bb12ea0c973123cf15f
+  metadata.gz: 82f7cd93c4e7ee082a902f0742453e7e7b187743
+  data.tar.gz: 5e472f2e130e8e7cac9d41b4cedd930eab6a8a9a
 SHA512:
-  metadata.gz: 9d6d4dc8b130952e6c002af7d5f524f35464f2359e88b5c7b01cdae49f8fc63cb11a8c5e97b681c4be509ca9851a50d0040ff60129843c163e01ea1ee115b7ab
-  data.tar.gz: d6f2cf9bcd93e7cf2a169b138a3fadc56b9494702d4bd36a347e9fe9d2b6404022d05e92eb58d987ec53f84484e14f0b6cc11d900f60ab33e98b7a1012ae7492
+  metadata.gz: ec4fd9f3d07dfb14032ff017c959bcde30d050d5a2910127d03a55869966f251e29ff7f115238ae805a8882450a3dcb1517cfca0aa7a09360985f8ed0f633fb4
+  data.tar.gz: 2b1dfbdeff424442bb95d6538c00e56f681b591711b3e09df034f1260f80bf57943eb77fe2fcec5637902d93865f61eff5d0c3ebb077202174f1cd21208ea28c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flash_flow (1.3.2.1)
+    flash_flow (1.4.2)
       hipchat (~> 1.5)
       octokit (~> 4.1)
       percy-client

data/README.md

@@ -31,12 +31,12 @@ are ready to go for flash_flow basic. If not, edit that file and change branch a
 flash_flow is a ruby script which, in the simplest case, can just be run by calling `flash_flow`.
 What that will do (once your application is properly configured) is:
 
-1. Push your branch to the `merge_remote`
+1. Push your branch to the `remote`
 2. Reset your `merge_branch` to be the same as your `master_branch`
 3. Get your list of pull requests from github (or use the saved list, more on that later)
 4. Filter out any "removed" branches
 5. Merge the rest into the newly created `merge_branch`
-6. Push the `merge_branch` to the `merge_remote`
+6. Push the `merge_branch` to the `remote`
 7. The `merge_branch` is now a merge of your master branch plus all of your pull requests.
 
 ### Notes

data/flash_flow.yml.erb.example

@@ -5,8 +5,8 @@ git:
   # more description elsewhere about how this works.
   use_rerere: true
 
-  # Which remote to push the merge branch to
-  merge_remote: origin
+  # Which remote your branches use
+  remote: origin
 
   # This branch is owned by flash_flow, it force pushes every time. So don't use a branch to which you make
   # commits. Treat this as 100% ephemeral, but if you can you should deploy it automatically to your

data/lib/flash_flow/branch_merger.rb

@@ -14,7 +14,7 @@ module FlashFlow
         return
       end
 
-      @git.run("merge --no-ff #{@branch.remote}/#{@branch.ref}")
+      @git.run("merge --no-ff #{@git.remote}/#{@branch.ref}")
 
       if @git.last_success? || try_rerere(rerere_forget)
         @result = :success
@@ -41,7 +41,7 @@ module FlashFlow
     end
 
     def get_sha
-      @git.run("rev-parse #{@branch.remote}/#{@branch.ref}")
+      @git.run("rev-parse #{@git.remote}/#{@branch.ref}")
       @git.last_stdout.strip if @git.last_success?
     end
 

data/lib/flash_flow/data/base.rb

@@ -18,14 +18,14 @@ module FlashFlow
       def initialize(branch_config, filename, git, opts={})
         @git = git
         @store = Store.new(filename, git, opts)
-        @collection = initialize_collection(branch_config, git.remotes_hash)
+        @collection = initialize_collection(branch_config)
       end
 
-      def initialize_collection(branch_config, remotes)
-        stored_collection = Collection.from_hash(remotes, stored_branches)
+      def initialize_collection(branch_config)
+        stored_collection = Collection.from_hash(stored_branches)
 
         if ! branch_config.empty?
-          collection = Collection.fetch(remotes, branch_config)
+          collection = Collection.fetch(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)
@@ -70,7 +70,7 @@ module FlashFlow
       end
 
       def saved_branches
-        Collection.from_hash(@git.remotes, stored_branches).to_a
+        Collection.from_hash(stored_branches).to_a
       end
     end
   end

data/lib/flash_flow/data/branch.rb

@@ -4,12 +4,10 @@ module FlashFlow
   module Data
 
     class Branch
-      attr_accessor :remote, :remote_url, :ref, :sha, :status, :resolutions, :stories, :conflict_sha, :metadata,
+      attr_accessor :ref, :sha, :status, :resolutions, :stories, :conflict_sha, :metadata,
                     :current_record, :merge_order, :updated_at, :created_at
 
-      def initialize(_remote, _remote_url, _ref)
-        @remote = _remote
-        @remote_url = _remote_url
+      def initialize(_ref)
         @ref = _ref
         @resolutions = {}
         @stories = []
@@ -19,7 +17,7 @@ module FlashFlow
       end
 
       def self.from_hash(hash)
-        branch = new(hash['remote'], hash['remote_url'], hash['ref'])
+        branch = new(hash['ref'])
         branch.sha = hash['sha']
         branch.status = hash['status']
         branch.merge_order = hash['merge_order']
@@ -44,13 +42,11 @@ module FlashFlow
       end
 
       def ==(other)
-        other.remote_url == remote_url && other.remote == remote && other.ref == ref
+        other.ref == ref
       end
 
       def to_hash
         {
-            'remote' => remote,
-            'remote_url' => remote_url,
             'ref' => ref,
             'sha' => sha,
             'status' => status,

data/lib/flash_flow/data/collection.rb

@@ -6,10 +6,9 @@ module FlashFlow
 
     class Collection
 
-      attr_accessor :branches, :remotes
+      attr_accessor :branches
 
-      def initialize(remotes, config=nil)
-        @remotes = remotes
+      def initialize(config=nil)
         @branches = {}
 
         if config && config['class'] && config['class']['name']
@@ -18,27 +17,34 @@ module FlashFlow
         end
       end
 
-      def self.fetch(remotes, config=nil)
-        collection = new(remotes, config)
+      def self.fetch(config=nil)
+        collection = new(config)
         collection.fetch
         collection
       end
 
-      def self.from_hash(remotes, hash, collection_instance=nil)
-        collection = new(remotes)
-        collection.branches = branches_from_hash(hash.dup)
+      def self.from_hash(hash, collection_instance=nil)
+        collection = new
+        collection.branches = branches_from_hash(hash)
         collection.instance_variable_set(:@collection_instance, collection_instance)
         collection
       end
 
       def self.branches_from_hash(hash)
-        hash.each do |key, val|
-          hash[key] = val.is_a?(Branch) ? val : Branch.from_hash(val)
+        {}.tap do |new_branches|
+          hash.each do |_, val|
+            branch = val.is_a?(Branch) ? val : Branch.from_hash(val)
+            new_branches[branch.ref] = branch
+          end
         end
       end
 
-      def get(remote_url, ref)
-        @branches[key(remote_url, ref)]
+      def self.key(ref)
+        ref
+      end
+
+      def get(ref)
+        @branches[key(ref)]
       end
 
       def to_hash
@@ -75,7 +81,7 @@ module FlashFlow
           end
         end
 
-        self.class.from_hash(remotes, merged_branches, @collection_instance)
+        self.class.from_hash(merged_branches, @collection_instance)
       end
 
       def to_a
@@ -120,15 +126,15 @@ module FlashFlow
         end
       end
 
-      def add_to_merge(remote, ref)
-        branch = record(remote, nil, ref)
+      def add_to_merge(ref)
+        branch = record(ref)
         branch.current_record = true
         @collection_instance.add_to_merge(branch) if @collection_instance.respond_to?(:add_to_merge)
         branch
       end
 
-      def remove_from_merge(remote, ref)
-        branch = record(remote, nil, ref)
+      def remove_from_merge(ref)
+        branch = record(ref)
         branch.current_record = true
         branch.removed!
         @collection_instance.remove_from_merge(branch) if @collection_instance.respond_to?(:remove_from_merge)
@@ -156,8 +162,8 @@ module FlashFlow
         branch
       end
 
-      def add_story(remote, ref, story_id)
-        branch = get(url_from_remote(remote), ref)
+      def add_story(ref, story_id)
+        branch = get(ref)
         branch.stories ||= []
         branch.stories << story_id
 
@@ -186,31 +192,17 @@ module FlashFlow
 
       private
 
-      def key(remote_url, ref)
-        "#{remote_url}/#{ref}"
-      end
-
-      def remote_from_url(url)
-        remotes.detect { |_, url_val| url_val == url }.first
-      end
-
-      def url_from_remote(remote)
-        remotes[remote]
-      end
-
-      def fixup(branch)
-        branch.remote ||= remote_from_url(branch.remote_url)
-        branch.remote_url ||= url_from_remote(branch.remote)
+      def key(ref)
+        self.class.key(ref)
       end
 
       def update_or_add(branch)
-        fixup(branch)
-        old_branch = @branches[key(branch.remote_url, branch.ref)]
-        @branches[key(branch.remote_url, branch.ref)] = old_branch.nil? ? branch : old_branch.merge(branch)
+        old_branch = @branches[key(branch.ref)]
+        @branches[key(branch.ref)] = old_branch.nil? ? branch : old_branch.merge(branch)
       end
 
-      def record(remote, remote_url, ref)
-        update_or_add(Branch.new(remote, remote_url, ref))
+      def record(ref)
+        update_or_add(Branch.new(ref))
       end
 
     end

data/lib/flash_flow/data/github.rb

@@ -36,7 +36,6 @@ module FlashFlow
       def fetch
         pull_requests.map do |pr|
           Branch.from_hash(
-              'remote_url' => pr.head.repo.ssh_url,
               'ref' => pr.head.ref,
               'status' => status_from_labels(pr),
               'metadata' => metadata(pr),
@@ -90,7 +89,7 @@ module FlashFlow
       end
 
       def pr_for(branch)
-        pull_requests.detect { |p| branch.remote_url == p.head.repo.ssh_url && branch.ref == p.head.ref }
+        pull_requests.detect { |p| branch.ref == p.head.ref }
       end
 
       def update_pr(pr_number)

data/lib/flash_flow/git.rb

@@ -3,7 +3,7 @@ require 'shellwords'
 
 module FlashFlow
   class Git
-    ATTRIBUTES = [:merge_remote, :merge_branch, :master_branch, :release_branch, :use_rerere]
+    ATTRIBUTES = [:remote, :merge_branch, :master_branch, :release_branch, :use_rerere]
     attr_reader *ATTRIBUTES
     attr_reader :working_branch
 
@@ -11,7 +11,10 @@ module FlashFlow
 
     def initialize(config, logger=nil)
       @cmd_runner = CmdRunner.new(logger: logger)
+
       config['release_branch'] ||= config['master_branch']
+      config['remote'] ||= config['merge_remote'] # For backwards compatibility
+
       ATTRIBUTES.each do |attr|
         unless config.has_key?(attr.to_s)
           raise RuntimeError.new("git configuration missing. Required config parameters: #{ATTRIBUTES}")
@@ -55,14 +58,6 @@ module FlashFlow
       run("merge #{branch}")
     end
 
-    def fetch(remote)
-      @fetched_remotes ||= {}
-      unless @fetched_remotes[remote]
-        run("fetch #{remote}")
-        @fetched_remotes[remote] = true
-      end
-    end
-
     def branch_contains?(branch, ref)
       run("branch --contains #{ref}", log: CmdRunner::LOG_CMD)
       last_stdout.split("\n").detect { |str| str[2..-1] == branch }
@@ -73,11 +68,11 @@ module FlashFlow
     end
 
     def in_original_merge_branch
-      in_branch("#{merge_remote}/#{merge_branch}") { yield }
+      in_branch("#{remote}/#{merge_branch}") { yield }
     end
 
     def read_file_from_merge_branch(filename)
-      run("show #{merge_remote}/#{merge_branch}:#{filename}", log: CmdRunner::LOG_CMD)
+      run("show #{remote}/#{merge_branch}:#{filename}", log: CmdRunner::LOG_CMD)
       last_stdout
     end
 
@@ -147,28 +142,6 @@ module FlashFlow
       arr.split("\n").map { |s| s.split(".git/rr-cache/").last.split("/postimage").first }
     end
 
-    def remotes
-      run('remote -v')
-      last_stdout.split("\n")
-    end
-
-    def remotes_hash
-      return @remotes_hash if @remotes_hash
-
-      @remotes_hash = {}
-      remotes.each do |r|
-        name = r.split[0]
-        url = r.split[1]
-        @remotes_hash[name] ||= url
-      end
-      @remotes_hash
-    end
-
-    def fetch_remote_for_url(url)
-      fetch_remotes = remotes.grep(Regexp.new(url)).grep(/ \(fetch\)/)
-      fetch_remotes.map { |remote| remote.to_s.split("\t").first }.first
-    end
-
     def staged_and_working_dir_files
       run("status --porcelain")
       last_stdout.split("\n").reject { |line| line[0..1] == '??' }
@@ -190,15 +163,15 @@ module FlashFlow
 
     def reset_temp_merge_branch
       in_branch(master_branch) do
-        run("fetch #{merge_remote}")
+        run("fetch #{remote}")
         run("branch -D #{temp_merge_branch}")
         run("checkout -b #{temp_merge_branch}")
-        run("reset --hard #{merge_remote}/#{master_branch}")
+        run("reset --hard #{remote}/#{master_branch}")
       end
     end
 
     def push(branch, force=false)
-      run("push #{'-f' if force} #{merge_remote} #{branch}")
+      run("push #{'-f' if force} #{remote} #{branch}")
     end
 
     def   copy_temp_to_branch(branch, squash_message = nil)
@@ -253,14 +226,14 @@ module FlashFlow
     private
 
     def squash_commits(branch, commit_message)
-      unless branch_exists?("#{merge_remote}/#{branch}")
-        run("push #{merge_remote} #{master_branch}:#{branch}")
+      unless branch_exists?("#{remote}/#{branch}")
+        run("push #{remote} #{master_branch}:#{branch}")
       end
 
       # Get all the files that differ between existing acceptance and new acceptance
-      run("diff --name-only #{merge_remote}/#{branch} #{branch}")
+      run("diff --name-only #{remote}/#{branch} #{branch}")
       files = last_stdout.split("\n")
-      run("reset #{merge_remote}/#{branch}")
+      run("reset #{remote}/#{branch}")
 
       run("add -f #{files.map { |f| "\"#{Shellwords.escape(f)}\"" }.join(" ")}")
 

data/lib/flash_flow/merge/acceptance.rb

@@ -25,7 +25,6 @@ module FlashFlow
           open_pull_request
 
           @lock.with_lock do
-            @git.fetch(@git.merge_remote)
             @git.in_original_merge_branch do
               @git.initialize_rerere
             end
@@ -56,7 +55,7 @@ module FlashFlow
 
       def commit_branch_info
         @stories.each do |story_id|
-          @data.add_story(@git.merge_remote, @git.working_branch, story_id)
+          @data.add_story(@git.remote, @git.working_branch, story_id)
         end
         @data.save!
       end
@@ -100,15 +99,13 @@ module FlashFlow
       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)
+          @data.remove_from_merge(@local_git.remote, @local_git.working_branch)
         else
-          @data.add_to_merge(@local_git.merge_remote, @local_git.working_branch)
+          @data.add_to_merge(@local_git.working_branch)
         end
       end
 
@@ -123,7 +120,7 @@ module FlashFlow
           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."
+            errors << "WARNING: Unable to merge branch #{@local_git.remote}/#{branch.ref} to #{@local_git.merge_branch} due to conflicts."
           end
         end
         errors << branch_not_merged if branch_not_merged

data/lib/flash_flow/merge/base.rb

@@ -51,12 +51,6 @@ module FlashFlow
         ordered_branches.each_with_index do |branch, index|
           branch.merge_order = index + 1
 
-          remote = @git.fetch_remote_for_url(branch.remote_url)
-          if remote.nil?
-            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)
           merger = git_merge(branch)
 
           yield(branch, merger)

data/lib/flash_flow/merge/master.rb

@@ -29,12 +29,11 @@ module FlashFlow
             release = @data.releases.detect { |r| r['status'] == 'Pending' }
             if release
               raise PendingReleaseError.new("There is already a pending release: #{release}")
-            elsif @git.branch_exists?("#{@git.merge_remote}/#{@git.release_branch}") &&
-                !@git.branch_contains?(@git.master_branch, @git.get_sha("#{@git.merge_remote}/#{@git.release_branch}"))
+            elsif @git.branch_exists?("#{@git.remote}/#{@git.release_branch}") &&
+                !@git.branch_contains?(@git.master_branch, @git.get_sha("#{@git.remote}/#{@git.release_branch}"))
               raise PendingReleaseError.new("The release branch '#{@git.release_branch}' has commits that are not in master")
             end
 
-            @git.fetch(@git.merge_remote)
             @git.in_original_merge_branch do
               @git.initialize_rerere
             end
@@ -58,10 +57,10 @@ module FlashFlow
               @data.releases.unshift({ created_at: Time.now, sha: release_sha, status: 'Pending' })
 
               @git.in_temp_merge_branch do
-                @git.run("reset --hard #{@git.merge_remote}/#{@git.merge_branch}")
+                @git.run("reset --hard #{@git.remote}/#{@git.merge_branch}")
               end
               @git.in_merge_branch do
-                @git.run("reset --hard #{@git.merge_remote}/#{@git.merge_branch}")
+                @git.run("reset --hard #{@git.remote}/#{@git.merge_branch}")
               end
 
               @data.save!
@@ -94,7 +93,7 @@ module FlashFlow
       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) }
+        branch_list.map { |b| Data::Branch.new(b) }
       end
 
       def check_branches

data/lib/flash_flow/merge_order.rb

@@ -20,7 +20,7 @@ module FlashFlow
     private
 
     def current_sha(branch)
-      @git.get_sha("#{branch.remote}/#{branch.ref}")
+      @git.get_sha("#{@git.remote}/#{branch.ref}")
     end
 
   end

data/lib/flash_flow/options.rb

@@ -23,7 +23,7 @@ module FlashFlow
         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('--make-release branch1,branch2', 'Comma-delimited list of branches to merge to the release branch. Run "--merge-release 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/resolve.rb

@@ -48,7 +48,7 @@ module FlashFlow
 
     def merge_conflicted
       @git.run("checkout #{branch.conflict_sha}")
-      @git.run("merge origin/#{working_branch}")
+      @git.run("merge {@git.remote}/#{working_branch}")
     end
 
     def git_reset

data/lib/flash_flow/shadow_repo.rb

@@ -12,8 +12,8 @@ module FlashFlow
       @cmd_runner.dir = flash_flow_dir
 
       run("clean -x -f")
-      fetch(merge_remote)
-      run("remote prune #{merge_remote}")
+      run("fetch #{remote}")
+      run("remote prune #{remote}")
       run("reset --hard HEAD")
     end
 

data/lib/flash_flow/version.rb

@@ -1,3 +1,3 @@
 module FlashFlow
-  VERSION = "1.4.0"
+  VERSION = "1.4.2"
 end

data/test/lib/data/test_branch.rb

@@ -73,8 +73,6 @@ module FlashFlow
       def test_from_hash
         branch = Branch.from_hash(branch_hash)
         assert_equal(branch.ref, branch_hash['ref'])
-        assert_equal(branch.remote_url, branch_hash['remote_url'])
-        assert_equal(branch.remote, branch_hash['remote'])
         assert_equal(branch.status, branch_hash['status'])
         assert_equal(branch.stories, branch_hash['stories'])
         assert_equal(branch.metadata, branch_hash['metadata'])
@@ -126,14 +124,6 @@ module FlashFlow
         branch2 = Branch.from_hash(branch_hash)
         assert(branch1 == branch2)
 
-        branch1.remote_url = 'different_url'
-        refute(branch1 == branch2)
-
-        branch1.remote_url = branch2.remote_url
-        branch1.remote = 'different remote'
-        refute(branch1 == branch2)
-
-        branch1.remote = branch2.remote
         branch1.ref = 'different ref'
         refute(branch1 == branch2)
       end
@@ -144,7 +134,7 @@ module FlashFlow
       end
 
       def test_success
-        branch = Branch.new(1,2,3)
+        branch = Branch.new(1)
 
         branch.success!
         assert(branch.success?)
@@ -154,7 +144,7 @@ module FlashFlow
       end
 
       def test_fail
-        branch = Branch.new(1,2,3)
+        branch = Branch.new(1)
 
         branch.fail!
         assert(branch.fail?)
@@ -164,7 +154,7 @@ module FlashFlow
       end
 
       def test_removed
-        branch = Branch.new(1,2,3)
+        branch = Branch.new(1)
 
         branch.removed!
         assert(branch.removed?)
@@ -174,7 +164,7 @@ module FlashFlow
       end
 
       def test_deleted
-        branch = Branch.new(1,2,3)
+        branch = Branch.new(1)
 
         branch.deleted!
         assert(branch.deleted?)
@@ -184,7 +174,7 @@ module FlashFlow
       end
 
       def test_unknown
-        branch = Branch.new(1,2,3)
+        branch = Branch.new(1)
 
         branch.unknown!
         assert(branch.unknown?)
@@ -198,8 +188,6 @@ module FlashFlow
       def branch_hash
         @branch_hash ||= {
             'ref' => 'branch 1',
-            'remote_url' => 'the_origin_url',
-            'remote' => 'origin',
             'sha' => 'random_sha',
             'status' => 'success',
             'merge_order' => nil,

data/test/lib/data/test_collection.rb

@@ -18,18 +18,13 @@ module FlashFlow
       def setup
         setup_fake_branches
         @fake_branches = FakeBranches.branches
-        @branch = Branch.new('origin', 'the_origin_url', 'some_branch')
-        @collection = Collection.new({ 'origin' => 'the_origin_url' }, { 'class' => { 'name' => 'FakeBranches' }})
+        @branch = Branch.new('some_branch')
+        @collection = Collection.new({ 'class' => { 'name' => 'FakeBranches' }})
       end
 
       def test_from_hash_set_branches
-        hash = { 'some_url/some_branch' => Branch.new('origin', 'the_origin_url', 'some_branch') }
-        assert_equal(Collection.from_hash({}, hash).branches, hash)
-      end
-
-      def test_from_hash_set_remotes
-        remotes = { 'some_remote' => 'some_remote_url' }
-        assert_equal(Collection.from_hash(remotes, {}).remotes, remotes)
+        hash = { 'some_branch' => Branch.new('some_branch') }
+        assert_equal(Collection.from_hash(hash).branches, hash)
       end
 
       def test_fetch_calls_collection_class
@@ -44,17 +39,8 @@ module FlashFlow
       end
 
       def test_fetch_maps_collection_class_to_branches
-        branch = Data::Branch.new('origin', 'the_origin_url', 'some_branch')
-        @fake_branches.expect(:fetch, [Branch.from_hash({'remote' => branch.remote, 'remote_url' => branch.remote_url, 'ref' => branch.ref })], [])
-        @collection.fetch
-
-        assert_equal(@collection.branches.values, [branch])
-        @fake_branches.verify
-      end
-
-      def test_fetch_finds_the_remote
-        branch = Data::Branch.new('origin', 'the_origin_url', 'some_branch')
-        @fake_branches.expect(:fetch, [Branch.from_hash({'remote_url' => branch.remote_url, 'ref' => branch.ref })], [])
+        branch = Data::Branch.new('some_branch')
+        @fake_branches.expect(:fetch, [Branch.from_hash({'ref' => branch.ref })], [])
         @collection.fetch
 
         assert_equal(@collection.branches.values, [branch])
@@ -64,99 +50,97 @@ module FlashFlow
       def test_reverse_merge_when_old_is_empty
         @collection.mark_success(@branch)
 
-        merged = @collection.reverse_merge(Collection.from_hash({}, {}))
-        assert_equal(['the_origin_url/some_branch'], merged.to_h.keys)
-        assert(merged.get('the_origin_url', 'some_branch').success?)
+        merged = @collection.reverse_merge(Collection.from_hash({}))
+        assert_equal(['some_branch'], merged.to_h.keys)
+        assert(merged.get('some_branch').success?)
       end
 
       def test_reverse_merge_old_marks_old_branches
         @collection.mark_success(@branch)
 
-        merged = @collection.reverse_merge(Collection.from_hash({}, old_branches))
-        assert(merged.get('the_origin_url', 'some_old_branch').unknown?)
+        merged = @collection.reverse_merge(Collection.from_hash(old_branches))
+        assert(merged.get('some_old_branch').unknown?)
       end
 
       def test_reverse_merge_old_adds_new_stories
         @collection.mark_success(@branch)
-        @collection.add_story('origin', 'some_branch', '456')
-        merged = @collection.reverse_merge(Collection.from_hash({}, old_branches))
+        @collection.add_story('some_branch', '456')
+        merged = @collection.reverse_merge(Collection.from_hash(old_branches))
 
-        assert_equal(['222', '456'], merged.get('the_origin_url', 'some_branch').stories)
+        assert_equal(['222', '456'], merged.get('some_branch').stories)
       end
 
       def test_reverse_merge_old_uses_old_created_at
-        @collection.add_to_merge('origin', 'some_old_branch')
-        @collection.add_to_merge('origin', 'some_new_branch')
-        old_branch_collection = Collection.from_hash({}, old_branches)
+        @collection.add_to_merge('some_old_branch')
+        @collection.add_to_merge('some_new_branch')
+        old_branch_collection = Collection.from_hash(old_branches)
         merged = @collection.reverse_merge(old_branch_collection)
 
-        assert_equal(old_branch_collection.get('the_origin_url', 'some_branch').created_at, merged.get('the_origin_url', 'some_branch').created_at)
+        assert_equal(old_branch_collection.get('some_branch').created_at, merged.get('some_branch').created_at)
         # Assert the new branch is created_at within the last minute
-        assert(merged.get('the_origin_url', 'some_new_branch').created_at > (Time.now - 60))
+        assert(merged.get('some_new_branch').created_at > (Time.now - 60))
       end
 
       def test_reverse_merge_old_uses_new_status
-        @collection.mark_failure(old_branches['the_origin_url/some_branch'])
-        merged = @collection.reverse_merge(Collection.from_hash({}, old_branches))
+        @collection.mark_failure(old_branches['some_branch'])
+        merged = @collection.reverse_merge(Collection.from_hash(old_branches))
 
-        assert(merged.get('the_origin_url', 'some_branch').fail?)
+        assert(merged.get('some_branch').fail?)
       end
 
       def test_fetch_returns_a_collection_instance
         FakeBranches.branches.expect(:fetch, [])
-        collection = Collection.fetch({ 'origin' => 'the_origin_url' }, { 'class' => { 'name' => 'FakeBranches' }})
+        collection = Collection.fetch({ 'class' => { 'name' => 'FakeBranches' }})
         assert(collection.is_a?(Collection))
       end
 
       def test_add_to_merge_new_branch
-        @collection.add_to_merge('origin', 'some_branch')
-        assert_equal(@collection.get('the_origin_url', 'some_branch').ref, 'some_branch')
-        assert_equal(@collection.get('the_origin_url', 'some_branch').remote, 'origin')
-        assert_equal(@collection.get('the_origin_url', 'some_branch').remote_url, 'the_origin_url')
+        @collection.add_to_merge('some_branch')
+        assert_equal(@collection.get('some_branch').ref, 'some_branch')
       end
 
       def test_add_to_merge_existing_branch
         @collection.mark_failure(@branch)
-        @collection.add_to_merge(@branch.remote, @branch.ref)
+        @collection.add_to_merge(@branch.ref)
 
-        assert_equal(@collection.get(@branch.remote_url, @branch.ref), @branch)
+        assert_equal(@collection.get(@branch.ref), @branch)
       end
 
       def test_add_to_merge_calls_branches_class
         @fake_branches.expect(:add_to_merge, true, [@branch])
-        @collection.add_to_merge(@branch.remote, @branch.ref)
+        @collection.add_to_merge(@branch.ref)
 
         @fake_branches.verify
       end
 
       def test_remove_from_merge_new_branch
-        @collection.remove_from_merge(@branch.remote, @branch.ref)
-        assert(@collection.get(@branch.remote_url, @branch.ref).removed?)
+        @collection.remove_from_merge(@branch.ref)
+        assert(@collection.get(@branch.ref).removed?)
       end
 
       def test_remove_from_merge_existing_branch
         @collection.mark_success(@branch)
-        assert(@collection.get(@branch.remote_url, @branch.ref).success?)
-        @collection.remove_from_merge(@branch.remote, @branch.ref)
-        assert(@collection.get(@branch.remote_url, @branch.ref).removed?)
+        assert(@collection.get(@branch.ref).success?)
+        @collection.remove_from_merge(@branch.ref)
+        assert(@collection.get(@branch.ref).removed?)
       end
 
       def test_remove_from_merge_calls_branches_class
         @fake_branches.expect(:remove_from_merge, true, [@branch])
-        @collection.remove_from_merge(@branch.remote, @branch.ref)
+        @collection.remove_from_merge(@branch.ref)
         @fake_branches.verify
       end
 
       def test_mark_success_new_branch
         @collection.mark_success(@branch)
-        assert(@collection.get(@branch.remote_url, @branch.ref).success?)
+        assert(@collection.get(@branch.ref).success?)
       end
 
       def test_mark_success_existing_branch
-        branch = @collection.add_to_merge(@branch.remote, @branch.ref)
+        branch = @collection.add_to_merge(@branch.ref)
         @collection.mark_failure(branch)
         @collection.mark_success(branch)
-        assert(@collection.get(@branch.remote_url, @branch.ref).success?)
+        assert(@collection.get(@branch.ref).success?)
       end
 
       def test_mark_success_calls_branches_class
@@ -166,10 +150,10 @@ module FlashFlow
       end
 
       def test_mark_failure_existing_branch
-        branch = @collection.add_to_merge(@branch.remote, @branch.ref)
+        branch = @collection.add_to_merge(@branch.ref)
         @collection.mark_success(branch)
         @collection.mark_failure(branch)
-        assert(@collection.get(@branch.remote_url, @branch.ref).fail?)
+        assert(@collection.get(@branch.ref).fail?)
       end
 
       def test_mark_failure_new_branch
@@ -185,14 +169,14 @@ module FlashFlow
 
       def test_mark_deleted_new_branch
         @collection.mark_deleted(@branch)
-        assert(@collection.get(@branch.remote_url, @branch.ref).deleted?)
+        assert(@collection.get(@branch.ref).deleted?)
       end
 
       def test_mark_deleted_existing_branch
-        branch = @collection.add_to_merge(@branch.remote, @branch.ref)
+        branch = @collection.add_to_merge(@branch.ref)
         @collection.mark_failure(branch)
         @collection.mark_deleted(branch)
-        assert(@collection.get(@branch.remote_url, @branch.ref).deleted?)
+        assert(@collection.get(@branch.ref).deleted?)
       end
 
       def test_mark_deleted_calls_branches_class
@@ -202,15 +186,15 @@ module FlashFlow
       end
 
       def test_add_story
-        @collection.add_to_merge('origin', 'some_branch')
-        @collection.add_story('origin', 'some_branch', '999')
-        assert_equal(@collection.get('the_origin_url', 'some_branch').stories, ['999'])
+        @collection.add_to_merge('some_branch')
+        @collection.add_story('some_branch', '999')
+        assert_equal(@collection.get('some_branch').stories, ['999'])
       end
 
       def test_add_story_calls_branches_class
         @fake_branches.expect(:add_story, true, [@branch, '999'])
-        @collection.add_to_merge('origin', 'some_branch')
-        @collection.add_story('origin', 'some_branch', '999')
+        @collection.add_to_merge('some_branch')
+        @collection.add_story('some_branch', '999')
         @fake_branches.verify
       end
 
@@ -237,9 +221,9 @@ module FlashFlow
       end
 
       def test_current_branches
-        branch1 = Branch.new('111', '111', '111')
-        branch2 = Branch.new('222', '222', '222')
-        branch3 = Branch.new('333', '333', '333')
+        branch1 = Branch.new('111')
+        branch2 = Branch.new('222')
+        branch3 = Branch.new('333')
         branch2.current_record = true
         @collection.mark_success(branch1)
         @collection.mark_success(branch2)
@@ -249,9 +233,9 @@ module FlashFlow
       end
 
       def test_mark_all_as_current
-        branch1 = Branch.new('111', '111', '111')
-        branch2 = Branch.new('222', '222', '222')
-        branch3 = Branch.new('333', '333', '333')
+        branch1 = Branch.new('111')
+        branch2 = Branch.new('222')
+        branch3 = Branch.new('333')
         branch2.current_record = true
         @collection.mark_success(branch1)
         @collection.mark_success(branch2)
@@ -288,35 +272,35 @@ module FlashFlow
         @collection.mark_failure(fail1)
         @collection.mark_success(success1)
         @collection.mark_failure(fail2)
-        @removed1 = @collection.remove_from_merge(removed1.remote, removed1.ref)
+        @removed1 = @collection.remove_from_merge(removed1.ref)
         @collection.mark_success(success2)
         @collection.mark_all_as_current
       end
 
       def fail1
-        @fail1 ||= Branch.new('111', '111', '111')
+        @fail1 ||= Branch.new('111')
       end
 
       def fail2
-        @fail2 ||= Branch.new('333', '333', '333')
+        @fail2 ||= Branch.new('333')
       end
 
       def success1
-        @success1 ||= Branch.new('222', '222', '222')
+        @success1 ||= Branch.new('222')
       end
 
       def success2
-        @success2 ||= Branch.new('555', '555', '555')
+        @success2 ||= Branch.new('555')
       end
 
       def removed1
-        @removed1 ||= Branch.new('444', '444', '444')
+        @removed1 ||= Branch.new('444')
       end
 
       def old_branches
         @old_branches ||= {
-            'the_origin_url/some_old_branch' => Branch.from_hash({'ref' => 'some_old_branch', 'remote_url' => 'the_origin_url', 'remote' => 'origin', 'created_at' => (Time.now - 3600), 'stories' => ['111']}),
-            'the_origin_url/some_branch' => Branch.from_hash({'ref' => 'some_branch', 'remote_url' => 'the_origin_url', 'remote' => 'origin', 'status' => 'success', 'created_at' => (Time.now - 1800), 'stories' => ['222']})
+            'some_old_branch' => Branch.from_hash({'ref' => 'some_old_branch', 'created_at' => (Time.now - 3600), 'stories' => ['111']}),
+            'some_branch' => Branch.from_hash({'ref' => 'some_branch', 'status' => 'success', 'created_at' => (Time.now - 1800), 'stories' => ['222']})
         }
       end
     end

data/test/lib/data/test_store.rb

@@ -6,8 +6,8 @@ module FlashFlow
     class TestStore < Minitest::Test
       def setup
         @mock_git = MockGit.new
-        @collection = Collection.new({ 'origin' => 'the_origin_url' })
-        @branch = Branch.new('origin', 'the_origin_url', 'some_branch')
+        @collection = Collection.new
+        @branch = Branch.new('some_branch')
         @storage = Store.new('/dev/null', @mock_git)
       end
 
@@ -30,8 +30,8 @@ module FlashFlow
         @old_branches ||= {
             'version' => '1.0.0',
             'branches' => {
-              'the_origin_url/some_old_branch' => {'ref' => 'some_old_branch', 'remote_url' => 'the_origin_url', 'remote' => 'origin', 'created_at' => (Time.now - 3600).to_s, 'stories' => ['111']},
-              'the_origin_url/some_branch' => {'ref' => 'some_branch', 'remote_url' => 'the_origin_url', 'remote' => 'origin', 'status' => 'success', 'created_at' => (Time.now - 1800).to_s, 'stories' => ['222']}
+              'some_old_branch' => {'ref' => 'some_old_branch', 'created_at' => (Time.now - 3600).to_s, 'stories' => ['111']},
+              'some_branch' => {'ref' => 'some_branch', 'status' => 'success', 'created_at' => (Time.now - 1800).to_s, 'stories' => ['222']}
             }
           }
       end
@@ -39,19 +39,15 @@ module FlashFlow
       def sorted_branches
         @sorted_branches ||= {
             'branches' => {
-                'the_origin_url/some_branch' => {
+                'some_branch' => {
                     'created_at' => (Time.now - 1800).to_s,
                     'ref' => 'some_branch',
-                    'remote' => 'origin',
-                    'remote_url' => 'the_origin_url',
                     'status' => 'success',
                     'stories' => ['222']
                 },
-                'the_origin_url/some_old_branch' => {
+                'some_old_branch' => {
                     'created_at' => (Time.now - 3600).to_s,
                     'ref' => 'some_old_branch',
-                    'remote' => 'origin',
-                    'remote_url' => 'the_origin_url',
                     'stories' => ['111']},
             },
             'version' => '1.0.0',

data/test/lib/issue_tracker/test_pivotal.rb

@@ -285,11 +285,11 @@ module FlashFlow
       end
 
       def sample_branches
-        @sample_branches ||= [Data::Branch.from_hash({'ref' => 'branch1', 'remote' => 'origin', 'sha' => 'sha1', 'status' => 'success', 'created_at' => (Time.now - 3600), 'stories' => ['111']}),
-            Data::Branch.from_hash({'ref' => 'branch2', 'remote' => 'origin', 'sha' => 'sha2', 'status' => 'success', 'created_at' => (Time.now - 1800), 'stories' => ['222']}),
-            Data::Branch.from_hash({'ref' => 'branch3', 'remote' => 'origin', 'sha' => 'sha3', 'status' => 'fail', 'created_at' => (Time.now - 1800), 'stories' => ['333']}),
-            Data::Branch.from_hash({'ref' => 'branch4', 'remote' => 'origin', 'sha' => 'sha4', 'status' => nil, 'created_at' => (Time.now - 1800), 'stories' => ['444']}),
-            Data::Branch.from_hash({'ref' => 'branch5', 'remote' => 'origin', 'sha' => 'sha5', 'status' => 'removed', 'created_at' => (Time.now - 1800), 'stories' => ['555']})
+        @sample_branches ||= [Data::Branch.from_hash({'ref' => 'branch1', 'sha' => 'sha1', 'status' => 'success', 'created_at' => (Time.now - 3600), 'stories' => ['111']}),
+            Data::Branch.from_hash({'ref' => 'branch2', 'sha' => 'sha2', 'status' => 'success', 'created_at' => (Time.now - 1800), 'stories' => ['222']}),
+            Data::Branch.from_hash({'ref' => 'branch3', 'sha' => 'sha3', 'status' => 'fail', 'created_at' => (Time.now - 1800), 'stories' => ['333']}),
+            Data::Branch.from_hash({'ref' => 'branch4', 'sha' => 'sha4', 'status' => nil, 'created_at' => (Time.now - 1800), 'stories' => ['444']}),
+            Data::Branch.from_hash({'ref' => 'branch5', 'sha' => 'sha5', 'status' => 'removed', 'created_at' => (Time.now - 1800), 'stories' => ['555']})
         ]
       end
     end

data/test/lib/merge/test_acceptance.rb

@@ -10,15 +10,14 @@ module FlashFlow
         config!(git:
                     {
                         'merge_branch' => 'test_acceptance',
-                        'merge_remote' => 'test_remote',
+                        'remote' => 'test_remote',
                         'master_branch' => 'test_master',
-                        'remotes' => ['fake_origin'],
                         'use_rerere' => true
                     },
                 branches: {}
         )
 
-        @branch = Data::Branch.from_hash({'ref' => 'pushing_branch', 'remote' => 'origin', 'status' => 'fail', 'stories' => []})
+        @branch = Data::Branch.from_hash({'ref' => 'pushing_branch', 'status' => 'fail', 'stories' => []})
         @deploy = Acceptance.new
       end
 
@@ -71,7 +70,7 @@ module FlashFlow
       def test_print_errors_when_another_branch_cant_merge
         data.expect(:failures, [@branch])
 
-        other_branch_error = "WARNING: Unable to merge branch origin/pushing_branch to test_acceptance due to conflicts."
+        other_branch_error = "WARNING: Unable to merge branch test_remote/pushing_branch to test_acceptance due to conflicts."
 
         assert_equal(@deploy.format_errors, other_branch_error)
       end

data/test/lib/test_branch_merger.rb

@@ -63,14 +63,15 @@ module FlashFlow
     end
 
     def branch
-      @branch ||= Data::Branch.from_hash({'ref' => 'pushing_branch', 'remote' => 'origin', 'status' => 'fail', 'stories' => []})
+      @branch ||= Data::Branch.from_hash({'ref' => 'pushing_branch', 'status' => 'fail', 'stories' => []})
     end
 
     def git
       return @git if @git
 
       @git = Minitest::Mock.new
-      @git.expect(:run, true, ["merge --no-ff #{branch.remote}/#{branch.ref}"])
+      @git.expect(:remote, 'origin', [])
+      @git.expect(:run, true, ["merge --no-ff origin/#{branch.ref}"])
     end
 
   end

data/test/lib/test_config.rb

@@ -6,10 +6,9 @@ module FlashFlow
       @config_hash = {
           'git' => {
             'use_rerere' => true,
-            'merge_remote' => 'arbitrary_remote',
+            'remote' => 'arbitrary_remote',
             'merge_branch' => 'acceptance',
-            'master_branch' => 'master',
-            'remotes' => ['origin']
+            'master_branch' => 'master'
           },
           'branch_info_file' => 'some_file.txt',
           'notifier' => {
@@ -43,10 +42,9 @@ module FlashFlow
         assert('some_file.txt' == config.branch_info_file)
         assert({
                    'use_rerere' => true,
-                   'merge_remote' => 'arbitrary_remote',
+                   'remote' => 'arbitrary_remote',
                    'merge_branch' => 'acceptance',
-                   'master_branch' => 'master',
-                   'remotes' => ['origin']
+                   'master_branch' => 'master'
                } == config.git)
         assert({ 'class' => { 'name' => 'NotifierClass' }} == config.notifier)
         assert({ 'class' => { 'name' => 'IssueTrackerClass' }} == config.issue_tracker)

data/test/lib/test_git.rb

@@ -5,9 +5,8 @@ module FlashFlow
     def setup
       @git_args = {
           'merge_branch' => 'acceptance',
-          'merge_remote' => 'origin',
+          'remote' => 'origin',
           'master_branch' => 'master',
-          'remotes' => ['origin'],
           'use_rerere' => true
       }
       @cmd_runner = setup_cmd_runner
@@ -15,6 +14,7 @@ module FlashFlow
 
     def test_initialize_rerere_checks_flag
       @git_args['use_rerere'] = false
+
       instance.initialize_rerere
 
       @cmd_runner.verify

data/test/lib/test_merge_order.rb

@@ -46,7 +46,8 @@ module FlashFlow
     private
 
     def mock_current_sha(branch, sha)
-      @git.expect(:get_sha, sha, ["#{branch.remote}/#{branch.ref}"])
+      @git.expect(:remote, 'origin')
+      @git.expect(:get_sha, sha, ["origin/#{branch.ref}"])
     end
 
     def mock_working_branch(branch)
@@ -54,9 +55,9 @@ module FlashFlow
     end
 
     def sample_branches
-      @sample_branches ||= [Data::Branch.from_hash({'ref' => 'branch0', 'remote' => 'origin', 'sha' => 'sha0', 'merge_order' => 1}),
-        Data::Branch.from_hash({'ref' => 'branch1', 'remote' => 'origin', 'sha' => 'sha1', 'merge_order' => 2}),
-        Data::Branch.from_hash({'ref' => 'branch2', 'remote' => 'origin', 'sha' => 'sha2', 'merge_order' => 3})]
+      @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)

data/test/lib/test_resolve.rb

@@ -35,16 +35,14 @@ module FlashFlow
 
     def setup
       @resolve_tester = ResolveTester.new({ 'merge_branch' => 'test_acceptance',
-                               'merge_remote' => 'test_remote',
+                               'remote' => 'test_remote',
                                'master_branch' => 'test_master',
-                               'remotes' => ['fake_origin'],
                                'use_rerere' => true
                              }, 'some_file')
 
       @resolve = Resolve.new({ 'merge_branch' => 'test_acceptance',
-                                            'merge_remote' => 'test_remote',
+                                            'remote' => 'test_remote',
                                             'master_branch' => 'test_master',
-                                            'remotes' => ['fake_origin'],
                                             'use_rerere' => true
                                           }, 'some_file')
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flash_flow
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors:
 - Flashfunders
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit