fastlane 2.32.0.beta.20170518010031 → 2.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 628fb80a7557e8bd6a3977c975fd74490bb9cf8f
-  data.tar.gz: 34f0bd675989ddbdc1817c67309216f0f4b3fe4e
+  metadata.gz: b4d571b0849ea335ab1184f3436547b7386cbd58
+  data.tar.gz: f75a49396c4482f4b4b99c82716252f1f3d6630d
 SHA512:
-  metadata.gz: 9c4bc5a524402ec12cba3017e79f017af6d1f04a49a3b123d82cdb7452b1ab8e8602cae67b0a25e9030754ce189366bebd33c911f1b004db7336c243048ac248
-  data.tar.gz: af7ae644c8198aea84c2109777b160db06682a081b8e84d1543feaef20a11aac1e458c3ee508a9fedf488583e65b48cbfb142678f8f3d343afe32101dd02be95
+  metadata.gz: aef8f31380fc8ad25c5df0f3200d703b31e004bf0f0d4b8c54aad4501c7df6f25e4b208d6c273e2e53d150d64f1aa934efc84324b1eef66106b7289b3b306890
+  data.tar.gz: 11f6357a4d06b3e37dee4aad05f8e74b36f3476af7a8944cf2c335ce6284309a14dbd6d82f3775c92008736c84845668a8a594dd4a46a1b68478dd7c1849640c

data/fastlane/lib/fastlane/runner.rb

@@ -252,9 +252,9 @@ module Fastlane
             class_ref.run(arguments)
           end
         end
-      rescue \
-        FastlaneCore::Interface::FastlaneBuildFailure,    # build_failure!
-        FastlaneCore::Interface::FastlaneTestFailure => e # test_failure!
+      rescue Interrupt => e
+        raise e # reraise the interruption to avoid logging this as a crash
+      rescue FastlaneCore::Interface::FastlaneCommonException => e # these are exceptions that we dont count as crashes
         raise e
       rescue FastlaneCore::Interface::FastlaneError => e # user_error!
         FastlaneCore::CrashReporter.report_crash(exception: e, action: method_sym)

data/fastlane/lib/fastlane/version.rb

@@ -1,4 +1,4 @@
 module Fastlane
-  VERSION = '2.32.0.beta.20170518010031'.freeze
+  VERSION = '2.32.0'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
 end

data/fastlane_core/lib/fastlane_core.rb

@@ -38,6 +38,7 @@ require 'fastlane_core/ui/errors/fastlane_exception'
 require 'fastlane_core/ui/errors/fastlane_error'
 require 'fastlane_core/ui/errors/fastlane_crash'
 require 'fastlane_core/ui/errors/fastlane_shell_error'
+require 'fastlane_core/ui/errors/fastlane_not_counted_error'
 
 # Third Party code
 require 'colored'

data/fastlane_core/lib/fastlane_core/project.rb

@@ -314,9 +314,9 @@ module FastlaneCore
             UI.error("Could not read build settings. Make sure that the scheme \"#{options[:scheme]}\" is configured for running by going to Product → Scheme → Edit Scheme…, selecting the \"Build\" section, checking the \"Run\" checkbox and closing the scheme window.")
           end
         rescue Timeout::Error
-          UI.crash!("xcodebuild -showBuildSettings timed-out after #{timeout} seconds and #{retries} retries." \
+          raise FastlaneCore::Interface::FastlaneDependencyCausedException.new, "xcodebuild -showBuildSettings timed-out after #{timeout} seconds and #{retries} retries." \
             " You can override the timeout value with the environment variable FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT," \
-            " and the number of retries with the environment variable FASTLANE_XCODEBUILD_SETTINGS_RETRIES ")
+            " and the number of retries with the environment variable FASTLANE_XCODEBUILD_SETTINGS_RETRIES ".red
         end
       end
 

data/fastlane_core/lib/fastlane_core/ui/errors/fastlane_exception.rb

@@ -32,10 +32,5 @@ module FastlaneCore
         exception.message
       end
     end
-    class FastlaneBuildFailure < FastlaneException
-    end
-
-    class FastlaneTestFailure < FastlaneException
-    end
   end
 end

data/fastlane_core/lib/fastlane_core/ui/errors/fastlane_not_counted_error.rb

@@ -0,0 +1,17 @@
+module FastlaneCore
+  class Interface
+    # Super class for exception types that we do not want to record
+    # explictly as crashes or user errors
+    class FastlaneCommonException < FastlaneException; end
+
+    # Raised when there is a build failure in xcodebuild
+    class FastlaneBuildFailure < FastlaneCommonException; end
+
+    # Raised when a test fails when being run by tools such as scan or snapshot
+    class FastlaneTestFailure < FastlaneCommonException; end
+
+    # Raise this type of exception when a failure caused by a third party
+    # dependency (i.e. xcodebuild, gradle, slather) happens.
+    class FastlaneDependencyCausedException < FastlaneCommonException; end
+  end
+end

data/fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb

@@ -64,9 +64,7 @@ module Commander
           FastlaneCore::CrashReporter.report_crash(exception: e, action: @program[:name])
           abort e.to_s
         end
-      rescue \
-        FastlaneCore::Interface::FastlaneBuildFailure,    # build_failure!
-        FastlaneCore::Interface::FastlaneTestFailure => e # test_failure!
+      rescue FastlaneCore::Interface::FastlaneCommonException => e # these are exceptions that we dont count as crashes
         display_user_error!(e, e.to_s)
       rescue FastlaneCore::Interface::FastlaneError => e # user_error!
         collector.did_raise_error(@program[:name])

data/spaceship/lib/spaceship/tunes/iap.rb

@@ -6,6 +6,7 @@ require 'spaceship/tunes/iap_family_list'
 require 'spaceship/tunes/iap_families'
 require 'spaceship/tunes/iap_family_details'
 require 'spaceship/tunes/iap_families'
+require 'spaceship/tunes/iap_subscription_pricing_tier'
 
 module Spaceship
   module Tunes

data/spaceship/lib/spaceship/tunes/iap_detail.rb

@@ -118,9 +118,8 @@ module Spaceship
       #    }
       #  ]
       def pricing_intervals
-        parsed_intervals = []
-        raw_data["pricingIntervals"].each do |interval|
-          parsed_intervals << {
+        @pricing_intervals ||= raw_data["pricingIntervals"].map do |interval|
+          {
             tier: interval["value"]["tierStem"].to_i,
             begin_date: interval["value"]["priceTierEffectiveDate"],
             end_date: interval["value"]["priceTierEndDate"],
@@ -128,7 +127,6 @@ module Spaceship
             country: interval["value"]["country"]
           }
         end
-        return parsed_intervals
       end
 
       # @return (String) Human Readable type of the purchase
@@ -217,6 +215,52 @@ module Spaceship
       def delete!
         client.delete_iap!(app_id: application.apple_id, purchase_id: self.purchase_id)
       end
+
+      # Retrieves the actual prices for an iap.
+      #
+      # @return ([]) An empty array
+      #   if the iap is not yet cleared for sale
+      # @return ([Spaceship::Tunes::PricingInfo]) An array of pricing infos from the same pricing tier
+      #   if the iap uses world wide pricing
+      # @return ([Spaceship::Tunes::IAPSubscriptionPricingInfo]) An array of pricing infos from multple subscription pricing tiers
+      #   if the iap uses territorial pricing
+      def pricing_info
+        return [] unless cleared_for_sale
+        return world_wide_pricing_info if world_wide_pricing?
+        territorial_pricing_info
+      end
+
+      private
+
+      # Checks wheather an iap uses world wide or territorial pricing.
+      #
+      # @return (true, false)
+      def world_wide_pricing?
+        pricing_intervals.fetch(0, {})[:country] == "WW"
+      end
+
+      # Maps a single pricing interval to pricing infos.
+      #
+      # @return ([Spaceship::Tunes::PricingInfo]) An array of pricing infos from the same tier
+      def world_wide_pricing_info
+        client
+          .pricing_tiers
+          .find { |p| p.tier_stem == pricing_intervals.first[:tier].to_s }
+          .pricing_info
+      end
+
+      # Maps pricing intervals to their respective subscription pricing infos.
+      #
+      # @return ([Spaceship::Tunes::IAPSubscriptionPricingInfo]) An array of subscription pricing infos
+      def territorial_pricing_info
+        pricing_matrix = client.subscription_pricing_tiers(application.apple_id)
+        pricing_intervals.map do |interval|
+          pricing_matrix
+            .find { |p| p.tier_stem == interval[:tier].to_s }
+            .pricing_info
+            .find { |i| i.country_code == interval[:country] }
+        end
+      end
     end
   end
 end

data/spaceship/lib/spaceship/tunes/iap_subscription_pricing_tier.rb

@@ -0,0 +1,76 @@
+module Spaceship
+  module Tunes
+    class IAPSubscriptionPricingTier < TunesBase
+      # @return (String) Number of the subscription price tier (e.g. "1" for Tier 1 )
+      attr_accessor :tier_stem
+
+      # @return (String) Name of the tier (e.g. "ITC.addons.pricing.tier.1" for Tier 1)
+      attr_accessor :tier_name
+
+      # @return ([Spaceship::Tunes::IAPSubscriptionPricingInfo]) A list of all prices for the respective countries
+      attr_accessor :pricing_info
+
+      attr_mapping(
+        "tierStem" => :tier_stem,
+        "tierName" => :tier_name
+      )
+
+      class << self
+        # Create a new object based on a hash.
+        # This is used to create a new object based on the server response.
+        def factory(attrs)
+          obj = self.new(attrs)
+          obj.unfold_pricing_info(attrs["pricingInfo"])
+
+          return obj
+        end
+      end
+
+      def unfold_pricing_info(attrs)
+        unfolded_pricing_info = attrs.map { |info| IAPSubscriptionPricingInfo.new(info) }
+        instance_variable_set(:@pricing_info, unfolded_pricing_info)
+      end
+    end
+
+    class IAPSubscriptionPricingInfo < TunesBase
+      # @return (String) country code, e.g. "US"
+      attr_accessor :country_code
+
+      # @return (String) currency symbol, e.g. "$"
+      attr_accessor :currency_symbol
+
+      # @return (String) currency code, e.g. "USD"
+      attr_accessor :currency_code
+
+      # @return (Number) net proceedings for the developer in the first year
+      attr_accessor :wholesale_price
+
+      # @return (Number) net proceedings for the developer after the first year
+      attr_accessor :wholesale_price2
+
+      # @return (Number) customer price
+      attr_accessor :retail_price
+
+      # @return (String) formatted customer price, e.g. "$0.00"
+      attr_accessor :f_retail_price
+
+      # @return (String) formatted net proceedings in the first year, e.g. "$0.00"
+      attr_accessor :f_wholesale_price
+
+      # @return (String) formatted net proceedings after the first year, e.g. "$0.00"
+      attr_accessor :f_wholesale_price2
+
+      attr_mapping(
+        "countryCode" => :country_code,
+        "currencySymbol" => :currency_symbol,
+        "currencyCode" => :currency_code,
+        "wholesalePrice" => :wholesale_price,
+        "wholesalePrice2" => :wholesale_price2,
+        "retailPrice" => :retail_price,
+        "fRetailPrice" => :f_retail_price,
+        "fWholesalePrice" => :f_wholesale_price,
+        "fWholesalePrice2" => :f_wholesale_price2
+      )
+    end
+  end
+end

data/spaceship/lib/spaceship/tunes/tunes_client.rb

@@ -514,9 +514,11 @@ module Spaceship
     # }, {
     # ...
     def pricing_tiers
-      r = request(:get, 'ra/apps/pricing/matrix')
-      data = parse_response(r, 'data')['pricingTiers']
-      data.map { |tier| Spaceship::Tunes::PricingTier.factory(tier) }
+      @pricing_tiers ||= begin
+        r = request(:get, 'ra/apps/pricing/matrix')
+        data = parse_response(r, 'data')['pricingTiers']
+        data.map { |tier| Spaceship::Tunes::PricingTier.factory(tier) }
+      end
     end
 
     #####################################################
@@ -1011,18 +1013,31 @@ module Spaceship
       handle_itc_response(r)
     end
 
-    # loads the full In-App-Purchases
+    # Loads the full In-App-Purchases
     def load_iap(app_id: nil, purchase_id: nil)
       r = request(:get, "ra/apps/#{app_id}/iaps/#{purchase_id}")
       parse_response(r, 'data')
     end
 
-    # loads the full In-App-Purchases-Family
+    # Loads the full In-App-Purchases-Family
     def load_iap_family(app_id: nil, family_id: nil)
       r = request(:get, "ra/apps/#{app_id}/iaps/family/#{family_id}")
       parse_response(r, 'data')
     end
 
+    # Loads the full In-App-Purchases-Pricing-Matrix
+    #   note: the matrix is the same for any app_id
+    #
+    # @param app_id (String) The Apple ID of any app
+    # @return ([Spaceship::Tunes::IAPSubscriptionPricingTier]) An array of pricing tiers
+    def subscription_pricing_tiers(app_id)
+      @subscription_pricing_tiers ||= begin
+        r = request(:get, "ra/apps/#{app_id}/iaps/pricing/matrix/recurring")
+        data = parse_response(r, "data")["pricingTiers"]
+        data.map { |tier| Spaceship::Tunes::IAPSubscriptionPricingTier.factory(tier) }
+      end
+    end
+
     # updates an In-App-Purchases-Family
     def update_iap_family!(app_id: nil, family_id: nil, data: nil)
       with_tunes_retry do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.32.0.beta.20170518010031
+  version: 2.32.0
 platform: ruby
 authors:
 - Felix Krause
@@ -1111,6 +1111,7 @@ files:
 - fastlane_core/lib/fastlane_core/ui/errors/fastlane_crash.rb
 - fastlane_core/lib/fastlane_core/ui/errors/fastlane_error.rb
 - fastlane_core/lib/fastlane_core/ui/errors/fastlane_exception.rb
+- fastlane_core/lib/fastlane_core/ui/errors/fastlane_not_counted_error.rb
 - fastlane_core/lib/fastlane_core/ui/errors/fastlane_shell_error.rb
 - fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb
 - fastlane_core/lib/fastlane_core/ui/github_issue_inspector_reporter.rb
@@ -1330,6 +1331,7 @@ files:
 - spaceship/lib/spaceship/tunes/iap_family_list.rb
 - spaceship/lib/spaceship/tunes/iap_list.rb
 - spaceship/lib/spaceship/tunes/iap_status.rb
+- spaceship/lib/spaceship/tunes/iap_subscription_pricing_tier.rb
 - spaceship/lib/spaceship/tunes/iap_type.rb
 - spaceship/lib/spaceship/tunes/language_converter.rb
 - spaceship/lib/spaceship/tunes/language_item.rb
@@ -1365,23 +1367,23 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
+- cert/lib
+- credentials_manager/lib
 - deliver/lib
-- spaceship/lib
-- screengrab/lib
+- fastlane/lib
+- fastlane_core/lib
 - frameit/lib
-- scan/lib
+- gym/lib
 - match/lib
+- pem/lib
+- pilot/lib
 - produce/lib
-- fastlane/lib
-- snapshot/lib
+- scan/lib
+- screengrab/lib
 - sigh/lib
+- snapshot/lib
+- spaceship/lib
 - supply/lib
-- pilot/lib
-- credentials_manager/lib
-- pem/lib
-- cert/lib
-- gym/lib
-- fastlane_core/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -1389,14 +1391,15 @@ 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.4.5.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: The easiest way to automate beta deployments and releases for your iOS and
   Android apps
 test_files: []
+has_rdoc: