flash_flow 1.4.9 → 1.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ff14ebe3a079bc64c495fbe66f528e08f6c9114
-  data.tar.gz: d50b3136f470ffc95cd2120c5b3db0035a4f81cd
+  metadata.gz: 952e4f7a486fdb5f394ff02c131bf51fac271d54
+  data.tar.gz: 4c7c524879fcf1902f899609b2e5fd2c53cb208c
 SHA512:
-  metadata.gz: b28bf44030d7ce604b797b198f0c7b1bde4636e360a69da26494360c8096635ee7184dc35e66035c632caf8468a259b9b46cc4609e1deeea4377f3e8d57417b3
-  data.tar.gz: a6a37d3ff1fe2ec6bc41ce96ac82e48fa43c0406e3a145239853e3c5185b19f9dafa69f0f2d14961b3005e4cd0f48f00b4174ab4bcdf227edeca3b1e50da73a2
+  metadata.gz: 9303c67f43148c4bbaddf614a16d36bfe14f1f5ed7bad729c9f3916af849fa9a427ffc5159ba3927bdbc9d842530d310ca4e4349c5d3922f70b8a804cf4fa6d7
+  data.tar.gz: efa60f954abd042a8f714d4d3ee50f1cb5b3f50c401c16bcde11a62f34d9be79904567f9be9772e8c5165e067cedcd1501ea929603dc757c1bf96a1261dbaf2d

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    flash_flow (1.4.9)
+    flash_flow (1.4.10)
+      google-api-client
       hipchat (~> 1.5)
       mail
       octokit (~> 4.1)
@@ -27,6 +28,24 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
+    google-api-client (0.9.12)
+      addressable (~> 2.3)
+      googleauth (~> 0.5)
+      httpclient (~> 2.7)
+      hurley (~> 0.1)
+      memoist (~> 0.11)
+      mime-types (>= 1.6)
+      representable (~> 2.3.0)
+      retriable (~> 2.0)
+      thor (~> 0.19)
+    googleauth (0.5.1)
+      faraday (~> 0.9)
+      jwt (~> 1.4)
+      logging (~> 2.0)
+      memoist (~> 0.12)
+      multi_json (~> 1.11)
+      os (~> 0.9)
+      signet (~> 0.7)
     hipchat (1.5.3)
       httparty
       mimemagic
@@ -34,9 +53,16 @@ GEM
       domain_name (~> 0.5)
     httparty (0.14.0)
       multi_xml (>= 0.5.2)
-    httpclient (2.8.2)
+    httpclient (2.8.2.2)
+    hurley (0.2)
+    jwt (1.5.4)
+    little-plugger (1.1.4)
+    logging (2.1.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
+    memoist (0.14.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
@@ -44,6 +70,7 @@ GEM
     mini_portile2 (2.1.0)
     minitest (5.3.5)
     minitest-stub_any_instance (1.0.1)
+    multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     netrc (0.11.0)
@@ -54,6 +81,7 @@ GEM
       nokogiri (~> 1.5)
     octokit (4.3.0)
       sawyer (~> 0.7.0, >= 0.5.3)
+    os (0.9.6)
     pdf-core (0.6.1)
     percy-client (1.6.0)
       faraday (>= 0.9)
@@ -69,17 +97,27 @@ GEM
       pdf-core (~> 0.6.1)
       ttfunk (~> 1.4.0)
     rake (10.4.2)
+    representable (2.3.0)
+      uber (~> 0.0.7)
     rest-client (2.0.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
+    retriable (2.1.0)
     ruby-graphviz (1.2.2)
     safe_yaml (1.0.4)
     sawyer (0.7.0)
       addressable (>= 2.3.5, < 2.5)
       faraday (~> 0.8, < 0.10)
+    signet (0.7.3)
+      addressable (~> 2.3)
+      faraday (~> 0.9)
+      jwt (~> 1.5)
+      multi_json (~> 1.10)
     slop (3.6.0)
+    thor (0.19.1)
     ttfunk (1.4.0)
+    uber (0.0.15)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)

data/bin/flash_flow

@@ -36,6 +36,8 @@ case
     FlashFlow::Release::Base.new(FlashFlow::Config.configuration.release).gen_pdf_diffs(*options[:gen_pdf_diffs])
   when options[:merge_release]
     FlashFlow::Merge::Master.new(options).run
+  when options[:notify_compliance]
+    FlashFlow::Release::Base.new(FlashFlow::Config.configuration.release).send_compliance_email
   else
     FlashFlow::Merge::Acceptance.new(options).run
     FlashFlow::IssueTracker::Base.new(FlashFlow::Config.configuration.issue_tracker).stories_pushed

data/flash_flow.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'percy-client'
   spec.add_dependency 'mail'
   spec.add_dependency 'prawn'
+  spec.add_dependency 'google-api-client'
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "> 0"

data/flash_flow.yml.erb.example

@@ -89,8 +89,20 @@ branch_info_file: 'your/random/file'
 #    token: <%= ENV['PERCY_TOKEN'] %>
 #    repo: # Your github repo. For example, the flash_flow repo is 'flashfunders/flash_flow'
 #    api_url: 'https://percy.io/api/v1/'
-#    email: 'foo@bar.com'
-#    cc_email: 'bar@foo.com'
+#    compliance:
+#      max_wait_time: minutes to wait
+#      delay: minutes between checks
+#      file_prefix: 'Release_Candidate_'
+#      permissions:
+#        group:
+#          reader: comma-delimited list of emails
+#          writer: comma-delimited list of emails
+#        user:
+#          reader: comma-delimited list of emails
+#          writer: comma-delimited list of emails
+#      notify: true
+#      message: 'string for the message body. %percy_url% will be replaced with the url to the percy build'
+
 #smtp:
 #  settings:
 #    domain: 'yourdomain.com'
@@ -101,8 +113,9 @@ branch_info_file: 'your/random/file'
 #    authentication: 'plain'
 #    enable_starttls_auto: true
 #  emails:
-#    from: 'sender@domain.com'
-#    to: 'receiver@domain.com'
-#    cc: 'cc@domain.com'
-#    subject: 'The engineering team has a new release candidate'
-#    body_file: 'path/to/email_template.erb'
+#    release_ready:
+#      from: 'sender@domain.com'
+#      to: 'receiver@domain.com'
+#      cc: 'cc@domain.com'
+#      subject: 'The engineering team has a new release candidate'
+#      body_file: 'path/to/email_template.erb'

data/lib/flash_flow/google_drive.rb

@@ -0,0 +1,43 @@
+require 'google/api_client/client_secrets'
+require 'google/apis/drive_v3'
+
+module FlashFlow
+  module Release
+    class GoogleDrive
+
+      attr_reader :client
+
+      DRIVE = Google::Apis::DriveV3
+
+      def initialize
+        scopes = [DRIVE::AUTH_DRIVE]
+        @client = DRIVE::DriveService.new
+        @client.authorization = Google::Auth.get_application_default(scopes)
+      end
+
+      def upload_file(local_file, config={})
+        metadata = DRIVE::File.new(name: File.basename(local_file), extension: 'pdf')
+        metadata = @client.create_file(metadata, upload_source: local_file, content_type: 'application/pdf')
+        set_file_permissions(metadata.id, config)
+      end
+
+      def find_files(query)
+        response = @client.list_files(q: query)
+        response.files
+      end
+
+      def set_file_permissions(file_id, config={})
+        @client.batch do
+          %w(group user).each do |type|
+            %w(reader writer).each do |role| # owner is currently not supported
+              config.dig('permissions', type, role).to_s.split(',').each do |email|
+                permission = DRIVE::Permission.new(role: role, type: type, email_address: email)
+                @client.create_permission(file_id, permission, email_message: config[:email_body], send_notification_email: config['notify'])
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/flash_flow/options.rb

@@ -27,6 +27,7 @@ module FlashFlow
         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', '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 }
 
         opts.on_tail('-h', '--help', 'Show this message') do
           puts opts

data/lib/flash_flow/release.rb

@@ -17,6 +17,10 @@ module FlashFlow
         @release.find_latest_by_sha(sha) if @release.respond_to?(:find_latest_by_sha)
       end
 
+      def send_compliance_email
+        @release.send_compliance_email if @release.respond_to?(:send_compliance_email)
+      end
+
       def send_release_email
         @release.send_release_email if @release.respond_to?(:send_release_email)
       end

data/lib/flash_flow/release/percy_client.rb

@@ -2,6 +2,7 @@ require 'percy'
 require 'flash_flow/git'
 require 'flash_flow/mailer'
 require 'flash_flow/release/pdf_diff_generator'
+require 'flash_flow/google_drive'
 
 module FlashFlow
   module Release
@@ -10,6 +11,7 @@ module FlashFlow
       def initialize(config={})
         @client = initialize_connection!(config)
         @git = ShadowGit.new(Config.configuration.git, Config.configuration.logger)
+        @compliance_config = config['compliance']
       end
 
       def find_latest_by_sha(sha)
@@ -18,10 +20,20 @@ module FlashFlow
         find_build_by_commit_id(response, commit['id'])
       end
 
+      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)
+
+        unless build_approved?(build)
+          gen_compliance_pdf_file(build)
+        end
+      end
+
       def send_release_email
         build = find_latest_by_sha(get_latest_sha)
 
-        if has_unapproved_diffs?(build)
+        unless build_approved?(build)
           mailer.deliver!(:compliance, { percy_build_url: build['web-url'] })
         end
       end
@@ -39,8 +51,52 @@ module FlashFlow
 
       private
 
+      def find_completed_build_by_sha(sha, max_wait_time=5, delay=1)
+        max_wait_time *= 60
+        delay *= 60
+        build = find_latest_by_sha(sha)
+        start_time = Time.now
+
+        until build_completed?(build) do
+          return nil if Time.now - start_time >= max_wait_time
+          putc '#'
+          sleep delay
+          build = find_latest_by_sha(sha)
+        end
+        build
+      end
+
+      def gen_compliance_pdf_file(build)
+        build_id = extract_build_id(build)
+        base_file_name = gen_compliance_file_name(build_id)
+        drive = GoogleDrive.new
+        existing_files = drive.find_files("name contains '#{File.basename(base_file_name)}' and mimeType = 'application/pdf'")
+
+        if existing_files.empty?
+          file_name = "#{base_file_name}_#{Time.now.strftime('%Y%m%dT%H%M')}.pdf"
+          gen_pdf_diffs(file_name, build_id)
+
+          puts "Uploading #{file_name} to Google Drive"
+          drive.upload_file(file_name, @compliance_config.merge({ email_body: compose_compliance_email_body(build) }))
+        else
+          puts "This build has already been processed: #{existing_files.first.name}."
+        end
+      end
+
+      def gen_compliance_file_name(build_id)
+        "/tmp/#{@compliance_config['file_prefix']}#{build_id}"
+      end
+
+      def compose_compliance_email_body(build)
+        @compliance_config['message'].sub('%percy_url%', build['web-url'])
+      end
+
       def get_build_id(sha=nil)
         build = find_latest_by_sha(sha || get_latest_sha)
+        extract_build_id(build)
+      end
+
+      def extract_build_id(build)
         build['web-url'].split('/').last
       end
 
@@ -75,19 +131,24 @@ module FlashFlow
 
       def builds_collection(response)
         response.fetch('data', [])
-          .select do |h| h['type'] == 'builds' &&
+          .select do |h|
+          h['type'] == 'builds' &&
             h.dig('attributes', 'web-url') &&
             h.dig('relationships', 'commit', 'data', 'type') == 'commits'
-          end
+        end
       end
 
       def commits_data(response)
-        response.fetch('included', {'id' => nil})
+        response.fetch('included', { 'id' => nil })
           .select { |data| data['type'] == 'commits' }
       end
 
-      def has_unapproved_diffs?(build)
-        build['total-comparisons-diff'] > 0 && build['approved-at'].nil?
+      def build_approved?(build)
+        !build.nil? && !build['approved-at'].nil?
+      end
+
+      def build_completed?(build)
+        build['state'] == 'finished';
       end
 
       def get_latest_sha

data/lib/flash_flow/version.rb

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

data/test/lib/release/test_percy_client.rb

@@ -59,10 +59,10 @@ module FlashFlow
       def test_has_unapproved_diffs?
         @percy_client.stub(:get_builds, sample_response) do
           build1 = @percy_client.find_latest_by_sha('bbbbb')
-          assert(@percy_client.send(:has_unapproved_diffs?, build1))
+          refute(@percy_client.send(:build_approved?, build1))
 
           build2 = @percy_client.find_latest_by_sha('aaaaa')
-          refute(@percy_client.send(:has_unapproved_diffs?, build2))
+          assert(@percy_client.send(:build_approved?, build2))
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flash_flow
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.4.10
 platform: ruby
 authors:
 - Flashfunders
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: google-api-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -208,6 +222,7 @@ files:
 - lib/flash_flow/data/github.rb
 - lib/flash_flow/data/store.rb
 - lib/flash_flow/git.rb
+- lib/flash_flow/google_drive.rb
 - lib/flash_flow/install.rb
 - lib/flash_flow/issue_tracker.rb
 - lib/flash_flow/issue_tracker/pivotal.rb