fastlane 2.96.0.beta.20180511050050 → 2.96.0.beta.20180512050121

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea4d5243558186be073d2b32830fc255844e199e
-  data.tar.gz: ee6cecd0244a18c870a898e562c1d0b0351103a7
+  metadata.gz: 7e8287ff0f76e56ef45e34af2cb5d576c30f7cdf
+  data.tar.gz: 57670fd91a6a20af68212eef1a1e79c6a393e9bf
 SHA512:
-  metadata.gz: 4fb22ae751c6eb90a915a606c58037fa28daaf1f55faa5a301134134f1709404a71bf447adbbba90d5d8bf85866d5b21767b141b78dab443aacd97d8f9d13800
-  data.tar.gz: b10c96c4e1c81160d5ea0a35afb6a254452ead4c18515fe9ad9e14f4097b5b7b6ffac29aa8a7306b2e3f2986f59dcc0b9dcdbcd2f1849f728f09312dd1dc86a6
+  metadata.gz: 92841764c4b77f4e22e8226c01e629cab259454ded2f88b30e334f22b15f6e6a79a0a4128d171f80753ded62bef1dafbd1ac9c4f738faf1935d6c073c7302a52
+  data.tar.gz: 7546f8b0c70411e3d366df7f0ed5836805c97afd2ebb465afef84325f3e05b39aebcd92ef0be8c62c19d4a1c1edae007182eb74e6b2a82311e5b5bbe51b146ce

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

@@ -29,6 +29,8 @@ module Fastlane
           merge_commit_filtering = :exclude_merges
         end
 
+        params[:path] = './' unless params[:path]
+
         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])

data/fastlane/lib/fastlane/actions/ensure_xcode_version.rb

@@ -8,15 +8,39 @@ module Fastlane
       def self.run(params)
         Actions.verify_gem!('xcode-install')
         required_version = params[:version]
+
+        if required_version.to_s.length == 0
+          # The user didn't provide an Xcode version, let's see
+          # if the current project has a `.xcode-version` file
+          #
+          # The code below can be improved to also consider
+          # the directory of the Xcode project
+          xcode_version_paths = Dir.glob(".xcode-version")
+
+          if xcode_version_paths.first
+            UI.verbose("Loading required version from #{xcode_version_paths.first}")
+            required_version = File.read(xcode_version_paths.first).strip
+          else
+            UI.user_error!("No version: provided when calling the `ensure_xcode_version` action")
+          end
+        end
+
         selected_version = sh("xcversion selected").match(/^Xcode (.*)$/)[1]
 
+        begin
+          selected_version = Gem::Version.new(selected_version)
+          required_version = Gem::Version.new(required_version)
+        rescue ArgumentError => ex
+          UI.user_error!("Invalid version number provided, make sure it's valid: #{ex}")
+        end
+
         if selected_version == required_version
           UI.success("Selected Xcode version is correct: #{selected_version}")
         else
           UI.message("Selected Xcode version is not correct: #{selected_version}. You expected #{required_version}.")
           UI.message("To correct this, use: `xcode_select(version: #{required_version})`.")
 
-          UI.user_error!("Selected Xcode version doesn't match your requirement.\nExpected: Xcode #{required_version}\nActual: #{selected_version}\n")
+          UI.user_error!("Selected Xcode version doesn't match your requirement.\nExpected: Xcode #{required_version}\nActual: Xcode #{selected_version}\n")
         end
       end
 
@@ -25,13 +49,14 @@ module Fastlane
       #####################################################
 
       def self.description
-        "Ensure the selected Xcode version with xcode-select matches a value"
+        "Ensure the right version of Xcode is used"
       end
 
       def self.details
         [
           "If building your app requires a specific version of Xcode, you can invoke this command before using gym.",
-          "For example, to ensure that a beta version of Xcode is not accidentally selected to build, which would make uploading to TestFlight fail."
+          "For example, to ensure that a beta version of Xcode is not accidentally selected to build, which would make uploading to TestFlight fail.",
+          "You can either manually provide a specific version using `version: ` or you make use of the `.xcode-version` file."
         ].join("\n")
       end
 
@@ -41,7 +66,7 @@ module Fastlane
                                        env_name: "FL_ENSURE_XCODE_VERSION",
                                        description: "Xcode version to verify that is selected",
                                        is_string: true,
-                                       optional: false)
+                                       optional: true)
         ]
       end
 
@@ -55,7 +80,7 @@ module Fastlane
       end
 
       def self.authors
-        ["JaviSoto"]
+        ["JaviSoto", "KrauseFx"]
       end
 
       def self.example_code

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.96.0.beta.20180511050050'.freeze
+  VERSION = '2.96.0.beta.20180512050121'.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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.96.0.beta.20180511050050
+  version: 2.96.0.beta.20180512050121
 platform: ruby
 authors:
 - Stefan Natchev
@@ -27,7 +27,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-11 00:00:00.000000000 Z
+date: 2018-05-12 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:
+- precheck/lib
 - scan/lib
+- frameit/lib
+- gym/lib
+- sigh/lib
+- pilot/lib
 - snapshot/lib
-- match/lib
+- fastlane/lib
 - deliver/lib
-- gym/lib
-- precheck/lib
+- screengrab/lib
+- cert/lib
 - supply/lib
-- sigh/lib
 - pem/lib
-- produce/lib
 - fastlane_core/lib
-- screengrab/lib
 - credentials_manager/lib
-- cert/lib
-- fastlane/lib
+- match/lib
 - spaceship/lib
-- frameit/lib
-- pilot/lib
+- produce/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="