fastlane-plugin-aws_s3 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a352c57e53f5406a111832c0fd3b14c92db1683
-  data.tar.gz: 76c4956e0f8f3abd737f3a40064cffef2802f849
+  metadata.gz: 3aaf513a3c224f2a23d038c6005f068cbcb865bc
+  data.tar.gz: 718db50abe2b1c3258ab82ebffb3828270fc3ad3
 SHA512:
-  metadata.gz: 6ed8f148df62eb74aa7de573ba140a564b3a02126d1c37256570e6ac0f68ea1ce844e5401172dcf201a7e943b847023cd7487c6d004a9ea16c704d3743ea0d50
-  data.tar.gz: c577cdf27707fc409ab0bdd4b89334a86017e551a92ee15ad79c0291ba37ce90f9b06a3a88a108c0332fff5ee9a5d6b9d66d723796443c4174ab7e0ac23b277d
+  metadata.gz: b32f82a441f776f9d3fc18d92af6220a4a83a33b4beb168d7ffdde610d8feeb39d9e0a82933839256393aafe38cf6561fc4e1ce486058267f9a690da8e65154f
+  data.tar.gz: 1cd12aa70a40c680f2d1e42ff91c92c81cf4d05e7601160dac5b43aa56044217475be96b052e351ade745a82cd69155414413a61c3f351d6c310ba1ab6c0c049

data/README.md

@@ -14,7 +14,7 @@ fastlane add_plugin aws_s3
 
 Upload a new build to Amazon S3 to distribute the build to beta testers. Works for both Ad Hoc and Enterprise signed applications. This step will generate the necessary HTML, plist, and version files for you.
 
-The `aws_s3` action can upload both iOS apps (IPAs) and Android apps (APKs). It is **highly** suggested that you make a separate bucket for each of the apps.
+The `aws_s3` action can upload both iOS apps (IPAs) and Android apps (APKs). If you would like to upload both iOS and Android apps to the same bucket, you can set the `app_directory` parameter so each app goes into their own S3 bucket directory.
 
 Below is what the default generated page looks like that gets hosted on S3.
 
@@ -40,7 +40,9 @@ aws_s3(
   ipa: 'AppName.ipa',                             # Required (if not uploading an APK).
   dsym: 'AppName.app.dSYM.zip',                   # Optional is you use `ipa` to build.
 
-  apk: 'AppName.apk'                              # Required (if not uploading an IPA).
+  apk: 'AppName.apk',                             # Required (if not uploading an IPA).
+  
+  app_directory: 'ios_or_android',                # Optional but nice if you want to put multiple apps in same bucket
 
   path: 'v{CFBundleShortVersionString}_b{CFBundleVersion}/', # This is actually the default.
   upload_metadata: true,                          # Upload version.json, plist and HTML. Set to false to skip uploading of these files.

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

@@ -24,6 +24,7 @@ module Fastlane
         params[:secret_access_key] = config[:secret_access_key]
         params[:bucket] = config[:bucket]
         params[:region] = config[:region]
+        params[:app_directory] = config[:app_directory]
         params[:acl] = config[:acl]
         params[:source] = config[:source]
         params[:path] = config[:path]
@@ -69,6 +70,8 @@ module Fastlane
 
         s3_path = "v{CFBundleShortVersionString}_b{CFBundleVersion}/" unless s3_path
 
+        app_directory = params[:app_directory]
+
         plist_template_path = params[:plist_template_path]
         html_template_path = params[:html_template_path]
         html_file_name = params[:html_file_name]
@@ -81,7 +84,7 @@ module Fastlane
         ipa_file_name = "#{url_part}#{ipa_file_basename}"
         ipa_file_data = File.open(ipa_file, 'rb')
 
-        ipa_url = self.upload_file(s3_client, s3_bucket, ipa_file_name, ipa_file_data, acl)
+        ipa_url = self.upload_file(s3_client, s3_bucket, app_directory, ipa_file_name, ipa_file_data, acl)
 
         # Setting action and environment variables
         Actions.lane_context[SharedValues::S3_IPA_OUTPUT_PATH] = ipa_url
@@ -92,7 +95,7 @@ module Fastlane
           dsym_file_name = "#{url_part}#{dsym_file_basename}"
           dsym_file_data = File.open(dsym_file, 'rb')
 
-          dsym_url = self.upload_file(s3_client, s3_bucket, dsym_file_name, dsym_file_data, acl)
+          dsym_url = self.upload_file(s3_client, s3_bucket, app_directory, dsym_file_name, dsym_file_data, acl)
 
           # Setting action and environment variables
           Actions.lane_context[SharedValues::S3_DSYM_OUTPUT_PATH] = dsym_url
@@ -151,7 +154,7 @@ module Fastlane
         # plist uploading
         #
         #####################################
-        plist_url = self.upload_file(s3_client, s3_bucket, plist_file_name, plist_render, acl)
+        plist_url = self.upload_file(s3_client, s3_bucket, app_directory, plist_file_name, plist_render, acl)
 
         # Creates html from template
         if html_template_path && File.exist?(html_template_path)
@@ -189,8 +192,8 @@ module Fastlane
         # html uploading
         #
         #####################################
-        html_url = self.upload_file(s3_client, s3_bucket, html_file_name, html_render, acl)
-        version_url = self.upload_file(s3_client, s3_bucket, version_file_name, version_render, acl)
+        html_url = self.upload_file(s3_client, s3_bucket, app_directory, html_file_name, html_render, acl)
+        version_url = self.upload_file(s3_client, s3_bucket, app_directory, version_file_name, version_render, acl)
 
         # Setting action and environment variables
         Actions.lane_context[SharedValues::S3_PLIST_OUTPUT_PATH] = plist_url
@@ -203,6 +206,7 @@ module Fastlane
         ENV[SharedValues::S3_VERSION_OUTPUT_PATH.to_s] = version_url
 
         UI.success("Successfully uploaded ipa file to '#{Actions.lane_context[SharedValues::S3_IPA_OUTPUT_PATH]}'")
+        UI.success("iOS app can be downloaded at '#{Actions.lane_context[SharedValues::S3_HTML_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)
@@ -214,6 +218,8 @@ module Fastlane
 
         s3_path = "#{version_code}_#{version_name}/" unless s3_path
 
+        app_directory = params[:app_directory]
+
         html_template_path = params[:html_template_path]
         html_file_name = params[:html_file_name]
         version_template_path = params[:version_template_path]
@@ -225,7 +231,7 @@ module Fastlane
         apk_file_name = "#{url_part}#{apk_file_basename}"
         apk_file_data = File.open(apk_file, 'rb')
 
-        apk_url = self.upload_file(s3_client, s3_bucket, apk_file_name, apk_file_data, acl)
+        apk_url = self.upload_file(s3_client, s3_bucket, app_directory, apk_file_name, apk_file_data, acl)
 
         # Setting action and environment variables
         Actions.lane_context[SharedValues::S3_APK_OUTPUT_PATH] = apk_url
@@ -280,8 +286,8 @@ module Fastlane
         #
         #####################################
 
-        html_url = self.upload_file(s3_client, s3_bucket, html_file_name, html_render, acl)
-        version_url = self.upload_file(s3_client, s3_bucket, version_file_name, version_render, acl)
+        html_url = self.upload_file(s3_client, s3_bucket, app_directory, html_file_name, html_render, acl)
+        version_url = self.upload_file(s3_client, s3_bucket, app_directory, version_file_name, version_render, acl)
 
         Actions.lane_context[SharedValues::S3_HTML_OUTPUT_PATH] = html_url
         ENV[SharedValues::S3_HTML_OUTPUT_PATH.to_s] = html_url
@@ -290,6 +296,7 @@ module Fastlane
         ENV[SharedValues::S3_VERSION_OUTPUT_PATH.to_s] = version_url
 
         UI.success("Successfully uploaded apk file to '#{Actions.lane_context[SharedValues::S3_APK_OUTPUT_PATH]}'")
+        UI.success("Android app can be downloaded at '#{Actions.lane_context[SharedValues::S3_HTML_OUTPUT_PATH]}'")
       end
 
       def self.get_apk_version(apk_file)
@@ -330,7 +337,12 @@ module Fastlane
         [versionCode, versionName, name]
       end
 
-      def self.upload_file(s3_client, bucket_name, 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,
@@ -435,11 +447,15 @@ module Fastlane
                                        description: "AWS bucket name",
                                        optional: true,
                                        default_value: ENV['AWS_BUCKET_NAME']),
-          FastlaneCore::ConfigItem.new(key: :region,
+         FastlaneCore::ConfigItem.new(key: :region,
                                        env_name: "S3_REGION",
                                        description: "AWS region (for bucket creation) ",
                                        optional: true,
                                        default_value: ENV['AWS_REGION']),
+          FastlaneCore::ConfigItem.new(key: :app_directory,
+                                       env_name: "S3_BUCKET_APP_DIRECTORY",
+                                       description: "Directory in bucket for the app",
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :path,
                                        env_name: "S3_PATH",
                                        description: "S3 'path'. Values from Info.plist will be substituded for keys wrapped in {}  ",

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

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

metadata

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