fastlane 2.14.2 → 2.15.0.beta.20170213032052

data/spaceship/lib/spaceship/base.rb

@@ -158,6 +158,24 @@ module Spaceship
           super
         end
       end
+
+      ##
+      # The factory class-method. This should only be used or overridden in very specific use-cases
+      #
+      # The only time it makes sense to use or override this method is when we want a base class
+      # to return a sub-class based on attributes.
+      #
+      # Here, we define the method to be the same as `Spaceship::Base.new(attrs)`, be it should
+      # be used only by classes that override it.
+      #
+      # Example:
+      #
+      #   Certificate.factory(attrs)
+      #   #=> #<PushCertificate ... >
+      #
+      def factory(attrs)
+        self.new(attrs)
+      end
     end
 
     ##

data/spaceship/lib/spaceship/client.rb

@@ -79,8 +79,8 @@ module Spaceship
 
         [
           "Apple provided the following error info:",
-          CGI.unescapeHTML(@error_info['resultString']),
-          CGI.unescapeHTML(@error_info['userString'])
+          @error_info['resultString'],
+          @error_info['userString']
         ].compact.uniq # sometimes 'resultString' and 'userString' are the same value
       end
     end
@@ -395,7 +395,7 @@ module Spaceship
     rescue UnauthorizedAccessError => ex
       if @loggedin && !(tries -= 1).zero?
         msg = "Auth error received: '#{ex.message}'. Login in again then retrying after 3 seconds (remaining: #{tries})..."
-        puts msg if $verbose
+        puts msg if Spaceship::Globals.verbose?
         logger.warn msg
 
         if self.class.spaceship_session_env.to_s.length > 0
@@ -438,15 +438,18 @@ module Spaceship
       if response.body
         # If we have an `expected_key`, select that from response.body Hash
         # Else, don't.
+
+        # the returned error message and info, is html encoded ->  "issued" -> make this readable ->  "issued"
+        response.body["userString"] = CGI.unescapeHTML(response.body["userString"]) if response.body["userString"]
+        response.body["resultString"] = CGI.unescapeHTML(response.body["resultString"]) if response.body["resultString"]
+
         content = expected_key ? response.body[expected_key] : response.body
       end
-
       if content.nil?
         # Check if the failure is due to missing permissions (iTunes Connect)
         if response.body && response.body["messages"] && response.body["messages"]["error"].include?("Forbidden")
           raise_insuffient_permission_error!
         end
-
         raise UnexpectedResponse, response.body
       elsif content.kind_of?(Hash) && (content["resultString"] || "").include?("NotAllowed")
         # example content when doing a Developer Portal action with not enough permission

data/spaceship/lib/spaceship/globals.rb

@@ -0,0 +1,12 @@
+module Spaceship
+  class Globals
+    # if spaceship is run with a FastlaneCore available respect the global state there
+    # otherwise fallback to $verbose
+    def self.verbose?
+      if Object.const_defined?("FastlaneCore")
+        return FastlaneCore::Globals.verbose?
+      end
+      return $verbose
+    end
+  end
+end

data/spaceship/lib/spaceship/portal/app.rb

@@ -68,12 +68,6 @@ module Spaceship
       )
 
       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)
-          self.new(attrs)
-        end
-
         # @param mac [Bool] Fetches Mac apps if true
         # @return (Array) Returns all apps available for this account
         def all(mac: false)

data/spaceship/lib/spaceship/portal/app_group.rb

@@ -36,12 +36,6 @@ module Spaceship
       )
 
       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)
-          self.new(attrs)
-        end
-
         # @return (Array) Returns all app groups available for this account
         def all
           client.app_groups.map { |group| self.factory(group) }

data/spaceship/lib/spaceship/portal/device.rb

@@ -52,12 +52,6 @@ module Spaceship
       })
 
       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)
-          self.new(attrs)
-        end
-
         # @param mac [Bool] Fetches Mac devices if true
         # @param include_disabled [Bool] Whether to include disable devices. false by default.
         # @return (Array) Returns all devices registered for this account

data/spaceship/lib/spaceship/portal/person.rb

@@ -35,12 +35,6 @@ module Spaceship
         'teamMemberId' => :team_member_id
       )
 
-      class << self
-        def factory(attrs)
-          self.new(attrs)
-        end
-      end
-
       def remove!
         client.team_remove_member!(team_member_id)
       end

data/spaceship/lib/spaceship/portal/portal.rb

@@ -1,5 +1,6 @@
 require 'spaceship/portal/portal_base'
 require 'spaceship/portal/app'
+require 'spaceship/portal/website_push'
 require 'spaceship/portal/app_group'
 require 'spaceship/portal/app_service'
 require 'spaceship/portal/certificate'

data/spaceship/lib/spaceship/portal/portal_client.rb

@@ -199,6 +199,43 @@ module Spaceship
       parse_response(r, 'appId')
     end
 
+    #####################################################
+    # @!group Website Push
+    #####################################################
+
+    def website_push(mac: false)
+      paging do |page_number|
+        r = request(:post, "account/#{platform_slug(mac)}/identifiers/listWebsitePushIds.action", {
+            teamId: team_id,
+            pageNumber: page_number,
+            pageSize: page_size,
+            sort: 'name=asc'
+        })
+        parse_response(r, 'websitePushIdList')
+      end
+    end
+
+    def create_website_push!(name, bundle_id, mac: false)
+      ensure_csrf(Spaceship::WebsitePush)
+
+      r = request(:post, "account/#{platform_slug(mac)}/identifiers/addWebsitePushId.action", {
+          name: name,
+          identifier: bundle_id,
+          teamId: team_id
+      })
+      parse_response(r, 'websitePushId')
+    end
+
+    def delete_website_push!(website_id, mac: false)
+      ensure_csrf(Spaceship::WebsitePush)
+
+      r = request(:post, "account/#{platform_slug(mac)}/identifiers/deleteWebsitePushId.action", {
+          teamId: team_id,
+          websitePushId: website_id
+      })
+      parse_response(r)
+    end
+
     #####################################################
     # @!group App Groups
     #####################################################

data/spaceship/lib/spaceship/portal/spaceship.rb

@@ -44,6 +44,11 @@ module Spaceship
         Spaceship::App.set_client(@client)
       end
 
+      # @return (Class) Access the website pushes for the spaceship
+      def website_push
+        Spaceship::WebsitePush.set_client(@client)
+      end
+
       # @return (Class) Access the app groups for the spaceship
       def app_group
         Spaceship::AppGroup.set_client(@client)
@@ -85,6 +90,10 @@ module Spaceship
       Spaceship::Portal.app
     end
 
+    def website_push
+      Spaceship::Portal.website_push
+    end
+
     def app_group
       Spaceship::Portal.app_group
     end

data/spaceship/lib/spaceship/portal/website_push.rb

@@ -0,0 +1,90 @@
+module Spaceship
+  module Portal
+    # Represents an Website Push ID from the Developer Portal
+    class WebsitePush < PortalBase
+      # @return (String) The identifier of this website push, provided by the Dev Portal
+      # @example
+      #   "RGAWZGXSAA"
+      attr_accessor :website_id
+
+      # @return (String) The name you provided for this website push
+      # @example
+      #   "Spaceship"
+      attr_accessor :name
+
+      # @return (String) the supported platform of this website push
+      # @example
+      #   "ios"
+      attr_accessor :platform
+
+      # Prefix provided by the Dev Portal
+      # @example
+      #   "5A997XSHK2"
+      attr_accessor :prefix
+
+      # @return (String) The bundle_id (website identifier) of website push id
+      # @example
+      #   "web.com.krausefx.app"
+      attr_accessor :bundle_id
+
+      # @return (String) Status of the website push
+      # @example
+      #   "current"
+      attr_accessor :status
+
+      attr_mapping(
+        'websitePushId' => :website_id,
+        'name' => :name,
+        'prefix' => :prefix,
+        'identifier' => :bundle_id,
+        'status' => :status
+      )
+
+      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)
+          self.new(attrs)
+        end
+
+        # @param mac [Bool] Fetches Mac website push if true
+        # @return (Array) Returns all website push available for this account
+        def all(mac: false)
+          client.website_push(mac: mac).map { |website_push| self.factory(website_push) }
+        end
+
+        # Creates a new Website Push ID on the Apple Dev Portal
+        #
+        # @param bundle_id [String] the bundle id (website_push_identifier) of the website push
+        # @param name [String] the name of the Website Push
+        # @param mac [Bool] is this a Mac Website Push?
+        # @return (Website Push) The Website Push you just created
+        def create!(bundle_id: nil, name: nil, mac: false)
+          new_website_push = client.create_website_push!(name, bundle_id, mac: mac)
+          self.new(new_website_push)
+        end
+
+        # Find a specific Website Push ID based on the bundle_id
+        # @param mac [Bool] Searches Mac website pushes if true
+        # @return (Website Push) The website push you're looking for. This is nil if the website push can't be found.
+        def find(bundle_id, mac: false)
+          all(mac: mac).find do |website_push|
+            website_push.bundle_id == bundle_id
+          end
+        end
+      end
+
+      # Delete this Website Push ID.
+      # @return (Website Push) The website you just deleted
+      def delete!
+        client.delete_website_push!(website_id, mac: mac?)
+        self
+      end
+
+      # @return (Bool) Is this a Mac website push?
+      def mac?
+        platform == 'mac'
+      end
+    end
+  end
+end

data/spaceship/lib/spaceship/tunes/app_image.rb

@@ -21,12 +21,6 @@ module Spaceship
         'originalFileName' => :original_file_name
       )
 
-      class << self
-        def factory(attrs)
-          self.new(attrs)
-        end
-      end
-
       def reset!(attrs = {})
         update_raw_data!(
           {

data/spaceship/lib/spaceship/tunes/app_ratings.rb

@@ -85,15 +85,6 @@ module Spaceship
         'ratingFiveCount' => :five_star_rating_count
       })
 
-      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)
-          return obj
-        end
-      end
-
       # @return (Float) the average rating for this summary (rounded to 2 decimal places)
       def average_rating
         ((self.one_star_rating_count +

data/spaceship/lib/spaceship/tunes/app_screenshot.rb

@@ -5,13 +5,6 @@ module Spaceship
       attr_accessor :device_type
 
       attr_accessor :language
-
-      class << self
-        # Create a new object based on a hash.
-        def factory(attrs)
-          self.new(attrs)
-        end
-      end
     end
   end
 end

data/spaceship/lib/spaceship/tunes/app_trailer.rb

@@ -33,12 +33,6 @@ module Spaceship
         'videoStatus' => :video_status
       )
 
-      class << self
-        def factory(attrs)
-          self.new(attrs)
-        end
-      end
-
       def reset!(attrs = {})
         update_raw_data!({
           video_asset_token: nil,

data/spaceship/lib/spaceship/tunes/app_version.rb

@@ -584,6 +584,7 @@ module Spaceship
         lang_details = languages[0]
         display_families = lang_details["displayFamilies"]["value"]
         device_details = display_families.find { |display_family| display_family['name'] == device }
+        raise "Couldn't find device familiy for #{device}" if device_details.nil?
         raise "Unexpected state: missing device details for #{device}" unless device_details.key?(data_field)
         return device_details[data_field]
       rescue => ex

data/spaceship/lib/spaceship/tunes/app_version_generated_promocodes.rb

@@ -17,15 +17,6 @@ module Spaceship
         'username' => :username
       })
 
-      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)
-          return obj
-        end
-      end
-
       def setup
         @version = Tunes::AppVersionPromocodes.factory(raw_data['version'])
         @codes = raw_data['codes']

data/spaceship/lib/spaceship/tunes/app_version_history.rb

@@ -21,15 +21,6 @@ module Spaceship
         'items' => :items
       })
 
-      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)
-          return obj
-        end
-      end
-
       # Returns an array of all builds that can be sent to review
       def items
         @items ||= fetch_items

data/spaceship/lib/spaceship/tunes/app_version_promocodes.rb

@@ -20,15 +20,6 @@ module Spaceship
         'maximumNumberOfCodes' => :maximum_number_of_codes,
         'contractFileName' => :contract_file_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)
-          return obj
-        end
-      end
     end
   end
 end

data/spaceship/lib/spaceship/tunes/app_version_ref.rb

@@ -8,12 +8,6 @@ module Spaceship
         'ssoTokenForImage' => :sso_token_for_image,
         'ssoTokenForVideo' => :sso_token_for_video
       )
-
-      class << self
-        def factory(attrs)
-          self.new(attrs)
-        end
-      end
     end
   end
 end

data/spaceship/lib/spaceship/tunes/app_version_states_history.rb

@@ -20,15 +20,6 @@ module Spaceship
         'userEmail' => :user_email,
         'date' => :date
       })
-
-      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)
-          return obj
-        end
-      end
     end
   end
 end