fastlane 1.88.0 → 1.89.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9927ac2cd5350fa89c4e9c3b90d26fbff1fd14f3
-  data.tar.gz: 2fbb1bb963af63e52d3c2231760b32d92cf42cb9
+  metadata.gz: 7ab10b5466a620abbe5ef7ec4f08f18612f49f77
+  data.tar.gz: 9a97c9b31a2aa353d5b006aec8c51f6a90f37227
 SHA512:
-  metadata.gz: f2a17afe167377fe9094940660a184ee423752db2b7038bd61c3d8d37f515f9c93d833aa3325a61b8510f6064865d0984308d3ed5f4cf46f9aa2e9bebd57f966
-  data.tar.gz: 02cdab05808de5fe681f86ed794b54e118789fdbb8c921bbd52ab51b3cf6a2691428e901b6fa2f304d34fc10f1a67bb696d726359c10dd5ced33e8cc28c0e5bc
+  metadata.gz: 5eec8e96803f2af205fd37ac2e6d32fe66a48a5aeab221497878e7228899283fdcde65d0a9172ea4410e42c2b4e6b3e87cdf3d41166b24d45e00d98dd60c53c4
+  data.tar.gz: 439f42b67b05dceac8dd534cfc7eeccb38431b58c655ee7c5581bb7306edd6fc76e70b66dd6cc1abacbd7e19f637b3f90ac149750b8514c1292a1a6be62be662

data/lib/fastlane/actions/changelog_from_git_commits.rb

@@ -6,16 +6,19 @@ module Fastlane
 
     class ChangelogFromGitCommitsAction < Action
       def self.run(params)
-        if params[:between]
-          from, to = params[:between]
+        if params[:commits_count]
+          UI.success("Collecting the last #{params[:commits_count]} Git commits")
         else
-          from = Actions.last_git_tag_name(params[:match_lightweight_tag], params[:tag_match_pattern])
-          UI.verbose("Found the last Git tag: #{from}")
-          to = 'HEAD'
+          if params[:between]
+            from, to = params[:between]
+          else
+            from = Actions.last_git_tag_name(params[:match_lightweight_tag], params[:tag_match_pattern])
+            UI.verbose("Found the last Git tag: #{from}")
+            to = 'HEAD'
+          end
+          UI.success("Collecting Git commits between #{from} and #{to}")
         end
 
-        UI.success("Collecting Git commits between #{from} and #{to}")
-
         # Normally it is not good practice to take arbitrary input and convert it to a symbol
         # because prior to Ruby 2.2, symbols are never garbage collected. However, we've
         # already validated that the input matches one of our allowed values, so this is OK
@@ -26,7 +29,11 @@ module Fastlane
           merge_commit_filtering = :exclude_merges
         end
 
-        changelog = Actions.git_log_between(params[:pretty], from, to, merge_commit_filtering)
+        if params[:commits_count]
+          changelog = Actions.git_log_last_commits(params[:pretty], params[:commits_count], merge_commit_filtering)
+        else
+          changelog = Actions.git_log_between(params[:pretty], from, to, merge_commit_filtering)
+        end
         changelog = changelog.gsub("\n\n", "\n") if changelog # as there are duplicate newlines
         Actions.lane_context[SharedValues::FL_CHANGELOG] = changelog
 
@@ -53,14 +60,25 @@ module Fastlane
         [
           FastlaneCore::ConfigItem.new(key: :between,
                                        env_name: 'FL_CHANGELOG_FROM_GIT_COMMITS_BETWEEN',
-                                       description: 'Array containing two Git revision values between which to collect messages',
+                                       description: 'Array containing two Git revision values between which to collect messages, you mustn\'t use it with :commits_count key at the same time',
                                        optional: true,
                                        is_string: false,
+                                       conflicting_options: [:commits_count],
                                        verify_block: proc do |value|
                                          UI.user_error!(":between must be of type array") unless value.kind_of?(Array)
                                          UI.user_error!(":between must not contain nil values") if value.any?(&:nil?)
                                          UI.user_error!(":between must be an array of size 2") unless (value || []).size == 2
                                        end),
+          FastlaneCore::ConfigItem.new(key: :commits_count,
+                                       env_name: 'FL_CHANGELOG_FROM_GIT_COMMITS_COUNT',
+                                       description: 'Number of commits to include in changelog, you mustn\'t use it with :between key at the same time',
+                                       optional: true,
+                                       is_string: false,
+                                       conflicting_options: [:between],
+                                       verify_block: proc do |value|
+                                         UI.user_error!(":commits_count must be an integer") unless value.kind_of? Integer
+                                         UI.user_error!(":commits_count must be >= 1") unless value >= 1
+                                       end),
           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',
@@ -103,7 +121,7 @@ module Fastlane
       end
 
       def self.author
-        ['mfurtak', 'asfalcone']
+        ['mfurtak', 'asfalcone', 'SiarheiFedartsou']
       end
 
       def self.is_supported?(platform)

data/lib/fastlane/cli_tools_distributor.rb

@@ -14,7 +14,7 @@ module Fastlane
         # every time one of the tools is launched
         available_lanes = Fastlane::FastlaneFolder.available_lanes
 
-        tool_name = ARGV.first.downcase
+        tool_name = ARGV.first ? ARGV.first.downcase : nil
         if tool_name && Fastlane::TOOLS.include?(tool_name.to_sym) && !available_lanes.include?(tool_name.to_sym)
           # Triggering a specific tool
           # This happens when the users uses things like

data/lib/fastlane/fast_file.rb

@@ -115,11 +115,21 @@ module Fastlane
       @runner.set_before_all(@current_platform, block)
     end
 
+    # Is executed before each lane
+    def before_each(&block)
+      @runner.set_before_each(@current_platform, block)
+    end
+
     # Is executed after each test run
     def after_all(&block)
       @runner.set_after_all(@current_platform, block)
     end
 
+    # Is executed before each lane
+    def after_each(&block)
+      @runner.set_after_each(@current_platform, block)
+    end
+
     # Is executed if an error occured during fastlane execution
     def error(&block)
       @runner.set_error(@current_platform, block)

data/lib/fastlane/helper/git_helper.rb

@@ -5,8 +5,16 @@ module Fastlane
     def self.git_log_between(pretty_format, from, to, merge_commit_filtering)
       command = 'git log'
       command << " --pretty=\"#{pretty_format}\" #{from.shellescape}...#{to.shellescape}"
-      command << " --no-merges" if merge_commit_filtering == :exclude_merges
-      command << " --merges" if merge_commit_filtering == :only_include_merges
+      command << git_log_merge_commit_filtering_option(merge_commit_filtering)
+      Actions.sh(command, log: false).chomp
+    rescue
+      nil
+    end
+
+    def self.git_log_last_commits(pretty_format, commit_count, merge_commit_filtering)
+      command = 'git log'
+      command << " --pretty=\"#{pretty_format}\" -n #{commit_count}"
+      command << git_log_merge_commit_filtering_option(merge_commit_filtering)
       Actions.sh(command, log: false).chomp
     rescue
       nil
@@ -80,5 +88,17 @@ module Fastlane
     rescue
       nil
     end
+
+    private_class_method
+    def self.git_log_merge_commit_filtering_option(merge_commit_filtering)
+      case merge_commit_filtering
+      when :exclude_merges
+        " --no-merges"
+      when :only_include_merges
+        " --merges"
+      else
+        ""
+      end
+    end
   end
 end

data/lib/fastlane/runner.rb

@@ -44,17 +44,15 @@ module Fastlane
       parameters ||= {}
       begin
         Dir.chdir(path_to_use) do # the file is located in the fastlane folder
-          # Call the platform specific before_all block and then the general one
-
-          before_all_blocks[current_platform].call(current_lane, parameters) if before_all_blocks[current_platform] && current_platform
-          before_all_blocks[nil].call(current_lane, parameters) if before_all_blocks[nil]
+          execute_flow_block(before_all_blocks, current_platform, current_lane, parameters)
+          execute_flow_block(before_each_blocks, current_platform, current_lane, parameters)
 
           return_val = lane_obj.call(parameters) # by default no parameters
 
-          # `after_all` is only called if no exception was raised before
-          # Call the platform specific before_all block and then the general one
-          after_all_blocks[current_platform].call(current_lane, parameters) if after_all_blocks[current_platform] && current_platform
-          after_all_blocks[nil].call(current_lane, parameters) if after_all_blocks[nil]
+          # after blocks are only called if no exception was raised before
+          # Call the platform specific after block and then the general one
+          execute_flow_block(after_each_blocks, current_platform, current_lane, parameters)
+          execute_flow_block(after_all_blocks, current_platform, current_lane, parameters)
         end
 
         return return_val
@@ -127,6 +125,8 @@ module Fastlane
 
         UI.user_error!("Parameters for a lane must always be a hash") unless (parameters.first || {}).kind_of? Hash
 
+        execute_flow_block(before_each_blocks, current_platform, new_lane, parameters)
+
         pretty = [new_lane]
         pretty = [current_platform, new_lane] if current_platform
         Actions.execute_action("Switch to #{pretty.join(' ')} lane") {} # log the action
@@ -138,6 +138,10 @@ module Fastlane
         result = block.call(parameters.first || {}) # to always pass a hash
         self.current_lane = original_lane
 
+        # after blocks are only called if no exception was raised before
+        # Call the platform specific after block and then the general one
+        execute_flow_block(after_each_blocks, current_platform, new_lane, parameters)
+
         UI.success "Cruising back to lane '#{original_full}' 🚘".green
         return result
       else
@@ -182,6 +186,12 @@ module Fastlane
       end
     end
 
+    def execute_flow_block(block, current_platform, lane, parameters)
+      # Call the platform specific block and default back to the general one
+      block[current_platform].call(lane, parameters) if block[current_platform] && current_platform
+      block[nil].call(lane, parameters) if block[nil]
+    end
+
     def verify_supported_os(name, class_ref)
       if class_ref.respond_to?(:is_supported?)
         if Actions.lane_context[Actions::SharedValues::PLATFORM_NAME]
@@ -218,6 +228,14 @@ module Fastlane
       lanes[lane.platform][lane.name] = lane
     end
 
+    def set_before_each(platform, block)
+      before_each_blocks[platform] = block
+    end
+
+    def set_after_each(platform, block)
+      after_each_blocks[platform] = block
+    end
+
     def set_before_all(platform, block)
       before_all_blocks[platform] = block
     end
@@ -234,6 +252,14 @@ module Fastlane
       @lanes ||= {}
     end
 
+    def before_each_blocks
+      @before_each ||= {}
+    end
+
+    def after_each_blocks
+      @after_each ||= {}
+    end
+
     def before_all_blocks
       @before_all ||= {}
     end

data/lib/fastlane/version.rb

@@ -1,4 +1,4 @@
 module Fastlane
-  VERSION = '1.88.0'.freeze
+  VERSION = '1.89.0'.freeze
   DESCRIPTION = "The easiest way to automate building and releasing your iOS and Android apps"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 1.88.0
+  version: 1.89.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: krausefx-shenzhen
@@ -908,7 +908,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The easiest way to automate building and releasing your iOS and Android apps