flash_flow 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6afda2b38eb992aadb2ce598dbc419e89df7c708
-  data.tar.gz: c1125d844a6d4716c1fe44773cc861e46a5d0a59
+  metadata.gz: bcac5f48c7e0f0cf6700988e91ac9dbaa949050b
+  data.tar.gz: d51fa3318c6841aefcbc0ef09787c4758e575bab
 SHA512:
-  metadata.gz: 229f2e6192a286d4e9994f52b4fab5950c40a23b857ea153b2216c4fbfe72bd7ad83fd070aa9b3ab0909cca44cdcef985cc8a1da862c79bd0fe1b0a0fd793536
-  data.tar.gz: d9b22f0e08dc78f509014e86c41178a5a9d89e06f1326da100ba586910d84d0d557e8614b8091b8a961b00ee0798f577be400e6950d84b952d5a1ba77cdb969e
+  metadata.gz: f415a2e12db0081979a922a26b319e42762bd5dad73e2bb383281234250c1001f0d73858b731caa85cf884b5617598a3708bd78e975ba9442ad33d1342d6714b
+  data.tar.gz: 749e4d8213f85e8a37ac3bbf35369b6ef2dc4579ed231cc47f19120670411952e8c3a180be2ab3f41fea30c441464d047b247180a2de00059f4648003a9113f5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flash_flow (1.5.0)
+    flash_flow (1.5.1)
       google-api-client
       hipchat (~> 1.5)
       mail

data/flash_flow.yml.erb.example

@@ -65,6 +65,7 @@ branch_info_file: 'your/random/file'
 #    token: <%= ENV['GH_TOKEN'] %>
 #    repo: # Your github repo. For example, the flash_flow repo is 'flashfunders/flash_flow'
 #    issue_id: # Your github issue id goes here
+#    lock_label: # optional - default value is 'IS_LOCKED'
 
 
 ## We use Github as our source of truth for which branches to merge. All open pull requests that don't

data/lib/flash_flow/lock/github.rb

@@ -15,15 +15,15 @@ module FlashFlow
       end
 
       def with_lock(&block)
-        if issue_open?
+        if issue_locked?
           raise Lock::Error.new(error_message)
         else
-          open_issue
+          lock_issue
 
           begin
             block.call
           ensure
-            close_issue
+            unlock_issue
           end
         end
       end
@@ -31,36 +31,29 @@ module FlashFlow
       private
 
       def error_message
-        last_event = get_last_event
-        actor = last_event[:actor][:login]
-        time = last_event[:created_at]
         issue_link = "https://github.com/#{repo}/issues/#{issue_id}"
-        minutes_ago = ((Time.now - time).to_i / 60) rescue 'unknown'
 
-        "#{actor} started running flash_flow #{minutes_ago} minutes ago. To manually unlock flash_flow, go here: #{issue_link} and close the issue and re-run flash_flow."
+        "flash_flow is running and locked by #{actor}. To manually unlock flash_flow, go here: #{issue_link} and remove the #{locked_label} label and re-run flash_flow."
       end
 
-      def get_last_event
-        Octokit.issue_events(repo, issue_id)
-        response = Octokit.last_response
-        pages = response.rels[:last]
-        if pages
-          return pages.get.data.last
-        else
-          response.data.last
-        end
+      def issue_locked?
+        get_lock_labels.detect {|label| label[:name] == locked_label}
       end
 
-      def issue_open?
-        get_last_event.event == 'reopened'
+      def lock_issue
+        Octokit.add_labels_to_an_issue(repo, issue_id, [actor, locked_label])
       end
 
-      def open_issue
-        Octokit.reopen_issue(repo, issue_id)
+      def unlock_issue
+        Octokit.remove_all_labels(repo, issue_id)
       end
 
-      def close_issue
-        Octokit.close_issue(repo, issue_id)
+      def get_lock_labels
+        begin
+          Octokit.labels_for_issue(repo, issue_id)
+        rescue Octokit::NotFound
+          []
+        end
       end
 
       def verify_params!
@@ -86,6 +79,14 @@ module FlashFlow
       def issue_id
         config['issue_id']
       end
+
+      def locked_label
+        config['lock_label'] || 'IS_LOCKED'
+      end
+
+      def actor
+        @user_login ||= Octokit.user.login
+      end
     end
   end
-end
+end

data/lib/flash_flow/merge/release.rb

@@ -14,6 +14,8 @@ module FlashFlow
         @release_branches = parse_branches(opts[:release_branches])
 
         @data = Data::Base.new({}, Config.configuration.branch_info_file, @git, logger: logger)
+
+        @release_branches.each {|b| b.merge_order = @data.collection.get(b.ref).merge_order }
       end
 
       def run

data/lib/flash_flow/version.rb

@@ -1,3 +1,3 @@
 module FlashFlow
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
 end

data/test/lib/lock/test_github.rb

@@ -22,22 +22,24 @@ module FlashFlow
         assert_raises(Lock::Error) { Lock::Github.new(config) }
       end
 
-      def test_error_message_when_issue_opened
-        @lock.stub(:issue_open?, true) do
-          @lock.stub(:get_last_event, {actor: {login: 'anonymous'}, created_at: Time.now}) do
-            assert_raises(FlashFlow::Lock::Error) do
-              @lock.with_lock
+      def test_error_message_when_issue_locked
+        @lock.stub(:actor, 'actor') do
+          @lock.stub(:issue_locked?, true) do
+            @lock.stub(:get_lock_labels, {name: @lock.send(:locked_label)}) do
+              assert_raises(FlashFlow::Lock::Error) do
+                @lock.with_lock
+              end
             end
           end
         end
       end
 
       def test_with_lock_calls_the_block
-        my_mock = Minitest::Mock.new.expect(:block_call, true).expect(:close_issue, true)
+        my_mock = Minitest::Mock.new.expect(:block_call, true).expect(:unlock_issue, true)
 
-        @lock.stub(:issue_open?, false) do
-          @lock.stub(:open_issue, nil) do
-            @lock.stub(:close_issue, -> { my_mock.close_issue }) do
+        @lock.stub(:issue_locked?, false) do
+          @lock.stub(:lock_issue, nil) do
+            @lock.stub(:unlock_issue, -> { my_mock.unlock_issue }) do
               @lock.with_lock { my_mock.block_call }
               my_mock.verify
             end
@@ -45,12 +47,14 @@ module FlashFlow
         end
       end
 
-      def test_with_lock_closes_issue_no_matter_what
-        my_mock = Minitest::Mock.new.expect(:some_method, true)
+      def test_with_unlock_issue_no_matter_what
+        my_mock = Minitest::Mock.new
+          .expect(:some_method, true)
+          .expect(:actor, 'actor')
 
-        @lock.stub(:issue_open?, false) do
-          @lock.stub(:open_issue, nil) do
-            @lock.stub(:close_issue, -> { my_mock.some_method }) do
+        @lock.stub(:issue_locked?, false) do
+          @lock.stub(:lock_issue, nil) do
+            @lock.stub(:unlock_issue, -> { my_mock.some_method }) do
               assert_raises(SomeFakeError) do
                 @lock.with_lock { raise SomeFakeError }
                 my_mock.verify

metadata

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