fastlane 2.95.0.beta.20180502050125 → 2.95.0.beta.20180503050136

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bdad5e365a2ddea2f5d4205197d8a2175d038ba
-  data.tar.gz: 4c65d0e72f385450b2aa493caf51efe4ce48e7d2
+  metadata.gz: 3abe7f47de2ab60cef65f6cc24b219f9c2f8599f
+  data.tar.gz: 185724ecc03fe6388c4e6953b9d8ffdd822e7cb8
 SHA512:
-  metadata.gz: d82bb1f76111c32e50586eb67d7af026c7e529dd4cca61f2574641f6d374d89ffb8e03120f058b6d200a9e12e64043fc7b7b9bea7b1260ac02c573d8738477f0
-  data.tar.gz: c810132f70bd323832cc09b3a5b2e50b0245d328515663c73ad410bcb3eda3e89e2ef243d66a801763366122cedf91ec0e7f58919bf34a98b705a215967e43c1
+  metadata.gz: e7d8be4839517946020d96f5ab3a5cf2911e28f00cb06b007965c63549e5db7a26b082ee9c1599f9f0fc7e3680f204985bea2c758a0cdabdba6d456d87a2e8b0
+  data.tar.gz: d9c2c3c1ea81a6393b84039eb9d90458c791bd3d5078f77a9ab9a932e11d3828096099e2c078baf4f4816073cbad42ec35611def2540fdfd843a8773f6039f8e

data/fastlane/lib/fastlane/actions/changelog_from_git_commits.rb

@@ -29,19 +29,22 @@ module Fastlane
           merge_commit_filtering = :exclude_merges
         end
 
-        if params[:commits_count]
-          changelog = Actions.git_log_last_commits(params[:pretty], params[:commits_count], merge_commit_filtering, params[:date_format], params[:ancestry_path])
-        else
-          changelog = Actions.git_log_between(params[:pretty], from, to, merge_commit_filtering, params[:date_format], params[:ancestry_path])
-        end
-        changelog = changelog.gsub("\n\n", "\n") if changelog # as there are duplicate newlines
-        Actions.lane_context[SharedValues::FL_CHANGELOG] = changelog
+        Dir.chdir(params[:path]) do
+          if params[:commits_count]
+            changelog = Actions.git_log_last_commits(params[:pretty], params[:commits_count], merge_commit_filtering, params[:date_format], params[:ancestry_path])
+          else
+            changelog = Actions.git_log_between(params[:pretty], from, to, merge_commit_filtering, params[:date_format], params[:ancestry_path])
+          end
+
+          changelog = changelog.gsub("\n\n", "\n") if changelog # as there are duplicate newlines
+          Actions.lane_context[SharedValues::FL_CHANGELOG] = changelog
 
-        puts("")
-        puts(changelog)
-        puts("")
+          puts("")
+          puts(changelog)
+          puts("")
 
-        changelog
+          changelog
+        end
       end
 
       #####################################################
@@ -83,6 +86,11 @@ module Fastlane
                                        verify_block: proc do |value|
                                          UI.user_error!(":commits_count must be >= 1") unless value.to_i >= 1
                                        end),
+          FastlaneCore::ConfigItem.new(key: :path,
+                                       env_name: 'FL_CHANGELOG_FROM_GIT_COMMITS_PATH',
+                                       description: 'Path of the git repository',
+                                       optional: true,
+                                       default_value: './'),
           FastlaneCore::ConfigItem.new(key: :pretty,
                                        env_name: 'FL_CHANGELOG_FROM_GIT_COMMITS_PRETTY',
                                        description: 'The format applied to each commit while generating the collected value',

data/fastlane/lib/fastlane/actions/docs/frame_screenshots.md

@@ -205,7 +205,7 @@ The `keyword.strings` and `title.strings` are standard `.strings` file you alrea
 
 **Notes**
 
-- These `.strings` files **MUST** be utf-16 encoded (UTF-16 BE with BOM). They also must begin with an empty line. If you are having trouble see [issue #1740](https://github.com/fastlane/fastlane/issues/1740)
+- These `.strings` files **MUST** be utf-8 (UTF-8) or utf-16 encoded (UTF-16 BE with BOM). They also must begin with an empty line. If you are having trouble see [issue #1740](https://github.com/fastlane/fastlane/issues/1740)
 - You **MUST** provide a background if you want titles. _frameit_ will not add the tiles if a background is not specified.
 
 # Mac

data/fastlane/lib/fastlane/actions/docs/sync_code_signing.md

@@ -325,6 +325,25 @@ If you want to manually decrypt a file you can.
 openssl aes-256-cbc -k "<password>" -in "<fileYouWantToDecryptPath>" -out "<decryptedFilePath>" -a -d
 ```
 
+#### Export Distribution Certificate and Private Key as Single .p12 File
+
+_match_ stores the certificate (.cer) and the private key (.p12) files separately. The following steps will repackage the separate certificate and private key into a single .p12 file.
+
+Decrypt your cert found in certs/`<type>`/`<unique-id>`.cer as a pem file
+```no-highlight
+openssl aes-256-cbc -k "<password>" -in "certs/<type>/<unique-id>.cer" -out "cert.dem" -a -d
+openssl x509 -inform der -in cert.der -out cert.pem
+```
+
+Decrypt your private key found in certs/`<type>`/`<unique-id>`.p12 as a pem file
+```no-highlight
+openssl aes-256-cbc -k "<password>" -in "certs/distribution/<unique-id>.p12" -out "key.pem" -a -d
+```
+
+Generate an encrypted p12 file with the same or new password
+```no-highlight
+openssl pkcs12 -export -out "cert.p12" -inkey "key.pem' -in "cert.pem" -password pass:<password>
+```
 
 ## Is this secure?
 

data/fastlane/lib/fastlane/actions/update_fastlane.rb

@@ -28,9 +28,9 @@ module Fastlane
         sudo_needed = !File.writable?(gem_dir)
 
         if sudo_needed
-          UI.important("It seems that your Gem directory is not writable by your current User.")
+          UI.important("It seems that your Gem directory is not writable by your current user.")
           UI.important("fastlane would need sudo rights to update itself, however, running 'sudo fastlane' is not recommended.")
-          UI.important("If you still want to use this action, please read the documentation on a guide how to set this up:")
+          UI.important("If you still want to use this action, please read the documentation on how to set this up:")
           UI.important("https://docs.fastlane.tools/actions/#update_fastlane")
           return
         end

data/fastlane/lib/fastlane/fast_file.rb

@@ -57,6 +57,7 @@ module Fastlane
           # rubocop:enable Security/Eval
         rescue SyntaxError => ex
           line = ex.to_s.match(/#{Regexp.escape(relative_path)}:(\d+)/)[1]
+          UI.content_error(data, line)
           UI.user_error!("Syntax error in your Fastfile on line #{line}: #{ex}")
         end
       end

data/fastlane/lib/fastlane/lane_manager.rb

@@ -57,12 +57,17 @@ module Fastlane
       e = nil
       begin
         ff.runner.execute(lane, platform, parameters)
+      rescue NameError => ex
+        print_lane_context
+        print_error_line(ex)
+        e = ex
       rescue Exception => ex # rubocop:disable Lint/RescueException
         # We also catch Exception, since the implemented action might send a SystemExit signal
         # (or similar). We still want to catch that, since we want properly finish running fastlane
         # Tested with `xcake`, which throws a `Xcake::Informative` object
 
         print_lane_context
+        print_error_line(ex)
         UI.error(ex.to_s) if ex.kind_of?(StandardError) # we don't want to print things like 'system exit'
         e = ex
       end

data/fastlane/lib/fastlane/lane_manager_base.rb

@@ -75,5 +75,14 @@ module Fastlane
         rows: FastlaneCore::PrintTable.transform_output(rows)
       }))
     end
+
+    def self.print_error_line(ex)
+      error_line = ex.backtrace[0].match("Fastfile:(\\d+):")
+      return unless error_line
+
+      line = error_line[1]
+      UI.error("Error in your Fastfile at line #{line}")
+      UI.content_error(File.read(FastlaneCore::FastlaneFolder.fastfile_path, encoding: "utf-8"), line)
+    end
   end
 end

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.95.0.beta.20180502050125'.freeze
+  VERSION = '2.95.0.beta.20180503050136'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
   RUBOCOP_REQUIREMENT = '0.49.1'.freeze

data/fastlane_core/lib/fastlane_core/configuration/configuration_file.rb

@@ -43,12 +43,14 @@ module FastlaneCore
 
       begin
         # rubocop:disable Security/Eval
-        eval(content) # this is okay in this case
+        puts(eval(content)) # this is okay in this case
         # rubocop:enable Security/Eval
 
         print_resulting_config_values unless skip_printing_values # only on success
       rescue SyntaxError => ex
         line = ex.to_s.match(/\(eval\):(\d+)/)[1]
+        UI.error("Error in your #{File.basename(path)} at line #{line}")
+        UI.content_error(content, line)
         UI.user_error!("Syntax error in your configuration file '#{path}' on line #{line}: #{ex}")
       rescue => ex
         raise ExceptionWhileParsingError.new(ex, self.options), "Error while parsing config file at #{path}"

data/fastlane_core/lib/fastlane_core/ui/implementations/shell.rb

@@ -96,6 +96,23 @@ module FastlaneCore
       success("-" * i)
     end
 
+    def content_error(content, error_line)
+      error_line = error_line.to_i
+      return unless error_line > 0
+
+      contents = content.split(/\r?\n/).map(&:chomp)
+
+      start_line = error_line - 2 < 1 ? 1 : error_line - 2
+      end_line = error_line + 2 < contents.length ? error_line + 2 : contents.length
+
+      Range.new(start_line, end_line).each do |line|
+        str = line == error_line ? " => " : "    "
+        str << line.to_s.rjust(Math.log10(end_line) + 1)
+        str << ":\t#{contents[line - 1]}"
+        error(str)
+      end
+    end
+
     #####################################################
     # @!group Errors: Inputs
     #####################################################

data/fastlane_core/lib/fastlane_core/ui/interface.rb

@@ -78,6 +78,14 @@ module FastlaneCore
       not_implemented(__method__)
     end
 
+    # Print lines of content around specific line where
+    #   failed to parse.
+    #
+    #   This message will be shown as error
+    def content_error(content, error_line)
+      not_implemented(__method__)
+    end
+
     #####################################################
     # @!group Errors: Inputs
     #####################################################

data/pilot/lib/pilot/commands_generator.rb

@@ -151,7 +151,7 @@ module Pilot
 
       command :import do |c|
         c.syntax = "fastlane pilot import"
-        c.description = "Create external testers from a CSV file"
+        c.description = "Import external testers from a CSV file called testers.csv"
 
         FastlaneCore::CommanderGenerator.new.generate(Pilot::Options.available_options, command: c)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.95.0.beta.20180502050125
+  version: 2.95.0.beta.20180503050136
 platform: ruby
 authors:
 - Stefan Natchev
@@ -27,7 +27,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-02 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -1651,24 +1651,24 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
-- screengrab/lib
+- gym/lib
+- pem/lib
+- fastlane_core/lib
 - deliver/lib
+- screengrab/lib
+- scan/lib
+- precheck/lib
+- match/lib
+- fastlane/lib
+- sigh/lib
+- spaceship/lib
 - frameit/lib
 - pilot/lib
-- credentials_manager/lib
-- fastlane_core/lib
 - cert/lib
-- pem/lib
-- gym/lib
+- produce/lib
 - snapshot/lib
-- fastlane/lib
-- sigh/lib
-- spaceship/lib
-- match/lib
-- precheck/lib
-- scan/lib
 - supply/lib
-- produce/lib
+- credentials_manager/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="