flash_flow 1.4.8 → 1.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab463512263ea658c6333055b40843e6bf750774
-  data.tar.gz: 8934a6e867ecb14a17bc94f055058adac0d546eb
+  metadata.gz: 2ff14ebe3a079bc64c495fbe66f528e08f6c9114
+  data.tar.gz: d50b3136f470ffc95cd2120c5b3db0035a4f81cd
 SHA512:
-  metadata.gz: bb3bd57682a03a359a4b984625e3f3ac24a13e938101aeb4a6ca5d0bf89cb2032cf682fdcf65803724d7462ac7ed0d3f044578020de28181eeda09d0df380ad6
-  data.tar.gz: dcb89112e10b385d05aa959474e4e71c1049633a3da291ffb15462a6c5a1abcf3cebf1ea1734bfc81065ed14012a82613f8c5a5dcf8202958ee332f4e573e354
+  metadata.gz: b28bf44030d7ce604b797b198f0c7b1bde4636e360a69da26494360c8096635ee7184dc35e66035c632caf8468a259b9b46cc4609e1deeea4377f3e8d57417b3
+  data.tar.gz: a6a37d3ff1fe2ec6bc41ce96ac82e48fa43c0406e3a145239853e3c5185b19f9dafa69f0f2d14961b3005e4cd0f48f00b4174ab4bcdf227edeca3b1e50da73a2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flash_flow (1.4.8)
+    flash_flow (1.4.9)
       hipchat (~> 1.5)
       mail
       octokit (~> 4.1)

data/flash_flow.yml.erb.example

@@ -94,7 +94,7 @@ branch_info_file: 'your/random/file'
 #smtp:
 #  settings:
 #    domain: 'yourdomain.com'
-#    address: <%= ENV['SMTP_ADDRESS'] %>
+#    address: <%= ENV['SMTP_HOST'] %>
 #    user_name: <%= ENV['SMTP_USERNAME'] %>
 #    password: <%= ENV['SMTP_PASSWORD'] %>
 #    port: 587

data/lib/flash_flow/git.rb

@@ -60,12 +60,12 @@ module FlashFlow
     end
 
     def branch_contains?(branch, ref)
-      run("branch --contains #{ref}", log: CmdRunner::LOG_CMD)
+      run("branch -a --contains #{ref}", log: CmdRunner::LOG_CMD)
       last_stdout.split("\n").detect { |str| str[2..-1] == branch }
     end
 
-    def master_branch_contains?(ref)
-      branch_contains?(master_branch, ref)
+    def master_branch_contains?(sha)
+      branch_contains?("remotes/#{remote}/#{master_branch}", sha)
     end
 
     def in_original_merge_branch
@@ -213,8 +213,12 @@ module FlashFlow
       "flash_flow/#{merge_branch}"
     end
 
-    def get_sha(branch)
-      run("rev-parse #{branch}")
+    def get_sha(branch, opts={})
+      if opts[:short]
+        run("rev-parse --short #{branch}")
+      else
+        run("rev-parse #{branch}")
+      end
       last_stdout.strip if last_success?
     end
 

data/lib/flash_flow/mailer.rb

@@ -12,8 +12,8 @@ module FlashFlow
         configure!(config['settings'])
       end
 
-      def deliver!(data={})
-        delivery_info = Config.configuration.smtp["emails"]
+      def deliver!(type, data={})
+        delivery_info = get_delivery_info(type)
 
         if delivery_info
           delivery_info["body_html"] = body_html(data, delivery_info["body_file"])
@@ -40,6 +40,10 @@ module FlashFlow
         erb_template.result(binding)
       end
 
+      def get_delivery_info(email_type)
+        Config.configuration.smtp.dig("emails", email_type.to_s)
+      end
+
     end
   end
 end

data/lib/flash_flow/merge/base.rb

@@ -77,7 +77,7 @@ module FlashFlow
 
       def release_ahead_of_master
         @git.branch_exists?("#{@git.remote}/#{@git.release_branch}") &&
-            !@git.branch_contains?(@git.master_branch, @git.get_sha("#{@git.remote}/#{@git.release_branch}"))
+            !@git.master_branch_contains?(@git.get_sha("#{@git.remote}/#{@git.release_branch}"))
       end
 
       def write_data(commit_msg)

data/lib/flash_flow/merge/master.rb

@@ -1,4 +1,5 @@
 require 'flash_flow/merge/base'
+require 'flash_flow/release'
 
 module FlashFlow
   module Merge
@@ -15,8 +16,10 @@ module FlashFlow
       def run
         begin
           check_version
-          puts "Merging #{@git.release_branch} into #{@git.master_branch}"
-          logger.info "\n\n### Beginning merge of #{@git.release_branch} into #{@git.master_branch} ###\n\n"
+          # puts "Merging #{@git.release_branch} into #{@git.master_branch}"
+          # logger.info "\n\n### Beginning merge of #{@git.release_branch} into #{@git.master_branch} ###\n\n"
+          puts "Checking #{@git.release_branch} QA approval"
+          logger.info "\n\n### Beginning check of #{@git.release_branch} QA ###\n\n"
 
           mergers, errors = [], []
 
@@ -26,33 +29,12 @@ module FlashFlow
               raise NothingToMergeError.new("There is no pending release.")
             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")
             end
 
-            @git.in_original_merge_branch do
-              @git.initialize_rerere
-            end
-
-            @git.in_branch(@git.master_branch) do
-              @git.run("reset --hard origin/master")
-              merge_branches([Data::Branch.new(@git.release_branch)]) do |branch, merger|
-                mergers << [branch, merger]
-              end
-            end
-
-            errors = mergers.select { |m| m.last.result != :success }
-
-            if errors.empty?
-              unless @git.push("#{@git.master_branch}:#{@git.master_branch}", true)
-                raise GitPushFailure.new("Unable to push to #{@git.master_branch}. See log for details.")
-              end
-
-              released_sha = @git.get_sha(@git.master_branch)
-
-              release['status'] = 'Success'
-              release['released_sha'] = released_sha
-
-              write_data('Release merged [ci skip]')
-            end
+            # errors = merge_master(release)
+            send_release_ready_email(release)
           end
 
           if errors.empty?
@@ -62,7 +44,7 @@ module FlashFlow
           end
 
           logger.info "### Finished merge of #{@git.release_branch} into #{@git.master_branch} ###"
-        rescue Lock::Error, OutOfSyncWithRemote, UnmergeableBranch, GitPushFailure, NothingToMergeError, VersionError => e
+        rescue Lock::Error, OutOfSyncWithRemote, UnmergeableBranch, GitPushFailure, NothingToMergeError, FlashFlow::Release::QAError, VersionError => e
           puts 'Failure!'
           puts e.message
         ensure
@@ -70,6 +52,57 @@ module FlashFlow
         end
       end
 
+      def merge_master(release)
+        @git.in_original_merge_branch do
+          @git.initialize_rerere
+        end
+
+        @git.in_branch(@git.master_branch) do
+          @git.run("reset --hard origin/master")
+          merge_branches([Data::Branch.new(@git.release_branch)]) do |branch, merger|
+            mergers << [branch, merger]
+          end
+        end
+
+        errors = mergers.select { |m| m.last.result != :success }
+
+        if errors.empty?
+          unless @git.push("#{@git.master_branch}:#{@git.master_branch}", true)
+            raise GitPushFailure.new("Unable to push to #{@git.master_branch}. See log for details.")
+          end
+
+          mark_release_success(release, @git.get_sha(@git.master_branch))
+        end
+
+        errors
+      end
+
+      def mark_release_success(release, sha)
+        release['status'] = 'Success'
+        release['released_sha'] = sha
+
+        write_data('Release merged [ci skip]')
+      end
+
+      def release_qa_approved?
+        release = FlashFlow::Release::Base.new(FlashFlow::Config.configuration.release)
+        release.qa_approved?(get_release_sha)
+      end
+
+      def send_release_ready_email(release)
+        begin
+          mailer = FlashFlow::Mailer::Base.new(Config.configuration.smtp)
+          mailer.deliver!(:release_ready, { approved_sha: get_release_sha(short: true) })
+          mark_release_success(release, get_release_sha)
+        rescue ArgumentError => e
+          raise FlashFlow::Release::QAError.new("Cannot send the email: #{e}")
+        end
+      end
+
+      def get_release_sha(opts={})
+        @get_release_sha ||= @git.get_sha("#{@git.remote}/#{@git.release_branch}", opts)
+      end
+
     end
   end
-end
+end

data/lib/flash_flow/merge/release.rb

@@ -10,6 +10,7 @@ module FlashFlow
       def initialize(opts={})
         super(opts)
 
+        @force = opts[:force]
         @release_branches = parse_branches(opts[:release_branches])
 
         @data = Data::Base.new({}, Config.configuration.branch_info_file, @git, logger: logger)
@@ -73,10 +74,6 @@ module FlashFlow
         end
       end
 
-      def branch_data
-
-      end
-
       def parse_branches(user_branches)
         branch_list = user_branches == ['ready'] ? shippable_branch_names : [user_branches].flatten.compact
 
@@ -86,8 +83,10 @@ module FlashFlow
       def check_branches
         raise NothingToMergeError.new("Nothing to merge") if @release_branches.empty?
 
-        requested_not_ready_branches = (@release_branches.map(&:ref) - shippable_branch_names)
-        raise RuntimeError.new("The following branches are not ready to ship:\n#{requested_not_ready_branches.join("\n")}") unless requested_not_ready_branches.empty?
+        unless @force
+          requested_not_ready_branches = (@release_branches.map(&:ref) - shippable_branch_names)
+          raise RuntimeError.new("The following branches are not ready to ship:\n#{requested_not_ready_branches.join("\n")}") unless requested_not_ready_branches.empty?
+        end
       end
 
       def shippable_branch_names

data/lib/flash_flow/release/pdf_diff_generator.rb

@@ -15,7 +15,6 @@ module FlashFlow
           set_dimensions(*pdf.bounds.top_right)
           generate_title_page(pdf)
           info.each do |comparison|
-            puts comparison.dig('head-screenshot', :url)
             add_comparison_to_pdf(pdf, comparison)
           end
           pdf.number_pages('<page> of <total>', { start_count_at: 1, align: :right, size: 12 })

data/lib/flash_flow/release/percy_client.rb

@@ -13,8 +13,6 @@ module FlashFlow
       end
 
       def find_latest_by_sha(sha)
-
-        require 'byebug'; debugger
         response = get_builds
         commit = find_commit_by_sha(response, sha)
         find_build_by_commit_id(response, commit['id'])
@@ -24,7 +22,7 @@ module FlashFlow
         build = find_latest_by_sha(get_latest_sha)
 
         if has_unapproved_diffs?(build)
-          mailer.deliver!(percy_build_url: build['web-url'])
+          mailer.deliver!(:compliance, { percy_build_url: build['web-url'] })
         end
       end
 
@@ -34,6 +32,11 @@ module FlashFlow
         PdfDiffGenerator.new.generate(get_comparisons(build_id), output_file, threshold)
       end
 
+      def qa_approved?(sha=nil)
+        build = find_latest_by_sha(sha || get_latest_sha)
+        !build['approved-at'].nil?
+      end
+
       private
 
       def get_build_id(sha=nil)
@@ -88,7 +91,7 @@ module FlashFlow
       end
 
       def get_latest_sha
-        @git.get_sha("#{@git.remote}/#{@git.release_branch}")
+        @git.get_sha(@git.release_branch)
       end
 
       def mailer

data/lib/flash_flow/release.rb

@@ -2,6 +2,8 @@ require 'flash_flow/release/percy_client'
 
 module FlashFlow
   module Release
+    class QAError < RuntimeError; end
+
     class Base
       def initialize(config=nil)
         release_class_name = config && config['class'] && config['class']['name']
@@ -20,7 +22,11 @@ module FlashFlow
       end
 
       def gen_pdf_diffs(output_file, threshold=0.0)
-        @release.gen_pdf_diffs(output_file, nil, threshold) if @release.respond_to?(:gen_pdf_diffs)
+        @release.gen_pdf_diffs(output_file, threshold) if @release.respond_to?(:gen_pdf_diffs)
+      end
+
+      def qa_approved?(sha)
+        @release.qa_approved?(sha) if @release.respond_to?(:qa_approved?)
       end
 
     end

data/lib/flash_flow/version.rb

@@ -1,3 +1,3 @@
 module FlashFlow
-  VERSION = '1.4.8'
+  VERSION = '1.4.9'
 end