deliver 0.11.1.beta → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2239fd5bba34fcb6740d557e361cc46cff1b3dc9
-  data.tar.gz: 79bfbbb21f2a6661f100219071e97982af26127e
+  metadata.gz: 8afb0b10b73ef864caba0f7e22f3a179bfefe4b3
+  data.tar.gz: 3df6b0d6a8e7795b3ab5987ebba891e42d756480
 SHA512:
-  metadata.gz: c63951ad37598e81d9345d18010f2ac30a8a8877c41827d25bcef8f001008d95ec097ce1bc84ae22d84d84f92691a91601f3be918321fe8106df84ed0667e62e
-  data.tar.gz: 326323368895b94511146c459a7eed97dfd31bfa89c3ee7f57e577aa8d9a4a07d9b5b4f970abce7ac5c7236e0765f235fee4464655a0e6f41728a055d2c4774d
+  metadata.gz: 6a793c043a3c32fa93b92c58f4b3141a298571a17398a930c251d4d3797acb68e9ee2310dddce740a05ac9c0769e1f45256dd86e84771f225b223f246e9f58eb
+  data.tar.gz: 1e74130e251d1a42bce10b81fedf1d40b684896c4d5ad2cd9f53da48b90f82e6d07f143e39b7a1748f8dab4387ace3c3b49aea9cc83d1105f3e5e91f9a66b74b

data/lib/assets/summary.html.erb

@@ -67,6 +67,7 @@
               margin-left: 25px;
               margin-right: 25px;
               margin-top: 22px;
+              font-weight: 300;
           }
 
           #app-screenshots {

data/lib/deliver/app_metadata.rb

@@ -145,7 +145,14 @@ module Deliver
     #  as keys.
     # @raise (AppMetadataParameterError) Is thrown when don't pass a correct hash with correct language codes.
     def update_changelog(hash)
-      update_metadata_key(:version_whats_new, hash)
+      # check if we're allowed to do that
+      if FastlaneCore::ItunesSearchApi.fetch(@app.apple_id)
+        # App is already in the store
+        update_metadata_key(:version_whats_new, hash)
+      else
+        # App is not in the store, skipping changelog for now
+        Helper.log.info "It seems like this it the initial release of your app, which can't contain a changelog. Skipping the changelog for now.".yellow
+      end
     end
 
     # Updates the Marketing URL

data/lib/deliver/app_metadata_screenshots.rb

@@ -105,7 +105,6 @@ module Deliver
 
     def set_screenshots_for_each_language(hash, use_framed = false)
       raise AppMetadataParameterError.new("Parameter needs to be an hash, containg strings with the new description") unless hash.kind_of?Hash
-
       hash.each do |language, current_path|
         resulting_path = "#{current_path}/**/*.{png,jpg,jpeg}"
 
@@ -122,7 +121,8 @@ module Deliver
             # When frameit is enabled, we only want to upload the framed screenshots
             if use_framed
               # Except for Watch screenshots, they are okay without _framed
-              if AppScreenshot.new(path).screen_size != AppScreenshot::ScreenSize::IOS_APPLE_WATCH
+              is_apple_watch = ((AppScreenshot.new(path).screen_size == AppScreenshot::ScreenSize::IOS_APPLE_WATCH) rescue false)
+              unless is_apple_watch
                 next unless path.include?"_framed."
               end
             else

data/lib/deliver/deliver_process.rb

@@ -26,29 +26,23 @@ module Deliver
 
     def run
       begin
+        pre_load_default_values
+
         unless metadata_only?
           run_unit_tests
-          fetch_app_key_information
           fetch_information_from_ipa_file
-
-          @app_version ||= get_latest_version
-          verify_ipa_file
-        else
-          fetch_app_key_information
-          @app_identifier ||= ask("App Identifier (e.g. com.krausefx.app): ")
-          @app_version ||= get_latest_version || ask("Which version number should be updated? ")
         end
-        create_app
 
-        Helper.log.info("Got all information needed to deploy a new update ('#{@app_version}') for app '#{@app_identifier}'")
+        Helper.log.info("Got all information needed to deploy a new update ('#{app_version}') for app '#{app_identifier}'")
 
         verify_app_on_itunesconnect unless metadata_only?
 
-        if ready_for_sale?
-          raise "Cannot update metadata of apps 'Ready for Sale'. You can dupe: http://www.openradar.appspot.com/18263306".red 
-        end
 
         if is_beta_build?
+          if ready_for_sale?
+            raise "Cannot update metadata of apps 'Ready for Sale'. You can dupe: http://www.openradar.appspot.com/18263306".red 
+          end
+
           Helper.log.info "Beta builds don't upload new metadata to iTunesConnet".yellow
         else
           upload_metadata
@@ -76,6 +70,48 @@ module Deliver
       trigger_metadata_upload
     end
 
+    #####################################################
+    # @!group Getters
+    #####################################################
+
+    def app
+      return @app if @app
+
+      @app = Deliver::App.new(app_identifier: app_identifier,
+                                    apple_id: @deploy_information[Deliverer::ValKey::APPLE_ID]) # apple_id can be nil, will be fetched automatically
+    end
+
+    def app_version
+      return @app_version if @app_version
+
+      if Helper.is_test?
+        raise "No App Version given"
+      end
+
+      @app_version ||= ask("Which version number should be updated? ")
+    end
+
+    def app_identifier
+      return @app_identifier if @app_identifier
+
+      if Helper.is_test?
+        raise "No App Identifier given"
+      end
+
+      Helper.log.info "No App Identifier found. Pass one using `app_identifier` in your Deliverfile".yellow
+      @app_identifier = ask("App Identifier (e.g. com.krausefx.app): ")
+    end
+
+    # Preloads default values from the given hashes + Appfile
+    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_version ||= @deploy_information[Deliverer::ValKey::APP_VERSION]
+      @app_version ||= (FastlaneCore::ItunesSearchApi.fetch_by_identifier(app_identifier)['version'] rescue nil)
+      @app_version ||= (app.get_live_version rescue nil)
+    end
+
     #####################################################
     # @!group What kind of release
     #####################################################
@@ -125,23 +161,6 @@ module Deliver
       end
     end
 
-    # Tries to fetch app version and app identifier from Deliverfile
-    def fetch_app_key_information
-      @app_version = @deploy_information[Deliverer::ValKey::APP_VERSION]
-      @app_identifier = @deploy_information[Deliverer::ValKey::APP_IDENTIFIER]
-      fetch_app_identifier_from_app_file
-    end
-
-    # returns the latest app version from iTunes Connect
-    def get_latest_version
-      return nil if Helper.is_test?
-
-      data = itc.get_app_information(Deliver::App.new(app_identifier: @app_identifier))
-      return (data['version']['value'] rescue nil)
-    rescue
-      return nil
-    end
-
     def fetch_information_from_ipa_file
       used_ipa_file = ENV["IPA_OUTPUT_PATH"]# if (ENV["IPA_OUTPUT_PATH"] and File.exists?(ENV["IPA_OUTPUT_PATH"]))
 
@@ -183,31 +202,17 @@ module Deliver
 
         # 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
-        @app_identifier = verify_app_identifier(@app_identifier)
-        @app_version = verify_app_version(@app_version)
+        # Overwrite the cached value if there is any
+        load_app_identifier_from_ipa
+        load_app_version_from_ipa
       end
     end
 
-    def fetch_app_identifier_from_app_file
-      @app_identifier ||= (CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier) rescue nil)
-    end
-
-    def verify_ipa_file
-      fetch_app_identifier_from_app_file unless @app_identifier
-      raise Deliverfile::Deliverfile::DeliverfileDSLError.new(Deliverfile::Deliverfile::MISSING_APP_IDENTIFIER_MESSAGE.red) unless @app_identifier
-      raise Deliverfile::Deliverfile::DeliverfileDSLError.new(Deliverfile::Deliverfile::MISSING_VERSION_NUMBER_MESSAGE.red) unless @app_version
-    end
-
-    def create_app
-      @app = Deliver::App.new(app_identifier: @app_identifier,
-                                    apple_id: @deploy_information[Deliverer::ValKey::APPLE_ID])
-    end
-
     def verify_app_on_itunesconnect
       if (@ipa and is_release_build?) or !@ipa
         # This is a real release, which should also upload the ipa file onto production
-        @app.create_new_version!(@app_version) unless Helper.is_test?
-        @app.metadata.verify_version(@app_version) if @ipa
+        app.create_new_version!(app_version) unless Helper.is_test?
+        app.metadata.verify_version(app_version) if @ipa
       end
     end
 
@@ -267,17 +272,17 @@ module Deliver
     end
 
     def set_app_metadata
-      @app.metadata.update_title(@deploy_information[Deliverer::ValKey::TITLE]) if @deploy_information[Deliverer::ValKey::TITLE]
-      @app.metadata.update_description(@deploy_information[Deliverer::ValKey::DESCRIPTION]) if @deploy_information[Deliverer::ValKey::DESCRIPTION]
+      app.metadata.update_title(@deploy_information[Deliverer::ValKey::TITLE]) if @deploy_information[Deliverer::ValKey::TITLE]
+      app.metadata.update_description(@deploy_information[Deliverer::ValKey::DESCRIPTION]) if @deploy_information[Deliverer::ValKey::DESCRIPTION]
 
-      @app.metadata.update_support_url(@deploy_information[Deliverer::ValKey::SUPPORT_URL]) if @deploy_information[Deliverer::ValKey::SUPPORT_URL]
-      @app.metadata.update_changelog(@deploy_information[Deliverer::ValKey::CHANGELOG]) if @deploy_information[Deliverer::ValKey::CHANGELOG]
-      @app.metadata.update_marketing_url(@deploy_information[Deliverer::ValKey::MARKETING_URL]) if @deploy_information[Deliverer::ValKey::MARKETING_URL]
-      @app.metadata.update_privacy_url(@deploy_information[Deliverer::ValKey::PRIVACY_URL]) if @deploy_information[Deliverer::ValKey::PRIVACY_URL]
+      app.metadata.update_support_url(@deploy_information[Deliverer::ValKey::SUPPORT_URL]) if @deploy_information[Deliverer::ValKey::SUPPORT_URL]
+      app.metadata.update_changelog(@deploy_information[Deliverer::ValKey::CHANGELOG]) if @deploy_information[Deliverer::ValKey::CHANGELOG]
+      app.metadata.update_marketing_url(@deploy_information[Deliverer::ValKey::MARKETING_URL]) if @deploy_information[Deliverer::ValKey::MARKETING_URL]
+      app.metadata.update_privacy_url(@deploy_information[Deliverer::ValKey::PRIVACY_URL]) if @deploy_information[Deliverer::ValKey::PRIVACY_URL]
 
-      @app.metadata.update_keywords(@deploy_information[Deliverer::ValKey::KEYWORDS]) if @deploy_information[Deliverer::ValKey::KEYWORDS]
+      app.metadata.update_keywords(@deploy_information[Deliverer::ValKey::KEYWORDS]) if @deploy_information[Deliverer::ValKey::KEYWORDS]
 
-      @app.metadata.update_price_tier(@deploy_information[Deliverer::ValKey::PRICE_TIER]) if @deploy_information[Deliverer::ValKey::PRICE_TIER]
+      app.metadata.update_price_tier(@deploy_information[Deliverer::ValKey::PRICE_TIER]) if @deploy_information[Deliverer::ValKey::PRICE_TIER]
     end
 
     def screenshots_path
@@ -298,7 +303,7 @@ module Deliver
       screens_path = screenshots_path
       if screens_path
         # Not using Snapfile. Not a good user.
-        if not @app.metadata.set_all_screenshots_from_path(screens_path, use_framed_screenshots?)
+        if not app.metadata.set_all_screenshots_from_path(screens_path, use_framed_screenshots?)
           # This path does not contain folders for each language
           if screens_path.kind_of?String
             if @deploy_information[Deliverer::ValKey::DEFAULT_LANGUAGE]
@@ -309,7 +314,7 @@ module Deliver
               screens_path = nil
             end
           end
-          @app.metadata.set_screenshots_for_each_language(screens_path, use_framed_screenshots?) if screens_path
+          app.metadata.set_screenshots_for_each_language(screens_path, use_framed_screenshots?) if screens_path
         end
       end
     end
@@ -348,7 +353,7 @@ module Deliver
     end
 
     def trigger_metadata_upload
-      result = @app.metadata.upload!
+      result = app.metadata.upload!
       raise "Error uploading app metadata".red unless result == true
     end
 
@@ -358,28 +363,28 @@ module Deliver
 
     def additional_itc_information
       # e.g. rating or copyright
-      itc.set_copyright!(@app, @deploy_information[Deliverer::ValKey::COPYRIGHT]) if @deploy_information[Deliverer::ValKey::COPYRIGHT]
-      itc.set_app_review_information!(@app, @deploy_information[Deliverer::ValKey::APP_REVIEW_INFORMATION]) if @deploy_information[Deliverer::ValKey::APP_REVIEW_INFORMATION]
-      itc.set_release_after_approval!(@app, @deploy_information[Deliverer::ValKey::AUTOMATIC_RELEASE]) if @deploy_information[Deliverer::ValKey::AUTOMATIC_RELEASE] != nil
+      itc.set_copyright!(app, @deploy_information[Deliverer::ValKey::COPYRIGHT]) if @deploy_information[Deliverer::ValKey::COPYRIGHT]
+      itc.set_app_review_information!(app, @deploy_information[Deliverer::ValKey::APP_REVIEW_INFORMATION]) if @deploy_information[Deliverer::ValKey::APP_REVIEW_INFORMATION]
+      itc.set_release_after_approval!(app, @deploy_information[Deliverer::ValKey::AUTOMATIC_RELEASE]) if @deploy_information[Deliverer::ValKey::AUTOMATIC_RELEASE] != nil
 
       # Categories
       primary = @deploy_information[Deliverer::ValKey::PRIMARY_CATEGORY]
       secondary = @deploy_information[Deliverer::ValKey::SECONDARY_CATEGORY]
-      itc.set_categories!(@app, primary, secondary) if (primary or secondary)
+      itc.set_categories!(app, primary, secondary) if (primary or secondary)
 
       # App Rating
-      itc.set_app_rating!(@app, @deploy_information[Deliverer::ValKey::RATINGS_CONFIG_PATH]) if @deploy_information[Deliverer::ValKey::RATINGS_CONFIG_PATH]
+      itc.set_app_rating!(app, @deploy_information[Deliverer::ValKey::RATINGS_CONFIG_PATH]) if @deploy_information[Deliverer::ValKey::RATINGS_CONFIG_PATH]
 
       # App Icon
-      itc.upload_app_icon!(@app, @deploy_information[Deliverer::ValKey::APP_ICON]) if @deploy_information[Deliverer::ValKey::APP_ICON]
+      itc.upload_app_icon!(app, @deploy_information[Deliverer::ValKey::APP_ICON]) if @deploy_information[Deliverer::ValKey::APP_ICON]
 
       # Apple Watch App Icon
-      itc.upload_apple_watch_app_icon!(@app, @deploy_information[Deliverer::ValKey::APPLE_WATCH_APP_ICON]) if @deploy_information[Deliverer::ValKey::APPLE_WATCH_APP_ICON]
+      itc.upload_apple_watch_app_icon!(app, @deploy_information[Deliverer::ValKey::APPLE_WATCH_APP_ICON]) if @deploy_information[Deliverer::ValKey::APPLE_WATCH_APP_ICON]
     end
 
     def trigger_ipa_upload
       if @ipa
-        @ipa.app = @app # we now have the resulting app
+        @ipa.app = app # we now have the resulting app
         result = @ipa.upload! # Important: this will also actually deploy the app on iTunesConnect
         raise "Error uploading ipa file".red unless result == true
       else
@@ -411,8 +416,8 @@ module Deliver
       def hash_for_callback(error = nil)
         {
           error: error,
-          app_version: @app_version,
-          app_identifier: @app_identifier,
+          app_version: (app_version rescue nil),
+          app_identifier: (app_identifier rescue nil),
           skipped_deploy: skip_deployment?,
           is_release_build: is_release_build?,
           is_beta_build: is_beta_build?,
@@ -420,26 +425,24 @@ module Deliver
         }
       end
 
-      def verify_app_identifier(app_identifier)
+      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
-        else
-          app_identifier = @ipa.fetch_app_identifier
         end
-        return app_identifier
       end
 
-      def verify_app_version(app_version)
+      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
-        else
-          app_version = @ipa.fetch_app_version
         end
-        return app_version
       end
   end
 end

data/lib/deliver/ipa_uploader.rb

@@ -94,6 +94,15 @@ module Deliver
         else
           Helper.log.info "deliver will **not** submit the app for Review or for TestFlight distribution".yellow
           Helper.log.info "If you want to distribute the binary, don't define `skip_deploy` ".yellow
+
+          if ENV["DELIVER_WHAT_TO_TEST"] or ENV["DELIVER_BETA_DESCRIPTION"] or ENV["DELIVER_BETA_FEEDBACK_EMAIL"]
+            Helper.log.warn "---------------------------------------------------".yellow
+            Helper.log.warn "You provided beta version metadata, but used the ".yellow
+            Helper.log.warn "`skip_deploy` option when running deliver.".yellow
+            Helper.log.warn "You have to remove `skip_deploy` to set a changelog".yellow
+            Helper.log.warn "for TestFlight builds".yellow
+            Helper.log.warn "---------------------------------------------------".yellow
+          end
         end
         return true
       end

data/lib/deliver/itunes_connect/itunes_connect_reader.rb

@@ -44,16 +44,7 @@ module Deliver
       begin
         verify_app(app)
 
-        open_app_page(app)
-
-        begin
-          version_number = wait_for_elements("input[ng-model='versionInfo.version.value']").first.value
-          version_number ||= first(".status.ready").text.split(" ").first
-          return version_number
-        rescue
-          Helper.log.debug "Could not fetch version number of the live version for app #{app}."
-          return nil
-        end
+        return (get_app_information(app)['version']['value'] rescue nil)
       rescue => ex
         error_occured(ex)
       end

data/lib/deliver/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deliver
 version: !ruby/object:Gem::Version
-  version: 0.11.1.beta
+  version: 0.11.1
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -193,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.19.0
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -267,9 +267,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2