flash_flow 1.4.2 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82f7cd93c4e7ee082a902f0742453e7e7b187743
-  data.tar.gz: 5e472f2e130e8e7cac9d41b4cedd930eab6a8a9a
+  metadata.gz: 850c7954c81a98af1fd93586fa26480206f77e1b
+  data.tar.gz: 84c7d961f340a47df35b7815ef8aa28b476dd044
 SHA512:
-  metadata.gz: ec4fd9f3d07dfb14032ff017c959bcde30d050d5a2910127d03a55869966f251e29ff7f115238ae805a8882450a3dcb1517cfca0aa7a09360985f8ed0f633fb4
-  data.tar.gz: 2b1dfbdeff424442bb95d6538c00e56f681b591711b3e09df034f1260f80bf57943eb77fe2fcec5637902d93865f61eff5d0c3ebb077202174f1cd21208ea28c
+  metadata.gz: 3152a86788e0a3a1ced7ce324b53de41c7675f16db7fb7c0c234be495240794e18e5e06363791082f08eb8fee9ef408bd8ad9ded1e90dcc5621f4876a6bfd00c
+  data.tar.gz: a24836c67acb42b3125694d48b063516393f08c83ba390ae4fef7d7d75929ff589ed4796a4ed89112a01ef1185f0254ab72b4e3365c7e68de6fe8d521b7d5637

data/Gemfile.lock

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

data/lib/flash_flow/data/base.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'flash_flow/time_helper'
 require 'flash_flow/version'
 require 'flash_flow/data/branch'
 require 'flash_flow/data/collection'
@@ -28,13 +29,16 @@ module FlashFlow
           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)
+          collection = collection.reverse_merge(stored_collection)
 
         else
           collection = stored_collection
           collection.mark_all_as_current
-          collection
         end
+
+        collection.branches.delete_if { |k, v|  TimeHelper.massage_time(v.updated_at) < Time.now - TimeHelper.two_weeks  }
+
+        collection
       end
 
       def version

data/lib/flash_flow/data/branch.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'flash_flow/time_helper'
 
 module FlashFlow
   module Data
@@ -25,22 +26,11 @@ module FlashFlow
         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.updated_at = TimeHelper.massage_time(hash['updated_at'])
+        branch.created_at = TimeHelper.massage_time(hash['created_at'])
         branch
       end
 
-      def self.massage_time(time)
-        case time
-          when Time
-            time
-          when NilClass
-            Time.now
-          else
-            Time.parse(time)
-        end
-      end
-
       def ==(other)
         other.ref == ref
       end

data/lib/flash_flow/issue_tracker/pivotal.rb

@@ -1,11 +1,9 @@
 require 'pivotal-tracker'
-require 'time'
 require 'flash_flow/time_helper'
 
 module FlashFlow
   module IssueTracker
     class Pivotal
-      include TimeHelper
 
       def initialize(branches, git, opts={})
         @branches = branches
@@ -125,7 +123,7 @@ module FlashFlow
         story = get_story(story_id)
         if story
           unless has_shipped_text?(story)
-            story.notes.create(:text => with_time_zone(@timezone) { Time.now.strftime(note_time_format) })
+            story.notes.create(:text => TimeHelper.with_time_zone(@timezone) { Time.now.strftime(note_time_format) })
           end
         end
       end

data/lib/flash_flow/merge/acceptance.rb

@@ -1,4 +1,5 @@
 require 'flash_flow/merge/base'
+require 'flash_flow/time_helper'
 
 module FlashFlow
   module Merge
@@ -61,16 +62,12 @@ module FlashFlow
       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_branches = @data.to_a.select { |branch| !@git.master_branch_contains?(branch.sha) && (Time.now - branch.updated_at < TimeHelper.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/lib/flash_flow/resolve.rb

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

data/lib/flash_flow/time_helper.rb

@@ -1,5 +1,8 @@
+require 'time'
+
 module FlashFlow
   module TimeHelper
+
     def with_time_zone(tz_name)
       prev_tz = ENV['TZ']
       ENV['TZ'] = tz_name
@@ -7,5 +10,23 @@ module FlashFlow
     ensure
       ENV['TZ'] = prev_tz
     end
+
+    def massage_time(time)
+      case time
+        when Time
+          time
+        when NilClass
+          Time.now
+        else
+          Time.parse(time)
+      end
+    end
+
+    def two_weeks
+      60 * 60 * 24 * 14
+    end
+
+    module_function :with_time_zone, :massage_time, :two_weeks
+
   end
 end

data/lib/flash_flow/version.rb

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

metadata

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