flash_flow 1.4.10 → 1.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 952e4f7a486fdb5f394ff02c131bf51fac271d54
-  data.tar.gz: 4c7c524879fcf1902f899609b2e5fd2c53cb208c
+  metadata.gz: 1316f7c17ae74bb0938114c027c99eede522883d
+  data.tar.gz: cb94a7bd830e1c209e395eaea82bc45daaa9b891
 SHA512:
-  metadata.gz: 9303c67f43148c4bbaddf614a16d36bfe14f1f5ed7bad729c9f3916af849fa9a427ffc5159ba3927bdbc9d842530d310ca4e4349c5d3922f70b8a804cf4fa6d7
-  data.tar.gz: efa60f954abd042a8f714d4d3ee50f1cb5b3f50c401c16bcde11a62f34d9be79904567f9be9772e8c5165e067cedcd1501ea929603dc757c1bf96a1261dbaf2d
+  metadata.gz: 2109602b4fce98cba0d82b6b9a69975d5d0ee7cf6d0ed78e88fb4553b76a87216840c7cfd7270b4e666bceb436daff19db230d8c31d1b58b7a54869f19757778
+  data.tar.gz: 4d7d02dc133936e0134f4a014db56ece371d1723b2ee84249b8839f681e965e995f775917dbae76ce594f5daa43ca0a2756ae12c6585e585d241a375e601c40d

data/Gemfile.lock

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

data/lib/flash_flow/data/base.rb

@@ -76,6 +76,10 @@ module FlashFlow
       def saved_branches
         Collection.from_hash(stored_branches).to_a
       end
+
+      def pending_release
+        releases.detect { |r| r['status'] == 'Pending' }
+      end
     end
   end
 end

data/lib/flash_flow/git.rb

@@ -227,6 +227,10 @@ module FlashFlow
       last_success?
     end
 
+    def ahead_of_master?(branch)
+      branch_exists?(branch) && !master_branch_contains?(get_sha(branch))
+    end
+
     private
 
     def squash_commits(branch, commit_message)

data/lib/flash_flow/merge/base.rb

@@ -72,12 +72,11 @@ module FlashFlow
       end
 
       def pending_release
-        @data.releases.detect { |r| r['status'] == 'Pending' }
+        @data.pending_release
       end
 
-      def release_ahead_of_master
-        @git.branch_exists?("#{@git.remote}/#{@git.release_branch}") &&
-            !@git.master_branch_contains?(@git.get_sha("#{@git.remote}/#{@git.release_branch}"))
+      def release_ahead_of_master?
+        @git.ahead_of_master?("#{@git.remote}/#{@git.release_branch}")
       end
 
       def write_data(commit_msg)
@@ -97,4 +96,4 @@ module FlashFlow
 
     end
   end
-end
+end

data/lib/flash_flow/merge/master.rb

@@ -27,7 +27,7 @@ module FlashFlow
             release = pending_release
             if !release
               raise NothingToMergeError.new("There is no pending release.")
-            elsif !release_ahead_of_master
+            elsif !release_ahead_of_master?
               raise NothingToMergeError.new("The release branch '#{@git.release_branch}' has no commits that are not in master")
             elsif !release_qa_approved?
               raise FlashFlow::Release::QAError.new("The release build '#{get_release_sha(short: true)}' has not been approved for release")

data/lib/flash_flow/release.rb

@@ -1,16 +1,22 @@
+require 'flash_flow/data/base'
+require 'flash_flow/git'
 require 'flash_flow/release/percy_client'
 
 module FlashFlow
   module Release
-    class QAError < RuntimeError; end
+    class QAError < RuntimeError;
+    end
 
     class Base
       def initialize(config=nil)
         release_class_name = config && config['class'] && config['class']['name']
         return unless release_class_name
 
+        @git = ShadowGit.new(Config.configuration.git, Config.configuration.logger)
+        @data = Data::Base.new({}, Config.configuration.branch_info_file, @git, logger: logger)
+
         @release_class = Object.const_get(release_class_name)
-        @release = @release_class.new(config['class'])
+        @release = @release_class.new(config['class'].merge({ 'release_sha' => release_sha }))
       end
 
       def find_latest_by_sha(sha)
@@ -18,7 +24,7 @@ module FlashFlow
       end
 
       def send_compliance_email
-        @release.send_compliance_email if @release.respond_to?(:send_compliance_email)
+        @release.send_compliance_email if @release.respond_to?(:send_compliance_email) && pending_release?
       end
 
       def send_release_email
@@ -33,6 +39,17 @@ module FlashFlow
         @release.qa_approved?(sha) if @release.respond_to?(:qa_approved?)
       end
 
+      private
+
+      def pending_release?
+        pending_release = @data.pending_release
+        !pending_release.nil? && @git.ahead_of_master?("#{@git.remote}/#{@git.release_branch}")
+      end
+
+      def release_sha
+        @git.get_sha("#{@git.remote}/#{@git.release_branch}")
+      end
+
     end
   end
 end

data/lib/flash_flow/release/percy_client.rb

@@ -1,5 +1,4 @@
 require 'percy'
-require 'flash_flow/git'
 require 'flash_flow/mailer'
 require 'flash_flow/release/pdf_diff_generator'
 require 'flash_flow/google_drive'
@@ -10,8 +9,8 @@ module FlashFlow
 
       def initialize(config={})
         @client = initialize_connection!(config)
-        @git = ShadowGit.new(Config.configuration.git, Config.configuration.logger)
         @compliance_config = config['compliance']
+        @release_sha = config['release_sha']
       end
 
       def find_latest_by_sha(sha)
@@ -23,7 +22,7 @@ module FlashFlow
       def send_compliance_email
         max_wait_time = @compliance_config['max_wait_time'] || 0
         delay = @compliance_config['delay'] || 1
-        build = find_completed_build_by_sha(get_latest_sha, max_wait_time, delay)
+        build = find_completed_build_by_sha(@release_sha, max_wait_time, delay)
 
         unless build_approved?(build)
           gen_compliance_pdf_file(build)
@@ -31,7 +30,7 @@ module FlashFlow
       end
 
       def send_release_email
-        build = find_latest_by_sha(get_latest_sha)
+        build = find_latest_by_sha(@release_sha)
 
         unless build_approved?(build)
           mailer.deliver!(:compliance, { percy_build_url: build['web-url'] })
@@ -45,7 +44,7 @@ module FlashFlow
       end
 
       def qa_approved?(sha=nil)
-        build = find_latest_by_sha(sha || get_latest_sha)
+        build = find_latest_by_sha(sha || @release_sha)
         !build['approved-at'].nil?
       end
 
@@ -92,7 +91,7 @@ module FlashFlow
       end
 
       def get_build_id(sha=nil)
-        build = find_latest_by_sha(sha || get_latest_sha)
+        build = find_latest_by_sha(sha || @release_sha)
         extract_build_id(build)
       end
 
@@ -151,10 +150,6 @@ module FlashFlow
         build['state'] == 'finished';
       end
 
-      def get_latest_sha
-        @git.get_sha(@git.release_branch)
-      end
-
       def mailer
         @mailer ||= FlashFlow::Mailer::Base.new(Config.configuration.smtp)
       end

data/lib/flash_flow/version.rb

@@ -1,3 +1,3 @@
 module FlashFlow
-  VERSION = '1.4.10'
+  VERSION = '1.4.11'
 end

data/test/lib/release/test_percy_client.rb

@@ -12,7 +12,7 @@ module FlashFlow
         reset_config!
         config!(configuration)
 
-        @percy_client = Release::PercyClient.new({'token' => ''})
+        @percy_client = Release::PercyClient.new({'token' => '', 'release_sha' => 'bbbbb'})
       end
 
       def test_find_latest_by_sha
@@ -25,21 +25,15 @@ module FlashFlow
       end
 
       def test_send_release_email
-        @git = Minitest::Mock.new
-          .expect(:release_branch, 'release')
-          .expect(:get_sha, 'bbbbb', ['release'])
-
         @mailer = Minitest::Mock.new
         @mailer.expect(:deliver!, true, [:compliance, {percy_build_url: 'https://percy.io/repo/builds/1111'}])
 
-        @percy_client.instance_variable_set('@git'.to_sym, @git)
         @percy_client.instance_variable_set('@mailer'.to_sym, @mailer)
 
         @percy_client.stub(:get_builds, sample_response) do
           @percy_client.send_release_email
         end
 
-        @git.verify
         @mailer.verify
       end
 

metadata

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