flash_flow 1.4.7 → 1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15f833dbdf036b8b927f9aa237a16eeb7517dddd
-  data.tar.gz: 23a4cfc9d4c72be08b0d62033135761ad2b1b312
+  metadata.gz: ab463512263ea658c6333055b40843e6bf750774
+  data.tar.gz: 8934a6e867ecb14a17bc94f055058adac0d546eb
 SHA512:
-  metadata.gz: 7c13b101fa30de5b08f047f5f595505b183d0e93a2ec79ffdef3537d751d0aa0503552c18533c07a3b5b15c63ca1f35e7464192eaec2e5fd193b439d9e51b82e
-  data.tar.gz: 9eff4cf8331cb77cc4c29db326f08e793c8ce2db05d3e2f5aa3b09502cff9bbde14e16ddb963986bf5f4bfb6889c7ea8489cc74d86d74968ef8eee57cecad947
+  metadata.gz: bb3bd57682a03a359a4b984625e3f3ac24a13e938101aeb4a6ca5d0bf89cb2032cf682fdcf65803724d7462ac7ed0d3f044578020de28181eeda09d0df380ad6
+  data.tar.gz: dcb89112e10b385d05aa959474e4e71c1049633a3da291ffb15462a6c5a1abcf3cebf1ea1734bfc81065ed14012a82613f8c5a5dcf8202958ee332f4e573e354

data/Gemfile.lock

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

data/lib/flash_flow/git.rb

@@ -60,12 +60,12 @@ module FlashFlow
     end
 
     def branch_contains?(branch, ref)
-      run("branch -a --contains #{ref}", log: CmdRunner::LOG_CMD)
+      run("branch --contains #{ref}", log: CmdRunner::LOG_CMD)
       last_stdout.split("\n").detect { |str| str[2..-1] == branch }
     end
 
-    def master_branch_contains?(sha)
-      branch_contains?("remotes/#{remote}/#{master_branch}", sha)
+    def master_branch_contains?(ref)
+      branch_contains?(master_branch, ref)
     end
 
     def in_original_merge_branch

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.master_branch_contains?(@git.get_sha("#{@git.remote}/#{@git.release_branch}"))
+            !@git.branch_contains?(@git.master_branch, @git.get_sha("#{@git.remote}/#{@git.release_branch}"))
       end
 
       def write_data(commit_msg)

data/lib/flash_flow/release.rb

@@ -20,7 +20,7 @@ module FlashFlow
       end
 
       def gen_pdf_diffs(output_file, threshold=0.0)
-        @release.gen_pdf_diffs(output_file, threshold) if @release.respond_to?(:gen_pdf_diffs)
+        @release.gen_pdf_diffs(output_file, nil, threshold) if @release.respond_to?(:gen_pdf_diffs)
       end
 
     end

data/lib/flash_flow/release/pdf_diff_generator.rb

@@ -15,6 +15,7 @@ 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,6 +13,8 @@ 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'])
@@ -86,7 +88,7 @@ module FlashFlow
       end
 
       def get_latest_sha
-        @git.get_sha(@git.release_branch)
+        @git.get_sha("#{@git.remote}/#{@git.release_branch}")
       end
 
       def mailer

data/lib/flash_flow/version.rb

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

metadata

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