fastlane 2.55.0.beta.20170823010002 → 2.55.0.beta.20170824010002

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99cdfdb7503377b51f475f311e246b7581996ffa
-  data.tar.gz: e0158183b77a5a49019ff1b3919d0837d39b11f8
+  metadata.gz: 7eda60a25970ce0b2b1a213e3871590c54e3f1cf
+  data.tar.gz: 9cf521b29cf8c43d1caab482786f0ee20da9b863
 SHA512:
-  metadata.gz: 5eadbe2ff89d49b284a063cad4fa218244038463432133287ea02ef3975680031cfc80e7227f1de0cd12de33834d7ac7affe9f0e4e9446463bed55e90330a476
-  data.tar.gz: 7f27969d4ea4c69c490cb0f7f11caee33f4c08853d1424e3bf900f007eb72c572d6420902bf0c872c6f56a67284120184d134640afc79dc9fd1dee716ff01068
+  metadata.gz: 636a7f81fb98e4a2b923a097af24cdeb253de7569ee6275534d41d1f55beeb75c3ab400ec3a7f0f5937a9ed9116ee0dc9ed3c61b6cfc400298c006984cf13ec3
+  data.tar.gz: b871ede6b7787c259b9c4fe3f308a7723961ac225a4dd5b2c805222c3beef0047ad15dc53844798afc680d9dbc0ff65e06017a6a55bfc0cdaa9e7eeba8c69e31

data/deliver/lib/deliver/loader.rb

@@ -12,7 +12,7 @@ module Deliver
 
     EXCEPTION_DIRECTORIES = UploadMetadata::ALL_META_SUB_DIRS.map(&:downcase).freeze
 
-    def self.language_folders(root)
+    def self.language_folders(root, ignore_validation)
       folders = Dir.glob(File.join(root, '*'))
 
       if Helper.is_test?
@@ -21,7 +21,8 @@ module Deliver
         available_languages = Spaceship::Tunes.client.available_languages.sort
       end
 
-      allowed_directory_names = (available_languages + SPECIAL_DIR_NAMES).map(&:downcase).freeze
+      allowed_directory_names_with_case = (available_languages + SPECIAL_DIR_NAMES)
+      allowed_directory_names = allowed_directory_names_with_case.map(&:downcase).freeze
 
       selected_folders = folders.select do |path|
         File.directory?(path) && allowed_directory_names.include?(File.basename(path).downcase)
@@ -33,9 +34,11 @@ module Deliver
         File.directory?(path) && !allowed_directory_names.include?(normalized_path) && !EXCEPTION_DIRECTORIES.include?(normalized_path)
       end.sort
 
-      unless rejected_folders.empty?
+      if !ignore_validation && !rejected_folders.empty?
         rejected_folders = rejected_folders.map { |path| File.basename(path) }
-        UI.user_error! "Unsupport directory name(s) for screenshots/metadata: #{rejected_folders.join(', ')}\n\nValid directory names are: #{allowed_directory_names}"
+        UI.user_error! "Unsupported directory name(s) for screenshots/metadata in '#{root}': #{rejected_folders.join(', ')}" \
+                       "\nValid directory names are: #{allowed_directory_names_with_case}" \
+                       "\n\nEnable 'ignore_language_directory_validation' to prevent this validation from happening"
       end
 
       selected_folders

data/deliver/lib/deliver/options.rb

@@ -315,7 +315,12 @@ module Deliver
         FastlaneCore::ConfigItem.new(key: :languages,
                                      description: "Metadata: List of languages to activate",
                                      type: Array,
-                                     optional: true)
+                                     optional: true),
+        FastlaneCore::ConfigItem.new(key: :ignore_language_directory_validation,
+                                     env_name: "DELIVER_IGNORE_LANGUAGE_DIRECTORY_VALIDATION",
+                                     description: "Ignore errors when invalid languages are found in metadata and screeenshot directories",
+                                     default_value: false,
+                                     is_string: false)
       ]
     end
   end

data/deliver/lib/deliver/upload_metadata.rb

@@ -158,7 +158,8 @@ module Deliver
       end
 
       # Check folder list (an empty folder signifies a language is required)
-      Loader.language_folders(options[:metadata_path]).each do |lang_folder|
+      ignore_validation = options[:ignore_language_directory_validation]
+      Loader.language_folders(options[:metadata_path], ignore_validation).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)
@@ -198,7 +199,8 @@ module Deliver
       end
 
       # Check folder list (an empty folder signifies a language is required)
-      Loader.language_folders(options[:metadata_path]).each do |lang_folder|
+      ignore_validation = options[:ignore_language_directory_validation]
+      Loader.language_folders(options[:metadata_path], ignore_validation).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)
@@ -252,7 +254,8 @@ module Deliver
       return if options[:skip_metadata]
 
       # Load localised data
-      Loader.language_folders(options[:metadata_path]).each do |lang_folder|
+      ignore_validation = options[:ignore_language_directory_validation]
+      Loader.language_folders(options[:metadata_path], ignore_validation).each do |lang_folder|
         language = File.basename(lang_folder)
         (LOCALISED_VERSION_VALUES + LOCALISED_APP_VALUES).each do |key|
           path = File.join(lang_folder, "#{key}.txt")

data/deliver/lib/deliver/upload_screenshots.rb

@@ -68,10 +68,12 @@ module Deliver
 
     def collect_screenshots(options)
       return [] if options[:skip_screenshots]
-      return collect_screenshots_for_languages(options[:screenshots_path])
+      return collect_screenshots_for_languages(options)
     end
 
-    def collect_screenshots_for_languages(path)
+    def collect_screenshots_for_languages(options)
+      path = options[:screenshots_path]
+
       screenshots = []
       extensions = '{png,jpg,jpeg}'
 
@@ -79,7 +81,8 @@ module Deliver
         lang_hash[lang.downcase] = lang
       end
 
-      Loader.language_folders(path).each do |lng_folder|
+      ignore_validation = options[:ignore_language_directory_validation]
+      Loader.language_folders(path, ignore_validation).each do |lng_folder|
         language = File.basename(lng_folder)
 
         # Check to see if we need to traverse multiple platforms or just a single platform

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

@@ -2,6 +2,9 @@ module Fastlane
   module Actions
     class BadgeAction < Action
       def self.run(params)
+        UI.important('The badge action has been deprecated,')
+        UI.important('please checkout the badge plugin here:')
+        UI.important('https://github.com/HazAT/fastlane-plugin-badge')
         Actions.verify_gem!('badge')
         require 'badge'
         options = {
@@ -52,7 +55,7 @@ module Fastlane
       end
 
       def self.category
-        :misc
+        :deprecated
       end
 
       def self.available_options

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.55.0.beta.20170823010002'.freeze
+  VERSION = '2.55.0.beta.20170824010002'.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/fastlane_core/lib/fastlane_core/update_checker/update_checker.rb

@@ -177,6 +177,18 @@ module FastlaneCore
       return nil if FastlaneCore::Env.truthy?("FASTLANE_OPT_OUT_USAGE")
       require 'credentials_manager'
 
+      app_identifier = app_id(args, gem_name)
+
+      if app_identifier
+        return Digest::SHA256.hexdigest("p#{app_identifier}fastlan3_SAlt") # hashed + salted the bundle identifier
+      end
+
+      return nil
+    rescue
+      return nil
+    end
+
+    def self.app_id(args, gem_name)
       # check if this is an android project first because some of the same params exist for iOS and Android tools
       app_identifier = android_app_identifier(args, gem_name)
       @platform = nil # since have a state in-between runs
@@ -186,14 +198,7 @@ module FastlaneCore
         app_identifier = ios_app_identifier(args)
         @platform = :ios if app_identifier
       end
-
-      if app_identifier
-        return Digest::SHA256.hexdigest("p#{app_identifier}fastlan3_SAlt") # hashed + salted the bundle identifier
-      end
-
-      return nil
-    rescue
-      return nil
+      return app_identifier
     end
 
     def self.send_launch_analytic_events_for(gem_name)
@@ -220,7 +225,7 @@ module FastlaneCore
     def self.event_for_p_hash(p_hash, tool, platform, timestamp_seconds)
       {
         event_source: {
-          oauth_app_name: 'fastlane-refresher',
+          oauth_app_name: oauth_app_name,
           product: 'fastlane'
         },
         actor: {
@@ -236,7 +241,7 @@ module FastlaneCore
         },
         secondary_target: {
           name: 'platform',
-          detail: platform || 'unknown'
+          detail: secondary_target_string(platform || 'unknown')
         },
         millis_since_epoch: timestamp_seconds * 1000,
         version: 1
@@ -246,7 +251,7 @@ module FastlaneCore
     def self.event_for_launch(tool, ci, timestamp_seconds)
       {
         event_source: {
-          oauth_app_name: 'fastlane-refresher',
+          oauth_app_name: oauth_app_name,
           product: 'fastlane'
         },
         actor: {
@@ -260,6 +265,10 @@ module FastlaneCore
           name: 'ci',
           detail: ci
         },
+        secondary_target: {
+          name: 'launch',
+          detail: secondary_target_string('')
+        },
         millis_since_epoch: timestamp_seconds * 1000,
         version: 1
       }
@@ -300,7 +309,7 @@ module FastlaneCore
     def self.event_for_completion(tool, ci, duration, timestamp_seconds)
       {
         event_source: {
-          oauth_app_name: 'fastlane-refresher',
+          oauth_app_name: oauth_app_name,
           product: 'fastlane'
         },
         actor: {
@@ -316,7 +325,7 @@ module FastlaneCore
         },
         secondary_target: {
           name: 'ci',
-          detail: ci
+          detail: secondary_target_string(ci)
         },
         millis_since_epoch: timestamp_seconds * 1000,
         version: 1
@@ -326,7 +335,7 @@ module FastlaneCore
     def self.event_for_install_method(tool, ci, install_method, timestamp_seconds)
       {
         event_source: {
-          oauth_app_name: 'fastlane-refresher',
+          oauth_app_name: oauth_app_name,
           product: 'fastlane'
         },
         actor: {
@@ -342,13 +351,21 @@ module FastlaneCore
         },
         secondary_target: {
           name: 'ci',
-          detail: ci
+          detail: secondary_target_string(ci)
         },
         millis_since_epoch: timestamp_seconds * 1000,
         version: 1
       }
     end
 
+    def self.secondary_target_string(string)
+      return string
+    end
+
+    def self.oauth_app_name
+      return 'fastlane-refresher'
+    end
+
     def self.send_completion_events(tool, ci, install_method, duration, timestamp_seconds)
       analytics = []
       analytics << event_for_completion(tool, ci, duration, timestamp_seconds)

data/gym/README.md

@@ -181,8 +181,8 @@ Optional: If _gym_ can't automatically detect the provisioning profiles to use,
 export_options(
   method: "app-store",
   provisioningProfiles: { 
-    "com.example.bundleid": "Provisioning Profile Name",
-    "com.example.bundleid2": "Provisioning Profile Name 2"
+    "com.example.bundleid" => "Provisioning Profile Name",
+    "com.example.bundleid2" => "Provisioning Profile Name 2"
   }
 )
 ```

data/supply/lib/supply/client.rb

@@ -130,7 +130,7 @@ module Supply
     def listings
       ensure_active_edit!
 
-      result = call_google_api { android_publisher.list_edit_listings(current_package_name, current_edit.id) }
+      result = call_google_api { android_publisher.list_listings(current_package_name, current_edit.id) }
 
       return result.listings.map do |row|
         Listing.new(self, row.language, row)
@@ -142,7 +142,7 @@ module Supply
       ensure_active_edit!
 
       begin
-        result = android_publisher.get_edit_listing(
+        result = android_publisher.get_listing(
           current_package_name,
           current_edit.id,
           language
@@ -159,7 +159,7 @@ module Supply
     def apks_version_codes
       ensure_active_edit!
 
-      result = call_google_api { android_publisher.list_edit_apks(current_package_name, current_edit.id) }
+      result = call_google_api { android_publisher.list_apks(current_package_name, current_edit.id) }
 
       return result.apks.map(&:version_code)
     end
@@ -169,7 +169,7 @@ module Supply
       ensure_active_edit!
 
       result = call_google_api do
-        android_publisher.list_edit_apklistings(
+        android_publisher.list_apk_listings(
           current_package_name,
           current_edit.id,
           apk_version_code
@@ -198,7 +198,7 @@ module Supply
       })
 
       call_google_api do
-        android_publisher.update_edit_listing(
+        android_publisher.update_listing(
           current_package_name,
           current_edit.id,
           language,
@@ -211,7 +211,7 @@ module Supply
       ensure_active_edit!
 
       result_upload = call_google_api do
-        android_publisher.upload_edit_apk(
+        android_publisher.upload_apk(
           current_package_name,
           current_edit.id,
           upload_source: path_to_apk
@@ -225,7 +225,7 @@ module Supply
       ensure_active_edit!
 
       call_google_api do
-        android_publisher.upload_edit_deobfuscationfile(
+        android_publisher.upload_deobfuscationfile(
           current_package_name,
           current_edit.id,
           apk_version_code,
@@ -249,7 +249,7 @@ module Supply
       })
 
       call_google_api do
-        android_publisher.update_edit_track(
+        android_publisher.update_track(
           current_package_name,
           current_edit.id,
           track,
@@ -263,7 +263,7 @@ module Supply
       ensure_active_edit!
 
       begin
-        result = android_publisher.get_edit_track(
+        result = android_publisher.get_track(
           current_package_name,
           current_edit.id,
           track
@@ -284,7 +284,7 @@ module Supply
       })
 
       call_google_api do
-        android_publisher.update_edit_apklisting(
+        android_publisher.update_apk_listing(
           current_package_name,
           current_edit.id,
           apk_listing.apk_version_code,
@@ -302,7 +302,7 @@ module Supply
       ensure_active_edit!
 
       result = call_google_api do
-        android_publisher.list_edit_images(
+        android_publisher.list_images(
           current_package_name,
           current_edit.id,
           language,
@@ -318,7 +318,7 @@ module Supply
       ensure_active_edit!
 
       call_google_api do
-        android_publisher.upload_edit_image(
+        android_publisher.upload_image(
           current_package_name,
           current_edit.id,
           language,
@@ -333,7 +333,7 @@ module Supply
       ensure_active_edit!
 
       call_google_api do
-        android_publisher.deleteall_edit_image(
+        android_publisher.deleteall_image(
           current_package_name,
           current_edit.id,
           language,
@@ -346,7 +346,7 @@ module Supply
       ensure_active_edit!
 
       call_google_api do
-        android_publisher.upload_edit_expansionfile(
+        android_publisher.upload_expansionfile(
           current_package_name,
           current_edit.id,
           apk_version_code,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.55.0.beta.20170823010002
+  version: 2.55.0.beta.20170824010002
 platform: ruby
 authors:
 - Felix Krause
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-23 00:00:00.000000000 Z
+date: 2017-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier