fastlane-plugin-aws_s3 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 792c2fd59fa5dc0480f690bed188dd7814825adb
-  data.tar.gz: e1f1c9e5c5334aea52f9b7f477d9c54a4668d4eb
+  metadata.gz: 384d78755eb4184c1eaff0d1e5ca53820367e031
+  data.tar.gz: 079c7f3475d1d87075229b33ef1b11fef7b11eca
 SHA512:
-  metadata.gz: 1106223561a29f1c2243b3e62506550f27eab456279b5d04234007e838bf76710779433490223e748aae0c48701739f3d4e75140ed4f1ff5d4295f3e50a2ee3f
-  data.tar.gz: 811a702b78f6554c16df73c611cff1cdd096401b4d3a6c1fb57a764d341d4148687d34763c7716383972d088779786a3dcd604ea97e399496306cb434f123b6b
+  metadata.gz: ee21202416b64bd3ef7e2aab5cde7628bc004068dfd7fc35fc92c93169350da44d6e2f1a0ae67a850113c3c7c6051c1cfbe5071d600ef3d81d3326cd53ecd7be
+  data.tar.gz: 7084aa5b148a7c2d86a4cc8d9bad9c606793772982337329271bb1ac18d1fb5c4f012c018b6f639aae98c49ea8a92340482c73d2dda31494e68a8cb7c2214387

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

@@ -13,6 +13,7 @@ module Fastlane
       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_SOURCE_OUTPUT_PATH ||= :S3_SOURCE_OUTPUT_PATH
     end
 
     class AwsS3Action < Action
@@ -36,6 +37,7 @@ module Fastlane
         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[:skip_html_upload] = config[:skip_html_upload]
         params[:version_template_path] = config[:version_template_path]
         params[:version_file_name] = config[:version_file_name]
 
@@ -144,10 +146,8 @@ module Fastlane
 
         # Creates plist from template
         if plist_template_path && File.exist?(plist_template_path)
-          puts "1 - #{plist_template_path}"
           plist_template = eth.load_from_path(plist_template_path)
         else
-          puts "2 - #{Helper.gem_path('fastlane-plugin-aws_s3')}"
           plist_template = eth.load("s3_ios_plist_template")
         end
         plist_render = eth.render(plist_template, {
@@ -202,21 +202,26 @@ module Fastlane
         # html uploading
         #
         #####################################
-        html_url = self.upload_file(s3_client, s3_bucket, app_directory, html_file_name, html_render, acl)
+        
+        skip_html = params[:skip_html_upload]
+        
+        html_url = self.upload_file(s3_client, s3_bucket, app_directory, html_file_name, html_render, acl) unless skip_html
         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
         ENV[SharedValues::S3_PLIST_OUTPUT_PATH.to_s] = plist_url
 
-        Actions.lane_context[SharedValues::S3_HTML_OUTPUT_PATH] = html_url
-        ENV[SharedValues::S3_HTML_OUTPUT_PATH.to_s] = html_url
+        Actions.lane_context[SharedValues::S3_HTML_OUTPUT_PATH] = html_url unless skip_html
+        ENV[SharedValues::S3_HTML_OUTPUT_PATH.to_s] = html_url unless skip_html
 
         Actions.lane_context[SharedValues::S3_VERSION_OUTPUT_PATH] = version_url
         ENV[SharedValues::S3_VERSION_OUTPUT_PATH.to_s] = version_url
+        
+        self.upload_source(s3_client, params, s3_bucket, params[:source], s3_path, acl)
 
         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]}'")
+        UI.success("iOS app can be downloaded at '#{Actions.lane_context[SharedValues::S3_HTML_OUTPUT_PATH]}'") unless skip_html
       end
 
       def self.upload_apk(s3_client, params, s3_region, s3_access_key, s3_secret_access_key, s3_bucket, apk_file, s3_path, acl)
@@ -295,18 +300,47 @@ module Fastlane
         # html and plist uploading
         #
         #####################################
+        
+        skip_html = params[:skip_html_upload]
 
-        html_url = self.upload_file(s3_client, s3_bucket, app_directory, html_file_name, html_render, acl)
+        html_url = self.upload_file(s3_client, s3_bucket, app_directory, html_file_name, html_render, acl) unless skip_html
         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
+        Actions.lane_context[SharedValues::S3_HTML_OUTPUT_PATH] = html_url unless skip_html
+        ENV[SharedValues::S3_HTML_OUTPUT_PATH.to_s] = html_url unless skip_html
 
         Actions.lane_context[SharedValues::S3_VERSION_OUTPUT_PATH] = version_url
         ENV[SharedValues::S3_VERSION_OUTPUT_PATH.to_s] = version_url
 
+        self.upload_source(s3_client, params, s3_bucket, params[:source], s3_path, acl)
+        
         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]}'")
+        UI.success("Android app can be downloaded at '#{Actions.lane_context[SharedValues::S3_HTML_OUTPUT_PATH]}'") unless skip_html
+      end
+      
+      def self.upload_source(s3_client, params, s3_bucket, source_directory, s3_path, acl)
+        if source_directory && File.directory?(source_directory)
+          source_directory = File.absolute_path source_directory
+          output_file_path = Tempfile.new('aws_s3_source').path
+          
+          output_file_path = other_action.zip(
+            path: source_directory,
+            output_path: output_file_path.gsub(/(?<!.zip)$/, ".zip")
+          )
+          
+          s3_path = "#{version_code}_#{version_name}/" unless s3_path
+          app_directory = params[:app_directory]
+          url_part = s3_path
+          zip_file_name = "#{url_part}source.zip"
+          
+          output_path_data = File.open("#{output_file_path}", 'rb')
+          source_url = self.upload_file(s3_client, s3_bucket, app_directory, zip_file_name, output_path_data, acl)
+          
+          Actions.lane_context[SharedValues::S3_SOURCE_OUTPUT_PATH] = source_url
+          ENV[SharedValues::S3_SOURCE_OUTPUT_PATH.to_s] = source_url
+          
+          UI.success("Source can be downloaded at '#{Actions.lane_context[SharedValues::S3_SOURCE_OUTPUT_PATH]}'")
+        end
       end
 
       def self.get_apk_version(apk_file)
@@ -438,6 +472,12 @@ module Fastlane
                                        env_name: "",
                                        description: "uploaded html filename",
                                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :skip_html_upload,
+                                       env_name: "",
+                                       description: "skip html upload if true",
+                                       optional: true,
+                                       default_value: false,
+                                       is_string: false),
           FastlaneCore::ConfigItem.new(key: :version_template_path,
                                        env_name: "",
                                        description: "version erb template path",
@@ -499,7 +539,8 @@ 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_HTML_OUTPUT_PATH', 'Direct HTTP link to the uploaded HTML file'],
-          ['S3_VERSION_OUTPUT_PATH', 'Direct HTTP link to the uploaded Version file']
+          ['S3_VERSION_OUTPUT_PATH', 'Direct HTTP link to the uploaded Version file'],
+          ['S3_SOURCE_OUTPUT_PATH', 'Direct HTTP link to the uploaded source ']
         ]
       end
 

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

@@ -1,5 +1,5 @@
 module Fastlane
   module AwsS3
-    VERSION = "0.2.5"
+    VERSION = "0.2.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-aws_s3
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - Josh Holtz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -111,7 +111,6 @@ files:
 - lib/fastlane/plugin/aws_s3/actions/aws_s3_action.rb
 - lib/fastlane/plugin/aws_s3/helper/aws_s3_helper.rb
 - lib/fastlane/plugin/aws_s3/version.rb
-- lib/fastlane/plugin/s3/version.rb
 homepage: https://github.com/joshdholtz/fastlane-plugin-s3
 licenses:
 - MIT

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

@@ -1,5 +0,0 @@
-module Fastlane
-  module AwsS3
-    VERSION = "0.1.1"
-  end
-end