fastlane 2.63.0.beta.20171026010003 → 2.63.0.beta.20171027010003

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe369b68f6388108db0474221521216edfe1c2f8
-  data.tar.gz: cd2bb45122a1099e3774699317d4548ecdbff7e7
+  metadata.gz: 27411efe0af1b5da1306fc3963686d2023eaeece
+  data.tar.gz: ea01bfb262f7c2e68a3b1a7af162778f281f8af2
 SHA512:
-  metadata.gz: df505be58afcfc2ce336b1d53e41ed56157482ce4a5e967a7f338c382d6075b6c32ad0baeec3a984e3f9767d9b22b4e6c6059c12fdee172e479702ad170a2689
-  data.tar.gz: f64891f727d11e8b6cc21b8b16c671a87a8800bd8032319084b233c7985470c940798d666fb465a21da85d627bea8c46f1d9ca324e1c8a1bfcca5642b109dd06
+  metadata.gz: fa818bfe9143d441509f2a1e9c216628456cdf3e3d529a737a4d42f6e8a2396310c14f90783a20fe8a6ccad93903e9c4e4d8644287bf42ccf19884f66d5e06cf
+  data.tar.gz: 3e7405094e04325f52d205f72fff02c80e3d2bef0bee231486571bea645e0aabcc6e5794da6af1eb3880975af4586b3eab5aa7240a0f4afe621099a8acbdbea0

data/fastlane/lib/fastlane/actions/import_from_git.rb

@@ -32,6 +32,10 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :path,
                                        description: "The path of the Fastfile in the repository",
                                        default_value: 'fastlane/Fastfile',
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :version,
+                                       description: "The version to checkout on the respository. Optimistic operator can be used to select the latest version within constraints",
+                                       default_value: nil,
                                        optional: true)
         ]
       end
@@ -50,6 +54,7 @@ module Fastlane
             url: "git@github.com:fastlane/fastlane.git", # The URL of the repository to import the Fastfile from.
             branch: "HEAD", # The branch to checkout on the repository. Defaults to `HEAD`.
             path: "fastlane/Fastfile" # The path of the Fastfile in the repository. Defaults to `fastlane/Fastfile`.
+            version: "~> 1.0.0" #The version to checkout on the respository. Optimistic operator can be used to select the latest version within constraints.
           )'
         ]
       end

data/fastlane/lib/fastlane/fast_file.rb

@@ -225,7 +225,8 @@ module Fastlane
     # @param url [String] The git URL to clone the repository from
     # @param branch [String] The branch to checkout in the repository
     # @param path [String] The path to the Fastfile
-    def import_from_git(url: nil, branch: 'HEAD', path: 'fastlane/Fastfile')
+    # @param verion [String] Version of the required Fastlane version
+    def import_from_git(url: nil, branch: 'HEAD', path: 'fastlane/Fastfile', version: nil)
       UI.user_error!("Please pass a path to the `import_from_git` action") if url.to_s.length == 0
 
       Actions.execute_action('import_from_git') do
@@ -235,26 +236,34 @@ module Fastlane
 
         # Checkout the repo
         repo_name = url.split("/").last
+        checkout_param = branch
 
         Dir.mktmpdir("fl_clone") do |tmp_path|
           clone_folder = File.join(tmp_path, repo_name)
 
-          branch_option = ""
           branch_option = "--branch #{branch}" if branch != 'HEAD'
 
-          clone_command = "GIT_TERMINAL_PROMPT=0 git clone '#{url}' '#{clone_folder}' --depth 1 -n #{branch_option}"
-
           UI.message "Cloning remote git repo..."
-          Actions.sh(clone_command)
+          Actions.sh("GIT_TERMINAL_PROMPT=0 git clone '#{url}' '#{clone_folder}' --depth 1 -n #{branch_option}")
+
+          unless version.nil?
+            git_tags = fetch_remote_tags(folder: clone_folder)
+
+            # Separate version from optimistic operator
+            version_number = version(version_string: version)
+            operator = operator(version_string: version)
+
+            checkout_param = checkout_param_for_operator(operator: operator, version: version_number, git_tags: git_tags)
+          end
 
-          Actions.sh("cd '#{clone_folder}' && git checkout #{branch} '#{path}'")
+          Actions.sh("cd '#{clone_folder}' && git checkout #{checkout_param} '#{path}'")
 
           # We also want to check out all the local actions of this fastlane setup
           containing = path.split(File::SEPARATOR)[0..-2]
           containing = "." if containing.count == 0
           actions_folder = File.join(containing, "actions")
           begin
-            Actions.sh("cd '#{clone_folder}' && git checkout #{branch} '#{actions_folder}'")
+            Actions.sh("cd '#{clone_folder}' && git checkout #{checkout_param} '#{actions_folder}'")
           rescue
             # We don't care about a failure here, as local actions are optional
           end
@@ -268,6 +277,89 @@ module Fastlane
       end
     end
 
+    #####################################################
+    # @!group Versioning helpers
+    #####################################################
+
+    def fetch_remote_tags(folder: nil)
+      UI.message "Fetching remote git tags..."
+      Actions.sh("cd '#{folder}' && GIT_TERMINAL_PROMPT=0 git fetch --all --tags -q")
+
+      # Fetch all possible tags
+      git_tags_string = Actions.sh("cd '#{folder}' && git tag -l")
+      git_tags = git_tags_string.split("\n")
+
+      # Delete tags that are not a real version number
+      git_tags.delete_if { |tag| Gem::Version.correct?(tag) != 0 }
+
+      # Sort tags based on their version number
+      git_tags.sort_by { |tag| Gem::Version.new(tag) }
+
+      return git_tags
+    end
+
+    def checkout_param_for_operator(operator: nil, version: nil, git_tags: nil)
+      # ~> should select the latest version withing constraints.
+      # -> should select a specific version without fallback.
+      if operator == "~>"
+        return checkout_param_twiddle_wakka(version: version, git_tags: git_tags)
+
+      elsif operator == "->" || operator.nil?
+        return checkout_param_specific_version(version: version, git_tags: git_tags)
+
+      else
+        UI.user_error!("The specified operator \"#{operator}\" in \"#{version}\" is unknown. Please use one of these '~> ->'")
+      end
+    end
+
+    def checkout_param_specific_version(version: nil, git_tags: nil)
+      # Search matching version in array
+      matching_git_tags = git_tags.select do |tag|
+        tag == version
+      end
+
+      UI.user_error!("The specified version \"#{version}\" doesn't exist") if matching_git_tags.count == 0
+      return matching_git_tags.last
+    end
+
+    def checkout_param_twiddle_wakka(version: nil, git_tags: nil)
+      # Drop last specified digit in version
+      last_dot_index = version.rindex('.')
+      version_range = version[0..last_dot_index - 1]
+
+      # Search matching version in array
+      matching_git_tags = git_tags.select do |tag|
+        tag.start_with?(version_range)
+      end
+
+      UI.user_error!("No version found within the \"#{version_range}.*\" range") if matching_git_tags.count == 0
+
+      return matching_git_tags.last
+    end
+
+    def operator(version_string: nil)
+      version_info = version_range_info(version_string: version_string)
+
+      # version_info will have 2 elements if an optimistic operator is specified.
+      if version_info.count > 1
+
+        # Optimistic operator is always the first part. e.g.: ["~>", "2.0.0"]
+        return version_info.first
+      end
+
+      return nil
+    end
+
+    def version(version_string: nil)
+      version_info = version_range_info(version_string: version_string)
+      return version_info.last
+    end
+
+    def version_range_info(version_string: nil)
+      # Separate version from optimistic operator
+      return version_string.split(" ")
+    end
+
     #####################################################
     # @!group Overwriting Ruby methods
     #####################################################

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.63.0.beta.20171026010003'.freeze
+  VERSION = '2.63.0.beta.20171027010003'.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.63.0.beta.20171026010003
+  version: 2.63.0.beta.20171027010003
 platform: ruby
 authors:
 - Felix Krause
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2017-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier