fastlane-plugin-aws_s3 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf25b6b9b17c5e1ecab636e6cca8774c1c107f95
-  data.tar.gz: a3f657dd480e94d66593c8ea5f2ad1dfdb987360
+  metadata.gz: 1a352c57e53f5406a111832c0fd3b14c92db1683
+  data.tar.gz: 76c4956e0f8f3abd737f3a40064cffef2802f849
 SHA512:
-  metadata.gz: a796219f0d215c9ad032ae8d49bd01a12b0c7896dcc5b5cb049bc1ff8cf0039cd2525528483e0e91c48799f81af37a2dab5f93d94dae71b384a7099701af6dc3
-  data.tar.gz: f48b0e1685a567aa2f9019d77342a639eb8792bd7f04e71b1949e89d1cf0c22338c2c7ee11c3e48576eb5cd81f37522bc90fbfd50e1d5bb0c4426759e3793b24
+  metadata.gz: 6ed8f148df62eb74aa7de573ba140a564b3a02126d1c37256570e6ac0f68ea1ce844e5401172dcf201a7e943b847023cd7487c6d004a9ea16c704d3743ea0d50
+  data.tar.gz: c577cdf27707fc409ab0bdd4b89334a86017e551a92ee15ad79c0291ba37ce90f9b06a3a88a108c0332fff5ee9a5d6b9d66d723796443c4174ab7e0ac23b277d

data/README.md

@@ -1,30 +1,36 @@
-# fastlane-plugin-s3 `fastlane` Plugin
+# aws_s3 `fastlane` Plugin
 
-[![fastlane Plugin Badge](https://rawcdn.githack.com/fastlane/fastlane/master/fastlane/assets/plugin-badge.svg)](https://rubygems.org/gems/fastlane-plugin-s3)
+[![fastlane Plugin Badge](https://rawcdn.githack.com/fastlane/fastlane/master/fastlane/assets/plugin-badge.svg)](https://rubygems.org/gems/fastlane-plugin-aws_s3)
 
 ## Getting Started
 
 This project is a [fastlane](https://github.com/fastlane/fastlane) plugin. To get started with fastlane-plugin-s3, add it to your project by running:
 
 ```bash
-fastlane add_plugin s3
+fastlane add_plugin aws_s3
 ```
 
-## About s3
+## About 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 `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). It is **highly** suggested that you make a separate bucket for each of the apps.
 
-Add the `s3` action after the `gym` step:
+Below is what the default generated page looks like that gets hosted on S3.
+
+![Generated page](aws_s3_screenshot.png)
+
+## Example
+
+Add the `aws_s3` action after the `gym` step:
 
 ```ruby
-s3
+aws_s3
 ```
 
 You can also customize a lot of options:
 ```ruby
-s3(
+aws_s3(
   # All of these are used to make Shenzhen's `ipa distribute:s3` command
   access_key: ENV['S3_ACCESS_KEY'],               # Required from user.
   secret_access_key: ENV['S3_SECRET_ACCESS_KEY'], # Required from user.
@@ -54,12 +60,6 @@ The uploaded `version.json` file provides an easy way for apps to poll if a new
 }
 ```
 
-## Example
-
-Check out the [example `Fastfile`](fastlane/Fastfile) to see how to use this plugin. Try it by cloning the repo, running `fastlane install_plugins` and `bundle exec fastlane test`. 
-
-**Note to author:** Please set up a sample project to make it easy for users to explore what your plugin does. Provide everything that is necessary to try out the plugin in this project (including a sample Xcode/Android project if necessary)
-
 ## Issues and Feedback
 
 For any other issues and feedback about this plugin, please submit it to this repository.
@@ -75,3 +75,10 @@ For more information about how the `fastlane` plugin system works, check out the
 ## About `fastlane`
 
 `fastlane` automates building, testing, and releasing your app for beta and app store distributions. To learn more about `fastlane`, check out [fastlane.tools](https://fastlane.tools).
+
+## Author
+
+Josh Holtz, josh@rokkincat.com, [@joshdholtz](https://twitter.com/joshdholtz)
+
+I'm available for freelance work (Fastlane, iOS, and Android development) :muscle:
+Feel free to contact me :rocket:

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

@@ -5,12 +5,12 @@ require 'ostruct'
 module Fastlane
   module Actions
     module SharedValues
-      S3_APK_OUTPUT_PATH = :S3_APK_OUTPUT_PATH
-      S3_IPA_OUTPUT_PATH = :S3_IPA_OUTPUT_PATH
-      S3_DSYM_OUTPUT_PATH = :S3_DSYM_OUTPUT_PATH
-      S3_PLIST_OUTPUT_PATH = :S3_PLIST_OUTPUT_PATH
-      S3_HTML_OUTPUT_PATH = :S3_HTML_OUTPUT_PATH
-      S3_VERSION_OUTPUT_PATH = :S3_VERSION_OUTPUT_PATH
+      S3_APK_OUTPUT_PATH ||= :S3_APK_OUTPUT_PATH
+      S3_IPA_OUTPUT_PATH ||= :S3_IPA_OUTPUT_PATH
+      S3_DSYM_OUTPUT_PATH ||= :S3_DSYM_OUTPUT_PATH
+      S3_PLIST_OUTPUT_PATH ||= :S3_PLIST_OUTPUT_PATH
+      S3_HTML_OUTPUT_PATH ||= :S3_HTML_OUTPUT_PATH
+      S3_VERSION_OUTPUT_PATH ||= :S3_VERSION_OUTPUT_PATH
     end
 
     class AwsS3Action < Action
@@ -36,7 +36,6 @@ module Fastlane
 
         # Pulling parameters for other uses
         s3_region = params[:region]
-        s3_subdomain = params[:region] ? "s3-#{params[:region]}" : "s3"
         s3_access_key = params[:access_key]
         s3_secret_access_key = params[:secret_access_key]
         s3_bucket = params[:bucket]
@@ -60,13 +59,13 @@ module Fastlane
 
         s3_client = Aws::S3::Client.new
 
-        upload_ipa(s3_client, params, s3_region, s3_subdomain, s3_access_key, s3_secret_access_key, s3_bucket, ipa_file, dsym_file, s3_path, acl) if ipa_file.to_s.length > 0
-        upload_apk(s3_client, params, s3_region, s3_subdomain, s3_access_key, s3_secret_access_key, s3_bucket, apk_file, s3_path, acl) 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, s3_path, acl) 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) if apk_file.to_s.length > 0
 
         return true
       end
 
-      def self.upload_ipa(s3_client, params, s3_region, s3_subdomain, s3_access_key, s3_secret_access_key, s3_bucket, ipa_file, dsym_file, s3_path, acl)
+      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)
 
         s3_path = "v{CFBundleShortVersionString}_b{CFBundleVersion}/" unless s3_path
 
@@ -122,7 +121,6 @@ module Fastlane
 
         # Creating plist and html names
         plist_file_name = "#{url_part}#{title.delete(' ')}.plist"
-        plist_url = "https://#{s3_subdomain}.amazonaws.com/#{s3_bucket}/#{plist_file_name}"
 
         html_file_name ||= "index.html"
 
@@ -147,6 +145,13 @@ module Fastlane
           bundle_version: bundle_version,
           title: title
         })
+        
+        #####################################
+        #
+        # plist uploading
+        #
+        #####################################
+        plist_url = self.upload_file(s3_client, s3_bucket, plist_file_name, plist_render, acl)
 
         # Creates html from template
         if html_template_path && File.exist?(html_template_path)
@@ -181,11 +186,9 @@ module Fastlane
 
         #####################################
         #
-        # html and plist uploading
+        # html uploading
         #
         #####################################
-
-        plist_url = self.upload_file(s3_client, s3_bucket, plist_file_name, plist_render, acl)
         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)
 
@@ -202,7 +205,7 @@ module Fastlane
         UI.success("Successfully uploaded ipa file to '#{Actions.lane_context[SharedValues::S3_IPA_OUTPUT_PATH]}'")
       end
 
-      def self.upload_apk(s3_client, params, s3_region, s3_subdomain, s3_access_key, s3_secret_access_key, s3_bucket, apk_file, s3_path, acl)
+      def self.upload_apk(s3_client, params, s3_region, s3_access_key, s3_secret_access_key, s3_bucket, apk_file, s3_path, acl)
         version = get_apk_version(apk_file)
 
         version_code = version[0]

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-aws_s3
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Josh Holtz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Upload IPA and APK to S3