fastlane-plugin-polidea 2.1.0 → 2.1.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c734a5f190790b057fd810e006676c877b67ca63c5f592b2b9dccd85acc604e1
-  data.tar.gz: 3652e585a63174db49f9740d07466d4fb1681076023e8f01d029007ee2d58b9b
+  metadata.gz: 9389415ea79485df9f60db8fb7d36dc00f3722a0c659132f35e4744e89ab8c09
+  data.tar.gz: 455e97b59e28db63b05988617ab20453d49d281f8f18a987e58e12157168affe
 SHA512:
-  metadata.gz: a737c9abc1855393221caebbf39e1235c42c124d5be2578b2c6c72048177080a056466f11f5b7eb492d7a232dd473f868472bf2d123258748d314e8f2c44ea4a
-  data.tar.gz: 73e1a6f94666dece1de3813aeef9dd66cb50e54cec3b2b5df5d61f131cf6f455c9466211a6f4176cb9300749f6f00f20c0881b2781a5b016def83625e63089a4
+  metadata.gz: 6f8900858b70301309e2a41b474200a95fe0af1214a969e0a0fab853859e36fbb4e2717cd9d24240c5ea0e080f35abe7d6be5dfc8a55a2ec2198f593746c946d
+  data.tar.gz: edcb2e87e4381fbb62797dc9e7c5cde32db6578a315254c45c1ee0c85996024c6827d9c8a2453c184a9d57f53ea71c28b897272f65355182fe4f0948e6aefcb3

data/lib/fastlane/plugin/polidea/actions/fota_mail.rb

@@ -1,4 +1,5 @@
 # rubocop:disable Metrics/MethodLength
+require 'redcarpet'
 require 'fastlane/erb_template_helper'
 
 module Fastlane
@@ -105,24 +106,15 @@ module Fastlane
       end
 
       def self.inline_images(options)
-        base_path = "#{__dir__}/../templates/images"
         options[:inline] = [
           qr_code(options[:installation_link])
         ]
         options[:inline] << File.new(options[:app_icon]) if options[:app_icon]
-        images = [
-          "polidea-facebook-icon.png",
-          "polidea-github-icon.png",
-          "polidea-logo.png",
-          "polidea-twitter-icon.png"
-        ]
-        images << "icon-placeholder.png" unless options[:app_icon]
-        options[:inline].concat(images.map { |image| File.new("#{base_path}/#{image}") })
       end
 
       def self.qr_code(installation_link)
         qr_code_path = "/tmp/qr_code.png"
-        QRGenerator.new(installation_link, false, ::ChunkyPNG::Color.rgb(103, 103, 103)).generate(qr_code_path)
+        QRGenerator.new(installation_link, false, ::ChunkyPNG::Color.rgb(21, 18, 126)).generate(qr_code_path)
         File.new(qr_code_path)
       end
 
@@ -150,25 +142,27 @@ module Fastlane
           app_version: options[:app_version],
           build_number: options[:build_number],
           installation_link: options[:installation_link],
-          release_notes: (options[:release_notes] || "").split("\n"),
+          release_notes: options[:release_notes],
           platform: options[:platform],
           release_date: DateTime.now.strftime('%b %d, %Y'),
-          binary_size: (options[:binary_size] / 1024.0 / 1024.0).round(2).to_s
+          binary_size: (options[:binary_size] / 1024.0 / 1024.0).round(2).to_s,
+          qr_code: "qr_code.png"
         }
         hash[:success] = options[:success]
         hash[:ci_build_link] = options[:ci_build_link]
 
-        # grabs module
-        eth = Fastlane::ErbTemplateHelper
         # create html from template
         html_template_path = options[:template_path]
         if html_template_path && File.exist?(html_template_path)
+          eth = Fastlane::ErbTemplateHelper
           html_template = eth.load_from_path(html_template_path)
+          mail_html = eth.render(html_template, hash)
         else
-          html_template = eth.load_from_path("#{__dir__}/../templates/mailgun_template.erb")
+          mail_html = PageGenerator.mail(hash)
         end
+
         premailer = Premailer.new(
-          eth.render(html_template, hash),
+          mail_html,
           { warn_level: Premailer::Warnings::SAFE, with_html_string: true }
         )
         premailer.to_inline_css

data/lib/fastlane/plugin/polidea/actions/fota_s3.rb

@@ -164,7 +164,7 @@ module Fastlane
         icon_url = self.upload_icon(icon_file, url_part, bucket, acl, treat_bucket_as_domain_name)
 
         # Creates html from template
-        html_render = PageGenerator.generate({
+        html_render = PageGenerator.installation_page({
           url: "itms-services://?action=download-manifest&url=#{URI.encode_www_form_component(plist_url)}",
           installation_password: installation_password,
           app_version: bundle_version,
@@ -278,7 +278,7 @@ module Fastlane
         icon_url = self.upload_icon(icon_file, url_part, bucket, acl, treat_bucket_as_domain_name)
 
         # Creates html from template
-        html_render = PageGenerator.generate({
+        html_render = PageGenerator.installation_page({
           url: apk_url,
           installation_password: installation_password,
           app_version: app_version,
@@ -348,7 +348,7 @@ module Fastlane
           key: file_name,
           body: file_data,
           acl: acl,
-          content_type: content_type_for_file(file_name)
+          content_type: Mime.content_type_for_file(file_name)
         })
 
         # When you enable versioning on a S3 bucket,
@@ -378,7 +378,7 @@ module Fastlane
             key: s3_path,
             body: File.open(local_path),
             acl: acl,
-            content_type: content_type_for_file(local_path)
+            content_type: Mime.content_type_for_file(local_path)
           })
         end
       end
@@ -399,25 +399,6 @@ module Fastlane
         return files
       end
 
-      def self.content_type_for_file(file)
-        file_extension = File.extname(file)
-        extensions_to_type = {
-          ".html" => "text/html",
-          ".png"  => "image/png",
-          ".jpg"  => "text/jpeg",
-          ".gif"  => "image/gif",
-          ".svg"  => "image/svg+xml",
-          ".log"  => "text/plain",
-          ".css"  => "text/css",
-          ".js"   => "application/javascript"
-        }
-        if extensions_to_type[file_extension].nil?
-          "application/octet-stream"
-        else
-          extensions_to_type[file_extension]
-        end
-      end
-
       #
       # NOT a fan of this as this was taken straight from Shenzhen
       # https://github.com/nomad/shenzhen/blob/986792db5d4d16a80c865a2748ee96ba63644821/lib/shenzhen/plugins/s3.rb#L32
@@ -539,9 +520,9 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :release_notes,
                                       env_name: "S3_RELEASE_NOTES",
                                       description: "Release notes",
-                                      type: Array,
+                                      type: String,
                                       optional: true,
-                                      default_value: Actions.lane_context[SharedValues::RELEASE_NOTES] ? Actions.lane_context[SharedValues::RELEASE_NOTES].split("\n") : nil),
+                                      default_value: Actions.lane_context[SharedValues::RELEASE_NOTES]),
           FastlaneCore::ConfigItem.new(key: :treat_bucket_as_domain_name,
                                       description: "If it's true, it transforms all urls from https://s3.amazonaws.com/BUCKET_NAME to https://BUCKET_NAME",
                                       is_string: false,

data/lib/fastlane/plugin/polidea/helper/mime.rb

@@ -0,0 +1,22 @@
+module Fastlane
+  module Mime
+    def self.content_type_for_file(file)
+      file_extension = File.extname(file)
+      extensions_to_type = {
+        ".html" => "text/html",
+        ".png"  => "image/png",
+        ".jpg"  => "image/jpeg",
+        ".gif"  => "image/gif",
+        ".svg"  => "image/svg+xml",
+        ".log"  => "text/plain",
+        ".css"  => "text/css",
+        ".js"   => "application/javascript"
+      }
+      if extensions_to_type[file_extension].nil?
+        "application/octet-stream"
+      else
+        extensions_to_type[file_extension]
+      end
+    end
+  end
+end

data/lib/fastlane/plugin/polidea/helper/page_generator.rb

@@ -4,7 +4,28 @@ require 'json'
 
 module Fastlane
   module PageGenerator
-    def self.generate(config)
+    def self.mail(config)
+      UI.message("Generating e-mail...")
+      eth = Fastlane::ErbTemplateHelper
+      html_template = eth.load_from_path("#{__dir__}/../templates/download.erb")
+      eth.render(html_template, {
+        author: config[:author],
+        last_commit: config[:last_commit],
+        is_android: config[:is_android],
+        app_icon: config[:app_icon] ? "cid:#{config[:app_icon]}" : "https://s3.eu-central-1.amazonaws.com/fota.polidea.com/mails/images/icon-placeholder.png",
+        app_name: config[:app_name],
+        app_version: config[:app_version],
+        build_number: config[:build_number],
+        installation_link: config[:installation_link],
+        release_notes: parse_release_notes(config[:release_notes]),
+        platform: config[:platform],
+        release_date: config[:release_date],
+        binary_size: config[:binary_size],
+        qr_code: "cid:#{config[:qr_code]}"
+      })
+    end
+
+    def self.installation_page(config)
       if config[:installation_password]
         generate_private(config)
       else
@@ -26,7 +47,7 @@ module Fastlane
         app_name: config[:app_name],
         app_icon: config[:app_icon],
         platform: config[:platform],
-        release_notes: config[:release_notes]
+        release_notes: parse_release_notes(config[:release_notes])
       })
     end
     private_class_method :generate_private
@@ -42,7 +63,7 @@ module Fastlane
         app_name: config[:app_name],
         app_icon: config[:app_icon],
         platform: config[:platform],
-        release_notes: config[:release_notes]
+        release_notes: parse_release_notes(config[:release_notes])
       })
     end
     private_class_method :generate_public
@@ -67,5 +88,20 @@ module Fastlane
       return installation_link, salt, iv
     end
     private_class_method :encrypt
+
+    def self.parse_release_notes(release_notes)
+      renderer = Redcarpet::Render::HTML.new({
+        filter_html: true,
+        no_styles: true
+      })
+      markdown = Redcarpet::Markdown.new(
+        renderer,
+        fenced_code_blocks: true,
+        autolink: false,
+        tables: false
+      )
+      markdown.render(release_notes || "No release notes.")
+    end
+    private_class_method :parse_release_notes
   end
 end

data/lib/fastlane/plugin/polidea/helper/qr_generator.rb

@@ -10,7 +10,7 @@ module Fastlane
       @margin = 20
       @image = ::ChunkyPNG::Image.new(2 * @margin + @qr_code.qrcode.module_count * 5, 2 * @margin + @qr_code.qrcode.module_count * 5, ::ChunkyPNG::Color::WHITE)
 
-      @logo = ::ChunkyPNG::Image.from_file("#{path_to_resources}/logo.png")
+      @logo = ::ChunkyPNG::Image.from_file("#{path_to_resources}/polidea-logo.png")
       @logo = @logo.resize(2 * @margin + @qr_code.qrcode.module_count * 5, 2 * @margin + @qr_code.qrcode.module_count * 5)
     end