deploygate 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 240a15ab59a4c7bbf4a9eaddea45753f1e0c43b043d7dd13da404567034e8b97
-  data.tar.gz: f4e49f23e2e26a96c26d44e6cc499260494f6540b13e4cebd9a108b0e93e1e79
+  metadata.gz: 8cd91c1e3ea9e8f1bb159e257e3bc6f3eeb557b89c654caabb8aea817d1470e7
+  data.tar.gz: afc969266c279b32687df44fa78265ca843bb210b9e457195296abdc0c489d0e
 SHA512:
-  metadata.gz: 74c6ec9d1a2fc12a27f722a336e5e2438481644d2c4eec1740001c07ede7c1733739a51bebf0bec034a3a7e2aca88ecd2e2665c28fcca277a363af0e646086ba
-  data.tar.gz: ebbd48822b79e23fd0098377fa09254f5cd46a3244f08c817a942db381cc2080434f0e77c403caae9875ce1f59c0b27b7631cd5dbed7ac28d4720840e1420121
+  metadata.gz: bf82535795d7295dfdc325ca359b950ce599453e6927a02c02430a5a95d45fdeddd3ac4d67ab0626b1fc9f8e71e4bfbfdd1050b2b99bc75f301aed0a6f029859
+  data.tar.gz: c0e6d977d35e49acd25e4ee4cec35c6925535e4968964f172a0bff1bc7974b27fc834690a3d9dbd7ed0b6748ee8a95d75d64a9e2189c43369e9efc7625695645

data/.travis.yml

@@ -20,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/config/locales/en.yml

@@ -142,16 +142,16 @@ 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...'
@@ -171,5 +171,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/lib/deploygate/version.rb

@@ -1,3 +1,3 @@
 module DeployGate
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

data/lib/deploygate/xcode/analyze.rb

@@ -53,7 +53,7 @@ module DeployGate
         identity
       end
 
-      # Support Xcode7 more
+      # TODO: Need to support UDID additions for watchOS and App Extension
       # @return [String]
       def target_bundle_identifier
         bundle_identifier = nil
@@ -96,7 +96,17 @@ module DeployGate
 
         Xcodeproj::Project.open(@xcodeproj).targets.each do |target|
           target.build_configuration_list.build_configurations.each do |build_configuration|
-            next if build_configuration.name != specified_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
+
+            # If SKIP_INSTALL is true, it is an app extension or watch app
+            next if current["SKIP_INSTALL"]
+
             block.call(build_configuration, target)
           end
         end

data/lib/deploygate/xcode/export.rb

@@ -80,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
@@ -92,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
@@ -106,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
@@ -255,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/member_centers/provisioning_profile.rb

@@ -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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deploygate
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - deploygate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2020-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -424,8 +424,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: A command-line interface for DeployGate