fastlane 2.54.0.beta.20170821010003 → 2.54.0.beta.20170822010003

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbd53d6fa60e40115f9a2a25c255a93ce7169957
-  data.tar.gz: bdf8a6b4fbcb47a313fa103b6ed6568b05149751
+  metadata.gz: 32ceeaf72e899a6e33a12cf6218061c5b9297f3a
+  data.tar.gz: 4c6121a674608a8268e8354281519077e37cd699
 SHA512:
-  metadata.gz: fcea681bfcf187dfc4629b50d0ab7d6b40815f982044e3353f14895588ebd13a0aa7a5de3996915fafe68f9604782606ed61783220582a3cec544ef0ce60381b
-  data.tar.gz: a60b35aea507a95994440bb2e2b7ff8d83694d099fca82da29ea7e1fc69449e3c201c17f2a33230b1ab3e0d2854718567c04265651a1220ec19ae53ed11ebee4
+  metadata.gz: 7ec6be6e424f85fd7d7fc4619fff8c6bf86027329f95ea680c2f8f8bf478d0c486ec1029d61bc8b789eb10f1a1d03bdc38f15783c2cb2463e915f69c20a25543
+  data.tar.gz: dc9b54ddd7e1817bc6811d494887cd12d2c07795ce6062f02fe31b14f3a9e3fe663de00a2e4b16ad58baeecce82fb33fa596472ab267478a7b6e1c67cd2c8cbc

data/deliver/README.md

@@ -195,11 +195,15 @@ no, en-US, en-CA, fi, ru, zh-Hans, nl-NL, zh-Hant, en-AU, id, de-DE, sv, ko, ms,
 
 Deliver has a special `default` language code which allows you to provide values that are not localised, and which will be used as defaults when you don’t provide a specific localised value.
 
-You can use this either in json within your deliverfile, or as a folder in your metadata file.
+In order to use `default`, you will need to tell `deliver` which languages your app uses. You can do this in either of two ways:
+1. Create the folders named with the language in the metadata folder (i.e. fastlane/metadata/en-US or fastlane/metadata/de-DE)
+2. Add the following to your `Deliverfile` `languages(['en-US','de-DE'])` 
+
+You can use this either in json within your `Deliverfile` and/or as folders in your metadata folder. `deliver` will take the union of both language sets from the `Deliverfile` and from the metadata folder and create on single set of languages which will be enabled.
 
 Imagine that you have localised data for the following language codes:  ```en-US, de-DE, el, it```
 
-You can set the following in your deliverfile
+You can set the following in your `Deliverfile`
 
 ```ruby
 release_notes({

data/deliver/lib/deliver/detect_values.rb

@@ -7,6 +7,8 @@ module Deliver
       find_folders(options)
       ensure_folders_created(options)
       find_version(options) unless skip_params[:skip_version]
+
+      verify_languages!(options)
     end
 
     def find_app_identifier(options)
@@ -67,5 +69,17 @@ module Deliver
         options[:platform] = 'osx'
       end
     end
+
+    def verify_languages!(options)
+      languages = options[:languages]
+      return unless languages
+
+      all_languages = Spaceship::Tunes.client.available_languages
+      diff = languages - all_languages
+
+      unless diff.empty?
+        UI.user_error!("The following languages are invalid and cannot be activated: #{diff.join(',')}\n\nValid languages are: #{all_languages}")
+      end
+    end
   end
 end

data/deliver/lib/deliver/options.rb

@@ -284,7 +284,7 @@ module Deliver
                                          keywords = keywords.join(", ") if keywords.kind_of?(Array)
                                          value[language] = keywords
 
-                                         UI.user_error!(":keywords must be a hash with all values being strings") unless keywords.kind_of?(String)
+                                         UI.user_error!("keywords must be a hash with all values being strings") unless keywords.kind_of?(String)
                                        end
                                      end),
         FastlaneCore::ConfigItem.new(key: :promotional_text,
@@ -309,7 +309,13 @@ module Deliver
         FastlaneCore::ConfigItem.new(key: :marketing_url,
                                      description: "Metadata: Localised marketing url",
                                      optional: true,
-                                     is_string: false)
+                                     is_string: false),
+        # The verify_block has been removed from here and verification now happens in Deliver::DetectValues
+        # Verification needed Spaceship::Tunes.client which required the Deliver::Runner to already by started
+        FastlaneCore::ConfigItem.new(key: :languages,
+                                     description: "Metadata: List of languages to activate",
+                                     type: Array,
+                                     optional: true)
       ]
     end
   end

data/deliver/lib/deliver/runner.rb

@@ -6,7 +6,9 @@ module Deliver
 
     def initialize(options, skip_auto_detection = {})
       self.options = options
+
       login
+
       Deliver::DetectValues.new.run!(self.options, skip_auto_detection)
       FastlaneCore::PrintTable.print_values(config: options, hide_keys: [:app], mask_keys: ['app_review_information.demo_password'], title: "deliver #{Fastlane::VERSION} Summary")
     end
@@ -86,10 +88,15 @@ module Deliver
 
     # Upload all metadata, screenshots, pricing information, etc. to iTunes Connect
     def upload_metadata
+      upload_metadata = UploadMetadata.new
+      upload_screenshots = UploadScreenshots.new
+
       # First, collect all the things for the HTML Report
-      screenshots = UploadScreenshots.new.collect_screenshots(options)
-      UploadMetadata.new.load_from_filesystem(options)
-      UploadMetadata.new.assign_defaults(options)
+      screenshots = upload_screenshots.collect_screenshots(options)
+      upload_metadata.load_from_filesystem(options)
+
+      # Assign "default" values to all languages
+      upload_metadata.assign_defaults(options)
 
       # Handle app icon / watch icon
       prepare_app_icons(options)
@@ -98,8 +105,8 @@ module Deliver
       validate_html(screenshots)
 
       # Commit
-      UploadMetadata.new.upload(options)
-      UploadScreenshots.new.upload(options, screenshots)
+      upload_metadata.upload(options)
+      upload_screenshots.upload(options, screenshots)
       UploadPriceTier.new.upload(options)
       UploadAssets.new.upload(options) # e.g. app icon
     end

data/deliver/lib/deliver/upload_metadata.rb

@@ -140,25 +140,11 @@ module Deliver
 
     # If the user is using the 'default' language, then assign values where they are needed
     def assign_defaults(options)
-      # Build a complete list of the required languages
-      enabled_languages = []
-
-      # Get all languages used in existing settings
-      (LOCALISED_VERSION_VALUES + LOCALISED_APP_VALUES).each do |key|
-        current = options[key]
-        next unless current && current.kind_of?(Hash)
-        current.each do |language, value|
-          enabled_languages << language unless enabled_languages.include?(language)
-        end
-      end
-
-      # Check folder list (an empty folder signifies a language is required)
-      Loader.language_folders(options[:metadata_path]).each do |lng_folder|
-        next unless File.directory?(lng_folder) # We don't want to read txt as they are non localised
+      # Normalizes languages keys from symbols to strings
+      normalize_language_keys(options)
 
-        language = File.basename(lng_folder)
-        enabled_languages << language unless enabled_languages.include?(language)
-      end
+      # Build a complete list of the required languages
+      enabled_languages = detect_languages(options)
 
       return unless enabled_languages.include?("default")
       UI.message("Detected languages: " + enabled_languages.to_s)
@@ -180,6 +166,33 @@ module Deliver
       end
     end
 
+    def detect_languages(options)
+      # Build a complete list of the required languages
+      enabled_languages = options[:languages] || []
+
+      # Get all languages used in existing settings
+      (LOCALISED_VERSION_VALUES + LOCALISED_APP_VALUES).each do |key|
+        current = options[key]
+        next unless current && current.kind_of?(Hash)
+        current.each do |language, value|
+          enabled_languages << language unless enabled_languages.include?(language)
+        end
+      end
+
+      # Check folder list (an empty folder signifies a language is required)
+      Loader.language_folders(options[:metadata_path]).each do |lang_folder|
+        next unless File.directory?(lang_folder) # We don't want to read txt as they are non localised
+
+        language = File.basename(lang_folder)
+        enabled_languages << language unless enabled_languages.include?(language)
+      end
+
+      # Mapping to strings because :default symbol can be passed in
+      enabled_languages
+        .map(&:to_s)
+        .uniq
+    end
+
     # Makes sure all languages we need are actually created
     def verify_available_languages!(options)
       return if options[:skip_metadata]
@@ -190,7 +203,7 @@ module Deliver
       v = options[:app].edit_version
       UI.user_error!("Could not find a version to edit for app '#{options[:app].name}', the app metadata is read-only currently") unless v
 
-      enabled_languages = []
+      enabled_languages = options[:languages] || []
       LOCALISED_VERSION_VALUES.each do |key|
         current = options[key]
         next unless current && current.kind_of?(Hash)
@@ -200,6 +213,12 @@ module Deliver
         end
       end
 
+      # Reject "default" language from getting enabled
+      # because "default" is not an iTC language
+      enabled_languages = enabled_languages.reject do |lang|
+        lang == "default"
+      end.uniq
+
       if enabled_languages.count > 0
         v.create_languages(enabled_languages)
         lng_text = "language"
@@ -215,10 +234,10 @@ module Deliver
       return if options[:skip_metadata]
 
       # Load localised data
-      Loader.language_folders(options[:metadata_path]).each do |lng_folder|
-        language = File.basename(lng_folder)
+      Loader.language_folders(options[:metadata_path]).each do |lang_folder|
+        language = File.basename(lang_folder)
         (LOCALISED_VERSION_VALUES + LOCALISED_APP_VALUES).each do |key|
-          path = File.join(lng_folder, "#{key}.txt")
+          path = File.join(lang_folder, "#{key}.txt")
           next unless File.exist?(path)
 
           UI.message("Loading '#{path}'...")
@@ -261,6 +280,20 @@ module Deliver
 
     private
 
+    # Normalizes languages keys from symbols to strings
+    def normalize_language_keys(options)
+      (LOCALISED_VERSION_VALUES + LOCALISED_APP_VALUES).each do |key|
+        current = options[key]
+        next unless current && current.kind_of?(Hash)
+
+        current.keys.each do |language|
+          current[language.to_s] = current.delete(language)
+        end
+      end
+
+      options
+    end
+
     def set_trade_representative_contact_information(v, options)
       return unless options[:trade_representative_contact_information]
       info = options[:trade_representative_contact_information]

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.54.0.beta.20170821010003'.freeze
+  VERSION = '2.54.0.beta.20170822010003'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
 end

data/gym/lib/gym/code_signing_mapping.rb

@@ -17,6 +17,9 @@ module Gym
       final_mapping = (primary_mapping || {}).dup # for verbose output at the end of the method
       secondary_mapping ||= self.detect_project_profile_mapping # default to Xcode project
 
+      final_mapping = Hash[final_mapping.map { |k, v| [k.to_sym, v] }]
+      secondary_mapping = Hash[secondary_mapping.map { |k, v| [k.to_sym, v] }]
+
       # Now it's time to merge the (potentially) existing mapping
       #   (e.g. coming from `provisioningProfiles` of the `export_options` or from previous match calls)
       # with the secondary hash we just created (or was provided as parameter).
@@ -103,26 +106,50 @@ module Gym
 
     def detect_project_profile_mapping
       provisioning_profile_mapping = {}
+      specified_configuration = Gym.config[:configuration] || Gym.project.default_build_settings(key: "CONFIGURATION")
 
       self.project_paths.each do |project_path|
         UI.verbose("Parsing project file '#{project_path}' to find selected provisioning profiles")
+        UI.verbose("Finding provision profiles for '#{specified_configuration}'") if specified_configuration
 
         begin
+          # Storing bundle identifiers with duplicate profiles
+          # for informing user later on
+          bundle_identifiers_with_duplicates = []
+
           project = Xcodeproj::Project.open(project_path)
           project.targets.each do |target|
             target.build_configuration_list.build_configurations.each do |build_configuration|
               current = build_configuration.build_settings
               next if test_target?(current)
+              next unless specified_configuration == build_configuration.name
+
+              bundle_identifier = build_configuration.resolve_build_setting("PRODUCT_BUNDLE_IDENTIFIER")
+              provisioning_profile_specifier = build_configuration.resolve_build_setting("PROVISIONING_PROFILE_SPECIFIER")
+              provisioning_profile_uuid = build_configuration.resolve_build_setting("PROVISIONING_PROFILE")
+
+              has_profile_specifier = provisioning_profile_specifier.to_s.length > 0
+              has_profile_uuid = provisioning_profile_uuid.to_s.length > 0
 
-              bundle_identifier = current["PRODUCT_BUNDLE_IDENTIFIER"]
-              provisioning_profile_specifier = current["PROVISIONING_PROFILE_SPECIFIER"]
-              provisioning_profile_uuid = current["PROVISIONING_PROFILE"]
-              if provisioning_profile_specifier.to_s.length > 0
+              # Stores bundle identifiers that have already been mapped to inform user
+              if provisioning_profile_mapping[bundle_identifier] && (has_profile_specifier || has_profile_uuid)
+                bundle_identifiers_with_duplicates << bundle_identifier
+              end
+
+              # Creates the mapping for a bundle identifier and profile specifier/uuid
+              if has_profile_specifier
                 provisioning_profile_mapping[bundle_identifier] = provisioning_profile_specifier
-              elsif provisioning_profile_uuid.to_s.length > 0
+              elsif has_profile_uuid
                 provisioning_profile_mapping[bundle_identifier] = provisioning_profile_uuid
               end
             end
+
+            # Alerting user to explicitly specify a mapping if cannot be determined
+            next if bundle_identifiers_with_duplicates.empty?
+            UI.error("Couldn't automatically detect the provisioning profile mapping")
+            UI.error("There were multiple profiles for bundle identifier(s): #{bundle_identifiers_with_duplicates.uniq.join(', ')}")
+            UI.error("You need to provide an explicit mapping of what provisioning")
+            UI.error("profile to use for each bundle identifier of your app")
           end
         rescue => ex
           # We catch errors here, as we might run into an exception on one included project

data/snapshot/lib/snapshot/setup.rb

@@ -5,7 +5,7 @@ module Snapshot
       snapfile_path = File.join(path, 'Snapfile')
 
       if File.exist?(snapfile_path)
-        UI.user_error!("Snapfile already exists at path '#{snapfile_path}'. Run 'snapshot' to use snapshot.")
+        UI.user_error!("Snapfile already exists at path '#{snapfile_path}'. Run 'fastlane snapshot' to generate screenshots.")
       end
 
       File.write(snapfile_path, File.read("#{Snapshot::ROOT}/lib/assets/SnapfileTemplate"))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.54.0.beta.20170821010003
+  version: 2.54.0.beta.20170822010003
 platform: ruby
 authors:
 - Felix Krause
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.5.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -53,7 +53,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.5.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0