fastlane-plugin-polidea 2.2.0.pre → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 195dd2dd89017eb5f7bbd37fbed5081b8c2ea42434114e7d2b3930385f7b084b
-  data.tar.gz: 3c58ca6693ead25acc9614bcfe4ae20af1f9326d2d69f801f46c4a52e6df7abf
+  metadata.gz: 2496e6471bff3fc0eddd90de1a381e635ac1682b867a6512b1c72b5581cb7d99
+  data.tar.gz: 6f8463f55cc6cc95938139fcbfb24bf830ba77ed59feb824a456f4db0c9efb62
 SHA512:
-  metadata.gz: ce476129578f0e4302a1cc43373ff20e55f01a67dae595d95d13af8d07569d0534d8c961c17e12433e071a7bfe4b56cba8f961c6bf63946d9d128d8565def56a
-  data.tar.gz: f3e9a3d619bbcdb8c7f1d9df4886f567ee3d02c88eeab03cb56bd889f3494a1848750540a74a0a861e6d97a339f5249bf68cbce6b1edf93bfe1d4fcc4c35c65d
+  metadata.gz: 61427c87fc09b20e799aabfdee82e77ccba2081b1d4cb371d3d97b12fdf0c098ad909b5cd1a6f0e4ab2724f74888b40f3f6a198aebc9babb2e01d6ff9373a108
+  data.tar.gz: 249482c6403cde339d2e8abcd1c182dee57d4e6e7a28aba34ede81339976c1f96393598b6b05dfadc98aa6c6426635c4283678f86a97d6ce65fa85cc4a70c4fe

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_mail.rb

@@ -1,4 +1,3 @@
-# rubocop:disable Metrics/MethodLength
 require 'redcarpet'
 require 'fastlane/erb_template_helper'
 
@@ -118,7 +117,7 @@ module Fastlane
 
       def self.qr_code(installation_link)
         qr_code_path = "/tmp/qr_code.png"
-        QRGenerator.new(installation_link, false, ::ChunkyPNG::Color.rgb(21, 18, 126)).generate(qr_code_path)
+        QRGenerator.new(installation_link, ::ChunkyPNG::Color.rgb(21, 18, 126)).generate(qr_code_path)
         File.new(qr_code_path)
       end
 
@@ -130,7 +129,7 @@ module Fastlane
           https://api.mailgun.net/v3/#{sandbox_domain}/messages \
           -F from='#{options[:from]} <#{options[:postmaster]}>' \
           -F to='#{options[:to]}' \
-          -F subject='#{options[:app_name]} #{options[:app_version]} (#{options[:build_number]}) for #{options[:platform]} is ready to install' \
+          -F subject='#{options[:app_name]} #{options[:app_version]} (#{options[:build_number]}) for #{human_platform(options[:platform])} is ready to install' \
           --form-string html=#{Shellwords.escape(body)} \ """ + options[:inline].map { |file| "-F inline=@#{file.path}" }.join(" "), print_command: false, print_command_output: false
 
         return body
@@ -171,6 +170,17 @@ module Fastlane
         )
         premailer.to_inline_css
       end
+
+      def self.human_platform(platform)
+        case platform
+        when :ios
+          "iOS"
+        when :android
+          "Android"
+        else
+          platform.to_s
+        end
+      end
     end
   end
 end

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

@@ -1,5 +1,4 @@
 # rubocop:disable Metrics/AbcSize
-# rubocop:disable Metrics/MethodLength
 # rubocop:disable Metrics/ClassLength
 require 'fastlane/erb_template_helper'
 require 'ostruct'
@@ -12,22 +11,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 +29,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 +42,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 +67,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 +109,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 +155,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 +209,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 +224,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 +256,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 +287,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 +309,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 +452,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 +526,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 +546,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/actions/release_notes_from_commits.rb

@@ -29,7 +29,7 @@ module Fastlane
       def self.available_options
         [
           FastlaneCore::ConfigItem.new(key: :current_version,
-                                       env_name: "VERSION_NAME",
+                                       env_name: "",
                                        description: "Git ref of current version",
                                        optional: true,
                                        default_value: 'HEAD')

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

@@ -1,18 +1,20 @@
-require 'openssl'
-require 'base64'
 require 'json'
 
 module Fastlane
   module PageGenerator
+    PLACEHOLDER_URL = "https://s3.eu-central-1.amazonaws.com/fota.polidea.com/mails/images/icon-placeholder.jpg"
+
     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: mail_app_icon_or_placholder(config[:app_icon]),
         app_name: config[:app_name],
         app_version: config[:app_version],
         build_number: config[:build_number],
@@ -26,68 +28,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 +57,23 @@ module Fastlane
       markdown.render(release_notes || "No release notes.")
     end
     private_class_method :parse_release_notes
+
+    def self.mail_app_icon_or_placholder(app_icon)
+      if app_icon.nil?
+        PLACEHOLDER_URL
+      else
+        "cid:#{app_icon}"
+      end
+    end
+    private_class_method :mail_app_icon_or_placholder
+
+    def self.app_icon_or_placholder(app_icon)
+      if app_icon.nil?
+        PLACEHOLDER_URL
+      else
+        app_icon
+      end
+    end
+    private_class_method :app_icon_or_placholder
   end
 end

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

@@ -2,34 +2,22 @@ require 'rqrcode_png'
 
 module Fastlane
   class QRGenerator
-    def initialize(data, auto_awesome = false, dark_color = ::ChunkyPNG::Color::BLACK)
+    def initialize(data, dark_color = ::ChunkyPNG::Color::BLACK)
       @qr_code = RQRCode::QRCode.new(data, size: 10, level: :m)
-      @auto_awesome = auto_awesome
       @dark_color = dark_color
+      @light_color = ::ChunkyPNG::Color::WHITE
 
       @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}/polidea-logo.png")
-      @logo = @logo.resize(2 * @margin + @qr_code.qrcode.module_count * 5, 2 * @margin + @qr_code.qrcode.module_count * 5)
+      @image = ::ChunkyPNG::Image.new(2 * @margin + @qr_code.qrcode.module_count * 5, 2 * @margin + @qr_code.qrcode.module_count * 5, @light_color)
     end
 
     def generate(path)
-      white = ::ChunkyPNG::Color::WHITE
-      blue = ::ChunkyPNG::Color.rgb(26, 159, 217)
-
-      if !@auto_awesome
-        dark_color = @dark_color
-      else
-        dark_color = blue
-      end
-
       @qr_code.modules.each_index do |row|
         @qr_code.modules[row].each_index do |column|
           if @qr_code.modules[row][column]
-            print_symbol(dark_color, column, row, (column < 8 && row < 8) || (column < 8 && row >= @qr_code.qrcode.module_count - 8) || (column >= @qr_code.qrcode.module_count - 8 && row < 8))
+            print_symbol(@dark_color, column, row, (column < 8 && row < 8) || (column < 8 && row >= @qr_code.qrcode.module_count - 8) || (column >= @qr_code.qrcode.module_count - 8 && row < 8))
           else
-            print_symbol(white, column, row, (column < 8 && row < 8) || (column < 8 && row >= @qr_code.qrcode.module_count - 8) || (column >= @qr_code.qrcode.module_count - 8 && row < 8))
+            print_symbol(@light_color, column, row, (column < 8 && row < 8) || (column < 8 && row >= @qr_code.qrcode.module_count - 8) || (column >= @qr_code.qrcode.module_count - 8 && row < 8))
           end
         end
       end
@@ -40,37 +28,14 @@ module Fastlane
 
     def print_symbol(color, column, row, interpolate)
       (0..4).each do |i|
-        if i < 4 && i > 0
-          print_symbol_row(interpolated_color(color, 5 * column + i, 5 * row, true), 5 * column + i, row, interpolate)
-        else
-          print_symbol_row(interpolated_color(color, 5 * column + i, 5 * row, interpolate), 5 * column + i, row, interpolate)
-        end
+        print_symbol_row(color, 5 * column + i, row, interpolate)
       end
     end
 
-    def interpolated_color(color, column, row, interpolate)
-      if !@auto_awesome
-        interpolated_color = color
-      elsif interpolate
-        interpolated_color = ::ChunkyPNG::Color.interpolate_quick(color, @logo[@margin + column, @margin + row], 255)
-      else
-        interpolated_color = ::ChunkyPNG::Color.interpolate_quick(color, @logo[@margin + column, @margin + row], 40)
-      end
-      interpolated_color
-    end
-
     def print_symbol_row(color, column, row, interpolate)
       (0..4).each do |i|
-        if i < 4 && i > 0
-          @image[@margin + column, @margin + 5 * row + i] = interpolated_color(color, column, 5 * row + i, true)
-        else
-          @image[@margin + column, @margin + 5 * row + i] = interpolated_color(color, column, 5 * row + i, interpolate)
-        end
+        @image[@margin + column, @margin + 5 * row + i] = color
       end
     end
-
-    def path_to_resources
-      File.expand_path "#{__dir__}/../templates/images"
-    end
   end
 end