produce/lib/produce/developer_center.rb in fastlane-2.10.0 vs produce/lib/produce/developer_center.rb in fastlane-2.11.0

@@ -7,51 +7,21 @@
       create_new_app
     end
 
     def create_new_app
       ENV["CREATED_NEW_APP_ID"] = Time.now.to_i.to_s
-
       if app_exists?
         UI.success "[DevCenter] App '#{Produce.config[:app_identifier]}' already exists, nothing to do on the Dev Center"
         ENV["CREATED_NEW_APP_ID"] = nil
         # Nothing to do here
       else
         app_name = Produce.config[:app_name]
         UI.message "Creating new app '#{app_name}' on the Apple Dev Center"
 
-        app_service = Spaceship.app_service
-        enabled_clean_options = {}
-        Produce.config[:enabled_features].each do |k, v|
-          if k == :data_protection
-            case v
-            when "complete"
-              enabled_clean_options[app_service.data_protection.complete.service_id] = app_service.data_protection.complete.on
-            when "unlessopen"
-              enabled_clean_options[app_service.data_protection.unlessopen.service_id] = app_service.data_protection.unlessopen.on
-            when "untilfirstauth"
-              enabled_clean_options[app_service.data_protection.untilfirstauth.service_id] = app_service.data_protection.untilfirstauth.on
-            end
-          elsif k == :icloud
-            case v
-            when "legacy"
-              enabled_clean_options[app_service.icloud.on.service_id] = app_service.icloud.on
-              enabled_clean_options[app_service.cloud_kit.xcode5_compatible.service_id] = app_service.cloud_kit.xcode5_compatible
-            when "cloudkit"
-              enabled_clean_options[app_service.icloud.on.service_id] = app_service.icloud.on
-              enabled_clean_options[app_service.cloud_kit.cloud_kit.service_id] = app_service.cloud_kit.cloud_kit
-            end
-          else
-            if v == "on"
-              enabled_clean_options[app_service.send(k.to_s).on.service_id] = app_service.send(k.to_s).on
-            else
-              enabled_clean_options[app_service.send(k.to_s).off.service_id] = app_service.send(k.to_s).off
-            end
-          end
-        end
         app = Spaceship.app.create!(bundle_id: app_identifier,
                                          name: app_name,
-                                         enabled_features: enabled_clean_options,
+                                         enabled_features: enabled_features,
                                          mac: Produce.config[:platform] == "osx")
 
         if app.name != Produce.config[:app_name]
           UI.important("Your app name includes non-ASCII characters, which are not supported by the Apple Developer Portal.")
           UI.important("To fix this a unique (internal) name '#{app.name}' has been created for you. Your app's real name '#{Produce.config[:app_name]}'")
@@ -66,9 +36,42 @@
 
         UI.success "Finished creating new app '#{app_name}' on the Dev Center"
       end
 
       return true
+    end
+
+    def enabled_features
+      app_service = Spaceship.app_service
+      enabled_clean_options = {}
+      Produce.config[:enabled_features].each do |k, v|
+        if k.to_sym == :data_protection
+          case v
+          when "complete"
+            enabled_clean_options[app_service.data_protection.complete.service_id] = app_service.data_protection.complete
+          when "unlessopen"
+            enabled_clean_options[app_service.data_protection.unlessopen.service_id] = app_service.data_protection.unlessopen
+          when "untilfirstauth"
+            enabled_clean_options[app_service.data_protection.untilfirstauth.service_id] = app_service.data_protection.untilfirstauth
+          end
+        elsif k.to_sym == :icloud
+          case v
+          when "legacy"
+            enabled_clean_options[app_service.icloud.on.service_id] = app_service.icloud.on
+            enabled_clean_options[app_service.cloud_kit.xcode5_compatible.service_id] = app_service.cloud_kit.xcode5_compatible
+          when "cloudkit"
+            enabled_clean_options[app_service.icloud.on.service_id] = app_service.icloud.on
+            enabled_clean_options[app_service.cloud_kit.cloud_kit.service_id] = app_service.cloud_kit.cloud_kit
+          end
+        else
+          if v == "on"
+            enabled_clean_options[app_service.send(k.to_s).on.service_id] = app_service.send(k.to_s).on
+          else
+            enabled_clean_options[app_service.send(k.to_s).off.service_id] = app_service.send(k.to_s).off
+          end
+        end
+      end
+      enabled_clean_options
     end
 
     def app_identifier
       Produce.config[:app_identifier].to_s
     end