fastlane 2.82.0.beta.20180217010002 → 2.82.0.beta.20180218010003

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

@@ -38,6 +38,10 @@ module Spaceship
       # @return (Hash) subscription pricing target
       attr_accessor :subscription_price_target
 
+      # @return (Hash) Relevant only for recurring subscriptions. Holds pricing related data, such
+      # as subscription pricing, intro offers, etc.
+      attr_accessor :raw_pricing_data
+
       attr_mapping({
         'adamId' => :purchase_id,
         'referenceName.value' => :reference_name,
@@ -48,6 +52,15 @@ module Spaceship
         'clearedForSale.value' => :cleared_for_sale
       })
 
+      def setup
+        @raw_pricing_data = @raw_data["pricingData"]
+        @raw_data.delete("pricingData")
+
+        if @raw_pricing_data
+          @raw_data.set(["pricingIntervals"], @raw_pricing_data["subscriptions"])
+        end
+      end
+
       # @return (Hash) Hash of languages
       # @example: {
       #   'de-DE': {
@@ -104,6 +117,7 @@ module Spaceship
           }
         end
         raw_data.set(["pricingIntervals"], new_intervals)
+        @raw_pricing_data["subscriptions"] = new_intervals if @raw_pricing_data
       end
 
       # @return (Array) pricing intervals
@@ -117,7 +131,7 @@ module Spaceship
       #    }
       #  ]
       def pricing_intervals
-        @pricing_intervals ||= raw_data["pricingIntervals"].map do |interval|
+        @pricing_intervals ||= (raw_data["pricingIntervals"] || []).map do |interval|
           {
             tier: interval["value"]["tierStem"].to_i,
             begin_date: interval["value"]["priceTierEffectiveDate"],
@@ -201,6 +215,12 @@ module Spaceship
         end
         # Update the Purchase
         client.update_iap!(app_id: application.apple_id, purchase_id: self.purchase_id, data: raw_data)
+
+        # Update pricing for a recurring subscription.
+        if raw_data["addOnType"] == Spaceship::Tunes::IAPType::RECURRING
+          client.update_recurring_iap_pricing!(app_id: application.apple_id, purchase_id: self.purchase_id,
+                                               pricing_intervals: raw_data["pricingIntervals"])
+        end
       end
 
       # Deletes In-App-Purchase

data/spaceship/lib/spaceship/tunes/iap_list.rb

@@ -58,6 +58,13 @@ module Spaceship
       def edit
         attrs = client.load_iap(app_id: application.apple_id, purchase_id: self.purchase_id)
         attrs[:application] = application
+
+        if attrs["addOnType"] == Spaceship::Tunes::IAPType::RECURRING
+          raw_pricing_data = client.load_recurring_iap_pricing(app_id: application.apple_id,
+                                                               purchase_id: self.purchase_id)
+          attrs["pricingData"] = raw_pricing_data
+        end
+
         Tunes::IAPDetail.new(attrs)
       end
 

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

@@ -1103,6 +1103,24 @@ module Spaceship
       end
     end
 
+    def update_recurring_iap_pricing!(app_id: nil, purchase_id: nil, pricing_intervals: nil)
+      with_tunes_retry do
+        r = request(:post) do |req|
+          pricing_data = {}
+          req.url("ra/apps/#{app_id}/iaps/#{purchase_id}/pricing/subscriptions")
+          pricing_data["subscriptions"] = pricing_intervals
+          req.body = pricing_data.to_json
+          req.headers['Content-Type'] = 'application/json'
+        end
+        handle_itc_response(r.body)
+      end
+    end
+
+    def load_recurring_iap_pricing(app_id: nil, purchase_id: nil)
+      r = request(:get, "ra/apps/#{app_id}/iaps/#{purchase_id}/pricing")
+      parse_response(r, 'data')
+    end
+
     def create_iap_family(app_id: nil, name: nil, product_id: nil, reference_name: nil, versions: [])
       r = request(:get, "ra/apps/#{app_id}/iaps/family/template")
       data = parse_response(r, 'data')

data/supply/lib/supply/options.rb

@@ -12,7 +12,8 @@ module Supply
                                      short_option: "-p",
                                      description: "The package name of the application to use",
                                      code_gen_sensitive: true,
-                                     default_value: CredentialsManager::AppfileConfig.try_fetch_value(:package_name)),
+                                     default_value: CredentialsManager::AppfileConfig.try_fetch_value(:package_name),
+                                     default_value_dynamic: true),
         FastlaneCore::ConfigItem.new(key: :track,
                                      short_option: "-a",
                                      env_name: "SUPPLY_TRACK",
@@ -36,7 +37,8 @@ module Supply
                                      short_option: "-m",
                                      optional: true,
                                      description: "Path to the directory containing the metadata files",
-                                     default_value: (Dir["./fastlane/metadata/android"] + Dir["./metadata"]).first),
+                                     default_value: (Dir["./fastlane/metadata/android"] + Dir["./metadata"]).first,
+                                     default_value_dynamic: true),
         FastlaneCore::ConfigItem.new(key: :key,
                                      env_name: "SUPPLY_KEY",
                                      short_option: "-k",
@@ -45,6 +47,7 @@ module Supply
                                      description: "The p12 File used to authenticate with Google",
                                      code_gen_sensitive: true,
                                      default_value: Dir["*.p12"].first || CredentialsManager::AppfileConfig.try_fetch_value(:keyfile),
+                                     default_value_dynamic: true,
                                      verify_block: proc do |value|
                                        UI.user_error!("Could not find p12 file at path '#{File.expand_path(value)}'") unless File.exist?(File.expand_path(value))
                                      end),
@@ -56,6 +59,7 @@ module Supply
                                      description: "The issuer of the p12 file (email address of the service account)",
                                      code_gen_sensitive: true,
                                      default_value: CredentialsManager::AppfileConfig.try_fetch_value(:issuer),
+                                     default_value_dynamic: true,
                                      verify_block: proc do |value|
                                        UI.important("DEPRECATED --issuer OPTION. Use --json_key instead")
                                      end),
@@ -67,6 +71,7 @@ module Supply
                                      description: "The service account json file used to authenticate with Google",
                                      code_gen_sensitive: true,
                                      default_value: CredentialsManager::AppfileConfig.try_fetch_value(:json_key_file),
+                                     default_value_dynamic: true,
                                      verify_block: proc do |value|
                                        UI.user_error!("'#{value}' doesn't seem to be a JSON file") unless FastlaneCore::Helper.json_file?(File.expand_path(value))
                                        UI.user_error!("Could not find service account json file at path '#{File.expand_path(value)}'") unless File.exist?(File.expand_path(value))
@@ -79,6 +84,7 @@ module Supply
                                      description: "The service account json used to authenticate with Google",
                                      code_gen_sensitive: true,
                                      default_value: CredentialsManager::AppfileConfig.try_fetch_value(:json_key_data_raw),
+                                     default_value_dynamic: true,
                                      verify_block: proc do |value|
                                        begin
                                          JSON.parse(value)
@@ -93,6 +99,7 @@ module Supply
                                      conflicting_options: [:apk_paths],
                                      code_gen_sensitive: true,
                                      default_value: Dir["*.apk"].last || Dir[File.join("app", "build", "outputs", "apk", "app-Release.apk")].last,
+                                     default_value_dynamic: true,
                                      optional: true,
                                      verify_block: proc do |value|
                                        UI.user_error!("Could not find apk file at path '#{value}'") unless File.exist?(value)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.82.0.beta.20180217010002
+  version: 2.82.0.beta.20180218010003
 platform: ruby
 authors:
 - Olivier Halligon
@@ -25,7 +25,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-17 00:00:00.000000000 Z
+date: 2018-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier