fastlane-plugin-polidea 2.2.0.pre.1 → 3.0.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a200dfe6c81fc0c43478b1092c96b60a4bb2d516128b8d6e3e82d244b0f0278
-  data.tar.gz: 9bfa26033bfbe2bdae07e37c2fcd3271f2e0eb897c6a586b4d12430f7922d192
+  metadata.gz: 0e49b978d0f9ccc23f99bed241bf7c23c4a02a5742b8ef3497388268c267e245
+  data.tar.gz: 0b2a0731c0a81b86e32a37b46444f9d79f55758e86bb3b00e4c68f453dc2e83a
 SHA512:
-  metadata.gz: 2e1c8608894077d23abd728f70c020af492b2a83d0d1202e9374815336946694bb1b6b75308219258c4d99337b6c84839012ddfa06b5e9832845c53c055939f8
-  data.tar.gz: a15a41c923351da5092cd8c4bf1b8f32c537a159c3128317c569a87457b3e0c3c96bd778f757c0a756d798c58face121aa526e31eb6bcbef77e07b984a1d5117
+  metadata.gz: 8efd5143e60704460f492e8c55fea1130005d20f4f57a1c1019155eed99d43f9d5e33096e59234bca9d3226106f801cc488aa45ed0b122e9f108b95d70baeaad
+  data.tar.gz: 47028dd656853ddebf7dc589a8bcfbd69f7f49603a1f65a8eeef6bf697aae41388178709a801750d8920820392b2ee8697ef077c982cfb32a3149db84c3616ee

data/README.md

@@ -1,6 +1,6 @@
 # fastlane-plugin-polidea
 
-[![build status](https://gitlab.polidea.com/CICD/fastlane-plugin-polidea/badges/master/pipeline.svg)](https://gitlab.polidea.com/CICD/fastlane-plugin-polidea/pipelines)
+[![build status](https://gitlab.polidea.com/Shuttle/fastlane-plugin-polidea/badges/master/pipeline.svg)](https://gitlab.polidea.com/Shuttle/fastlane-plugin-polidea/pipelines)
 [![Gem](https://img.shields.io/gem/v/fastlane-plugin-polidea.svg?style=flat)](http://rubygems.org/gems/fastlane-plugin-polidea)
 
 
@@ -15,14 +15,13 @@ fastlane add_plugin polidea
 ## Available actions
 
 Plugin contains following actions:
-- `extract_app_name`: Extracts application name from .apk/.ipa
-- `extract_app_icon`: Extracts largest icon from .ipa/.apk
-- `extract_version`: Extracts app version and build number from .ipa/.apk
-- `get_binary_size`: Measures binary size in bytes
-- `s3`: Custom version of s3 action with Polidea's installation page
+- `extract_app_info`: Extracts application name, icon, version, binary size from .apk/.ipa
+- `release_notes`: Extracts release notes from git tag message
+- `fota_s3`: Custom version of s3 action with Polidea's installation page
 - `fota_mail`: Custom version of mailgun action with Polidea's mail template
+- `shuttle`: Upload new app to Shuttle
 
-See more details [here](https://gitlab2.polidea.com/CI/fastlane-plugin-polidea/blob/master/docs/Actions.md).
+See more details [here](./docs/Actions.md).
 To list all available actions run:
 ```bash
 fastlane actions
@@ -33,13 +32,10 @@ fastlane actions
 ```ruby
 lane :deploy do
   (some actions that produces .ipa/.apk)
-  extract_app_name
-  extract_app_icon
-  extract_version
-  get_binary_size
-  s3
+  extract_app_info
+  fota_s3
   fota_mail(
-    to: "piotr.dubiel@polidea.com"
+    to: "hey@polidea.com"
   )
 end
 ```

data/lib/fastlane/plugin/polidea.rb

@@ -13,6 +13,10 @@ module Fastlane
       @session_id ||= SecureRandom.uuid
       @session ||= Analytics.new(@session_id)
     end
+
+    def self.root
+      File.expand_path('../../..', __dir__)
+    end
   end
 end
 

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

@@ -12,22 +12,12 @@ module Fastlane
       S3_DSYM_OUTPUT_PATH = :S3_DSYM_OUTPUT_PATH
       S3_PLIST_OUTPUT_PATH = :S3_PLIST_OUTPUT_PATH
       S3_APK_OUTPUT_PATH = :S3_APK_OUTPUT_PATH
+      S3_MAPPING_OUTPUT_PATH = :S3_MAPPING_OUTPUT_PATH
       S3_HTML_OUTPUT_PATH = :S3_HTML_OUTPUT_PATH
       S3_VERSION_OUTPUT_PATH = :S3_VERSION_OUTPUT_PATH
       S3_ICON_OUTPUT_PATH = :S3_ICON_OUTPUT_PATH
     end
 
-    S3_ARGS_MAP = {
-      ipa: '-f',
-      dsym: '-d',
-      access_key: '-a',
-      secret_access_key: '-s',
-      bucket: '-b',
-      region: '-r',
-      acl: '--acl',
-      path: '-P'
-    }
-
     class FotaS3Action < Action
       def self.run(config)
         Fastlane::Polidea.session.action_launched("fota_s3", config)
@@ -40,6 +30,7 @@ module Fastlane
         params[:apk] = config[:apk]
         params[:icon] = config[:icon]
         params[:dsym] = config[:dsym]
+        params[:mapping] = config[:mapping]
         params[:access_key] = config[:access_key]
         params[:secret_access_key] = config[:secret_access_key]
         params[:bucket] = config[:bucket]
@@ -52,7 +43,6 @@ module Fastlane
         params[:version_template_path] = config[:version_template_path]
         params[:version_file_name] = config[:version_file_name]
         params[:acl] = config[:acl]
-        params[:installation_password] = config[:installation_password]
         params[:release_notes] = config[:release_notes]
         params[:treat_bucket_as_domain_name] = config[:treat_bucket_as_domain_name]
 
@@ -78,7 +68,6 @@ module Fastlane
         icon_file = params[:icon]
         dsym_file = params[:dsym]
         acl = params[:acl]
-        installation_password = params[:installation_password]
         release_notes = params[:release_notes]
         treat_bucket_as_domain_name = params[:treat_bucket_as_domain_name]
 
@@ -121,9 +110,7 @@ module Fastlane
 
           dsym_url = self.upload_file(bucket, dsym_file_name, dsym_file_data, acl, treat_bucket_as_domain_name)
 
-          # Setting action and environment variables
-          Actions.lane_context[SharedValues::S3_DSYM_OUTPUT_PATH] = dsym_url
-          ENV[SharedValues::S3_DSYM_OUTPUT_PATH.to_s] = dsym_url
+          dsym_file_data.close
         end
 
         if params[:upload_metadata] == false
@@ -169,7 +156,6 @@ module Fastlane
         # Creates html from template
         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,
           build_number: build_number,
           app_name: app_name,
@@ -224,6 +210,11 @@ module Fastlane
           ENV[SharedValues::S3_ICON_OUTPUT_PATH.to_s] = icon_url
           UI.success("Successfully uploaded icon file to '#{Actions.lane_context[SharedValues::S3_ICON_OUTPUT_PATH]}'")
         end
+        if dsym_url
+          Actions.lane_context[SharedValues::S3_DSYM_OUTPUT_PATH] = dsym_url
+          ENV[SharedValues::S3_DSYM_OUTPUT_PATH.to_s] = dsym_url
+          UI.success("Successfully uploaded dsym file to '#{Actions.lane_context[SharedValues::S3_DSYM_OUTPUT_PATH]}'")
+        end
       end
 
       def self.upload_android(params)
@@ -234,8 +225,8 @@ module Fastlane
         s3_bucket = params[:bucket]
         apk_file = params[:apk]
         icon_file = params[:icon]
+        mapping_file = params[:mapping]
         acl = params[:acl]
-        installation_password = params[:installation_password]
         release_notes = params[:release_notes]
         treat_bucket_as_domain_name = params[:treat_bucket_as_domain_name]
 
@@ -266,9 +257,23 @@ module Fastlane
         Actions.lane_context[SharedValues::S3_APK_OUTPUT_PATH] = apk_url
         ENV[SharedValues::S3_APK_OUTPUT_PATH.to_s] = apk_url
 
+        if mapping_file
+          mapping_file_basename = File.basename(mapping_file)
+          mapping_file_name = "#{url_part}#{mapping_file_basename}"
+          mapping_file_data = File.open(mapping_file, 'rb')
+
+          mapping_url = self.upload_file(bucket, mapping_file_name, mapping_file_data, acl, treat_bucket_as_domain_name)
+
+          # Setting action and environment variables
+          Actions.lane_context[SharedValues::S3_MAPPING_OUTPUT_PATH] = mapping_url
+          ENV[SharedValues::S3_MAPPING_OUTPUT_PATH.to_s] = mapping_url
+
+          mapping_file_data.close
+        end
+
         #####################################
         #
-        # html and plist building
+        # html building
         #
         #####################################
 
@@ -283,7 +288,6 @@ module Fastlane
         # Creates html from template
         html_render = PageGenerator.installation_page({
           url: apk_url,
-          installation_password: installation_password,
           app_version: app_version,
           build_number: build_number,
           app_name: app_name,
@@ -306,6 +310,9 @@ module Fastlane
           ENV[SharedValues::S3_ICON_OUTPUT_PATH.to_s] = icon_url
           UI.success("Successfully uploaded icon file to '#{Actions.lane_context[SharedValues::S3_ICON_OUTPUT_PATH]}'")
         end
+        if mapping_url
+          UI.success("Successfully uploaded mapping file to '#{Actions.lane_context[SharedValues::S3_MAPPING_OUTPUT_PATH]}'")
+        end
       end
 
       def self.validate(params)
@@ -446,19 +453,24 @@ module Fastlane
         [
           FastlaneCore::ConfigItem.new(key: :ipa,
                                        env_name: "",
-                                       description: ".ipa file for the build ",
+                                       description: ".ipa file for the build",
                                        optional: true,
                                        default_value: Actions.lane_context[SharedValues::IPA_OUTPUT_PATH]),
           FastlaneCore::ConfigItem.new(key: :dsym,
                                        env_name: "",
-                                       description: "zipped .dsym package for the build ",
+                                       description: "zipped .dsym package for the build",
                                        optional: true,
                                        default_value: Actions.lane_context[SharedValues::DSYM_OUTPUT_PATH]),
           FastlaneCore::ConfigItem.new(key: :apk,
                                        env_name: "",
-                                       description: ".apk file for the build ",
+                                       description: ".apk file for the build",
                                        optional: true,
                                        default_value: Actions.lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH]),
+          FastlaneCore::ConfigItem.new(key: :mapping,
+                                       env_name: "",
+                                       description: "The path to the mapping.txt file",
+                                       optional: true,
+                                       default_value: Actions.lane_context[SharedValues::GRADLE_MAPPING_TXT_OUTPUT_PATH]),
           FastlaneCore::ConfigItem.new(key: :icon,
                                        env_name: "",
                                        description: "app icon file to upload",
@@ -515,11 +527,6 @@ module Fastlane
                                        description: "Uploaded object permissions e.g public_read (default), private, public_read_write, authenticated_read ",
                                        optional: true,
                                        default_value: "public-read"),
-          FastlaneCore::ConfigItem.new(key: :installation_password,
-                                       env_name: "INSTALLATION_PASSWORD",
-                                       description: "Password for installation page",
-                                       optional: true,
-                                       default_value: nil),
           FastlaneCore::ConfigItem.new(key: :release_notes,
                                       env_name: "S3_RELEASE_NOTES",
                                       description: "Release notes",
@@ -540,6 +547,7 @@ module Fastlane
           ['S3_DSYM_OUTPUT_PATH', 'Direct HTTP link to the uploaded dsym file'],
           ['S3_PLIST_OUTPUT_PATH', 'Direct HTTP link to the uploaded plist file'],
           ['S3_APK_OUTPUT_PATH', 'Direct HTTP link to the uploaded apk file'],
+          ['S3_MAPPING_OUTPUT_PATH', 'Direct HTTP link to the uploaded mapping.txt file'],
           ['S3_HTML_OUTPUT_PATH', 'Direct HTTP link to the uploaded HTML file'],
           ['S3_VERSION_OUTPUT_PATH', 'Direct HTTP link to the uploaded Version file'],
           ['S3_ICON_OUTPUT_PATH', 'Direct HTTP link to the uploaded icon file']

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

@@ -21,7 +21,7 @@ module Fastlane
       end
 
       def self.description
-        "Extracts release notes from git tag messages"
+        "Extracts release notes from git tag message"
       end
 
       def self.output

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

@@ -1,5 +1,3 @@
-require 'openssl'
-require 'base64'
 require 'json'
 
 module Fastlane
@@ -7,12 +5,14 @@ module Fastlane
     def self.mail(config)
       UI.message("Generating e-mail...")
       eth = Fastlane::ErbTemplateHelper
-      html_template = eth.load_from_path("#{__dir__}/../templates/download.erb")
+      html_template = eth.load_from_path(
+        File.expand_path("templates/mail.erb", Polidea.root)
+      )
       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_icon: app_icon_or_placholder(config[:app_icon]),
         app_name: config[:app_name],
         app_version: config[:app_version],
         build_number: config[:build_number],
@@ -26,68 +26,20 @@ module Fastlane
     end
 
     def self.installation_page(config)
-      if config[:installation_password]
-        generate_private(config)
-      else
-        generate_public(config)
-      end
-    end
-
-    def self.generate_private(config)
-      UI.message("Generating private installation page with password `#{config[:installation_password]}`...")
-      eth = Fastlane::ErbTemplateHelper
-      html_template = eth.load_from_path("#{__dir__}/../templates/secure_installation_template.erb")
-      installation_link, salt, iv = encrypt(config[:url], config[:installation_password])
-      eth.render(html_template, {
-        url: installation_link,
-        salt: salt,
-        iv: iv,
-        app_version: config[:app_version],
-        build_number: config[:build_number],
-        app_name: config[:app_name],
-        app_icon: config[:app_icon],
-        platform: config[:platform],
-        release_notes: parse_release_notes(config[:release_notes])
-      })
-    end
-    private_class_method :generate_private
-
-    def self.generate_public(config)
       UI.message("Generating public installation page...")
       eth = Fastlane::ErbTemplateHelper
-      html_template = eth.load_from_path("#{__dir__}/../templates/installation_template.erb")
+      html_template = eth.load_from_path(
+        File.expand_path("templates/install.erb", Polidea.root)
+      )
       eth.render(html_template, {
         url: config[:url],
         app_version: config[:app_version],
         build_number: config[:build_number],
         app_name: config[:app_name],
-        app_icon: config[:app_icon],
-        platform: config[:platform],
+        app_icon: app_icon_or_placholder(config[:app_icon]),
         release_notes: parse_release_notes(config[:release_notes])
       })
     end
-    private_class_method :generate_public
-
-    def self.encrypt(url, password)
-      salt = OpenSSL::Random.random_bytes(32)
-      iter = 128
-      key_len = 32
-      key = OpenSSL::PKCS5.pbkdf2_hmac_sha1(password, salt, iter, key_len)
-
-      cipher = OpenSSL::Cipher::AES256.new(:CBC)
-      cipher.encrypt
-      cipher.key = key
-
-      random_iv = cipher.random_iv
-      iv = Base64.encode64(random_iv).delete "\n"
-      to_json = { url: url.to_s }.to_json
-      var = cipher.update(to_json.to_s) + cipher.final
-
-      installation_link = Base64.encode64(var).delete "\n"
-      salt = Base64.encode64(salt).delete "\n"
-      return installation_link, salt, iv
-    end
-    private_class_method :encrypt
 
     def self.parse_release_notes(release_notes)
       renderer = Redcarpet::Render::HTML.new({
@@ -103,5 +55,14 @@ module Fastlane
       markdown.render(release_notes || "No release notes.")
     end
     private_class_method :parse_release_notes
+
+    def self.app_icon_or_placholder(app_icon)
+      if app_icon.nil?
+        "https://s3.eu-central-1.amazonaws.com/fota.polidea.com/mails/images/icon-placeholder.jpg"
+      else
+        "cid:#{app_icon}"
+      end
+    end
+    private_class_method :app_icon_or_placholder
   end
 end

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

@@ -70,7 +70,7 @@ module Fastlane
     end
 
     def path_to_resources
-      File.expand_path "#{__dir__}/../templates/images"
+      File.expand_path("templates/images", Polidea.root)
     end
   end
 end

data/lib/fastlane/plugin/polidea/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Polidea
-    VERSION = "2.2.0.pre.1"
+    VERSION = "3.0.0.pre.1"
   end
 end

data/templates/install.erb

@@ -0,0 +1,238 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Install <%= app_name %></title>
+    <link rel="icon" 
+      type="image/png" 
+      href="https://s3.eu-central-1.amazonaws.com/fota.polidea.com/mails/images/favicon.ico">
+    <link
+      href="https://fonts.googleapis.com/css2?family=Overpass+Mono&display=swap"
+      rel="stylesheet"
+    />
+    <link href="https://use.typekit.net/kdr8bbb.css" rel="stylesheet" />
+
+    <style>
+      html {
+        min-height: 100%;
+      }
+      body {
+        margin: 0;
+        font-family: "acumin-pro", Helvetica, Arial, sans-serif;
+      }
+      @media screen and (min-width: 960px) {
+        body {
+          background-image: url(https://s3.eu-central-1.amazonaws.com/fota.polidea.com/mails/images/cover-polidea.jpg);
+          background-repeat: no-repeat;
+          background-size: cover;
+          background-position: center;
+        }
+      }
+
+      .content {
+        background-color: white;
+      }
+      @media screen and (min-width: 960px) {
+        .content {
+          width: 700px;
+          margin: 48px auto;
+        }
+      }
+
+      header {
+        padding: 20px 32px;
+      }
+      @media screen and (max-width: 959px) {
+        header {
+          padding: 16px 24px;
+          box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+        }
+      }
+
+      img.app-icon {
+        width: 64px;
+        height: 64px;
+        margin-right: 48px;
+        border-radius: 6px;
+        box-shadow: 0 2px 11px 0 #00000033;
+        background-color: white;
+      }
+
+      section.app-info {
+        padding: 16px 24px;
+      }
+      @media screen and (min-width: 960px) {
+        section.app-info {
+          padding: 16px 24px;
+          width: 560px;
+          margin: 0 auto;
+        }
+      }
+
+      .app-header {
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+      }
+
+      .spacer {
+        flex: 1;
+      }
+
+      .app-name h2,
+      .app-name p {
+        margin: 0;
+      }
+
+      .app-name p {
+        font-size: 12px;
+        color: #333333;
+      }
+
+      h1 {
+      }
+
+      h2 {
+        font-size: 18px;
+        font-weight: 600;
+        line-height: 1.78;
+      }
+
+      p {
+        font-size: 16px;
+        line-height: 1.63;
+      }
+
+      .button {
+        background-color: #2924fb;
+        padding: 12px 30px;
+        margin: 32px 0 0;
+        color: white;
+        border: none;
+        border-radius: 30px;
+        font-family: "Overpass Mono", monospace;
+        font-size: 14px;
+        font-weight: bold;
+        text-decoration: none;
+      }
+      .button img {
+        margin-bottom: -3px;
+      }
+
+      .release-notes-section {
+        padding: 32px 0;
+      }
+      .release-notes-section > h2 {
+        font-family: "Overpass Mono", monospace;
+        font-size: 16px;
+        font-weight: bold;
+        color: #2924fb;
+        margin-bottom: 16px;
+      }
+      .release-notes {
+        padding: 24px;
+        color: black;
+        background-color: #f8f8f8;
+        font-size: 16px;
+        line-height: 1.44;
+        letter-spacing: normal;
+        color: #333333;
+      }
+
+      .release-notes ul {
+        padding: 0;
+        list-style-type: square;
+        list-style-position: inside;
+      }
+
+      .release-notes h1,
+      .release-notes h2,
+      .release-notes h3,
+      .release-notes h4,
+      .release-notes h5,
+      .release-notes h6 {
+        color: black;
+        margin-top: 24px;
+        margin-bottom: 16px;
+      }
+
+      .release-notes h1 {
+        font-size: 26px;
+        font-weight: bold;
+        line-height: 1.27;
+      }
+
+      .release-notes h2 {
+        font-size: 18px;
+        font-weight: 500;
+        line-height: 1.78;
+      }
+
+      .release-notes h3 {
+        font-size: 18px;
+        font-weight: bold;
+        line-height: 1.2;
+      }
+
+      .release-notes h4 {
+        font-weight: 500;
+        font-size: 16px1em;
+      }
+
+      .release-notes h5 {
+        font-weight: 500;
+        font-size: 14px;
+      }
+
+      .release-notes h6 {
+        font-weight: 500;
+        font-size: 13px;
+      }
+
+      .release-notes pre {
+        padding: 0;
+        margin: 0;
+      }
+      .release-notes pre code {
+        margin: 0;
+        padding: 0;
+        font-family: "Overpass Mono", monospace;
+        color: #424242;
+        font-size: 12px;
+        font-weight: bold;
+        line-height: 1.75;
+      }
+    </style>
+  </head>
+  <body>
+    <article class="content">
+      <header><img src="https://s3.eu-central-1.amazonaws.com/fota.polidea.com/mails/images/polidea-logo.png" height="24" /></header>
+      <section class="app-info">
+        <div class="app-header">
+          <img class="app-icon" src="<%= app_icon %>" />
+          <div class="app-name">
+            <h2><%= app_name %></h2>
+            <p>Version <%= app_version %> (<%= build_number %>)</p>
+          </div>
+          <div class="spacer"></div>
+
+          <a class="button" href="<%= url %>">
+            <img
+              src="https://s3.eu-central-1.amazonaws.com/fota.polidea.com/mails/images/install-icon.png"
+              width="16"
+              height="16"
+            />
+            Install
+          </a>
+        </div>
+        <section class="release-notes-section">
+          <h2>What’s new:</h2>
+          <div class="release-notes">
+            <%= release_notes %>
+          </div>
+        </section>
+      </section>
+    </article>
+  </body>
+</html>