fastlane 2.113.0.beta.20190106200016 → 2.113.0.beta.20190107200010

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da0e6d3a5c97091d457f08661741c9a74a8c8f93
-  data.tar.gz: 59ff42e528e23f9aa8dff16d83c57caeccb8eb40
+  metadata.gz: 7665d827137b7e8e3d6bd005d4aeff2ad0f6aedb
+  data.tar.gz: fd27910f274d5f117192a4a5ca155ce31f6ddfc0
 SHA512:
-  metadata.gz: 93fb6ef45d09316a0e3fcb3eff0b3bd59438156fb9947c2381a0a487c0e4e0ebb1065cbfb0d4114626b56187b0aadeb34e055600c280c6c7654b2c8a5b4ba445
-  data.tar.gz: 439e2f8b3d3e338263b82335d7047dc5bcf5ae2eb3e1557a04f3a6ecc290c99099095e03bb5f3940349cf0e22a986efa00ed8f3159f4d3e767f8e3af47a41530
+  metadata.gz: 0013e9a12fc558d42c01c78cc353a2fc4e785033e15b12ab24ea680a6fb447db2889ad0de76fdd221be87e1ecb37f145c258fa5512267042fbbea8fbd0a3d51a
+  data.tar.gz: a895cf3d66c35033f18e016edf46caaf3f3c8b4175fed05471a5f35250bf71166e3ff303ff0d9e82c69f400164839de3473350fa20ad2627e1e3f67646b260e8

data/fastlane/lib/fastlane/actions/commit_version_bump.rb

@@ -35,9 +35,8 @@ module Fastlane
           # ensure that the xcodeproj passed in was OK
           UI.user_error!("Could not find the specified xcodeproj: #{xcodeproj_path}") unless File.directory?(xcodeproj_path)
         else
-          all_xcodeproj_paths = Dir[File.expand_path(File.join(repo_path, '**/*.xcodeproj'))]
-          # find an xcodeproj (ignoring the Cocoapods one)
-          xcodeproj_paths = Fastlane::Actions.ignore_cocoapods_path(all_xcodeproj_paths)
+          # find an xcodeproj (ignoring dependencies)
+          xcodeproj_paths = Fastlane::Helper::XcodeprojHelper.find(repo_path)
 
           # no projects found: error
           UI.user_error!('Could not find a .xcodeproj in the current repository\'s working directory.') if xcodeproj_paths.count == 0

data/fastlane/lib/fastlane/actions/create_pull_request.rb

@@ -33,11 +33,33 @@ module Fastlane
           html_url = json['html_url']
           UI.success("Successfully created pull request ##{number}. You can see it at '#{html_url}'")
 
+          # Add labels to pull request
+          add_labels(params, number) if params[:labels]
+
           Actions.lane_context[SharedValues::CREATE_PULL_REQUEST_HTML_URL] = html_url
           return html_url
         end
       end
 
+      def self.add_labels(params, number)
+        payload = {
+          'labels' => params[:labels]
+        }
+        GithubApiAction.run(
+          server_url: params[:api_url],
+          api_token: params[:api_token],
+          http_method: 'PATCH',
+          path: "repos/#{params[:repo]}/issues/#{number}",
+          body: payload,
+          error_handlers: {
+            '*' => proc do |result|
+              UI.error("GitHub responded with #{result[:status]}: #{result[:body]}")
+              return nil
+            end
+          }
+        )
+      end
+
       #####################################################
       # @!group Documentation
       #####################################################
@@ -72,6 +94,11 @@ module Fastlane
                                        description: "The contents of the pull request",
                                        is_string: true,
                                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :labels,
+                                       env_name: "GITHUB_PULL_REQUEST_LABELS",
+                                       description: "The labels for the pull request",
+                                       type: Array,
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :head,
                                        env_name: "GITHUB_PULL_REQUEST_HEAD",
                                        description: "The name of the branch where your changes are implemented (defaults to the current branch name)",

data/fastlane/lib/fastlane/actions/hg_commit_version_bump.rb

@@ -24,9 +24,8 @@ module Fastlane
             UI.user_error!("Could not find the specified xcodeproj: #{xcodeproj_path}") unless File.directory?(xcodeproj_path)
           end
         else
-          all_xcodeproj_paths = Dir[File.expand_path(File.join(repo_path, '**/*.xcodeproj'))]
-          # find an xcodeproj (ignoring the Cocoapods one)
-          xcodeproj_paths = Fastlane::Actions.ignore_cocoapods_path(all_xcodeproj_paths)
+          # find an xcodeproj (ignoring dependencies)
+          xcodeproj_paths = Fastlane::Helper::XcodeprojHelper.find(repo_path)
 
           # no projects found: error
           UI.user_error!('Could not find a .xcodeproj in the current repository\'s working directory.') if xcodeproj_paths.count == 0

data/fastlane/lib/fastlane/helper/xcodeproj_helper.rb

@@ -0,0 +1,12 @@
+module Fastlane
+  module Helper
+    class XcodeprojHelper
+      DEPENDENCY_MANAGER_DIRS = ['Pods', 'Carthage'].freeze
+
+      def self.find(dir)
+        xcodeproj_paths = Dir[File.expand_path(File.join(dir, '**/*.xcodeproj'))]
+        xcodeproj_paths.reject { |path| %r{/(#{DEPENDENCY_MANAGER_DIRS.join('|')})/.*.xcodeproj} =~ path }
+      end
+    end
+  end
+end

data/fastlane/lib/fastlane/plugins/template/.rubocop.yml

@@ -129,6 +129,7 @@ AllCops:
   - "**/lib/assets/custom_action_template.rb"
   - "./vendor/**/*"
   - "**/lib/assets/DefaultFastfileTemplate"
+  - "**/lib/assets/MatchfileTemplate"
   - "**/spec/fixtures/broken_files/broken_file.rb"
 Style/FileName:
   Exclude:

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.113.0.beta.20190106200016'.freeze
+  VERSION = '2.113.0.beta.20190107200010'.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/match/lib/assets/MatchfileTemplate

@@ -1,4 +1,4 @@
-git_url("[[GIT_URL]]")
+[[CONTENT]]
 
 type("development") # The default type, can be: appstore, adhoc, enterprise or development
 
@@ -7,3 +7,5 @@ type("development") # The default type, can be: appstore, adhoc, enterprise or d
 
 # For all available options run `fastlane match --help`
 # Remove the # in the beginning of the line to enable the other options
+
+# The docs are available on https://docs.fastlane.tools/actions/match

data/match/lib/match/setup.rb

@@ -1,4 +1,5 @@
 require_relative 'module'
+require_relative 'storage'
 
 module Match
   class Setup
@@ -9,11 +10,20 @@ module Match
         template = File.read("#{Match::ROOT}/lib/assets/MatchfileTemplate")
       end
 
-      UI.important("Please create a new, private git repository")
-      UI.important("to store the certificates and profiles there")
-      url = UI.input("URL of the Git Repo: ")
+      storage_mode = UI.select(
+        "fastlane match supports multiple storage modes, please select the one you want to use:",
+        self.storage_options
+      )
+
+      storage = Storage.for_mode(storage_mode, {})
+
+      specific_content = storage.generate_matchfile_content
+      UI.crash!("Looks like `generate_matchfile_content` was `nil` for `#{storage_mode}`") if specific_content.nil?
+      specific_content += "\n\n" if specific_content.length > 0
+      specific_content += "storage_mode(\"#{storage_mode}\")"
+
+      template.gsub!("[[CONTENT]]", specific_content)
 
-      template.gsub!("[[GIT_URL]]", url)
       File.write(path, template)
       UI.success("Successfully created '#{path}'. You can open the file using a code editor.")
 
@@ -22,5 +32,9 @@ module Match
       UI.message("certificates for you. From then on, it will automatically import the existing profiles.")
       UI.message("For more information visit https://docs.fastlane.tools/actions/match/")
     end
+
+    def storage_options
+      return ["git", "google_cloud"]
+    end
   end
 end

data/match/lib/match/storage/git_storage.rb

@@ -125,6 +125,13 @@ module Match
         ].join(" ")
       end
 
+      def generate_matchfile_content
+        UI.important("Please create a new, private git repository to store the certificates and profiles there")
+        url = UI.input("URL of the Git Repo: ")
+
+        return "git_url(\"#{url}\")"
+      end
+
       private
 
       # Create and checkout an specific branch in the git repo

data/match/lib/match/storage/google_cloud_storage.rb

@@ -127,6 +127,10 @@ module Match
         false
       end
 
+      def generate_matchfile_content
+        return "bucket_name(\"#{self.bucket_name}\")"
+      end
+
       private
 
       def bucket

data/match/lib/match/storage/interface.rb

@@ -90,6 +90,13 @@ module Match
         not_implemented(__method__)
       end
 
+      # Implement this for the `fastlane match init` command
+      # This method must return the content of the Matchfile
+      # that should be generated
+      def generate_matchfile_content(template: nil)
+        not_implemented(__method__)
+      end
+
       # Call this method to reset any changes made locally to the files
       def clear_changes
         return unless @working_directory

data/spaceship/lib/spaceship/du/utilities.rb

@@ -40,7 +40,7 @@ module Spaceship
     # @param video_path (String) the path to the video file
     # @param timestamp (String) the `ffmpeg` timestamp format (e.g. 00.00)
     # @param dimensions (Array) the dimension of the screenshot to generate
-    # @return the path to the TempFile containing the generated screenshot
+    # @return the TempFile containing the generated screenshot
     def grab_video_preview(video_path, timestamp, dimensions)
       width, height = dimensions
       require 'tempfile'
@@ -50,7 +50,7 @@ module Spaceship
       # puts "COMMAND: #{command}"
       `#{command}`
       raise "Failed to grab screenshot at #{timestamp} from #{video_path} (using #{command})" unless $CHILD_STATUS.to_i == 0
-      tmp.path
+      tmp
     end
 
     # identifies the resolution of a video using `ffmpeg`

data/spaceship/lib/spaceship/tunes/app_version.rb

@@ -567,7 +567,10 @@ module Spaceship
           else
             # IDEA: optimization, we could avoid fetching the screenshot if the timestamp hasn't changed
             video_preview_resolution = video_preview_resolution_for(device, trailer_path)
-            video_preview_path = Utilities.grab_video_preview(trailer_path, timestamp, video_preview_resolution)
+
+            # Keep a reference of the video_preview here to avoid Ruby getting rid of the Tempfile in the meanwhile
+            video_preview = Utilities.grab_video_preview(trailer_path, timestamp, video_preview_resolution)
+            video_preview_path = video_preview.path
           end
           video_preview_file = UploadFile.from_path(video_preview_path)
           video_preview_data = client.upload_trailer_preview(self, video_preview_file, device)

data/spaceship/lib/spaceship/tunes/tunes_client.rb

@@ -377,6 +377,10 @@ module Spaceship
 
         r = request(:get, rating_url)
         all_reviews.concat(parse_response(r, 'data')['reviews'])
+
+        # The following lines throw errors when there are no reviews so exit out of the loop before them if the app has no reviews
+        break if all_reviews.count == 0
+
         last_review_date = Time.at(all_reviews[-1]['value']['lastModified'] / 1000)
 
         if upto_date && last_review_date < upto_date

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.113.0.beta.20190106200016
+  version: 2.113.0.beta.20190107200010
 platform: ruby
 authors:
 - Danielle Tomlinson
@@ -27,7 +27,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-06 00:00:00.000000000 Z
+date: 2019-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -546,7 +546,7 @@ dependencies:
         version: 1.12.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -556,7 +556,7 @@ dependencies:
         version: 1.12.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -1206,7 +1206,6 @@ files:
 - fastlane/lib/fastlane/features.rb
 - fastlane/lib/fastlane/helper/README.md
 - fastlane/lib/fastlane/helper/adb_helper.rb
-- fastlane/lib/fastlane/helper/cocoapod_helper.rb
 - fastlane/lib/fastlane/helper/crashlytics_helper.rb
 - fastlane/lib/fastlane/helper/dotenv_helper.rb
 - fastlane/lib/fastlane/helper/gem_helper.rb
@@ -1214,6 +1213,7 @@ files:
 - fastlane/lib/fastlane/helper/gradle_helper.rb
 - fastlane/lib/fastlane/helper/podspec_helper.rb
 - fastlane/lib/fastlane/helper/sh_helper.rb
+- fastlane/lib/fastlane/helper/xcodeproj_helper.rb
 - fastlane/lib/fastlane/helper/xcversion_helper.rb
 - fastlane/lib/fastlane/junit_generator.rb
 - fastlane/lib/fastlane/lane.rb
@@ -1682,24 +1682,24 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
+- frameit/lib
+- spaceship/lib
 - precheck/lib
+- gym/lib
+- supply/lib
+- match/lib
 - scan/lib
+- fastlane_core/lib
+- cert/lib
 - deliver/lib
-- screengrab/lib
-- supply/lib
-- frameit/lib
-- sigh/lib
-- gym/lib
-- snapshot/lib
 - produce/lib
+- snapshot/lib
+- screengrab/lib
 - fastlane/lib
 - credentials_manager/lib
-- spaceship/lib
-- match/lib
-- pilot/lib
 - pem/lib
-- fastlane_core/lib
-- cert/lib
+- pilot/lib
+- sigh/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/fastlane/lib/fastlane/helper/cocoapod_helper.rb

@@ -1,7 +0,0 @@
-module Fastlane
-  module Actions
-    def self.ignore_cocoapods_path(all_xcodeproj_paths)
-      all_xcodeproj_paths.reject { |path| %r{/Pods/.*.xcodeproj} =~ path }
-    end
-  end
-end