flash_flow 1.2.3.alpha → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73df87f225f53804b6f04bc3974e7ad50a2e7593
-  data.tar.gz: 36469747a24560104ed64c357b64412ef7a0ef33
+  metadata.gz: 3ba7a7fe175b96cc420cab775f520719c7fc83f5
+  data.tar.gz: 7d49a193d1430a55a3b42a135e8ec35838bb47cc
 SHA512:
-  metadata.gz: e6f194f1021154559949b9a1256d792aa90a2b385a96f0a6577bddad4b3d829e7a2ebd37a07e2073fc8e6feca552908f2a758b56a47805c0e5cf5605469477d6
-  data.tar.gz: 5ac260eae49b4b4d5d57a00a3a88956cb3c7368eb675b7331ea57af87c0c0e4d449b9e6421bab009512586b8d90ff713f477f58b43884555f267eb7dc9d32a72
+  metadata.gz: 2b11140dd538fef6a9b37e17d62ffe72174efe6efc723679f0b1982303a992c4de46ddd655fe1889a895dda67de6ca80bb6b6f27697e9a495692bbf81e1dfc0a
+  data.tar.gz: 29f7e831e2461baf974abf70fdff8ca3a21b34ff937ac993822c04da698963e6251cee1ae8abd791ef0f3493ed87924e97fb3e3316fe7e9b607b049fd835284e

data/Gemfile.lock

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

data/lib/flash_flow/data/base.rb

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

data/lib/flash_flow/data/collection.rb

@@ -94,7 +94,15 @@ module FlashFlow
       end
 
       def failures
-        @branches.select { |_, v| v.fail? }
+        current_branches.select { |branch| branch.fail? }
+      end
+
+      def successes
+        current_branches.select { |branch| branch.success? }
+      end
+
+      def removals
+        to_a.select { |branch| branch.removed? }
       end
 
       def fetch
@@ -113,12 +121,14 @@ module FlashFlow
 
       def add_to_merge(remote, ref)
         branch = record(remote, nil, 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)
+        branch.current_record = true
         branch.removed!
         @collection_instance.remove_from_merge(branch) if @collection_instance.respond_to?(:remove_from_merge)
         branch

data/lib/flash_flow/deploy.rb

@@ -51,7 +51,7 @@ module FlashFlow
             commit_rerere
           end
 
-          @git.copy_temp_to_merge_branch
+          @git.copy_temp_to_merge_branch(commit_message)
           @git.delete_temp_merge_branch
           @git.push_merge_branch
         end
@@ -161,11 +161,11 @@ module FlashFlow
     def format_errors
       errors = []
       branch_not_merged = nil
-      @data.failures.each do |full_ref, failure|
-        if failure.ref == @local_git.working_branch
+      @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 #{failure.remote}/#{failure.ref} to #{@local_git.merge_branch} due to conflicts."
+          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
@@ -177,5 +177,21 @@ module FlashFlow
       end
     end
 
+    def commit_message
+      message =<<-EOS
+Flash Flow run from branch: #{@local_git.working_branch}
+
+Merged branches:
+#{@data.successes.empty? ? 'None' : @data.successes.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

data/lib/flash_flow/git.rb

@@ -68,7 +68,7 @@ module FlashFlow
     end
 
     def master_branch_contains?(ref)
-      run("branch --contains #{ref}")
+      run("branch --contains #{ref}", log: CmdRunner::LOG_CMD)
       last_stdout.split("\n").detect { |str| str[2..-1] == master_branch }
     end
 
@@ -208,17 +208,13 @@ module FlashFlow
       run("push -f #{merge_remote} #{merge_branch}")
     end
 
-    def copy_temp_to_merge_branch
+    def copy_temp_to_merge_branch(commit_message)
       run("checkout #{temp_merge_branch}")
       run("merge --strategy=ours --no-edit #{merge_branch}")
       run("checkout #{merge_branch}")
       run("merge #{temp_merge_branch}")
 
-      squash_commits
-    end
-
-    def commit_message(log)
-      "Flash Flow run from branch: #{working_branch}\n\n#{log}".gsub(/'/, '')
+      squash_commits(commit_message)
     end
 
     def delete_temp_merge_branch
@@ -248,11 +244,7 @@ module FlashFlow
 
     private
 
-    def squash_commits
-      # There are three commits created by flash flow that we don't need in the message
-      run("log #{merge_remote}/#{merge_branch}..#{merge_branch}~3", log: CmdRunner::LOG_CMD)
-      log = last_stdout
-
+    def squash_commits(commit_message)
       # Get all the files that differ between existing acceptance and new acceptance
       run("diff --name-only #{merge_remote}/#{merge_branch} #{merge_branch}")
       files = last_stdout.split("\n")
@@ -260,7 +252,7 @@ module FlashFlow
 
       run("add -f #{files.map { |f| "\"#{Shellwords.escape(f)}\"" }.join(" ")}")
 
-      run("commit -m '#{commit_message(log)}'")
+      run("commit -m '#{commit_message}'")
     end
 
     def temp_merge_branch

data/lib/flash_flow/resolve.rb

@@ -16,8 +16,8 @@ module FlashFlow
     end
 
     def manual_instructions
-      branch = check_for_conflict
-      puts manual_not_merged_instructions(branch)
+      check_for_conflict
+      puts manual_not_merged_instructions
     end
 
     def start
@@ -60,7 +60,7 @@ module FlashFlow
     end
 
     def bash_message
-      puts "\nPlease fix the following conflicts and then 'exit':\n#{unresolved_conflicts.join("\n")}\n\n"
+      puts "\nNote: You are in a special flash_flow directory (#{Dir.pwd}). The files still open in your editor will not reflect the merge conflicts, open them from this shell to get the conflicted versions.\n\nPlease fix the following conflicts and then 'exit':\n#{unresolved_conflicts.join("\n")}\n\n"
     end
 
     def launch_bash
@@ -82,7 +82,7 @@ module FlashFlow
       File.delete(filename)
     end
 
-    def manual_not_merged_instructions(branch)
+    def manual_not_merged_instructions
       <<-EOS
 
 Run the following commands to fix the merge conflict and then re-run flash_flow:

data/lib/flash_flow/version.rb

@@ -1,3 +1,3 @@
 module FlashFlow
-  VERSION = "1.2.3.alpha"
+  VERSION = "1.2.3"
 end

data/test/lib/data/test_collection.rb

@@ -265,18 +265,54 @@ module FlashFlow
       end
 
       def test_failures
-        branch1 = Branch.new('111', '111', '111')
-        branch2 = Branch.new('222', '222', '222')
-        branch3 = Branch.new('333', '333', '333')
-        @collection.mark_failure(branch1)
-        @collection.mark_success(branch2)
-        @collection.mark_failure(branch3)
+        mark_branches
+
+        assert_equal(@collection.failures, [fail1, fail2])
+      end
 
-        assert_equal(@collection.failures.values, [branch1, branch3])
+      def test_successes
+        mark_branches
+
+        assert_equal(@collection.successes, [success1, success2])
+      end
+
+      def test_removals
+        mark_branches
+
+        assert_equal(@collection.removals, [removed1])
       end
 
       private
 
+      def mark_branches
+        @collection.mark_failure(fail1)
+        @collection.mark_success(success1)
+        @collection.mark_failure(fail2)
+        @removed1 = @collection.remove_from_merge(removed1.remote, removed1.ref)
+        @collection.mark_success(success2)
+        @collection.mark_all_as_current
+      end
+
+      def fail1
+        @fail1 ||= Branch.new('111', '111', '111')
+      end
+
+      def fail2
+        @fail2 ||= Branch.new('333', '333', '333')
+      end
+
+      def success1
+        @success1 ||= Branch.new('222', '222', '222')
+      end
+
+      def success2
+        @success2 ||= Branch.new('555', '555', '555')
+      end
+
+      def removed1
+        @removed1 ||= Branch.new('444', '444', '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']}),

data/test/lib/test_deploy.rb

@@ -49,12 +49,12 @@ module FlashFlow
     end
 
     def test_print_errors_with_no_errors
-      data.expect(:failures, {})
+      data.expect(:failures, [])
       assert_equal(@deploy.format_errors, 'Success!')
     end
 
     def test_print_errors_when_current_branch_cant_merge
-      data.expect(:failures, {'origin/pushing_branch' => @branch})
+      data.expect(:failures, [@branch])
       @branch.fail!('some_random_sha')
 
       current_branch_error = "ERROR: Your branch did not merge to test_acceptance. Run 'flash_flow --resolve', fix the merge conflict(s) and then re-run this script\n"
@@ -65,7 +65,7 @@ module FlashFlow
     end
 
     def test_print_errors_when_another_branch_cant_merge
-      data.expect(:failures, {'origin/pushing_branch' => @branch})
+      data.expect(:failures, [@branch])
 
       other_branch_error = "WARNING: Unable to merge branch origin/pushing_branch to test_acceptance due to conflicts."
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flash_flow
 version: !ruby/object:Gem::Version
-  version: 1.2.3.alpha
+  version: 1.2.3
 platform: ruby
 authors:
 - Flashfunders
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -217,9 +217,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2