deploygate 0.6.8 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bdbcc5de1df4f1c28a1872b64fdcfb8935069f7659553527d6c305d2a5f48fe
-  data.tar.gz: 176b482a0756f4f8bd80a5ecaf61ad400a936ecf537235849807719b0d0f4bd3
+  metadata.gz: 785a1c89bea29d385d1bedb4deaeb9ce8148a5de83aaef2fbe889bb7b062c174
+  data.tar.gz: 4c939c3a624ef686da3ce629b82ff445b59fcbf1267e887c55e5feed468d71fe
 SHA512:
-  metadata.gz: dc4f630cdb9e9ca6b0838e4d94edd9ccfbaad2ae494e73ac89c1560ca7467873d2fd596e22499c5b6626c7160bf7eee3dca6e70968a0bc4a00534ae68afae681
-  data.tar.gz: e922a9fb18e69c3451d221bdc05acb1a9bf4021623103a97dbc35811b49950e12dfba20368f9dbb1565b690d0bddbaf3034ecb8b72dc009771a4ca595f5d6fd6
+  metadata.gz: 37644e62c47447cb9f6c9c0c974a0f9ffe6dc33ad67fc6399af8058bc6e50e0cc924f0526627a3a3a135202b8af251d3a6a90e268150126547266cb30bbbc6dc
+  data.tar.gz: f9460ac50d4e6c34ae5560cd4ea7de5cfb82c6ac5b3d8952e5681826a3bcbbe4abfddce7ed1f078a322a2c1739c0c11576b2f970a176a00a7ec4443abe8489af

data/.ruby-version

@@ -1 +1 @@
-2.2.0
+2.4.5

data/.travis.yml

@@ -3,9 +3,13 @@ env:
   global:
     secure: gGY+C54Cfp082o5Oaf6tZqzfOlXsWSMcVNvTpoOgMfJGsHo//d9t/si9Bn1pFaFyjJedW+IcC0pt+FcKVCDgnsUaL0Y0HT/ZsGkV8k7vv9F5nbHOde4nk189Sr2HtHR3wdr7KaMh2/DialisnqllxgzxA/wRLfHKsjqRsjWUw/VWL5E7Z734mzpTGE2mVJNRj02/cs0Y/izZgdi6wrt4lEZfxE3jS+QkJZHMjGNfcwvH26whU6oX1PiJ4o5xl0Rr8Q8xav3wbtTCcOJNPSeMkkiH5sSXuqrjI6kgwvjlByKhyg2Ws0GvZLxAfTml+Vo5po1uWsohdZJaJcEhd4GsGfbMZWCFuBP2mCE+gVmkkMeJxRKnWoi6NotgPmqG1JWlzGngDB/hJ4wuuh+swa0KJvZGiMEJ5P3GNydCybEPOsk1Ww+lUkXRHxD+/LW03EkxMd5LA3He/nYXz3pWCYA6qcFgrYMmq+3ozjSaQr+1d/Iu14Awv5+cwCltPfl5bERDno0jc0TdSs/7qplAL/efpjBsP7DkGE5r521gg8mIiXx509jU08i9S60SXiw0RBnYyjE5SzlsiOqaFdJxVygDGcDIAA/GTefLHO9i3SinZHFS6jr3Xi/vpOIc7Jz4W2Jmuqv+CJP4gspPoAxdWOE/QipTt0Jv4kCMf7dJwd9jaRc=
 rvm:
-  - 2.2.0
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
 before_install:
-  - gem install bundler -v 1.17.3
+  - gem install bundler -v 2.1.4
+install: BUNDLER_VERSION=2.1.4 bundle install --jobs=3 --retry=3
 script:
   - bundle exec rake
 deploy:
@@ -16,5 +20,6 @@ deploy:
   on:
     tags: true
     repo: DeployGate/deploygate-cli
+    rvm: 2.4
 after_deploy:
   - 'curl -X POST --data-urlencode "payload={\"text\": \"Released a deploygate gem in <https://rubygems.org/gems/deploygate/|RubyGems>\"}" $SLACK_URL'

data/README.md

@@ -1,8 +1,15 @@
 # deploygate-cli
+
 [![Gem Version](https://badge.fury.io/rb/deploygate.svg)](https://badge.fury.io/rb/deploygate)
 [![Build Status](https://travis-ci.org/DeployGate/deploygate-cli.svg?branch=master)](https://travis-ci.org/DeployGate/deploygate-cli)
 
-A command-line interface for DeployGate
+dg: A command-line interface for DeployGate
+
+## Requirements
+
+*dg* runs with a minimal set of requirements.
+
+- Ruby 2.4+ (Depends on [Ruby Maintenance Branches](https://www.ruby-lang.org/en/downloads/branches/))
 
 ## Installation
 
@@ -42,7 +49,7 @@ $ dg deploy [Android/iOS project path]
 
 ## License
 
-Copyright (C) 2015 DeployGate All rights reserved.
+Copyright (C) 2015- DeployGate All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
 

data/config/locales/en.yml

@@ -1,5 +1,7 @@
 ---
 en:
+  errors:
+    check_update_failure: 'Checking update failed'
   command_builder:
     name: 'dg'
     description: 'Control DeployGate from your terminal.'
@@ -142,27 +144,21 @@ en:
         choice: '%{team_name} %{team_id}'
       check_local_certificates:
         not_local_install_certificate:
-          error_message: 'Error: No applicable iPhone Distribution certificate found on your Mac.'
+          error_message: 'Error: No applicable iPhone Distribution or Apple Distribution certificate found on your Mac.'
           note: |
-            No "iPhone Distribution" certificate and/or corresponding private key installed locally.
+            No "iPhone Distribution" or "Apple Distribution" certificate and/or corresponding private key installed locally.
             To sign your application code, make sure you have installed them and available in your Keychain.
 
             See also: https://developer.apple.com/library/ios/documentation/IDEs/Conceptual/AppDistributionGuide/MaintainingCertificates/MaintainingCertificates.html
         conflict_certificate:
           error_message: 'Error: Too many certificates found.'
           note: |
-            You have more than one "iPhone Distribution" certificate installed on your Mac.
+            You have more than one "iPhone Distribution" or "Apple Distribution" certificate installed on your Mac.
             Please remove other unnecessary certificates from your Keychain.
       clean_provisioning_profiles:
         start: 'Cleaning local Provisioning Profiles...'
         delete: 'Delete %{path}'
         finish: 'Finish cleaning local Provisionig Profiles'
-    analyze:
-      target_bundle_identifier:
-        prompt: |
-          Please input your app bundle identifier
-          Example: com.example.ios
-        ask: 'Enter your app bundle identifier: '
     ios:
       build:
         error:
@@ -177,5 +173,5 @@ en:
           Note: Your password will be stored to your Keychain and never be sent to DeployGate.
         email: 'Email: '
       provisioning_profile:
-        not_installed_certificate_error: 'No iPhone Distribution Certificate associated with private key was found in local Keychain'
+        not_installed_certificate_error: 'No iPhone Distribution or Apple Distribution Certificate associated with private key was found in local Keychain'
         not_exist_uuid_provisioning_profile_error: 'No provisioning profile found for the specified UUID (%{uuid})'

data/deploygate.gemspec

@@ -20,7 +20,7 @@ dg installed! To get started fast:
 
 POST_INSTALL_MESSAGE
 
-  spec.add_runtime_dependency 'json', '~> 1.8'
+  spec.add_runtime_dependency 'json', '~> 2.0'
   spec.add_runtime_dependency 'httpclient', '~> 2.8'
   spec.add_runtime_dependency 'commander', '~> 4.4'
   spec.add_runtime_dependency 'plist', '~> 3.1'
@@ -38,9 +38,9 @@ POST_INSTALL_MESSAGE
   spec.add_runtime_dependency 'sentry-raven', '~> 2.8'
 
   # ios build
-  spec.add_runtime_dependency 'fastlane', '~> 2.57.2'
+  spec.add_runtime_dependency 'fastlane', '~> 2.148.1'
 
-  spec.add_development_dependency 'bundler', '~> 1.17'
+  spec.add_development_dependency 'bundler', '>= 2.1.4', '< 3.0'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.5'
   spec.add_development_dependency 'webmock', '~> 2.3'

data/lib/deploygate.rb

@@ -1,3 +1,4 @@
+require "resolv-replace"
 require "commander"
 require "json"
 require "httpclient"

data/lib/deploygate/add_devices_server.rb

@@ -1,8 +1,7 @@
 module DeployGate
   class AddDevicesServer
 
-    def start(token, owner_name, bundle_id, distribution_key, args, options)
-      DeployGate::Xcode::MemberCenter.instance
+    def start(token, owner_name, bundle_id, distribution_key, member_center, args, options)
       options.server = false
 
       puts I18n.t('command_builder.add_devices.server.connecting')
@@ -15,7 +14,7 @@ module DeployGate
         raise res[:message]
       end
 
-      websocket_setup(server, bundle_id, push_token, action, args, options) do |socket|
+      websocket_setup(server, bundle_id, push_token, action, member_center, args, options) do |socket|
         puts HighLine.color(I18n.t('command_builder.add_devices.server.start'), HighLine::GREEN)
 
         Workers::PeriodicTimer.new(60) do
@@ -33,12 +32,12 @@ module DeployGate
       end
     end
 
-    def self.build(pool, bunlde_id, iphones, args, options)
+    def self.build(pool, bunlde_id, iphones, member_center, args, options)
       iphones.reject! { |iphone| iphone['is_registered'] } # remove udids if already registered
       devices = iphones.map do |iphone|
         udid = iphone['udid']
         device_name= iphone['device_name']
-        DeployGate::Xcode::MemberCenters::Device.new(udid, '', device_name)
+        DeployGate::Xcode::MemberCenters::Device.new(udid, '', device_name, member_center)
       end
       return if devices.empty?
 
@@ -53,7 +52,7 @@ module DeployGate
 
     private
 
-    def websocket_setup(server, bundle_id, push_token, target_action, args, options, &block)
+    def websocket_setup(server, bundle_id, push_token, target_action, member_center, args, options, &block)
       socket = SocketIO::Client::Simple.connect server
       socket.on :connect do
         socket.emit :subscribe, push_token
@@ -72,7 +71,7 @@ module DeployGate
         data = JSON.parse(push_data['data'])
 
         iphones = data['iphones']
-        DeployGate::AddDevicesServer.build(pool, bundle_id, iphones, args, options)
+        DeployGate::AddDevicesServer.build(pool, bundle_id, iphones, member_center, args, options)
       end
     end
   end

data/lib/deploygate/api/v1/base.rb

@@ -45,7 +45,11 @@ module DeployGate
         private
 
         def client
-          HTTPClient.new(:agent_name => "dg/#{DeployGate::VERSION}")
+          timeout = 60 * 5 # 5 minutes
+          HTTPClient.new(agent_name: "dg/#{DeployGate::VERSION}").tap do |c|
+            c.receive_timeout = timeout
+            c.send_timeout = timeout
+          end
         end
 
         def headers

data/lib/deploygate/command_builder.rb

@@ -40,6 +40,7 @@ module DeployGate
     def run
       setup()
 
+      program :help_paging, false
       program :name, I18n.t('command_builder.name')
       program :version,  VERSION
       program :description, I18n.t('command_builder.description')
@@ -149,7 +150,7 @@ module DeployGate
       tags[:xcode_version] = version if version.present?
 
       puts ''
-      puts error_report(error, version, dg_version)
+      puts error_report(error, dg_version, version)
       if HighLine.agree(I18n.t('command_builder.error_handling.agree')) {|q| q.default = "y"}
         tags = {
             command: command,
@@ -202,6 +203,8 @@ EOF
       else
         request_gem_update_checker
       end
+    rescue => e
+      STDERR.puts I18n.t('errors.check_update_failure')
     end
 
     # @return [void]

data/lib/deploygate/commands/add_devices.rb

@@ -21,22 +21,27 @@ module DeployGate
           distribution_key = options.distribution_key
           server           = options.server
 
-          bundle_id = bundle_id(work_dir, options.configuration)
+          root_path = DeployGate::Xcode::Ios.project_root_path(work_dir)
+          workspaces = DeployGate::Xcode::Ios.find_workspaces(root_path)
+          analyze = DeployGate::Xcode::Analyze.new(workspaces, options.configuration)
+          bundle_id = analyze.target_bundle_identifier
+          developer_team = analyze.developer_team
+          member_center = DeployGate::Xcode::MemberCenter.new(developer_team)
 
           if server
-            run_server(session, owner, bundle_id, distribution_key, args, options)
+            run_server(session, owner, bundle_id, distribution_key, member_center, args, options)
           else
-            device_register(session, owner, udid, device_name, bundle_id, args, options)
+            device_register(session, owner, udid, device_name, bundle_id, member_center, args, options)
           end
         end
 
-        def run_server(session, owner, bundle_id, distribution_key, args, options)
-          DeployGate::AddDevicesServer.new().start(session.token, owner, bundle_id, distribution_key, args, options)
+        def run_server(session, owner, bundle_id, distribution_key, member_center, args, options)
+          DeployGate::AddDevicesServer.new().start(session.token, owner, bundle_id, distribution_key, member_center, args, options)
         end
 
-        def device_register(session, owner, udid, device_name, bundle_id, args, options)
+        def device_register(session, owner, udid, device_name, bundle_id, member_center, args, options)
           if udid.nil? && device_name.nil?
-            devices = fetch_devices(session.token, owner, bundle_id)
+            devices = fetch_devices(session.token, owner, bundle_id, member_center)
             select_devices = select_devices(devices)
             not_device if select_devices.empty?
 
@@ -44,7 +49,7 @@ module DeployGate
           else
             register_udid = udid || HighLine.ask(I18n.t('commands.add_devices.input_udid'))
             register_device_name = device_name || HighLine.ask(I18n.t('commands.add_devices.input_device_name'))
-            device = DeployGate::Xcode::MemberCenters::Device.new(register_udid, '', register_device_name)
+            device = DeployGate::Xcode::MemberCenters::Device.new(register_udid, '', register_device_name, member_center)
 
             puts device.to_s
             if HighLine.agree(I18n.t('commands.add_devices.device_register_confirm')) {|q| q.default = "y"}
@@ -54,7 +59,7 @@ module DeployGate
             end
           end
 
-          build!(bundle_id, args, options)
+          build!(bundle_id, member_center, args, options)
         end
 
         def register!(devices)
@@ -64,18 +69,18 @@ module DeployGate
           end
         end
 
-        def build!(bundle_id, args, options)
-          app = DeployGate::Xcode::MemberCenters::App.new(bundle_id)
+        def build!(bundle_id, member_center, args, options)
+          app = DeployGate::Xcode::MemberCenters::App.new(bundle_id, member_center)
           app.create! unless app.created?
 
-          DeployGate::Xcode::MemberCenters::ProvisioningProfile.new(bundle_id).create!
-          team = DeployGate::Xcode::MemberCenter.instance.team
+          DeployGate::Xcode::MemberCenters::ProvisioningProfile.new(bundle_id, member_center).create!
+          team = member_center.team
           DeployGate::Xcode::Export.clean_provisioning_profiles(bundle_id, team)
 
           DeployGate::Commands::Deploy::Build.run(args, options)
         end
 
-        def fetch_devices(token, owner, bundle_id)
+        def fetch_devices(token, owner, bundle_id, member_center)
           res = DeployGate::API::V1::Users::App.not_provisioned_udids(token, owner, bundle_id)
           if res[:error]
             case res[:message]
@@ -89,21 +94,11 @@ module DeployGate
           end
 
           results = res[:results]
-          devices = results.map{|r| DeployGate::Xcode::MemberCenters::Device.new(r[:udid], r[:user_name], r[:device_name])}
+          devices = results.map{|r| DeployGate::Xcode::MemberCenters::Device.new(r[:udid], r[:user_name], r[:device_name], member_center)}
 
           devices
         end
 
-        # @param [String] work_dir
-        # @param [String] build_configuration
-        # @return [String]
-        def bundle_id(work_dir, build_configuration)
-          root_path = DeployGate::Xcode::Ios.project_root_path(work_dir)
-          workspaces = DeployGate::Xcode::Ios.find_workspaces(root_path)
-          analyze = DeployGate::Xcode::Analyze.new(workspaces, build_configuration)
-          analyze.target_bundle_identifier
-        end
-
         # @param [Array]
         # @return [Array]
         def select_devices(devices)

data/lib/deploygate/commands/deploy/build.rb

@@ -38,44 +38,24 @@ module DeployGate
             analyze = DeployGate::Xcode::Analyze.new(workspaces, build_configuration, target_scheme)
             target_scheme = analyze.scheme
 
-            # TODO: Support export method option (ex: --method adhoc)
-            codesigning_identity= nil
-            provisioning_style = analyze.provisioning_style
-            provisioning_profile_info = nil
-            if (!over_xcode?(8) && provisioning_style == nil) ||
-                provisioning_style == DeployGate::Xcode::Analyze::PROVISIONING_STYLE_MANUAL
-
-              # Only run Provisioning Style is Manual or nil
-              bundle_identifier = analyze.target_bundle_identifier
-              xcode_provisioning_profile_uuid = analyze.target_xcode_setting_provisioning_profile_uuid
-              provisioning_team = analyze.provisioning_team
-              target_provisioning_profile = DeployGate::Xcode::Export.provisioning_profile(
-                  bundle_identifier,
-                  xcode_provisioning_profile_uuid,
-                  provisioning_team
-              )
-
-              method = DeployGate::Xcode::Export.method(target_provisioning_profile)
-              codesigning_identity = DeployGate::Xcode::Export.codesigning_identity(target_provisioning_profile)
-
-              profile = FastlaneCore::ProvisioningProfile.parse(target_provisioning_profile)
-              provisioning_profile_info = {
-                  provisioningProfiles: {
-                      "#{bundle_identifier}" => profile['Name']
-                  }
-              }
-            else
-              method = select_method
+            code_sign_identity = nil
+            project_profile_info = nil
+            allow_provisioning_updates = true
+            if analyze.code_sign_style == Xcode::Analyze::PROVISIONING_STYLE_MANUAL
+              code_sign_identity = analyze.code_sign_identity
+              project_profile_info = analyze.project_profile_info
             end
 
+            method = Xcode::Export.method(analyze.target_provisioning_profile) || select_method
+
             ipa_path = DeployGate::Xcode::Ios.build(
                 analyze,
                 target_scheme,
-                codesigning_identity,
-                provisioning_profile_info,
+                code_sign_identity,
+                project_profile_info,
                 build_configuration,
                 method,
-                over_xcode?(9) && codesigning_identity.nil?
+                allow_provisioning_updates
             )
             Push.upload([ipa_path], options)
           end

data/lib/deploygate/version.rb

@@ -1,3 +1,3 @@
 module DeployGate
-  VERSION = '0.6.8'
+  VERSION = '0.8.3'
 end

data/lib/deploygate/xcode/analyze.rb

@@ -1,7 +1,7 @@
 module DeployGate
   module Xcode
     class Analyze
-      attr_reader :workspaces, :scheme_workspace, :build_workspace, :scheme
+      attr_reader :workspaces, :scheme_workspace, :build_workspace, :scheme, :xcodeproj
 
       BASE_WORK_DIR_NAME = 'project.xcworkspace'
       DEFAULT_BUILD_CONFIGURATION = 'Release'
@@ -23,153 +23,93 @@ module DeployGate
         @build_workspace = find_build_workspace(workspaces)
         @xcodeproj = File.dirname(@scheme_workspace)
 
-        config = FastlaneCore::Configuration.create(Gym::Options.available_options, { workspace: @scheme_workspace })
-        project = FastlaneCore::Project.new(config)
+        config = FastlaneCore::Configuration.create(Gym::Options.available_options, { project: @xcodeproj })
+        Gym.config = config
+        @project = FastlaneCore::Project.new(config)
 
-        if project.schemes.length > 1 && target_scheme && project.schemes.include?(target_scheme)
-          project.options[:scheme] = target_scheme
+        if @project.schemes.length > 1 && target_scheme && @project.schemes.include?(target_scheme)
+          @project.options[:scheme] = target_scheme
         else
-          project.select_scheme
+          @project.select_scheme
         end
-        @scheme = project.options[:scheme]
+        @scheme = @project.options[:scheme]
       end
 
-      # Support Xcode7 more
-      # @return [String]
-      def target_bundle_identifier
-        begin
-          product_name = target_product_name
-          product_bundle_identifier = target_build_configration.build_settings['PRODUCT_BUNDLE_IDENTIFIER']
-          product_bundle_identifier = convert_bundle_identifier(product_bundle_identifier)
-
-          info_plist_file_path = target_build_configration.build_settings['INFOPLIST_FILE']
-          root_path = DeployGate::Xcode::Ios.project_root_path(@scheme_workspace)
-          plist_bundle_identifier =
-              File.open(File.join(root_path, info_plist_file_path)) do |file|
-                plist = Plist.parse_xml file.read
-                plist['CFBundleIdentifier']
-              end
-          plist_bundle_identifier = convert_bundle_identifier(plist_bundle_identifier)
-
-          bundle_identifier = if plist_bundle_identifier.blank?
-                                product_bundle_identifier
-                              else
-                                plist_bundle_identifier
-                              end
-          bundle_identifier.gsub!(/\$\(PRODUCT_NAME:.+\)/, product_name)
-        rescue BundleIdentifierDifferentError => e
-          raise e
-        rescue => e
-          cli = HighLine.new
-          puts I18n.t('xcode.analyze.target_bundle_identifier.prompt')
-          bundle_identifier = cli.ask(I18n.t('xcode.analyze.target_bundle_identifier.ask')) { |q| q.validate = /^(\w+)\.(\w+).*\w$/ }
+      def code_sign_style
+        style = nil
+        resolve_build_configuration do |build_configuration, target|
+          style = build_configuration.resolve_build_setting("CODE_SIGN_STYLE", target)
         end
 
-        bundle_identifier
+        style
       end
 
-      # @param [String] bundle_identifier
-      # @return [String]
-      def convert_bundle_identifier(bundle_identifier)
-        new_bundle_identifier = bundle_identifier.gsub(/\$\(([^\)]+)\)|\${([^}]+)}/) {
-          custom_id = $1 || $2
-          if custom_id == 'TARGET_NAME'
-            target_project_setting.name
-          else
-            target_build_configration.build_settings[custom_id]
-          end
-        }
-        # bail out if the result identical to the original
-        return bundle_identifier if new_bundle_identifier == bundle_identifier
+      def code_sign_identity
+        identity = nil
+        resolve_build_configuration do |build_configuration, target|
+          identity = build_configuration.resolve_build_setting("CODE_SIGN_IDENTITY", target)
+        end
 
-        convert_bundle_identifier(new_bundle_identifier)
+        identity
       end
 
+      # TODO: Need to support UDID additions for watchOS and App Extension
       # @return [String]
-      def target_xcode_setting_provisioning_profile_uuid
-        uuid = target_build_configration.build_settings['PROVISIONING_PROFILE']
-        UUID.validate(uuid) ? uuid : nil
-      end
-
-      def provisioning_style
-        target = target_provisioning_info
-        build_settings = target_build_configration.build_settings
-
-        style = PROVISIONING_STYLE_MANUAL
-        if target
-          # Manual or Automatic or nil (Xcode7 below)
-          begin
-            style = target['ProvisioningStyle'] || build_settings['CODE_SIGN_STYLE']
-          rescue
-            # Not catch error
-          end
+      def target_bundle_identifier
+        bundle_identifier = nil
+        resolve_build_configuration do |build_configuration, target|
+          bundle_identifier = build_configuration.resolve_build_setting("PRODUCT_BUNDLE_IDENTIFIER", target)
         end
 
-        style
+        bundle_identifier
       end
 
-      def provisioning_team
-        target = target_provisioning_info
-
+      def developer_team
         team = nil
-        if target
-          begin
-            team = target['DevelopmentTeam']
-          rescue
-            # Not catch error
-          end
+        resolve_build_configuration do |build_configuration, target|
+          team = build_configuration.resolve_build_setting("DEVELOPMENT_TEAM", target)
         end
 
         team
       end
 
-      private
-
-      def target_provisioning_info
-        main_target = target_project_setting
-        main_target_uuid = main_target && main_target.uuid
-
-        target = nil
-        if main_target_uuid
-          begin
-            target = target_project.root_object.attributes['TargetAttributes'][main_target_uuid]
-          rescue
-            # Not catch error
-          end
-        end
+      def project_profile_info
+        gym = Gym::CodeSigningMapping.new(project: @project)
 
-        target
+        {
+            provisioningProfiles: gym.detect_project_profile_mapping
+        }
       end
 
-      def target_build_configration
-        target_project_setting.build_configuration_list.build_configurations.reject{|conf| conf.name != @build_configuration}.first
-      end
+      def target_provisioning_profile
+        gym = Gym::CodeSigningMapping.new(project: @project)
+        bundle_id = target_bundle_identifier
 
-      def target_product_name
-        target_project_setting.product_name
+        Xcode::Export.provisioning_profile(bundle_id, nil, developer_team, gym.merge_profile_mapping[bundle_id.to_sym])
       end
 
-      def target_project_setting
-        scheme_file = find_xcschemes
-        xs = Xcodeproj::XCScheme.new(scheme_file)
-        target_name = xs.profile_action.buildable_product_runnable.buildable_reference.target_name
+      private
 
-        target_project.native_targets.reject{|target| target.name != target_name}.first
-      end
+      def resolve_build_configuration(&block)
+        gym = Gym::CodeSigningMapping.new(project: @project)
+        specified_configuration = gym.detect_configuration_for_archive
 
-      def target_project
-        Xcodeproj::Project.open(@xcodeproj)
-      end
+        Xcodeproj::Project.open(@xcodeproj).targets.each do |target|
+          target.build_configuration_list.build_configurations.each do |build_configuration|
+            # Used the following code as an example
+            # https://github.com/fastlane/fastlane/blob/2.148.1/gym/lib/gym/code_signing_mapping.rb#L138
+            current = build_configuration.build_settings
+            next if gym.test_target?(current)
+            sdk_root = build_configuration.resolve_build_setting("SDKROOT", target)
+            next unless gym.same_platform?(sdk_root)
+            next unless specified_configuration == build_configuration.name
 
-      def find_xcschemes
-        shared_schemes = Dir[File.join(@xcodeproj, 'xcshareddata', 'xcschemes', '*.xcscheme')].reject do |scheme|
-          @scheme != File.basename(scheme, '.xcscheme')
-        end
-        user_schemes = Dir[File.join(@xcodeproj, 'xcuserdata', '*.xcuserdatad', 'xcschemes', '*.xcscheme')].reject do |scheme|
-          @scheme != File.basename(scheme, '.xcscheme')
-        end
+            # If SKIP_INSTALL is true, it is an app extension or watch app
+            next if current["SKIP_INSTALL"]
 
-        shared_schemes.concat(user_schemes).first
+            block.call(build_configuration, target)
+          end
+        end
       end
 
       # @param [Array] workspaces

data/lib/deploygate/xcode/export.rb

@@ -12,12 +12,12 @@ module DeployGate
         # @param [String] uuid
         # @param [String] provisioning_team
         # @return [String]
-        def provisioning_profile(bundle_identifier, uuid = nil, provisioning_team = nil)
-          local_teams = DeployGate::Xcode::Export.find_local_data(bundle_identifier, uuid, provisioning_team)
+        def provisioning_profile(bundle_identifier, uuid = nil, provisioning_team = nil, specifier_name = nil)
+          local_teams = DeployGate::Xcode::Export.find_local_data(bundle_identifier, uuid, provisioning_team, specifier_name)
 
           case local_teams.teams_count
             when 0
-              target_provisioning_profile = create_provisioning(bundle_identifier, uuid)
+              target_provisioning_profile = create_provisioning(bundle_identifier, uuid, provisioning_team)
             when 1
               target_provisioning_profile = select_profile(local_teams.first_team_profile_paths)
             else
@@ -32,12 +32,13 @@ module DeployGate
         # @param [String] uuid
         # @param [String] provisioning_team
         # @return [LocalTeams]
-        def find_local_data(bundle_identifier, uuid = nil, provisioning_team = nil)
+        def find_local_data(bundle_identifier, uuid = nil, provisioning_team = nil, specifier_name = nil)
           local_teams = LocalTeams.new
 
           profile_paths = load_profile_paths
           profiles = profile_paths.map{|p| profile_to_plist(p)}
           profiles.reject! {|profile| profile['UUID'] != uuid} unless uuid.nil?
+          profiles.reject! {|profile| profile['Name'] != specifier_name} unless specifier_name.nil?
 
           profiles.each do |profile|
             next if DateTime.now >= profile['ExpirationDate'] || !installed_certificate?(profile['Path'])
@@ -79,7 +80,7 @@ module DeployGate
           certificates = installed_certificates()
           ids = []
           certificates.each do |current|
-            next unless current.match(/iPhone Distribution:/)
+            next unless current.match(/iPhone Distribution:/) || current.match(/Apple Distribution:/)
             begin
               (ids << current.match(/.*\) (.*) \".*/)[1])
             rescue
@@ -91,12 +92,12 @@ module DeployGate
         end
 
         # @return [Array]
-        def installed_distribution_conflicting_certificates
+        def installed_distribution_conflicting_certificates_by(distribution_name)
           certificates = installed_certificates()
           names = []
           certificates.each do |current|
             begin
-              names << current.match(/(iPhone Distribution:.*)/)[1]
+              names << current.match(/(#{distribution_name}:.*)/)[1]
             rescue
             end
           end
@@ -105,7 +106,7 @@ module DeployGate
           conflicting_certificates = []
           certificates.each do |current|
             begin
-              name = current.match(/(iPhone Distribution:.*)/)[1]
+              name = current.match(/(#{distribution_name}:.*)/)[1]
               next unless conflicting_names.include?(name)
               conflicting_certificates << current
             rescue
@@ -201,9 +202,10 @@ module DeployGate
           end
         end
 
-        def create_provisioning(identifier, uuid)
-          app = MemberCenters::App.new(identifier)
-          provisioning_prifile = MemberCenters::ProvisioningProfile.new(identifier)
+        def create_provisioning(identifier, uuid, team_id)
+          member_center = Xcode::MemberCenter.new(team_id)
+          app = MemberCenters::App.new(identifier, member_center)
+          provisioning_prifile = MemberCenters::ProvisioningProfile.new(identifier, member_center)
 
           begin
             unless app.created?
@@ -253,12 +255,16 @@ module DeployGate
             exit
           end
 
-          conflicting_certificates = installed_distribution_conflicting_certificates
-          if conflicting_certificates.count > 0
+          iphone_conflicting_certificates = installed_distribution_conflicting_certificates_by('iPhone Distribution')
+          apple_conflicting_certificates = installed_distribution_conflicting_certificates_by('Apple Distribution')
+          if iphone_conflicting_certificates.count > 0 || apple_conflicting_certificates.count > 0
             puts HighLine.color(I18n.t('xcode.export.check_local_certificates.conflict_certificate.error_message'), HighLine::RED)
             puts ''
             puts I18n.t('xcode.export.check_local_certificates.conflict_certificate.note')
-            conflicting_certificates.each do |certificate|
+            iphone_conflicting_certificates.each do |certificate|
+              puts certificate
+            end
+            apple_conflicting_certificates.each do |certificate|
               puts certificate
             end
             puts ""

data/lib/deploygate/xcode/ios.rb

@@ -28,10 +28,16 @@ module DeployGate
 
           values = {
               export_method: export_method,
-              workspace: ios_analyze.build_workspace,
               configuration: build_configuration || DeployGate::Xcode::Analyze::DEFAULT_BUILD_CONFIGURATION,
               scheme: target_scheme
           }
+
+          if ios_analyze.build_workspace
+            values[:workspace] = ios_analyze.build_workspace
+          else
+            values[:project] = ios_analyze.xcodeproj
+          end
+
           values[:codesigning_identity] = codesigning_identity if codesigning_identity
           if allow_provisioning_updates
             values[:xcargs]        = '-allowProvisioningUpdates'

data/lib/deploygate/xcode/member_center.rb

@@ -1,15 +1,12 @@
-require 'singleton'
-
 module DeployGate
   module Xcode
     class MemberCenter
-      include Singleton
       attr_reader :email, :method, :team, :launcher
 
-      def initialize
+      def initialize(team_id)
         @email = input_email
         @launcher = Spaceship::Launcher.new @email
-        @team = @launcher.select_team
+        @team = @launcher.select_team(team_id: team_id)
 
         if @launcher.client.in_house?
           @method = Export::ENTERPRISE

data/lib/deploygate/xcode/member_centers/app.rb

@@ -5,9 +5,10 @@ module DeployGate
         attr_reader :uuid, :member_center
 
         # @param [String] uuid
+        # @param [Xcode::MemberCenter] member_center
         # @return [DeployGate::Xcode::MemberCenters::App]
-        def initialize(uuid)
-          @member_center = DeployGate::Xcode::MemberCenter.instance
+        def initialize(uuid, member_center)
+          @member_center = member_center
           @uuid = uuid
         end
 

data/lib/deploygate/xcode/member_centers/device.rb

@@ -5,29 +5,31 @@ module DeployGate
         attr_reader :udid, :user_name ,:device_name, :member_center
         attr_accessor :register_name
 
+        REGISTER_NAME_MAX_LENGTH = 50
+
         # @param [String] udid
         # @param [String] user_name
         # @param [String] device_name
+        # @param [Xcode::MemberCenter] member_center
         # @return [DeployGate::Devices::Ios]
-        def initialize(udid, user_name, device_name)
+        def initialize(udid, user_name, device_name, member_center)
           @udid = udid
           @user_name = user_name
           @device_name = device_name
+          @member_center = member_center
 
           @register_name = generate_register_name(@user_name, @device_name)
         end
 
         def registered?
-          instance = DeployGate::Xcode::MemberCenter.instance
-          !instance.launcher.device.find_by_udid(@udid).nil?
+          !@member_center.launcher.device.find_by_udid(@udid).nil?
         end
 
         # @return [void]
         def register!
-          instance = DeployGate::Xcode::MemberCenter.instance
           return if registered?
 
-          instance.launcher.device.create!(name: @register_name, udid: @udid)
+          @member_center.launcher.device.create!(name: @register_name, udid: @udid)
         end
 
         # @return [String]
@@ -42,7 +44,13 @@ module DeployGate
           name += "#{user_name} - " if !user_name.nil? && user_name != ''
           name += device_name
 
-          name
+          register_name_trim(name)
+        end
+
+        # Device name must be 50 characters or less.
+        def register_name_trim(name)
+          return name if name.length <= REGISTER_NAME_MAX_LENGTH
+          name.slice(0, REGISTER_NAME_MAX_LENGTH)
         end
       end
     end

data/lib/deploygate/xcode/member_centers/provisioning_profile.rb

@@ -12,8 +12,8 @@ module DeployGate
         OUTPUT_PATH = '/tmp/dg/provisioning_profile/'
         CERTIFICATE_OUTPUT_PATH = '/tmp/dg/certificate/'
 
-        def initialize(app_identifier)
-          @member_center = DeployGate::Xcode::MemberCenter.instance
+        def initialize(app_identifier, member_center)
+          @member_center = member_center
           @app_identifier = app_identifier
 
           FileUtils.mkdir_p(OUTPUT_PATH)
@@ -35,16 +35,22 @@ module DeployGate
 
         # @return [Array]
         def all_create
-          if @member_center.adhoc?
-            prod_certs = @member_center.launcher.certificate.production.all
-          else
-            prod_certs = @member_center.launcher.certificate.all.reject{|cert| cert.class != Spaceship::Portal::Certificate::InHouse}
-          end
+          prod_certs = if @member_center.adhoc?
+                         @member_center.launcher.certificate.all.select{|cert|
+                           cert.class == Spaceship::Portal::Certificate::Production ||
+                               cert.class == Spaceship::Portal::Certificate::AppleDistribution
+                         }
+                       else
+                         @member_center.launcher.certificate.all.select{|cert|
+                           cert.class == Spaceship::Portal::Certificate::InHouse
+                         }
+                       end
 
           # check local install certificate
           FileUtils.mkdir_p(CERTIFICATE_OUTPUT_PATH)
           distribution_cert_ids = []
           prod_certs.each do |cert|
+            next if cert.expires < Time.now
             path = File.join(CERTIFICATE_OUTPUT_PATH, "#{cert.id}.cer")
             raw_data = cert.download_raw
             File.write(path, raw_data)

data/spec/deploygate/xcode/analyze_spec.rb

@@ -1,59 +1,2 @@
 describe DeployGate::Xcode::Analyze do
-
-  context '#convert_bundle_identifier' do
-
-    class DummyProject
-      SCHEME = 'dummy'
-      def schemes
-        [SCHEME, 'dummy2']
-      end
-
-      def options
-        {}
-      end
-    end
-
-    class DummyProjectSetting
-      def name
-        'TargetName'
-      end
-    end
-
-    class DummyBuildConfigration
-      def build_settings
-        {
-            'PRODUCT_NAME' => '$(TARGET_NAME)',
-            'CUSTOM_KEY'   => 'CustomKey',
-            'PRODUCT_BUNDLE_IDENTIFER' => 'com.deploygate.app',
-            'DEBUG_POSTFIX' => '.debug',
-            'LOOP' => '$(LOOP)'
-        }
-      end
-    end
-
-    before do
-      allow_any_instance_of(DeployGate::Xcode::Analyze).to receive(:find_scheme_workspace).and_return('')
-      allow_any_instance_of(DeployGate::Xcode::Analyze).to receive(:find_build_workspace)
-      allow_any_instance_of(DeployGate::Xcode::Analyze).to receive(:target_build_configration).and_return(DummyBuildConfigration.new)
-      allow_any_instance_of(DeployGate::Xcode::Analyze).to receive(:target_project_setting).and_return(DummyProjectSetting.new)
-      allow(FastlaneCore::Configuration).to receive(:create)
-      allow(FastlaneCore::Project).to receive(:new).and_return(DummyProject.new)
-    end
-
-    it do
-      analyze = DeployGate::Xcode::Analyze.new('', nil, DummyProject::SCHEME)
-      expect(analyze.convert_bundle_identifier('com.deploygate.$(PRODUCT_NAME).${CUSTOM_KEY}')).to eq 'com.deploygate.TargetName.CustomKey'
-    end
-
-    it 'if only env' do
-      analyze = DeployGate::Xcode::Analyze.new('', nil, DummyProject::SCHEME)
-      expect(analyze.convert_bundle_identifier('$(PRODUCT_BUNDLE_IDENTIFER)$(DEBUG_POSTFIX)')).to eq 'com.deploygate.app.debug'
-    end
-
-    it 'if loop env' do
-      analyze = DeployGate::Xcode::Analyze.new('', nil, DummyProject::SCHEME)
-      expect(analyze.convert_bundle_identifier('$(LOOP)')).to eq '$(LOOP)'
-    end
-  end
-
 end

data/spec/deploygate/xcode/export_spec.rb

@@ -61,6 +61,7 @@ describe DeployGate::Xcode::Export do
     before do
       @distribution_certificate_id = 'distribution_certificate_id'
       @distribution_certificate = "  1) #{@distribution_certificate_id} \"iPhone Distribution: DeployGate Inc.\""
+      @apple_distribution_certificate = "  1) #{@distribution_certificate_id} \"Apple Distribution: DeployGate Inc.\""
       @not_distribution_certificate = "  1) xxxxxxxxxxxxxx \"iPhone Developer: DeployGate Inc.\""
     end
     it "not installed distribution certificate" do
@@ -74,23 +75,44 @@ describe DeployGate::Xcode::Export do
       ids = DeployGate::Xcode::Export.installed_distribution_certificate_ids
       expect(ids).to eql([@distribution_certificate_id])
     end
+
+    it "installed apple distribution certificate" do
+      allow(DeployGate::Xcode::Export).to receive(:installed_certificates).and_return([@apple_distribution_certificate, @not_distribution_certificate])
+
+      ids = DeployGate::Xcode::Export.installed_distribution_certificate_ids
+      expect(ids).to eql([@distribution_certificate_id])
+    end
   end
 
-  describe "#installed_distribution_conflicting_certificates" do
+  describe "#installed_distribution_conflicting_certificates_by" do
     before do
       @distribution_certificate = "  1) xxxxxxxxxx \"iPhone Distribution: DeployGate Inc.\""
       @distribution_certificate2 = "  2) yyyyyyyyyyyy \"iPhone Distribution: DeployGate Inc.\""
       @distribution_certificate3 = "  2) yyyyyyyyyyyy \"iPhone Distribution: DeployGate Inc2.\""
+
+      @apple_distribution_certificate = "  1) xxxxxxxxxxx \"Apple Distribution: DeployGate Inc.\""
+      @apple_distribution_certificate2 = "  2) yyyyyyyyyyyy \"Apple Distribution: DeployGate Inc.\""
+      @apple_distribution_certificate3 = "  2) yyyyyyyyyyyy \"Apple Distribution: DeployGate Inc2.\""
     end
 
     it "conflicting" do
       allow(DeployGate::Xcode::Export).to receive(:installed_certificates).and_return([@distribution_certificate, @distribution_certificate2])
-      expect(DeployGate::Xcode::Export.installed_distribution_conflicting_certificates.count).to eql 2
+      expect(DeployGate::Xcode::Export.installed_distribution_conflicting_certificates_by('iPhone Distribution').count).to eql 2
+    end
+
+    it "conflicting by apple" do
+      allow(DeployGate::Xcode::Export).to receive(:installed_certificates).and_return([@apple_distribution_certificate, @apple_distribution_certificate2])
+      expect(DeployGate::Xcode::Export.installed_distribution_conflicting_certificates_by('Apple Distribution').count).to eql 2
     end
 
     it "not conflicting" do
       allow(DeployGate::Xcode::Export).to receive(:installed_certificates).and_return([@distribution_certificate, @distribution_certificate3])
-      expect(DeployGate::Xcode::Export.installed_distribution_conflicting_certificates.count).to eql 0
+      expect(DeployGate::Xcode::Export.installed_distribution_conflicting_certificates_by('iPhone Distribution').count).to eql 0
+    end
+
+    it "not conflicting by apple" do
+      allow(DeployGate::Xcode::Export).to receive(:installed_certificates).and_return([@apple_distribution_certificate, @apple_distribution_certificate3])
+      expect(DeployGate::Xcode::Export.installed_distribution_conflicting_certificates_by('Apple Distribution').count).to eql 0
     end
   end
 end

data/spec/deploygate/xcode/ios_spec.rb

@@ -9,6 +9,9 @@ describe DeployGate::Xcode::Ios do
       def build_workspace
         ''
       end
+      def xcodeproj
+        ''
+      end
     end
   end
 

data/spec/deploygate/xcode/member_center_spec.rb

@@ -5,7 +5,7 @@ describe DeployGate::Xcode::MemberCenter do
   end
 
   let(:email) { 'test@example.com' }
-  let(:center) { DeployGate::Xcode::MemberCenter.instance }
+  let(:center) { DeployGate::Xcode::MemberCenter.new('com-example-team-id') }
   before do
     allow_any_instance_of(Spaceship::PortalClient).to receive(:login) {}
     allow_any_instance_of(Spaceship::PortalClient).to receive(:teams) {['team_name', 'team_id']}

data/spec/deploygate/xcode/member_centers/app_spec.rb

@@ -2,7 +2,8 @@ describe DeployGate::Xcode::MemberCenters::App do
   let(:email) { 'test@example.com' }
   let(:registered_uuid) { 'com.example.test.registered' }
   let(:non_registered_uuid) { 'com.example.test.non.registered' }
-  let(:app) { DeployGate::Xcode::MemberCenters::App.new('com.example.test.new.app') }
+  let(:member_center) { DeployGate::Xcode::MemberCenter.new('com-example-team-id') }
+  let(:app) { DeployGate::Xcode::MemberCenters::App.new('com.example.test.new.app', member_center) }
 
   before do
     allow_any_instance_of(Spaceship::PortalClient).to receive(:login) {}
@@ -18,13 +19,13 @@ describe DeployGate::Xcode::MemberCenters::App do
   context "#created?" do
 
     it "app created" do
-      app = DeployGate::Xcode::MemberCenters::App.new(registered_uuid)
+      app = DeployGate::Xcode::MemberCenters::App.new(registered_uuid, member_center)
 
       expect(app.created?).to be_truthy
     end
 
     it "no app created" do
-      app = DeployGate::Xcode::MemberCenters::App.new(non_registered_uuid)
+      app = DeployGate::Xcode::MemberCenters::App.new(non_registered_uuid, member_center)
 
       expect(app.created?).to be_falsey
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deploygate
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.8.3
 platform: ruby
 authors:
 - deploygate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2020-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -240,28 +240,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.57.2
+        version: 2.148.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.57.2
+        version: 2.148.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.1.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.4
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -418,7 +424,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: A command-line interface for DeployGate