deliver 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8afb0b10b73ef864caba0f7e22f3a179bfefe4b3
-  data.tar.gz: 3df6b0d6a8e7795b3ab5987ebba891e42d756480
+  metadata.gz: c19a679c4731a7abb3c26bc71baef7837c809099
+  data.tar.gz: 33f947e8d5fc02381a6555f91c85cf2c37d58a0f
 SHA512:
-  metadata.gz: 6a793c043a3c32fa93b92c58f4b3141a298571a17398a930c251d4d3797acb68e9ee2310dddce740a05ac9c0769e1f45256dd86e84771f225b223f246e9f58eb
-  data.tar.gz: 1e74130e251d1a42bce10b81fedf1d40b684896c4d5ad2cd9f53da48b90f82e6d07f143e39b7a1748f8dab4387ace3c3b49aea9cc83d1105f3e5e91f9a66b74b
+  metadata.gz: 702f78837ac2edcd3a9c98146c1c171bb23bb3f1623b8eecf2b9d4b7452f50cae21eab64eb0156b3fd1e027e12fccfcdaddb3c55eb2fae836d771f37cec02218
+  data.tar.gz: cff14e99c1f8eb3cf39b306a6626f8ec0c709534c685afe8a561c11d505d8b5b7ac7b492e24a9ee47ad690d2d15c3edc9604b07402b8b108116bc9abfd9e0978

data/lib/deliver/deliver_process.rb

@@ -26,11 +26,11 @@ module Deliver
 
     def run
       begin
+        fetch_information_from_ipa_file
         pre_load_default_values
 
         unless metadata_only?
           run_unit_tests
-          fetch_information_from_ipa_file
         end
 
         Helper.log.info("Got all information needed to deploy a new update ('#{app_version}') for app '#{app_identifier}'")
@@ -106,8 +106,10 @@ module Deliver
     def pre_load_default_values
       @app_identifier ||= @deploy_information[Deliverer::ValKey::APP_IDENTIFIER]
       @app_identifier ||= (CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier) rescue nil)
+      @app_identifier ||= (@ipa.fetch_app_identifier rescue nil) # since ipa might be nil
 
       @app_version ||= @deploy_information[Deliverer::ValKey::APP_VERSION]
+      @app_version ||= (@ipa.fetch_app_version rescue nil) # since ipa might be nil
       @app_version ||= (FastlaneCore::ItunesSearchApi.fetch_by_identifier(app_identifier)['version'] rescue nil)
       @app_version ||= (app.get_live_version rescue nil)
     end
@@ -199,12 +201,6 @@ module Deliver
         end
 
         @ipa = Deliver::IpaUploader.new(Deliver::App.new, '/tmp/', used_ipa_file, upload_strategy)
-
-        # We are able to fetch some metadata directly from the ipa file
-        # If they were also given in the Deliverfile, we will compare the values
-        # Overwrite the cached value if there is any
-        load_app_identifier_from_ipa
-        load_app_version_from_ipa
       end
     end
 
@@ -424,25 +420,5 @@ module Deliver
           ipa_path: ENV["DELIVER_IPA_PATH"]
         }
       end
-
-      def load_app_identifier_from_ipa
-        @app_identifier ||= @ipa.fetch_app_identifier # to not ask the user if there is no identifier there yet
-
-        if app_identifier
-          if @ipa.fetch_app_identifier and app_identifier != @ipa.fetch_app_identifier
-            raise Deliver::Deliverfile::Deliverfile::DeliverfileDSLError.new("App Identifier of IPA does not match with the given one ('#{app_identifier}' != '#{@ipa.fetch_app_identifier}')".red)
-          end
-        end
-      end
-
-      def load_app_version_from_ipa
-        @app_version ||= @ipa.fetch_app_version # to not ask the user if there is no version there yet
-
-        if app_version
-          if @ipa.fetch_app_version and app_version != @ipa.fetch_app_version
-            raise Deliver::Deliverfile::Deliverfile::DeliverfileDSLError.new("App Version of IPA does not match with the given one (#{app_version} != #{@ipa.fetch_app_version})".red)
-          end
-        end
-      end
   end
 end

data/lib/deliver/deliverfile/dsl.rb

@@ -6,7 +6,7 @@ module Deliver
     class Deliverfile
       module DSL
         MISSING_VALUE_ERROR_MESSAGE = "You have to pass either a value or a block to the given method."
-        SPECIFY_LANGUAGE_FOR_VALUE = "You have to specify the language of the given value. Either set a default language using 'default_language \"en\"' on the top of the file or pass a hash containing the language codes"
+        SPECIFY_LANGUAGE_FOR_VALUE = "You have to specify the language of the given value. Either set a default language using 'default_language \"en-US\"' on the top of the file or pass a hash containing the language codes"
 
         MISSING_APP_IDENTIFIER_MESSAGE = "You have to pass a valid app identifier using the Deliver file. (e.g. 'app_identifier \"net.sunapps.app\"')"
         MISSING_VERSION_NUMBER_MESSAGE = "You have to pass a valid version number using the Deliver file. (e.g. 'version \"1.0\"')"

data/lib/deliver/version.rb

@@ -1,3 +1,3 @@
 module Deliver
-  VERSION = "0.11.1"
+  VERSION = "0.11.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deliver
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Felix Krause