fastlane 1.64.0 → 1.65.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45dd5cf53c7177ddb32515a4ea523968bed241e7
-  data.tar.gz: 6180e4b81438d84dddd2a2c90a92c98693519f88
+  metadata.gz: 9e759626e063ddfcef9ffba2c8f957d97096f60f
+  data.tar.gz: a3dd1d6f6e6228d309c8c374d4e7ee511a5ce699
 SHA512:
-  metadata.gz: e345f385b400bfd8703fb8b65b5760a957e33d583e17f0c0439969e310cca79e7a13b0cf271da5095409e9cdbd21e349d20447689e17d63dbe7135596e64df0a
-  data.tar.gz: 6b14e133ff543454b3919295a6f67437636b817795bdcdc9718310ad68f30bdb3b9eb665c64261a745ae21bb770de897ca36d618257814b9350ee7616fe87af4
+  metadata.gz: 21084918f23cbf71b2641aa709ce20a301580f52bb2bc1235fd041a9c623607fbaf8fa0f0b8b134cd195169fc3b60ddf6a50e7396e540cb7c11db65c76c13058
+  data.tar.gz: f41aaad6052def5c784f3a0b69804a1f84227444afec0344d869644d311ce001cf0e71e997b5efcbc3139dcafbf9a194545b79fe62d0da1df87c99a0e963ad81

data/lib/fastlane/actions/commit_version_bump.rb

@@ -89,7 +89,8 @@ module Fastlane
 
         # get the absolute paths to the files
         git_add_paths = expected_changed_files.map do |path|
-          File.expand_path(File.join(repo_pathname, path.gsub("$(SRCROOT)", ".")))
+          updated = path.gsub("$(SRCROOT)", ".").gsub("${SRCROOT}", ".")
+          File.expand_path(File.join(repo_pathname, updated))
         end
 
         # then create a commit with a message

data/lib/fastlane/actions/git_add.rb

@@ -3,9 +3,9 @@ module Fastlane
     class GitAddAction < Action
       def self.run(params)
         if params[:path].kind_of?(String)
-          paths = "'#{params[:path]}'"
+          paths = params[:path].shellescape
         else
-          paths = params[:path].join(" ")
+          paths = params[:path].map(&:shellescape).join(' ')
         end
 
         result = Actions.sh("git add #{paths}")

data/lib/fastlane/actions/git_commit.rb

@@ -3,9 +3,9 @@ module Fastlane
     class GitCommitAction < Action
       def self.run(params)
         if params[:path].kind_of?(String)
-          paths = "'#{params[:path]}'"
+          paths = params[:path].shellescape
         else
-          paths = params[:path].map {|path| "'#{path}'" }.join(" ")
+          paths = params[:path].map(&:shellescape).join(' ')
         end
 
         result = Actions.sh("git commit -m '#{params[:message]}' #{paths}")

data/lib/fastlane/actions/hockey.rb

@@ -59,7 +59,7 @@ module Fastlane
           Helper.log.info 'Build successfully uploaded to HockeyApp!'.green
         else
           if response.body.to_s.include?("App could not be created")
-            raise "Hockey has an issue processing this app. Please pass the :public_identifier option you can get from the Hockey website. More information https://github.com/fastlane/fastlane/issues/400"
+            raise "Hockey has an issue processing this app. Please confirm that an app in Hockey matches this IPA's bundle ID or that you are using the correct API upload token. If error persists, please provide the :public_identifier option from the HockeyApp website. More information https://github.com/fastlane/fastlane/issues/400"
           else
             raise "Error when trying to upload ipa to HockeyApp: #{response.body}".red
           end

data/lib/fastlane/actions/s3.rb

@@ -90,11 +90,19 @@ module Fastlane
         ENV[SharedValues::S3_IPA_OUTPUT_PATH.to_s] = ipa_url
 
         if dsym_file
-          dsym_file_name = File.basename(dsym_file)
-          dsym_url = "https://#{s3_subdomain}.amazonaws.com/#{s3_bucket}/#{url_part}#{dsym_file_name}"
+          dsym_file_basename = File.basename(dsym_file)
+          dsym_file_name = "#{url_part}#{dsym_file_basename}"
+          dsym_file_data = File.open(dsym_file, 'rb')
+
+          upload_dsym(
+            s3_access_key,
+            s3_secret_access_key,
+            s3_bucket,
+            s3_region,
+            dsym_file_name,
+            dsym_file_data
+          )
 
-          Actions.lane_context[SharedValues::S3_DSYM_OUTPUT_PATH] = dsym_url
-          ENV[SharedValues::S3_DSYM_OUTPUT_PATH.to_s] = dsym_url
         end
 
         if params[:upload_metadata] == false
@@ -241,7 +249,7 @@ module Fastlane
           version_obj = version_obj.object
         end
 
-        # Setting actionand environment variables
+        # Setting action and environment variables
         Actions.lane_context[SharedValues::S3_PLIST_OUTPUT_PATH] = plist_obj.public_url.to_s
         ENV[SharedValues::S3_PLIST_OUTPUT_PATH.to_s] = plist_obj.public_url.to_s
 
@@ -254,6 +262,39 @@ module Fastlane
         Helper.log.info "Successfully uploaded ipa file to '#{Actions.lane_context[SharedValues::S3_IPA_OUTPUT_PATH]}'".green
       end
 
+      def self.upload_dsym(s3_access_key, s3_secret_access_key, s3_bucket, s3_region, dsym_file_name, dsym_file_data)
+        Actions.verify_gem!('aws-sdk')
+        require 'aws-sdk'
+        if s3_region
+          s3_client = AWS::S3.new(
+            access_key_id: s3_access_key,
+            secret_access_key: s3_secret_access_key,
+            region: s3_region
+          )
+        else
+          s3_client = AWS::S3.new(
+            access_key_id: s3_access_key,
+            secret_access_key: s3_secret_access_key
+          )
+        end
+
+        bucket = s3_client.buckets[s3_bucket]
+
+        dsym_obj = bucket.objects.create(dsym_file_name, dsym_file_data, acl: :public_read)
+
+        # When you enable versioning on a S3 bucket,
+        # writing to an object will create an object version
+        # instead of replacing the existing object.
+        # http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/S3/ObjectVersion.html
+        if dsym_obj.kind_of? AWS::S3::ObjectVersion
+          dsym_obj = dsym_obj.object
+        end
+
+        # Setting action and environment variables
+        Actions.lane_context[SharedValues::S3_DSYM_OUTPUT_PATH] = dsym_obj.public_url.to_s
+        ENV[SharedValues::S3_DSYM_OUTPUT_PATH.to_s] = dsym_obj.public_url.to_s
+      end
+
       #
       # NOT a fan of this as this was taken straight from Shenzhen
       # https://github.com/nomad/shenzhen/blob/986792db5d4d16a80c865a2748ee96ba63644821/lib/shenzhen/plugins/s3.rb#L32

data/lib/fastlane/actions/screengrab.rb

@@ -6,7 +6,6 @@ module Fastlane
 
     class ScreengrabAction < Action
       def self.run(params)
-        UI.user_error! "screengrab currently only supports running on a Mac" unless Helper.mac?
         require 'screengrab'
 
         begin

data/lib/fastlane/actions/slack.rb

@@ -27,11 +27,8 @@ module Fastlane
 
         notifier = Slack::Notifier.new(options[:slack_url])
 
-        if options[:username].to_s.length > 0
-          notifier.username = options[:username]
-        else
-          notifier.username = 'fastlane'
-        end
+        notifier.username = options[:use_webhook_configured_username_and_icon] ? nil : options[:username]
+        icon_url = options[:use_webhook_configured_username_and_icon] ? nil : options[:icon_url]
 
         if options[:channel].to_s.length > 0
           notifier.channel = options[:channel]
@@ -42,15 +39,9 @@ module Fastlane
 
         return [notifier, slack_attachment] if Helper.is_test? # tests will verify the slack attachments and other properties
 
-        if options[:icon_url].to_s.length > 0
-          result = notifier.ping '',
-                                 icon_url: options[:icon_url],
-                                 attachments: [slack_attachment]
-        else
-          result = notifier.ping '',
-                                 icon_url: 'https://s3-eu-west-1.amazonaws.com/fastlane.tools/fastlane.png',
-                                 attachments: [slack_attachment]
-        end
+        result = notifier.ping '',
+                               icon_url: icon_url,
+                               attachments: [slack_attachment]
 
         if result.code.to_i == 200
           Helper.log.info 'Successfully sent Slack notification'.green
@@ -66,14 +57,6 @@ module Fastlane
 
       def self.available_options
         [
-          FastlaneCore::ConfigItem.new(key: :username,
-                                       env_name: "FL_SLACK_USERNAME",
-                                       description: "The username that should be displayed on Slack",
-                                       optional: true),
-          FastlaneCore::ConfigItem.new(key: :icon_url,
-                                       env_name: "FL_SLACK_ICON_URL",
-                                       description: "The URL of the icon that should be displayed on Slack",
-                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :message,
                                        env_name: "FL_SLACK_MESSAGE",
                                        description: "The message that should be displayed on Slack. This supports the standard Slack markup language",
@@ -82,12 +65,30 @@ module Fastlane
                                        env_name: "FL_SLACK_CHANNEL",
                                        description: "#channel or @username",
                                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :use_webhook_configured_username_and_icon,
+                                       env_name: "FL_SLACK_USE_WEBHOOK_CONFIGURED_USERNAME_AND_ICON",
+                                       description: "Use webook's default username and icon settings? (true/false)",
+                                       default_value: false,
+                                       is_string: false,
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :slack_url,
                                        env_name: "SLACK_URL",
                                        description: "Create an Incoming WebHook for your Slack group",
                                        verify_block: proc do |value|
                                          raise "Invalid URL, must start with https://" unless value.start_with? "https://"
                                        end),
+          FastlaneCore::ConfigItem.new(key: :username,
+                                       env_name: "FL_SLACK_USERNAME",
+                                       description: "Overrides the webook's username property if use_webhook_configured_username_and_icon is false",
+                                       default_value: "fastlane",
+                                       is_string: true,
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :icon_url,
+                                       env_name: "FL_SLACK_ICON_URL",
+                                       description: "Overrides the webook's image property if use_webhook_configured_username_and_icon is false",
+                                       default_value: "https://s3-eu-west-1.amazonaws.com/fastlane.tools/fastlane.png",
+                                       is_string: true,
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :payload,
                                        env_name: "FL_SLACK_PAYLOAD",
                                        description: "Add additional information to this post. payload must be a hash containg any key with any value",

data/lib/fastlane/version.rb

@@ -1,3 +1,3 @@
 module Fastlane
-  VERSION = '1.64.0'.freeze
+  VERSION = '1.65.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 1.64.0
+  version: 1.65.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: krausefx-shenzhen
@@ -174,7 +174,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.4
+        version: 0.22.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -184,7 +184,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.4
+        version: 0.22.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -830,7 +830,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.0
 signing_key: 
 specification_version: 4
 summary: Connect all iOS deployment tools into one streamlined workflow