deliver 0.13.3 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cd6fde6a668140cc586e2a4f601a5270016a525
-  data.tar.gz: dc7de78ed44f13b98b5a67f632f517fa19ab5ccc
+  metadata.gz: a65438668055954a4d000a5576168476bd6e941b
+  data.tar.gz: 0dce1693b8ac13639ece621d93e925e180d162fa
 SHA512:
-  metadata.gz: b002a8b44879414b952d2f663b2f588358c0615dd6f41756c747ae42f5090364980cd4b9fe015aa4fb71ac1577c9c98283b8f93a025cdae955dbf8b6dfcf5363
-  data.tar.gz: b4f2feadd4c2b14159ae84647940a7d92818c3ff9f458f2f61d23d44c82e8e2b58fbe5472cae8c2dff02078ca0aadaf5972382347d05b22a5435b930d5d259ba
+  metadata.gz: 1d63eeaf2a5cbc0787a634396c63f0e03527ca95b4da25e77b74fb4dd44ff4bfd740f7d54cc5cc4bb77295e06e8b09a85300ebb3123617f4a0213f53beba55c6
+  data.tar.gz: 244b66eea1d2ab780b1f9bdded7e26115161a97e1bead9c3557a9bd56d2e2dcd9c1db11be51f9631c93eac11323a18950388d1cc9504770eaa293afc09ee2c24

data/README.md

@@ -329,7 +329,7 @@ Before actually uploading anything to iTunes, ```deliver``` will generate a [PDF
 
 ## Available language codes
 ```ruby
-["da-DK", "de-DE", "el-GR", "en-AU", "en-CA", "en-GB", "en-US", "es-ES", "es-MX", "fi-FI", "fr-CA", "fr-FR", "id-ID", "it-IT", "ja-JP", "ko-KR", "ms-MY", "nl-NL", "no-NO", "pt-BR", "pt-PT", "ru-RU", "sv-SE", "th-TH", "tr-TR", "vi-VI", "cmn-Hans", "cmn-Hant"]
+"da", "de-DE", "el", "en-AU", "en-CA", "en-GB", "en-US", "es-ES", "es-MX", "fi", "fr-CA", "fr-FR", "id", "it", "ja", "ko", "ms", "nl", "no", "pt-BR", "pt-PT", "ru", "sv", "th", "tr", "vi", "zh-Hans", "zh-Hant"
 ```
 
 ## Use a clean status bar

data/lib/assets/DeliverfileDefault

@@ -27,4 +27,4 @@ version "[[APP_VERSION]]"
 
 app_identifier "[[APP_IDENTIFIER]]" # The bundle identifier of your app
 apple_id "[[APPLE_ID]]" # This is NOT your Apple login ID, but the App ID of your app
-email "[[EMAIL]]" # the login email address
+email "[[EMAIL]]" # the login email address

data/lib/deliver/app_metadata.rb

@@ -193,6 +193,10 @@ module Deliver
       update_localized_value('keywords', hash) do |field, keywords, language|
         raise AppMetadataParameterError.new("Parameter needs to be a hash (each language) with an array of keywords in it (given: #{hash})") unless keywords.kind_of?Array
 
+        next unless information
+        next unless information[language]
+        next unless information[language][:keywords]
+        
         if not information[language][:keywords] or keywords.sort != information[language][:keywords][:value].sort
           field.children.remove # remove old keywords
 
@@ -306,12 +310,21 @@ module Deliver
 
         # Run through all the locales given by the 'user'
         new_value.each do |language, value|
-          create_locale_if_not_exists(language)
+          # First, check if this is the legacy locale notation
+          unless FastlaneCore::Languages::ALL_LANGUAGES.include?language
+            # Check if we need to support legacy language codes
+            short_code = language.match(/(\w\w)\-.*/)
+            if short_code and short_code.length == 2 and FastlaneCore::Languages::ALL_LANGUAGES.include?short_code[1]
+              language = short_code[1]
+            else
+              raise AppMetadataParameterError.new("#{INVALID_LANGUAGE_ERROR} (#{language})")
+            end
+          end
 
-          locale = fetch_value("//x:locale[@name='#{language}']").first
 
-          raise AppMetadataParameterError.new("#{INVALID_LANGUAGE_ERROR} (#{language})") unless FastlaneCore::Languages::ALL_LANGUAGES.include?language
+          create_locale_if_not_exists(language)
 
+          locale = fetch_value("//x:locale[@name='#{language}']").first
 
           field = locale.search(xpath_name).first
 
@@ -351,7 +364,6 @@ module Deliver
 
       # Cleans up the package of stuff we do not want to modify/upload
       def clean_package
-
         # Remove the live version (if it exists)
         versions = fetch_value("//x:version")
         while versions.count > 1
@@ -367,6 +379,16 @@ module Deliver
         fetch_value("//x:in_app_purchases").remove
 
         fetch_value("//x:software_screenshots").remove
+
+        # Change the Chinese locale
+        # Radar 22548000
+        # from zh-Hans to cmn-Hans
+        chinese = []
+        chinese << fetch_value("//x:locale[@name='zh-Hant']").last
+        chinese << fetch_value("//x:locale[@name='zh-Hans']").last
+        chinese.each do |entry|
+          entry["name"] = entry["name"].gsub("zh", "cmn") if entry && entry["name"]
+        end
       end
 
       # This will fill in all information we got (from the downloaded metadata.xml file) into self.information

data/lib/deliver/app_metadata_screenshots.rb

@@ -150,7 +150,7 @@ module Deliver
 
       found = false
       FastlaneCore::Languages::ALL_LANGUAGES.each do |language|
-        full_path = path + "/#{language}"
+        full_path = File.join(path, language)
         if File.directory?(full_path)
           found = true
           set_screenshots_for_each_language({
@@ -158,6 +158,31 @@ module Deliver
           }, use_framed)
         end
       end
+
+      # Legacy: 
+      # We also want to support the "legacy" language format (ja-JP instead of just ja)
+      FastlaneCore::Languages::ALL_LANGUAGES_LEGACY.each do |language|
+        full_path = File.join(path, language)
+        if File.directory?(full_path)
+
+          if FastlaneCore::Languages::ALL_LANGUAGES.include?language
+            # We're all good, this language code is still supported
+          else
+            # This language code was changed - need to modify that
+            short_code = language.match(/(\w\w)\-.*/)
+            if short_code and short_code.length == 2
+              Helper.log.info "Using language code #{short_code[1]} instead of #{language}"
+              language = short_code[1]
+            end
+          end
+
+          found = true
+          set_screenshots_for_each_language({
+            language => full_path
+          }, use_framed)
+        end
+      end
+
       return found
     end
   end

data/lib/deliver/deliverfile/deliverfile_creator.rb

@@ -77,7 +77,7 @@ module Deliver
       FileUtils.mkdir_p File.join(deliver_path, 'screenshots') # just in case the fetching didn't work
       File.write(File.join(deliver_path, 'screenshots', 'README.txt'), File.read("#{Helper.gem_path('deliver')}/lib/assets/ScreenshotsHelp"))
       
-      Helper.log.info "Successfully created new Deliverfile at '#{file_path}'".green
+      Helper.log.info "Successfully created new Deliverfile".green
     end
 
     private
@@ -98,7 +98,7 @@ module Deliver
           Helper.log.info "Successfully downloaded existing metadata for language #{language}"
         end
         
-        puts "Successfully created new configuration files at '#{File.join(path, 'metadata')}'".green
+        puts "Successfully created new configuration files.".green
 
         gem_path = Helper.gem_path('deliver')
 

data/lib/deliver/itunes_transporter.rb

@@ -198,16 +198,19 @@ module Deliver
       end
 
       def build_upload_command(username, password, source = "/tmp")
-        [
+        parts = [
           '"' + Helper.transporter_path + '"',
           "-m upload",
           "-u \"#{username}\"",
           "-p '#{escaped_password(password)}'",
           "-f '#{source}'",
           ENV["DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS"], # that's here, because the user might overwrite the -t option
-          "-t 'Signiant'",
           "-k 100000"
-        ].join(' ')
+        ]
+
+        parts << "-t 'Signiant'" unless parts.join(" ").include?"-t"
+
+        parts.join(' ')
       end
 
       def escaped_password(password)

data/lib/deliver/version.rb

@@ -1,3 +1,3 @@
 module Deliver
-  VERSION = "0.13.3"
+  VERSION = "0.13.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deliver
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.4
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.15.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.15.3
 - !ruby/object:Gem::Dependency
   name: credentials_manager
   requirement: !ruby/object:Gem::Requirement
@@ -273,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Upload screenshots, metadata and your app to the App Store using a single