fastlane-plugin-aws_s3 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36228aaa143a537f1ff1ca339a1f5ec2a64097d1
-  data.tar.gz: 1b75bc3acd8afe2a4805a9570fb21422036e1cc4
+  metadata.gz: 5d977b937cc7060f4b57f9cf32b0b27b347bce5a
+  data.tar.gz: 8aaa4575eb1c388ea762f74f8a9e8207f248ac41
 SHA512:
-  metadata.gz: 5521b2bba83fa6baeec1585e649d434c5626ce29587e5161f70b8487adfecf24dec4313a91d8b9c16a0c0ff330ac7c291ae71fde02eb141c98d934d0b1a989e1
-  data.tar.gz: 722b6d042461c23410504fa064c2c4ea99cd45ab623f2d3904d089d7c20912b734e76d1d15c0db4a607a5dee88df01ea9e5a8fdd9104c29b549af87e7e6ef0f4
+  metadata.gz: b8fc79724b7fb26d1395c54b27f9f58e0e4c981e44fcfc9d8bbaaa7e67270426d4bcd90b5823c79f00efa964469884e6c4f5e13a3f02f5b5b4ad41b3b4536a07
+  data.tar.gz: e29b765248b814c56fdfc14c3896a7f525909a0dff8905f5970f9564d11e101a76a10bd66b3e818bb20ab1aed75a9a5ed1d40a4a98df903e30933ee851f8db95

data/README.md

@@ -42,7 +42,7 @@ aws_s3(
 
   endpoint: 'https://s3-us-west-1.amazonaws.com', # Optional, for buckets that require a specific endpoint
   ipa: 'AppName.ipa',                             # Required (if not uploading an APK).
-  dsym: 'AppName.app.dSYM.zip',                   # Optional is you use `ipa` to build.
+  dsym: 'AppName.app.dSYM.zip',                   # Optional if you use `ipa` to build.
 
   apk: 'AppName.apk',                             # Required (if not uploading an IPA).
 

data/lib/assets/s3_android_html_template.erb

@@ -11,6 +11,12 @@
         text-align: center;
         background-color: #f5f5f5;
       }
+      h1 {
+        margin-bottom: 0px;
+      }
+      h2 {
+        margin-top: 5px;
+      }
       .oneRow {
         width: 100%;
         overflow: auto;
@@ -50,6 +56,8 @@
     </style>
 
     <h1 style="text-align: center;"><%= title %></h1>
+    <h2><%= version_name %> (<%= version_code %>)</h2>
+    <p><em>Built on <%= Time.now.strftime('%a, %e %b %Y %H:%M %p') %></em></p>
     <!-- <img src="app_icon.png" id="appIcon"> -->
 
     <div class="oneRow">
@@ -57,8 +65,10 @@
         <a href="<%= apk_url %>" id="text" class="btn btn-lg btn-default" onclick="document.getElementById('finished').id = '';">
           Install <%= title %> <%= version_name %> (<%= version_code %>)
         </a>
-        <br>
-        <p>Built on <%= Time.now.strftime('%a, %e %b %Y %H:%M %p') %></p>
+      </span>
+
+      <span class="info">
+        <p><%= release_notes %></p>
       </span>
 
       <!-- <span class="download" id="android">

data/lib/assets/s3_android_version_template.erb

@@ -1,4 +1,7 @@
 {
     "latestVersion": "<%= full_version %>",
-    "updateUrl": "<%= apk_url %>"
+    "updateUrl": "<%= apk_url %>",
+    "version_code": "<%= version_code %>",
+    "version_name": "<%= version_name %>",
+    "release_notes": "<%= release_notes %>"
 }

data/lib/assets/s3_ios_html_template.erb

@@ -11,6 +11,12 @@
         text-align: center;
         background-color: #f5f5f5;
       }
+      h1 {
+        margin-bottom: 0px;
+      }
+      h2 {
+        margin-top: 5px;
+      }
       .oneRow {
         width: 100%;
         overflow: auto;
@@ -50,15 +56,20 @@
     </style>
 
     <h1 style="text-align: center;"><%= title %></h1>
+    <h2><%= bundle_version %> (<%= build_num %>)</h2>
+    <p><em>Built on <%= Time.now.strftime('%a, %e %b %Y %H:%M %p') %></em></p>
     <!-- <img src="app_icon.png" id="appIcon"> -->
 
     <div class="oneRow">
+
       <span class="download" id="ios">
         <a href="itms-services://?action=download-manifest&url=<%= url_encode(plist_url) %>" id="text" class="btn btn-lg btn-default" onclick="document.getElementById('finished').id = '';">
           Install <%= title %> <%= bundle_version %> (<%= build_num %>)
         </a>
-        <br>
-        <p>Built on <%= Time.now.strftime('%a, %e %b %Y %H:%M %p') %></p>
+      </span>
+
+      <span class="info">
+        <p><%= release_notes %></p>
       </span>
 
       <!-- <span class="download" id="android">

data/lib/assets/s3_ios_version_template.erb

@@ -1,4 +1,9 @@
 {
     "latestVersion": "<%= full_version %>",
-    "updateUrl": "itms-services://?action=download-manifest&url=<%= url_encode(plist_url) %>"
+    "updateUrl": "itms-services://?action=download-manifest&url=<%= url_encode(plist_url) %>",
+    "plist_url": "<%= plist_url %>",
+    "ipa_url": "<%= ipa_url %>",
+    "build_number": "<%= build_num %>",
+    "bundle_version": "<%= bundle_version %>",
+    "release_notes": "<%= release_notes %>"
 }

data/lib/fastlane/plugin/aws_s3/actions/aws_s3_action.rb

@@ -29,6 +29,7 @@ module Fastlane
         params[:ipa] = config[:ipa]
         params[:xcarchive] = config[:xcarchive]
         params[:dsym] = config[:dsym]
+        params[:release_notes] = config[:release_notes]
         params[:access_key] = config[:access_key]
         params[:secret_access_key] = config[:secret_access_key]
         params[:aws_profile] = config[:aws_profile]
@@ -64,6 +65,7 @@ module Fastlane
         s3_endpoint = params[:endpoint]
         apk_file = params[:apk]
         ipa_file = params[:ipa]
+        release_notes = params[:release_notes]
         xcarchive_file = params[:xcarchive]
         files = params[:files]
         folder = params[:folder]
@@ -101,8 +103,8 @@ module Fastlane
           xcarchive_file = Actions.lane_context[SharedValues::XCODEBUILD_ARCHIVE]
         end
 
-        upload_ipa(s3_client, params, s3_region, s3_access_key, s3_secret_access_key, s3_bucket, ipa_file, dsym_file, s3_path, acl, server_side_encryption) if ipa_file.to_s.length > 0
-        upload_apk(s3_client, params, s3_region, s3_access_key, s3_secret_access_key, s3_bucket, apk_file, s3_path, acl, server_side_encryption) if apk_file.to_s.length > 0
+        upload_ipa(s3_client, params, s3_region, s3_access_key, s3_secret_access_key, s3_bucket, ipa_file, dsym_file, release_notes, s3_path, acl, server_side_encryption) if ipa_file.to_s.length > 0
+        upload_apk(s3_client, params, s3_region, s3_access_key, s3_secret_access_key, s3_bucket, apk_file, release_notes, s3_path, acl, server_side_encryption) if apk_file.to_s.length > 0
         upload_xcarchive(s3_client, params, s3_region, s3_access_key, s3_secret_access_key, s3_bucket, ipa_file, xcarchive_file, s3_path, acl, server_side_encryption) if xcarchive_file.to_s.length > 0
         upload_files(s3_client, params, s3_region, s3_access_key, s3_secret_access_key, s3_bucket, files, s3_path, acl, server_side_encryption) if files.to_a.count > 0
         upload_folder(s3_client, params, s3_region, s3_access_key, s3_secret_access_key, s3_bucket, folder, s3_path, acl, server_side_encryption) if folder.to_s.length > 0
@@ -110,7 +112,7 @@ module Fastlane
         return true
       end
 
-      def self.upload_ipa(s3_client, params, s3_region, s3_access_key, s3_secret_access_key, s3_bucket, ipa_file, dsym_file, s3_path, acl, server_side_encryption)
+      def self.upload_ipa(s3_client, params, s3_region, s3_access_key, s3_secret_access_key, s3_bucket, ipa_file, dsym_file, release_notes, s3_path, acl, server_side_encryption)
 
         s3_path = "v{CFBundleShortVersionString}_b{CFBundleVersion}/" unless s3_path
 
@@ -220,7 +222,8 @@ module Fastlane
           build_num: build_num,
           bundle_id: bundle_id,
           bundle_version: bundle_version,
-          title: title
+          title: title,
+          release_notes: release_notes
         }.merge(html_template_params))
 
         # Creates version from template
@@ -235,7 +238,8 @@ module Fastlane
           ipa_url: ipa_url,
           build_num: build_num,
           bundle_version: bundle_version,
-          full_version: full_version
+          full_version: full_version,
+          release_notes: release_notes
         }.merge(version_template_params))
 
         #####################################
@@ -288,7 +292,7 @@ module Fastlane
         UI.success("Successfully uploaded archive file to '#{Actions.lane_context[SharedValues::S3_XCARCHIVE_OUTPUT_PATH]}'")
       end
 
-      def self.upload_apk(s3_client, params, s3_region, s3_access_key, s3_secret_access_key, s3_bucket, apk_file, s3_path, acl, server_side_encryption)
+      def self.upload_apk(s3_client, params, s3_region, s3_access_key, s3_secret_access_key, s3_bucket, apk_file, release_notes, s3_path, acl, server_side_encryption)
         version = get_apk_version(apk_file)
 
         version_code = version[0]
@@ -347,7 +351,8 @@ module Fastlane
           apk_url: apk_url,
           version_code: version_code,
           version_name: version_name,
-          title: title
+          title: title,
+          release_notes: release_notes
         }.merge(html_template_params))
 
         # Creates version from template
@@ -360,7 +365,8 @@ module Fastlane
           apk_url: apk_url,
           version_code: version_code,
           version_name: version_name,
-          full_version: "#{version_code}_#{version_name}"
+          full_version: "#{version_code}_#{version_name}",
+          release_notes: release_notes
         }.merge(version_template_params))
 
         #####################################
@@ -571,6 +577,10 @@ module Fastlane
                                        description: "zipped .dsym package for the build ",
                                        optional: true,
                                        default_value: Actions.lane_context[SharedValues::DSYM_OUTPUT_PATH]),
+          FastlaneCore::ConfigItem.new(key: :release_notes,
+                                       env_name: "",
+                                       description: "release notes to display on the html page and version json",
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :upload_metadata,
                                        env_name: "",
                                        description: "Upload relevant metadata for this build",

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

@@ -1,5 +1,5 @@
 module Fastlane
   module AwsS3
-    VERSION = "1.5.0"
+    VERSION = "1.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-aws_s3
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Josh Holtz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-22 00:00:00.000000000 Z
+date: 2019-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk