fastlane 2.86.0.beta.20180316050051 → 2.86.0.beta.20180317050040

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7995dfeda91951931b550ea21d89b8b3180477f5
-  data.tar.gz: 1ed638a12b3a8995e62b43731e98c7c7e1b80420
+  metadata.gz: da2c95e01cab5bb5882134041dd36ddc2032ec65
+  data.tar.gz: 4fda933db2786f9093f4706793e5ae11e817a8e2
 SHA512:
-  metadata.gz: 6cc45e497269218d8f291a0f0e7f59ff4b2d545558943298d1ae130f2a81de61205bb98252ac16df1c1c52c4e6d18ad776da359fb744f617fd7185f8d32ebdf8
-  data.tar.gz: 0b02429495aec40e156955c7221466c2e2be252f7d3bb0adad6bf7b0c9b7e917605cc36d314862f5a0140854dd13efbc5cf7e13dc0c50c62207f4f4c92e0d73d
+  metadata.gz: 04611c3cebac2bed102627c2c3cdf6623193ec4bc944903076236a349b589e62b706d0947cd5b200b070b2e686e6297ebfd5734e75a7e947ffcf5cc724d89571
+  data.tar.gz: ff99f8a53d0ad99e2d41f77f1f93ba3ae399b69c5c02a8a243252dd573e7a041ca93d0974d8ef9e59f28f6de2265319e70237192ac29fcf57b220fbf68ccac20

data/credentials_manager/lib/credentials_manager/appfile_config.rb

@@ -29,7 +29,7 @@ module CredentialsManager
 
       path ||= self.class.default_path
 
-      if path and File.exist?(path) # it might not exist, we still want to use the default values
+      if path && File.exist?(path) # it might not exist, we still want to use the default values
         full_path = File.expand_path(path)
         Dir.chdir(File.expand_path('..', path)) do
           content = File.read(full_path, encoding: "utf-8")

data/deliver/lib/deliver/app_screenshot.rb

@@ -232,7 +232,7 @@ module Deliver
     def self.calculate_screen_size(path)
       size = FastImage.size(path)
 
-      UI.user_error!("Could not find or parse file at path '#{path}'") if size.nil? or size.count == 0
+      UI.user_error!("Could not find or parse file at path '#{path}'") if size.nil? || size.count == 0
 
       # Walk up two directories and test if we need to handle a platform that doesn't support landscape
       path_component = Pathname.new(path).each_filename.to_a[-3]
@@ -246,12 +246,12 @@ module Deliver
       devices.each do |device_type, array|
         array.each do |resolution|
           if skip_landscape
-            if size[0] == resolution[0] and size[1] == resolution[1] # portrait
+            if size[0] == (resolution[0]) && size[1] == (resolution[1]) # portrait
               return device_type
             end
           else
-            if (size[0] == resolution[0] and size[1] == resolution[1]) or # portrait
-               (size[1] == resolution[0] and size[0] == resolution[1]) # landscape
+            if (size[0] == (resolution[0]) && size[1] == (resolution[1])) || # portrait
+               (size[1] == (resolution[0]) && size[0] == (resolution[1])) # landscape
               return device_type
             end
           end

data/deliver/lib/deliver/commands_generator.rb

@@ -102,7 +102,7 @@ module Deliver
         FastlaneCore::CommanderGenerator.new.generate(deliverfile_options, command: c)
 
         c.action do |args, options|
-          if File.exist?("Deliverfile") or File.exist?("fastlane/Deliverfile")
+          if File.exist?("Deliverfile") || File.exist?("fastlane/Deliverfile")
             UI.important("You already have a running deliver setup in this directory")
             return 0
           end

data/deliver/lib/deliver/options.rb

@@ -122,6 +122,11 @@ module Deliver
                                      description: "Submit the new version for Review after uploading everything",
                                      is_string: false,
                                      default_value: false),
+        FastlaneCore::ConfigItem.new(key: :reject_if_possible,
+                                     env_name: "DELIVER_REJECT_IF_POSSIBLE",
+                                     description: "Rejects the previously submitted build if it's in a state where it's possible",
+                                     is_string: false,
+                                     default_value: false),
         FastlaneCore::ConfigItem.new(key: :automatic_release,
                                      description: "Should the app be automatically released once it's approved?",
                                      is_string: false,

data/deliver/lib/deliver/runner.rb

@@ -44,8 +44,9 @@ module Deliver
 
       UI.success("Finished the upload to iTunes Connect") unless options[:skip_binary_upload]
 
-      precheck_success = precheck_app
+      reject_version_if_possible if options[:reject_if_possible]
 
+      precheck_success = precheck_app
       submit_for_review if options[:submit_for_review] && precheck_success
     end
 
@@ -160,6 +161,13 @@ module Deliver
       UI.user_error!("Could not upload binary to iTunes Connect. Check out the error above", show_github_issues: true) unless result
     end
 
+    def reject_version_if_possible
+      app = options[:app]
+      if app.reject_version_if_possible!
+        UI.success("Successfully rejected previous version!")
+      end
+    end
+
     def submit_for_review
       SubmitForReview.new.submit!(options)
     end

data/deliver/lib/deliver/submit_for_review.rb

@@ -33,7 +33,7 @@ module Deliver
       app = options[:app]
       v = app.edit_version
 
-      if options[:build_number] and options[:build_number] != "latest"
+      if options[:build_number] && options[:build_number] != "latest"
         UI.message("Selecting existing build-number: #{options[:build_number]}")
         build = v.candidate_builds.detect { |a| a.build_version == options[:build_number] }
         unless build

data/fastlane/lib/fastlane/actions/app_store_build_number.rb

@@ -24,7 +24,8 @@ module Fastlane
           unless version_number
             # Automatically fetch the latest version in testflight
             begin
-              testflight_version = app.all_build_train_numbers(platform: platform).sort_by { |v| Gem::Version.new(v) }.last
+              train_numbers = app.all_build_train_numbers(platform: platform)
+              testflight_version = self.order_versions(train_numbers).last
             rescue
               testflight_version = params[:version]
             end
@@ -40,7 +41,8 @@ module Fastlane
           UI.message("Fetching the latest build number for version #{version_number}")
 
           begin
-            build_nr = app.all_builds_for_train(train: version_number, platform: platform).map(&:build_version).map(&:to_i).sort.last
+            build_numbers = app.all_builds_for_train(train: version_number, platform: platform).map(&:build_version)
+            build_nr = self.order_versions(build_numbers).last
             if build_nr.nil? && params[:initial_build_number]
               UI.message("Could not find a build on iTC. Using supplied 'initial_build_number' option")
               build_nr = params[:initial_build_number]
@@ -54,6 +56,10 @@ module Fastlane
         Actions.lane_context[SharedValues::LATEST_BUILD_NUMBER] = build_nr
       end
 
+      def self.order_versions(versions)
+        versions.map(&:to_s).sort_by { |v| Gem::Version.new(v) }
+      end
+
       #####################################################
       # @!group Documentation
       #####################################################

data/fastlane/lib/fastlane/actions/badge.rb

@@ -74,7 +74,7 @@ module Fastlane
                                        description: "Add your custom overlay/badge image",
                                        optional: true,
                                        verify_block: proc do |value|
-                                         UI.user_error!("custom should be a valid file path") unless value and File.exist?(value)
+                                         UI.user_error!("custom should be a valid file path") unless value && File.exist?(value)
                                        end),
           FastlaneCore::ConfigItem.new(key: :no_badge,
                                        env_name: "FL_BADGE_NO_BADGE",

data/fastlane/lib/fastlane/actions/crashlytics.rb

@@ -64,7 +64,7 @@ module Fastlane
       def self.available_options
         platform = Actions.lane_context[Actions::SharedValues::PLATFORM_NAME]
 
-        if platform == :ios or platform.nil?
+        if platform == :ios || platform.nil?
           ipa_path_default = Dir["*.ipa"].sort_by { |x| File.mtime(x) }.last
         end
 

data/fastlane/lib/fastlane/actions/download_dsyms.rb

@@ -51,14 +51,13 @@ module Fastlane
         message << "(#{build_number})" if build_number
         UI.message(message.join(" "))
 
-        # Loop through all app versions and download their dSYM
-        app.all_build_train_numbers(platform: platform).each do |train_number|
-          UI.verbose("Found train: #{train_number}, comparing to supplied version: #{version}")
-          if version && version != train_number
+        app.tunes_all_build_trains(platform: platform).each do |train|
+          UI.verbose("Found train: #{train}, comparing to supplied version: #{version}")
+          if version && version != train.version_string
             UI.verbose("Version #{version} doesn't match: #{train_number}")
             next
           end
-          app.all_builds_for_train(train: train_number, platform: platform).each do |build|
+          app.tunes_all_builds_for_train(train: train.version_string, platform: platform).each do |build|
             UI.verbose("Found build version: #{build.build_version}, comparing to supplied build_number: #{build_number}")
             if build_number && build.build_version != build_number
               UI.verbose("build_version: #{build.build_version} doesn't match: #{build_number}")
@@ -68,23 +67,18 @@ module Fastlane
             begin
               # need to call reload here or dsym_url is nil
               UI.verbose("Build_version: #{build.build_version} matches #{build_number}, grabbing dsym_url")
-              build.reload
-              download_url = build.dsym_url
+              build_details = app.tunes_build_details(train: train.version_string, build_number: build.build_version, platform: platform)
+              download_url = build_details.dsym_url
               UI.verbose("dsym_url: #{download_url}")
             rescue Spaceship::TunesClient::ITunesConnectError => ex
               UI.error("Error accessing dSYM file for build\n\n#{build}\n\nException: #{ex}")
             end
 
             if download_url
-              result = self.download(download_url)
-              path   = write_dsym(result, app.bundle_id, train_number, build.build_version, output_directory)
-              UI.success("🔑  Successfully downloaded dSYM file for #{train_number} - #{build.build_version} to '#{path}'")
-
-              Actions.lane_context[SharedValues::DSYM_PATHS] ||= []
-              Actions.lane_context[SharedValues::DSYM_PATHS] << File.expand_path(path)
+              self.download(download_url, app.bundle_id, train.version_string, build.build_version, output_directory)
               break if build_number
             else
-              UI.message("No dSYM URL for #{build.build_version} (#{build.train_version})")
+              UI.message("No dSYM URL for #{build.build_version} (#{train.version_string})")
             end
           end
         end
@@ -95,6 +89,15 @@ module Fastlane
       end
       # rubocop:enable Metrics/PerceivedComplexity
 
+      def self.download(download_url, bundle_id, train_number, build_version, output_directory)
+        result = self.download_file(download_url)
+        path   = write_dsym(result, bundle_id, train_number, build_version, output_directory)
+        UI.success("🔑  Successfully downloaded dSYM file for #{train_number} - #{build_version} to '#{path}'")
+
+        Actions.lane_context[SharedValues::DSYM_PATHS] ||= []
+        Actions.lane_context[SharedValues::DSYM_PATHS] << File.expand_path(path)
+      end
+
       def self.write_dsym(data, bundle_id, train_number, build_number, output_directory)
         file_name = "#{bundle_id}-#{train_number}-#{build_number}.dSYM.zip"
         if output_directory
@@ -104,7 +107,7 @@ module Fastlane
         file_name
       end
 
-      def self.download(url)
+      def self.download_file(url)
         uri = URI.parse(url)
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = (uri.scheme == "https")

data/fastlane/lib/fastlane/actions/get_build_number.rb

@@ -61,7 +61,7 @@ module Fastlane
                              optional: true,
                              verify_block: proc do |value|
                                UI.user_error!("Please pass the path to the project, not the workspace") if value.end_with?(".xcworkspace")
-                               UI.user_error!("Could not find Xcode project") if !File.exist?(value) and !Helper.test?
+                               UI.user_error!("Could not find Xcode project") if !File.exist?(value) && !Helper.test?
                              end),
           FastlaneCore::ConfigItem.new(key: :hide_error_when_versioning_disabled,
                              env_name: "FL_BUILD_NUMBER_HIDE_ERROR_WHEN_VERSIONING_DISABLED",

data/fastlane/lib/fastlane/actions/get_push_certificate.rb

@@ -16,7 +16,7 @@ module Fastlane
           profile_path = PEM::Manager.start
         end
 
-        if success_block and profile_path
+        if success_block && profile_path
           success_block.call(File.expand_path(profile_path)) if success_block
         end
       end

data/fastlane/lib/fastlane/actions/get_version_number.rb

@@ -4,89 +4,79 @@ module Fastlane
       require 'shellwords'
 
       def self.run(params)
-        # More information about how to set up your project and how it works:
-        # https://developer.apple.com/library/ios/qa/qa1827/_index.html
-
         folder = params[:xcodeproj] ? File.join(params[:xcodeproj], '..') : '.'
+        target_name = params[:target]
+        configuration = params[:configuration]
 
-        command_prefix = [
-          'cd',
-          File.expand_path(folder).shellescape,
-          '&&'
-        ].join(' ')
+        # Get version_number
+        project = get_project!(folder)
+        target = get_target!(project, target_name)
+        plist_file = get_plist!(folder, target, configuration)
+        version_number = get_version_number!(plist_file)
 
-        command = [
-          command_prefix,
-          'agvtool',
-          'what-marketing-version',
-          '-terse'
-        ].join(' ')
+        # Store the number in the shared hash
+        Actions.lane_context[SharedValues::VERSION_NUMBER] = version_number
+
+        # Return the version number because Swift might need this return value
+        return version_number
+      end
 
-        line = ""
-        scheme = params[:scheme] || ""
-        target = params[:target] || ""
-        results = []
-
-        if Helper.test?
-          results = [
-            '$(date +%s)n    /usr/libexec/Plistbuddy -c "Set CFBundleVersion $buildnum" "${plist}"n',
-            '"SampleProject.xcodeproj/../TargetA/TargetA-Info.plist"=4.3.2',
-            '"SampleProject.xcodeproj/../TargetATests/Info.plist"=4.3.2',
-            '"SampleProject.xcodeproj/../TargetB/TargetB-Info.plist"=5.4.3',
-            '"SampleProject.xcodeproj/../TargetBTests/Info.plist"=5.4.3',
-            '"SampleProject.xcodeproj/../SampleProject/supporting_files/TargetC_internal-Info.plist"=7.5.2',
-            '"SampleProject.xcodeproj/../SampleProject/supporting_files/TargetC_production-Info.plist"=6.4.9',
-            '"SampleProject.xcodeproj/../SampleProject_tests/Info.plist"=1.0'
-          ]
+      def self.get_project!(folder)
+        require 'xcodeproj'
+        project_path = Dir.glob("#{folder}/*.xcodeproj").first
+        if project_path
+          return Xcodeproj::Project.open(project_path)
         else
-          results = Actions.sh(command).split("\n")
+          UI.user_error!("Unable to find Xcode project in folder: #{folder}")
+        end
+      end
+
+      def self.get_target!(project, target_name)
+        targets = project.targets
+
+        # Prompt targets if no name
+        unless target_name
+          options = targets.map(&:name)
+          target_name = UI.select("What target would you like to use?", options)
+        end
+
+        # Find target
+        target = targets.find do |t|
+          t.name == target_name
         end
+        UI.user_error!("Cannot find target named '#{target_name}'") unless target
 
-        if target.empty? && scheme.empty?
-          # Sometimes the results array contains nonsense as the first element
-          # This iteration finds the first 'real' result and returns that
-          # emulating the actual behavior or the -terse1 flag correctly
-          project_string = ".xcodeproj"
-          results.any? do |result|
-            if result.include?(project_string)
-              line = result
-              break
-            end
-          end
+        target
+      end
+
+      def self.get_plist!(folder, target, configuration = nil)
+        plist_files = target.resolved_build_setting("INFOPLIST_FILE")
+        plist_files_count = plist_files.values.compact.uniq.count
+
+        # Get plist file for specified configuration
+        # Or: Prompt for configuration if plist has different files in each configurations
+        # Else: Get first(only) plist value
+        if configuration
+          plist_file = plist_files[configuration]
+        elsif plist_files_count > 1
+          options = plist_files.keys
+          selected = UI.select("What build configuration would you like to use?", options)
+          plist_file = plist_files[selected]
         else
-          # This iteration finds the first folder structure or info plist
-          # matching the specified target
-          scheme_string = "/#{scheme}"
-          target_string = "/#{target}/"
-          plist_target_string = "/#{target}-"
-          results.any? do |result|
-            if !target.empty?
-              if result.include?(target_string)
-                line = result
-                break
-              elsif result.include?(plist_target_string)
-                line = result
-                break
-              end
-            else
-              if result.include?(scheme_string)
-                line = result
-                break
-              end
-            end
-          end
+          plist_file = plist_files.values.first
         end
 
-        version_number = line.partition('=').last
+        plist_file = File.absolute_path(File.join(folder, plist_file))
+        UI.user_error!("Cannot find plist file: #{plist_file}") unless File.exist?(plist_file)
 
-        # Store the number in the shared hash
-        Actions.lane_context[SharedValues::VERSION_NUMBER] = version_number
+        plist_file
+      end
 
-        # Return the version number because Swift might need this return value
-        return version_number
-      rescue => ex
-        UI.error('Before being able to increment and read the version number from your Xcode project, you first need to setup your project properly. Please follow the guide at https://developer.apple.com/library/content/qa/qa1827/_index.html')
-        raise ex
+      def self.get_version_number!(plist_file)
+        plist = Xcodeproj::Plist.read_from_path(plist_file)
+        UI.user_error!("Unable to read plist: #{plist_file}") unless plist
+
+        plist["CFBundleShortVersionString"]
       end
 
       #####################################################
@@ -99,9 +89,7 @@ module Fastlane
 
       def self.details
         [
-          "This action will return the current version number set on your project.",
-          "You first have to set up your Xcode project, if you haven't done it already:",
-          "https://developer.apple.com/library/ios/qa/qa1827/_index.html"
+          "This action will return the current version number set on your project."
         ].join(' ')
       end
 
@@ -113,19 +101,15 @@ module Fastlane
                              optional: true,
                              verify_block: proc do |value|
                                UI.user_error!("Please pass the path to the project, not the workspace") if value.end_with?(".xcworkspace")
-                               UI.user_error!("Could not find Xcode project at path '#{File.expand_path(value)}'") if !File.exist?(value) and !Helper.test?
+                               UI.user_error!("Could not find Xcode project at path '#{File.expand_path(value)}'") if !File.exist?(value) && !Helper.test?
                              end),
-          FastlaneCore::ConfigItem.new(key: :scheme,
-                             env_name: "FL_VERSION_NUMBER_SCHEME",
-                             description: "Specify a specific scheme if you have multiple per project, optional. " \
-                                          "This parameter is deprecated and will be removed in a future release. " \
-                                          "Please use the 'target' parameter instead. The behavior of this parameter " \
-                                          "is currently undefined if your scheme name doesn't match your target name",
-                             optional: true,
-                             deprecated: true),
           FastlaneCore::ConfigItem.new(key: :target,
                              env_name: "FL_VERSION_NUMBER_TARGET",
                              description: "Specify a specific target if you have multiple per project, optional",
+                             optional: true),
+          FastlaneCore::ConfigItem.new(key: :configuration,
+                             env_name: "FL_VERSION_NUMBER_CONFIGURATION",
+                             description: "Specify a specific configuration if you have multiple per target, optional",
                              optional: true)
         ]
       end
@@ -137,7 +121,7 @@ module Fastlane
       end
 
       def self.authors
-        ["Liquidsoul"]
+        ["Liquidsoul", "joshdholtz"]
       end
 
       def self.is_supported?(platform)

data/fastlane/lib/fastlane/actions/hockey.rb

@@ -39,7 +39,7 @@ module Fastlane
       def self.upload_build(api_token, ipa, options)
         connection = self.connection(options)
 
-        options[:ipa] = Faraday::UploadIO.new(ipa, 'application/octet-stream') if ipa and File.exist?(ipa)
+        options[:ipa] = Faraday::UploadIO.new(ipa, 'application/octet-stream') if ipa && File.exist?(ipa)
 
         dsym_filename = options.delete(:dsym_filename)
         if dsym_filename
@@ -74,11 +74,11 @@ module Fastlane
         options.delete(:apk)
         app_id = options.delete(:public_identifier)
 
-        ipaio = Faraday::UploadIO.new(ipa, 'application/octet-stream') if ipa and File.exist?(ipa)
+        ipaio = Faraday::UploadIO.new(ipa, 'application/octet-stream') if ipa && File.exist?(ipa)
         dsym = options.delete(:dsym)
 
         if dsym
-          dsym_io = Faraday::UploadIO.new(dsym, 'application/octet-stream') if dsym and File.exist?(dsym)
+          dsym_io = Faraday::UploadIO.new(dsym, 'application/octet-stream') if dsym && File.exist?(dsym)
         end
 
         # https://support.hockeyapp.net/discussions/problems/83559
@@ -206,7 +206,7 @@ module Fastlane
                                        sensitive: true,
                                        description: "API Token for Hockey Access",
                                        verify_block: proc do |value|
-                                         UI.user_error!("No API token for Hockey given, pass using `api_token: 'token'`") unless value and !value.empty?
+                                         UI.user_error!("No API token for Hockey given, pass using `api_token: 'token'`") unless value && !value.empty?
                                        end),
           FastlaneCore::ConfigItem.new(key: :ipa,
                                        env_name: "FL_HOCKEY_IPA",