flash_flow 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8006bd8e5430d1b82498e75a5ee3d0990804d19f
-  data.tar.gz: 168531a6539335bf8a5b5bc8bf00e3097ca1c134
+  metadata.gz: fe6bb7d56503c667baeff6630b04a356c2c1959e
+  data.tar.gz: cfb7c8792b7556c2bf54e4e47c8fd28d19af9aef
 SHA512:
-  metadata.gz: c3349383a3fe10ef4924c2c99273922408572b18ec2169b853a630f19649d43ef0ecdfd5ac3150901c7c241c1b923f180d1775aef61d6bd3336da1a29620a93c
-  data.tar.gz: 8630a2e23c234677f2379d90376bac227099f0c9cddde3c72a4f4f50f3c74ab33275a2496c6d1d2844d399f14a090100ab003075a0f24f5948446604b5e4aee5
+  metadata.gz: dbfe4f236e252efbc73a80607302945aeea1043a41de8fe35eecc10ceae14ec3933d6b6068067753a3f4c9d0b81083a4aac8fc90d885182a71073641c1f8b943
+  data.tar.gz: 116c96cfea5b0977a52250740e3dafc27e576952b4926ccda14976dbee1c90d700a0e59f89ff08ab3c3ec4f6653af0312f49ae0aa959a8d98f6f90cbf09021de

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flash_flow (1.0.0)
+    flash_flow (1.1.1)
       hipchat
       octokit
       pivotal-tracker

data/bin/flash_flow

@@ -18,9 +18,9 @@ case
   when options[:release_notes]
     FlashFlow::IssueTracker::Base.new(FlashFlow::Config.configuration.issue_tracker).release_notes(options[:release_notes])
   when options[:resolve]
-    FlashFlow::Resolve.new(Config.configuration.git, Config.configuration.branch_info_file, logger: Config.configuration.logger).start
+    FlashFlow::Resolve.new(FlashFlow::Config.configuration.git, FlashFlow::Config.configuration.branch_info_file, logger: FlashFlow::Config.configuration.logger).start
   when options[:resolve_manual]
-    FlashFlow::Resolve.new(Config.configuration.git, Config.configuration.branch_info_file, logger: Config.configuration.logger).manual_instructions
+    FlashFlow::Resolve.new(FlashFlow::Config.configuration.git, FlashFlow::Config.configuration.branch_info_file, logger: FlashFlow::Config.configuration.logger).manual_instructions
   else
     FlashFlow::Deploy.new(options).run
     FlashFlow::IssueTracker::Base.new(FlashFlow::Config.configuration.issue_tracker).stories_pushed

data/lib/flash_flow/data/branch.rb

@@ -4,7 +4,7 @@ module FlashFlow
   module Data
 
     class Branch
-      attr_accessor :remote, :remote_url, :ref, :sha, :status, :resolutions, :stories, :metadata, :updated_at, :created_at
+      attr_accessor :remote, :remote_url, :ref, :sha, :status, :resolutions, :stories, :conflict_sha, :metadata, :updated_at, :created_at
 
       def initialize(_remote, _remote_url, _ref)
         @remote = _remote
@@ -23,6 +23,7 @@ module FlashFlow
         branch.resolutions = hash['resolutions']
         branch.stories = hash['stories']
         branch.metadata = hash['metadata']
+        branch.conflict_sha = hash['conflict_sha'] || hash['metadata'].to_h['conflict_sha']
         branch.updated_at = massage_time(hash['updated_at'])
         branch.created_at = massage_time(hash['created_at'])
         branch
@@ -52,6 +53,7 @@ module FlashFlow
             'status' => status,
             'resolutions' => resolutions,
             'stories' => stories,
+            'conflict_sha' => conflict_sha,
             'metadata' => metadata,
             'updated_at' => updated_at,
             'created_at' => created_at,
@@ -94,7 +96,7 @@ module FlashFlow
       end
 
       def fail!(conflict_sha=nil)
-        add_metadata('conflict_sha' => conflict_sha) if conflict_sha
+        self.conflict_sha = conflict_sha
         self.status = 'fail'
       end
 

data/lib/flash_flow/data/collection.rb

@@ -64,6 +64,9 @@ module FlashFlow
             branch.created_at = info.created_at
             branch.resolutions = branch.resolutions.to_h.merge(info.resolutions.to_h)
             branch.stories = info.stories.to_a | merged_branches[full_ref].stories.to_a
+            if branch.fail?
+              branch.conflict_sha ||= info.conflict_sha
+            end
           else
             merged_branches[full_ref] = info
             merged_branches[full_ref].status = nil

data/lib/flash_flow/deploy.rb

@@ -132,8 +132,12 @@ module FlashFlow
           @data.set_resolutions(branch, merger.resolutions)
 
         when :conflict
-          @data.mark_failure(branch, merger.conflict_sha)
-          @notifier.merge_conflict(branch) unless is_working_branch
+          if is_working_branch
+            @data.mark_failure(branch, merger.conflict_sha)
+          else
+            @data.mark_failure(branch, nil)
+            @notifier.merge_conflict(branch)
+          end
       end
     end
 

data/lib/flash_flow/resolve.rb

@@ -49,7 +49,7 @@ module FlashFlow
     end
 
     def merge_conflicted
-      @git.run("checkout #{branch.metadata['conflict_sha']}")
+      @git.run("checkout #{branch.conflict_sha}")
       @git.run("merge origin/#{working_branch}")
     end
 
@@ -66,6 +66,8 @@ module FlashFlow
     end
 
     def launch_bash
+      bash_message
+
       with_init_file do |file|
         system("bash --init-file #{file} -i")
       end
@@ -87,7 +89,7 @@ module FlashFlow
 
 Run the following commands to fix the merge conflict and then re-run flash_flow:
   pushd #{flash_flow_directory}
-  git checkout #{branch.metadata['conflict_sha']}
+  git checkout #{branch.conflict_sha}
   git merge #{working_branch}
   # Resolve the conflicts
   git add <conflicted files>
@@ -103,7 +105,7 @@ Run the following commands to fix the merge conflict and then re-run flash_flow:
       return @data if @data
 
       in_shadow_repo do
-        @data = Data::Base.new({}, @branch_info_file, @git, logger: logger)
+        @data = Data::Base.new({}, @branch_info_file, @git, logger: @logger)
       end
 
       @data
@@ -152,7 +154,7 @@ Run the following commands to fix the merge conflict and then re-run flash_flow:
     end
 
     def check_for_conflict
-      raise NothingToResolve.new("The current branch (#{working_branch}) does not appear to be in conflict.") unless branch.metadata['conflict_sha']
+      raise NothingToResolve.new("The current branch (#{working_branch}) does not appear to be in conflict.") unless branch.conflict_sha
     end
   end
 end

data/lib/flash_flow/version.rb

@@ -1,3 +1,3 @@
 module FlashFlow
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/test/lib/data/test_branch.rb

@@ -80,6 +80,19 @@ module FlashFlow
         assert_equal(branch.metadata, branch_hash['metadata'])
       end
 
+      def test_from_hash_conflict_sha
+        branch = Branch.from_hash(branch_hash)
+        assert_equal(branch.conflict_sha, 'conflict_sha')
+
+        hash = branch_hash.merge({ 'conflict_sha' => nil, 'metadata' => { 'conflict_sha' => 'another_sha' } })
+        branch = Branch.from_hash(hash)
+        assert_equal(branch.conflict_sha, 'another_sha')
+
+        hash = branch_hash.merge({ 'conflict_sha' => nil})
+        branch = Branch.from_hash(hash)
+        assert_equal(branch.conflict_sha, nil)
+      end
+
       def test_from_hash_with_time_objects
         branch_hash['updated_at'] = Time.now - 200
         branch_hash['created_at'] = Time.now - 200
@@ -191,6 +204,7 @@ module FlashFlow
             'status' => 'success',
             'resolutions' => {},
             'stories' => ['123'],
+            'conflict_sha' => 'conflict_sha',
             'metadata' => {
                 'some' => 'data'
             },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flash_flow
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Flashfunders
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit