fastlane-plugin-aws_s3 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3aaf513a3c224f2a23d038c6005f068cbcb865bc
-  data.tar.gz: 718db50abe2b1c3258ab82ebffb3828270fc3ad3
+  metadata.gz: a5a738eaf68c791e8cfd28b354b5d5d504f0baee
+  data.tar.gz: 8a206f5567d09dfd35b4445e66b594847b6c7b00
 SHA512:
-  metadata.gz: b32f82a441f776f9d3fc18d92af6220a4a83a33b4beb168d7ffdde610d8feeb39d9e0a82933839256393aafe38cf6561fc4e1ce486058267f9a690da8e65154f
-  data.tar.gz: 1cd12aa70a40c680f2d1e42ff91c92c81cf4d05e7601160dac5b43aa56044217475be96b052e351ade745a82cd69155414413a61c3f351d6c310ba1ab6c0c049
+  metadata.gz: 079b2458bf33870dd5e39f15271126f6d37b3da5163da419316bbd4c1be629edb1903f963391d51e1fbccdd23b406ce285535fb806edbcac8beeb1fffee68311
+  data.tar.gz: 9e5ea5cd53d1f27aec1fa758a144671015e0b046c60158d44e617e69dc27034bfef99c859b411ddbcbe18b476a18f1bc5843a241654d82cf278a29da2a730197

data/lib/assets/s3_ios_html_template.erb

@@ -54,7 +54,7 @@
 
     <div class="oneRow">
       <span class="download" id="ios">
-        <a href="itms-services://?action=download-manifest&url=itms-services://?action=download-manifest&url=<%= plist_url %>" id="text" class="btn btn-lg btn-default" onclick="document.getElementById('finished').id = '';">
+        <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 %>
         </a>
       </span>

data/lib/assets/s3_ios_version_template.erb

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

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

@@ -1,5 +1,6 @@
 # rubocop:disable Metrics/AbcSize
 require 'fastlane/erb_template_helper'
+include ERB::Util
 require 'ostruct'
 
 module Fastlane
@@ -30,6 +31,7 @@ module Fastlane
         params[:path] = config[:path]
         params[:upload_metadata] = config[:upload_metadata]
         params[:plist_template_path] = config[:plist_template_path]
+        params[:plist_file_name] = config[:plist_file_name]
         params[:html_template_path] = config[:html_template_path]
         params[:html_file_name] = config[:html_file_name]
         params[:version_template_path] = config[:version_template_path]
@@ -73,6 +75,7 @@ module Fastlane
         app_directory = params[:app_directory]
 
         plist_template_path = params[:plist_template_path]
+        plist_file_name = params[:plist_file_name]
         html_template_path = params[:html_template_path]
         html_file_name = params[:html_file_name]
         version_template_path = params[:version_template_path]
@@ -123,7 +126,7 @@ module Fastlane
         full_version = "#{bundle_version}.#{build_num}"
 
         # Creating plist and html names
-        plist_file_name = "#{url_part}#{title.delete(' ')}.plist"
+        plist_file_name ||= "#{url_part}#{title.delete(' ')}.plist"
 
         html_file_name ||= "index.html"
 
@@ -148,7 +151,7 @@ module Fastlane
           bundle_version: bundle_version,
           title: title
         })
-        
+
         #####################################
         #
         # plist uploading
@@ -337,12 +340,12 @@ module Fastlane
         [versionCode, versionName, name]
       end
 
-      def self.upload_file(s3_client, bucket_name, app_directory, file_name, file_data, acl)  
-        
+      def self.upload_file(s3_client, bucket_name, app_directory, file_name, file_data, acl)
+
         if app_directory
           file_name = "#{app_directory}/#{file_name}"
         end
-        
+
         bucket = Aws::S3::Bucket.new(bucket_name, client: s3_client)
         obj = bucket.put_object({
           acl: acl,
@@ -416,6 +419,10 @@ module Fastlane
                                        env_name: "",
                                        description: "plist template path",
                                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :plist_file_name,
+                                       env_name: "",
+                                       description: "uploaded plist filename",
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :html_template_path,
                                        env_name: "",
                                        description: "html erb template path",

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

@@ -1,5 +1,5 @@
 module Fastlane
   module AwsS3
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-aws_s3
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Josh Holtz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk