deploygate 0.8.0 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 240a15ab59a4c7bbf4a9eaddea45753f1e0c43b043d7dd13da404567034e8b97
-  data.tar.gz: f4e49f23e2e26a96c26d44e6cc499260494f6540b13e4cebd9a108b0e93e1e79
+  metadata.gz: a067b187ce090f469740902b25df05047db95908131057a995481c4a023b11bd
+  data.tar.gz: 8d67c1abb0a90436120bdfd45e0831b9002a7b2089c46a3d42cd3ac7d985143c
 SHA512:
-  metadata.gz: 74c6ec9d1a2fc12a27f722a336e5e2438481644d2c4eec1740001c07ede7c1733739a51bebf0bec034a3a7e2aca88ecd2e2665c28fcca277a363af0e646086ba
-  data.tar.gz: ebbd48822b79e23fd0098377fa09254f5cd46a3244f08c817a942db381cc2080434f0e77c403caae9875ce1f59c0b27b7631cd5dbed7ac28d4720840e1420121
+  metadata.gz: 7a10f3ec84688ac65572f3ffb77a70f231436ae8222a6d2c7534a6e5cfa126eca71b4c8f2319ca8f7583c4257ae90896605b093af69dbcdc353e70f667307303
+  data.tar.gz: e5abc3793a771f2c1ac96cbaa875a80ab47e665993c7f4a77790f45c983ab557fe4d94345e34d03c9b2ad2ecbfada109bc6e2cacc50881c983da038c54740745

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

@@ -1,5 +1,8 @@
 ---
 en:
+  errors:
+    check_update_failure: 'Checking update failed'
+    account_not_found_error: 'Your account was not found. Please create it from https://deploygate.com'
   command_builder:
     name: 'dg'
     description: 'Control DeployGate from your terminal.'
@@ -93,7 +96,7 @@ en:
           $ dg login
       print_login_user: 'User name: %{name}'
     login:
-      start_login_or_create_account:
+      start_login:
         welcome: 'Welcome to DeployGate!'
         email: 'Email: '
         check_account: 'Checking for your account...'
@@ -103,28 +106,6 @@ en:
           Could not log in to DeployGate.
           Please try again.
         success: 'Hello %{name}!'
-      create_account:
-        prompt: "Looks new to DeployGate. Let's set up your account, just choose your user name and password."
-        creating: 'Creating your account... '
-        error: |
-          Could not create your account.
-          Please try again.
-        success: 'done! Your account has been set up successfully.'
-      input_new_account_name:
-        input_user_name: 'Username: '
-        checking: 'Checking for availability... '
-        already_used_user_name: 'Sorry, %{user_name} was already taken. Please try again.'
-        success: 'Good, %{user_name} is available.'
-      input_new_account_password:
-        input_password: 'Password: '
-        input_same_password: 'Type the same password: '
-        error: "Passwords didn't match. Please type again."
-      check_terms:
-        terms_url: 'Terms of Service: https://deploygate.com/terms'
-        privacy_url: 'Privacy Policy: https://deploygate.com/terms/privacy'
-        note: "DeployGate properly manages your account information under GDPR, Japan's Personal Information Protection Act and our Privacy Policy."
-        text: 'I agree to the Terms of Service and Privacy Policy (y/n) '
-        error: 'You must agree to the Terms of Service and Privacy Policy.'
     logout:
       success: |
         Logout success!
@@ -142,16 +123,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 +152,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/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/api/v1/user.rb

@@ -6,30 +6,6 @@ module DeployGate
         ENDPOINT = '/users'
 
         class << self
-          # @param [String] name
-          # @param [String] email
-          # @param [String] password
-          # @param [String] locale
-          # @return [Hash]
-          def create(name, email, password, locale = 'en')
-            res = Base.new().post(ENDPOINT, {:name => name, :email => email, :password => password, :locale => locale})
-
-            user_create_results = {
-                :error => res['error'],
-                :message => res['because']
-            }
-
-            results = res['results']
-            unless results.nil?
-              user_create_results.merge!({
-                                       :name => results['user']['name'],
-                                       :token => results['api_token']
-                                   })
-            end
-
-            user_create_results
-          end
-
           # @param [String] name
           # @param [String] email
           # @return [Boolean]

data/lib/deploygate/command_builder.rb

@@ -203,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

@@ -11,7 +11,7 @@ module DeployGate
 
           session = DeployGate::Session.new
           unless session.login?
-            Login.start_login_or_create_account()
+            Login.start_login()
             session = DeployGate::Session.new()
           end
 

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

@@ -13,7 +13,7 @@ module DeployGate
           def upload(args, options)
             session = DeployGate::Session.new()
             unless session.login?
-              Login.start_login_or_create_account()
+              Login.start_login()
               session = DeployGate::Session.new()
             end
 

data/lib/deploygate/commands/deploy.rb

@@ -6,7 +6,7 @@ module DeployGate
         # @param [Array] args
         # @param [Commander::Command::Options] options
         def run(args, options)
-          Login.start_login_or_create_account() unless DeployGate::Session.new.login?
+          Login.start_login() unless DeployGate::Session.new.login?
 
           # push or build(android/ios)
           args.push(Dir.pwd) if args.empty?

data/lib/deploygate/commands/login.rb

@@ -1,6 +1,8 @@
 module DeployGate
   module Commands
     class Login
+      class AccountNotFoundError < DeployGate::RavenIgnoreException; end
+
       class << self
 
         # @return [void]
@@ -8,31 +10,32 @@ module DeployGate
           welcome()
 
           if options.terminal
-            start_login_or_create_account()
+            start_login()
           else
             DeployGate::BrowserLogin.new().start()
           end
         end
 
         def welcome
-          puts I18n.t('commands.login.start_login_or_create_account.welcome')
+          puts I18n.t('commands.login.start_login.welcome')
           print_deploygate_aa()
         end
 
         # @return [void]
-        def start_login_or_create_account
+        # @raise [AccountNotFoundError] emailに一致するUserが存在しないとき
+        def start_login
           puts ''
-          email = ask(I18n.t('commands.login.start_login_or_create_account.email'))
+          email = ask(I18n.t('commands.login.start_login.email'))
 
           puts ''
-          puts I18n.t('commands.login.start_login_or_create_account.check_account')
+          puts I18n.t('commands.login.start_login.check_account')
           if DeployGate::User.registered?('', email)
             puts ''
-            password = input_password(I18n.t('commands.login.start_login_or_create_account.input_password'))
+            password = input_password(I18n.t('commands.login.start_login.input_password'))
             puts ''
             start(email, password)
           else
-            create_account(email)
+            raise AccountNotFoundError, HighLine.color(I18n.t('errors.account_not_found_error'))
           end
         end
 
@@ -56,69 +59,6 @@ module DeployGate
           puts HighLine.color(I18n.t('commands.login.start.success', name: session.name), HighLine::GREEN)
         end
 
-        # @param [String] email
-        # @return [void]
-        def create_account(email)
-          puts I18n.t('commands.login.create_account.prompt')
-          puts ''
-
-          name = input_new_account_name()
-          puts ''
-
-          password = input_new_account_password()
-          puts ''
-
-          unless check_terms
-            puts HighLine.color(I18n.t('commands.login.check_terms.error'), HighLine::RED)
-            exit 1
-          end
-
-          print I18n.t('commands.login.create_account.creating')
-          if DeployGate::User.create(name, email, password).nil?
-            puts HighLine.color(I18n.t('commands.login.create_account.error'), HighLine::RED)
-            raise 'User create error'
-          else
-            puts HighLine.color(I18n.t('commands.login.create_account.success'), HighLine::GREEN)
-            start(email, password)
-          end
-        end
-
-        # @return [String]
-        def input_new_account_name
-          user_name = ask(I18n.t('commands.login.input_new_account_name.input_user_name'))
-          print I18n.t('commands.login.input_new_account_name.checking')
-
-          if DeployGate::User.registered?(user_name, '')
-            puts HighLine.color(I18n.t('commands.login.input_new_account_name.already_used_user_name', user_name: user_name), HighLine::RED)
-            return input_new_account_name()
-          else
-            puts HighLine.color(I18n.t('commands.login.input_new_account_name.success', user_name: user_name), HighLine::GREEN)
-            return user_name
-          end
-        end
-
-        # @return [String]
-        def input_new_account_password
-          password = input_password(I18n.t('commands.login.input_new_account_password.input_password'))
-          secound_password = input_password(I18n.t('commands.login.input_new_account_password.input_same_password'))
-
-          if password == secound_password
-            return password
-          else
-            puts HighLine.color(I18n.t('commands.login.input_new_account_password.error'), HighLine::RED)
-            return input_new_account_password()
-          end
-        end
-
-        # @return [boolean]
-        def check_terms
-          puts I18n.t('commands.login.check_terms.terms_url')
-          puts I18n.t('commands.login.check_terms.privacy_url')
-          puts I18n.t('commands.login.check_terms.note')
-          puts ''
-          HighLine.agree(I18n.t('commands.login.check_terms.text')) {|q| q.default = "n"}
-        end
-
         # @return [String]
         def input_password(message)
           ask(message) { |q| q.echo = "*" }

data/lib/deploygate/user.rb

@@ -8,17 +8,6 @@ module DeployGate
       @name = name
     end
 
-    # @param [String] name
-    # @param [String] email
-    # @param [String] password
-    # @return [DeployGate::User]
-    def self.create(name, email, password)
-      locale = Locale.current.language
-      results = DeployGate::API::V1::User.create(name, email, password, locale)
-      return if results[:error]
-      DeployGate::User.new(results[:name])
-    end
-
     # @param [String] name
     # @param [String] email
     # @return [Boolean]

data/lib/deploygate/version.rb

@@ -1,3 +1,3 @@
 module DeployGate
-  VERSION = '0.8.0'
+  VERSION = '0.8.4'
 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/ios.rb

@@ -28,10 +28,16 @@ module DeployGate
 
           values = {
               export_method: export_method,
-              project: ios_analyze.xcodeproj,
               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_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/lib/deploygate.rb

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

data/spec/deploygate/api/v1/user_spec.rb

@@ -1,31 +1,4 @@
 describe DeployGate::API::V1::User do
-  describe "#create" do
-    it "success" do
-      name = 'test'
-      email = 'email'
-      password = 'password'
-      token = 'token'
-      response = {
-          :error => false,
-          :because => '',
-          :results => {
-              :user => {:name => name},
-              :api_token => token
-          }
-      }
-      stub_request(:post, "#{API_ENDPOINT}/users").
-          to_return(:body => response.to_json)
-
-      results = DeployGate::API::V1::User.create(name, email, password)
-      expect(results).to eq({
-                                :error => response[:error],
-                                :message => response[:because],
-                                :name => name,
-                                :token => token
-                            })
-    end
-  end
-
   describe "#registered?" do
     it "registered" do
       name = 'test'

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.4
 platform: ruby
 authors:
 - deploygate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2022-01-07 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