fastlane 2.29.0.beta.20170426010043 → 2.29.0.beta.20170427010043

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37e87d72458af7c88fe6f7bb0fee4d1cd3c5add4
-  data.tar.gz: 73188156461337eaeb5b21cf86a67d05cb9fdae0
+  metadata.gz: 938e4b0dc6e8d5661b43c1531faf76e43f329083
+  data.tar.gz: 54895c188864c896e72c6d069b3616ee7d463707
 SHA512:
-  metadata.gz: c3b79aee1d3c508149d0e9192eb26c5b7519e8425ddcf315199aa52d5577523b74405c365bb28b0bdd520ffe4d0245b55270a5c5cecc0efe80c557ae7504cc54
-  data.tar.gz: 889663d2ad46713de80b3fa55fd6b9aff67656a77802bba5a40f2123084fb978da037d71477a68d87791c211fa6cf6d0d010dcfaa97d94094cd0db8df5300e68
+  metadata.gz: 216e8a1d0cb1b25c7277b8ccff5b92760eb3aefa32806df6058cc7a66fbc76f670389cb6df8f9a7d33b42bb19f6437269132929f181875b915c6f95d7d22566d
+  data.tar.gz: e4b3a5b1aa6517630e4bdc484ad675d3efa2a04832b82a1d8bd55eac71a5cca0f54c786df10790ec2bc9ce86ebc1541ecee796b53a161194745e49244e203538

data/fastlane/lib/fastlane/version.rb

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

data/pilot/lib/pilot/tester_manager.rb

@@ -7,39 +7,23 @@ module Pilot
     def add_tester(options)
       start(options)
 
+      app = find_app(app_filter: config[:apple_id] || config[:app_identifier])
+      UI.user_error!("You must provide either a Apple ID for the app (with the `:apple_id` option) or app identifier (with the `:app_identifier` option)") unless app
+
+      tester = find_or_create_tester(email: config[:email], first_name: config[:first_name], last_name: config[:last_name])
+
       begin
-        tester = Spaceship::Tunes::Tester::External.find(config[:email])
-        if tester
-          UI.success("Existing tester #{tester.email}")
+        groups = add_tester_to_groups!(tester: tester, app: app, groups: config[:groups])
+        if tester.kind_of?(Spaceship::Tunes::Tester::Internal)
+          UI.success("Successfully added tester to app #{app.name}")
         else
-          # make sure the user isn't already an internal tester, because we don't support those
-          internal_tester = Spaceship::Tunes::Tester::Internal.find(config[:email])
-          UI.user_error!("#{internal_tester.email} is an internal tester; pilot does not support internal testers") unless internal_tester.nil?
-
-          tester = Spaceship::Tunes::Tester::External.create!(email: config[:email],
-                                                              first_name: config[:first_name],
-                                                              last_name: config[:last_name])
-          UI.success("Successfully added tester: #{tester.email} to your account")
+          group_names = groups.map(&:name).join(", ")
+          UI.success("Successfully added tester to app #{app.name} in group(s) #{group_names}")
         end
       rescue => ex
-        UI.error("Could not create tester #{config[:email]}")
+        UI.error("Could not add #{tester.email} to app: #{app.name}")
         raise ex
       end
-
-      app_filter = (config[:apple_id] || config[:app_identifier])
-      if app_filter
-        begin
-          app = Spaceship::Application.find(app_filter)
-          UI.user_error!("Couldn't find app with '#{app_filter}'") unless app
-
-          groups = add_tester_to_groups!(tester: tester, app: app, groups: config[:groups])
-          group_names = groups.map(&:name).join(", ")
-          UI.success("Successfully added tester to app #{app_filter} in group(s) #{group_names}")
-        rescue => ex
-          UI.error("Could not add #{tester.email} to app: #{app.name}")
-          raise ex
-        end
-      end
     end
 
     def find_tester(options)
@@ -58,38 +42,30 @@ module Pilot
       start(options)
 
       tester = Spaceship::Tunes::Tester::External.find(config[:email])
+      tester ||= Spaceship::Tunes::Tester::Internal.find(config[:email])
+      UI.user_error!("Tester not found: #{config[:email]}") if tester.nil?
 
-      if tester
-        app_filter = (config[:apple_id] || config[:app_identifier])
-        if app_filter
-          begin
-            app = Spaceship::Application.find(app_filter)
-            UI.user_error!("Couldn't find app with '#{app_filter}'") unless app
-
-            # If no groups are passed to options, remove the tester from the app-level,
-            # otherwise remove the tester from the groups specified.
-            if config[:groups].nil?
-              test_flight_tester = Spaceship::TestFlight::Tester.find(app_id: app.apple_id, email: tester.email)
-              test_flight_tester.remove_from_app!(app_id: app.apple_id)
-              UI.success("Successfully removed tester, #{test_flight_tester.email}, from app: #{app_filter}")
-            else
-              groups = remove_tester_from_groups!(tester: tester, app: app, groups: config[:groups])
-              group_names = groups.map(&:name).join(", ")
-              UI.success("Successfully removed tester #{tester.email} from app #{app_filter} in group(s) #{group_names}")
-            end
-          rescue => ex
-            UI.error("Could not remove #{tester.email} from app: #{ex}")
-            raise ex
-          end
+      app = find_app(app_filter: config[:apple_id] || config[:app_identifier])
+      unless app
+        tester.delete!
+        UI.success("Successfully removed tester #{tester.email}")
+      end
+
+      begin
+        # If no groups are passed to options, remove the tester from the app-level,
+        # otherwise remove the tester from the groups specified.
+        if config[:groups].nil? && tester.kind_of?(Spaceship::Tunes::Tester::External)
+          test_flight_tester = Spaceship::TestFlight::Tester.find(app_id: app.apple_id, email: tester.email)
+          test_flight_tester.remove_from_app!(app_id: app.apple_id)
+          UI.success("Successfully removed tester, #{test_flight_tester.email}, from app: #{app.name}")
         else
-          tester.delete!
-          UI.success("Successfully removed tester #{tester.email}")
+          groups = remove_tester_from_groups!(tester: tester, app: app, groups: config[:groups])
+          group_names = groups.map(&:name).join(", ")
+          UI.success("Successfully removed tester #{tester.email} from app #{app.name} in group(s) #{group_names}")
         end
-      else
-        internal_tester = Spaceship::Tunes::Tester::Internal.find(config[:email])
-        UI.user_error!("#{internal_tester.email} is an internal tester; pilot does not support internal testers") unless internal_tester.nil?
-
-        UI.user_error!("Tester not found: #{config[:email]}")
+      rescue => ex
+        UI.error("Could not remove #{tester.email} from app: #{ex}")
+        raise ex
       end
     end
 
@@ -106,6 +82,33 @@ module Pilot
 
     private
 
+    def find_app(app_filter: nil)
+      if app_filter
+        app = Spaceship::Application.find(app_filter)
+        UI.user_error!("Could not find an app by #{app_filter}") unless app
+        return app
+      end
+      nil
+    end
+
+    def find_or_create_tester(email: nil, first_name: nil, last_name: nil)
+      tester = Spaceship::Tunes::Tester::Internal.find(config[:email])
+      tester ||= Spaceship::Tunes::Tester::External.find(config[:email])
+
+      if tester
+        UI.success("Existing tester #{tester.email}")
+      else
+        tester = Spaceship::Tunes::Tester::External.create!(email: config[:email],
+                                                            first_name: config[:first_name],
+                                                            last_name: config[:last_name])
+        UI.success("Successfully added tester: #{tester.email} to your account")
+      end
+      return tester
+    rescue => ex
+      UI.error("Could not create tester #{config[:email]}")
+      raise ex
+    end
+
     def perform_for_groups_in_app(app: nil, groups: nil, &block)
       if groups.nil?
         default_external_group = app.default_external_group
@@ -125,11 +128,19 @@ module Pilot
     end
 
     def add_tester_to_groups!(tester: nil, app: nil, groups: nil)
-      perform_for_groups_in_app(app: app, groups: groups) { |group| group.add_tester!(tester) }
+      if tester.kind_of?(Spaceship::Tunes::Tester::Internal)
+        Spaceship::TestFlight::Group.internal_group(app_id: app.apple_id).add_tester!(tester)
+      else
+        perform_for_groups_in_app(app: app, groups: groups) { |group| group.add_tester!(tester) }
+      end
     end
 
     def remove_tester_from_groups!(tester: nil, app: nil, groups: nil)
-      perform_for_groups_in_app(app: app, groups: groups) { |group| group.remove_tester!(tester) }
+      if tester.kind_of?(Spaceship::Tunes::Tester::Internal)
+        Spaceship::TestFlight::Group.internal_group(app_id: app.apple_id).remove_tester!(tester)
+      else
+        perform_for_groups_in_app(app: app, groups: groups) { |group| group.remove_tester!(tester) }
+      end
     end
 
     def list_testers_by_app(app_filter)

data/spaceship/lib/spaceship/test_flight/group.rb

@@ -3,12 +3,14 @@ module Spaceship::TestFlight
     attr_accessor :id
     attr_accessor :name
     attr_accessor :is_default_external_group
+    attr_accessor :is_internal_group
 
     attr_accessor :app_id
 
     attr_mapping({
       'id' => :id,
       'name' => :name,
+      'isInternalGroup' => :is_internal_group,
       'isDefaultExternalGroup' => :is_default_external_group
     })
 
@@ -36,6 +38,11 @@ module Spaceship::TestFlight
       groups.select(&block)
     end
 
+    def self.internal_group(app_id: nil)
+      groups = self.all(app_id: app_id)
+      groups.find(&:internal_group?)
+    end
+
     # First we need to add the tester to the app
     # It's ok if the tester already exists, we just have to do this... don't ask
     # This will enable testing for the tester for a given app, as just creating the tester on an account-level
@@ -43,9 +50,9 @@ module Spaceship::TestFlight
     # This is a bug we reported to the iTunes Connect team, as it also happens on the iTunes Connect UI on 18. April 2017
     def add_tester!(tester)
       # This post request makes the account-level tester available to the app
-      client.post_tester(app_id: self.app_id, tester: tester)
+      tester_data = client.post_tester(app_id: self.app_id, tester: tester)
       # This put request adds the tester to the group
-      client.put_tester_to_group(group_id: self.id, tester_id: tester.tester_id, app_id: self.app_id)
+      client.put_tester_to_group(group_id: self.id, tester_id: tester_data['id'], app_id: self.app_id)
     end
 
     def remove_tester!(tester)
@@ -55,5 +62,9 @@ module Spaceship::TestFlight
     def default_external_group?
       is_default_external_group
     end
+
+    def internal_group?
+      is_internal_group
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.29.0.beta.20170426010043
+  version: 2.29.0.beta.20170427010043
 platform: ruby
 authors:
 - Felix Krause
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -1342,23 +1342,23 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
-- supply/lib
-- pilot/lib
-- match/lib
-- fastlane/lib
-- credentials_manager/lib
-- cert/lib
-- spaceship/lib
 - snapshot/lib
+- gym/lib
+- scan/lib
+- spaceship/lib
+- credentials_manager/lib
+- fastlane/lib
 - pem/lib
+- sigh/lib
 - fastlane_core/lib
-- gym/lib
+- match/lib
+- pilot/lib
+- produce/lib
 - deliver/lib
 - frameit/lib
-- produce/lib
-- scan/lib
-- sigh/lib
+- cert/lib
 - screengrab/lib
+- supply/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="