flash_flow 1.4.13 → 1.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9668bebe0723a492e320111ab89f3d46f15ddb1
-  data.tar.gz: 14505cce79f449ed28992b66acfa45f63f25cd17
+  metadata.gz: 66d16b9e43df289304d066479e3a46b650f0f9e5
+  data.tar.gz: e30417e519a29160954eada65ff131ddc342f059
 SHA512:
-  metadata.gz: fb2404b4d297947afcda81d1e8da2fb7fc3ec01698cca67bdeef94409c5e570a68ce98979df5b59915c23060d067c646e77d90ee574b689c10ea13781890347a
-  data.tar.gz: b93e838c8db3ded79fd694562eb8ea716e25559a3c311694088274021c8429131094c0f77d717087c8b6affa122a3f9faf5d08a55836ad4ab45b103c86c6c402
+  metadata.gz: 61e991d545bf08e34cabc752d95502dbe607edcac1979baba3d8c827b78062862d5d97153c1089a6573bd8484fdda727da9e5e4e7c85213ee91a418414d7d515
+  data.tar.gz: cb351083d67e184c6829f671e05ac4ee0df92c486e751cf582f349739ee96943ba4556a2a27485f7529188b8781112e402e53c52acb6d42b422e95877839bd36

data/Gemfile.lock

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

data/bin/flash_flow

@@ -34,6 +34,8 @@ case
     FlashFlow::Merge::Release.new(options).run
   when options[:gen_pdf_diffs]
     FlashFlow::Release::Base.new(FlashFlow::Config.configuration.release).gen_pdf_diffs(*options[:gen_pdf_diffs])
+  when options[:merge_release_email]
+    FlashFlow::Merge::Master.new(options).send_mail
   when options[:merge_release]
     FlashFlow::Merge::Master.new(options).run
   when options[:notify_compliance]

data/lib/flash_flow/data/base.rb

@@ -80,6 +80,10 @@ module FlashFlow
       def pending_release
         releases.detect { |r| r['status'] == 'Pending' }
       end
+
+      def ready_to_merge_release
+        releases.detect { |r| r['status'] == 'Ready to merge' }
+      end
     end
   end
 end

data/lib/flash_flow/merge/base.rb

@@ -75,6 +75,10 @@ module FlashFlow
         @data.pending_release
       end
 
+      def ready_to_merge_release
+        @data.ready_to_merge_release
+      end
+
       def release_ahead_of_master?
         @git.ahead_of_master?("#{@git.remote}/#{@git.release_branch}")
       end

data/lib/flash_flow/merge/master.rb

@@ -13,28 +13,39 @@ module FlashFlow
         @data = Data::Base.new({}, Config.configuration.branch_info_file, @git, logger: logger)
       end
 
+      def send_mail
+        check_version
+        puts "Checking #{@git.release_branch} QA approval"
+        logger.info "\n\n### Beginning check of #{@git.release_branch} QA ###\n\n"
+
+        @lock.with_lock do
+          release = pending_release
+          ready!(release)
+
+          send_release_ready_email(release)
+        end
+
+        logger.info "### Sent release email ###"
+      rescue Lock::Error, NothingToMergeError, FlashFlow::Release::QAError, VersionError => e
+        puts 'Failure!'
+        puts e.message
+      ensure
+        @local_git.run("checkout #{@local_git.working_branch}")
+      end
+
       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 "Checking #{@git.release_branch} QA approval"
-          logger.info "\n\n### Beginning check of #{@git.release_branch} QA ###\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"
 
-          mergers, errors = [], []
+          errors = []
 
           @lock.with_lock do
-            release = pending_release
-            if !release
-              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
-
-            # errors = merge_master(release)
-            send_release_ready_email(release)
+            release = pending_release || ready_to_merge_release
+            ready!(release)
+
+            errors = merge_master(release)
           end
 
           if errors.empty?
@@ -57,6 +68,8 @@ module FlashFlow
           @git.initialize_rerere
         end
 
+        mergers = []
+
         @git.in_branch(@git.master_branch) do
           @git.run("reset --hard origin/master")
           merge_branches([Data::Branch.new(@git.release_branch)]) do |branch, merger|
@@ -71,17 +84,22 @@ module FlashFlow
             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))
+          release['status'] = 'Success'
+          release['released_sha'] = @git.get_sha("#{@git.remote}/#{@git.master_branch}")
+          write_data('Release info updated [ci skip]')
         end
 
         errors
       end
 
-      def mark_release_success(release, sha)
-        release['status'] = 'Success'
-        release['released_sha'] = sha
-
-        write_data('Release merged [ci skip]')
+      def ready!(release)
+        if !release
+          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
       end
 
       def release_qa_approved?
@@ -93,7 +111,9 @@ module FlashFlow
         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)
+
+          release['status'] = 'Ready to merge'
+          write_data('Release info updated [ci skip]')
         rescue ArgumentError => e
           raise FlashFlow::Release::QAError.new("Cannot send the email: #{e}")
         end

data/lib/flash_flow/options.rb

@@ -26,6 +26,7 @@ module FlashFlow
         opts.on('--merge-status-html', 'Show status of all branches and their stories in html format and exit') { |v| options[:merge_status_html] = true }
         opts.on('--make-release branch1,branch2', 'Comma-delimited list of branches to merge to the release branch. Run "--merge-release ready" to merge all ready to ship branches') { |v| options[:release_branches] = v.split(',') }
         opts.on('--gen-pdf-diffs output_file,build_id,threshold', 'Generate a pdf file with screenshot differences for the specified (latest) build. output_file is required. build_id defaults to the latest build. threshold defaults to 0') { |v| options[:gen_pdf_diffs] = v.split(',') }
+        opts.on('--merge-release-email', 'Send an email if the release is ready to be merged to master') { |v| options[:merge_release_email] = true }
         opts.on('--merge-release', 'Merge the release branch into the master branch and push') { |v| options[:merge_release] = true }
         opts.on('--notify-compliance', 'Send the compliance notification email if everything is ready') { |v| options[:notify_compliance] = true }
 

data/lib/flash_flow/version.rb

@@ -1,3 +1,3 @@
 module FlashFlow
-  VERSION = '1.4.13'
+  VERSION = '1.4.14'
 end

metadata

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