deploygate 0.6.7 → 0.8.2

data/lib/deploygate/xcode/ios.rb

@@ -5,7 +5,7 @@ module DeployGate
       PROJECT_DIR_EXTNAME = '.xcodeproj'
       IGNORE_DIRS = [ '.git', 'Carthage' ]
 
-      class NotSupportExportMethodError < DeployGate::NotIssueError
+      class NotSupportExportMethodError < DeployGate::RavenIgnoreException
       end
 
       class << self
@@ -28,7 +28,7 @@ module DeployGate
 
           values = {
               export_method: export_method,
-              workspace: ios_analyze.build_workspace,
+              project: ios_analyze.xcodeproj,
               configuration: build_configuration || DeployGate::Xcode::Analyze::DEFAULT_BUILD_CONFIGURATION,
               scheme: target_scheme
           }

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

@@ -4,16 +4,16 @@ module DeployGate
       class ProvisioningProfile
         attr_reader :member_center, :app_identifier
 
-        class NotInstalledCertificateError < DeployGate::NotIssueError
+        class NotInstalledCertificateError < DeployGate::RavenIgnoreException
         end
-        class NotExistUUIDProvisioningProfileError < DeployGate::NotIssueError
+        class NotExistUUIDProvisioningProfileError < DeployGate::RavenIgnoreException
         end
 
         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.7
+  version: 0.8.2
 platform: ruby
 authors:
 - deploygate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2020-10-29 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
@@ -72,28 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-- !ruby/object:Gem::Dependency
-  name: github_issue_request
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -234,34 +220,54 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: sentry-raven
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: fastlane
   requirement: !ruby/object:Gem::Requirement
     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: 2.1.4
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        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.13'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -362,8 +368,8 @@ files:
 - lib/deploygate/config/cache_version.rb
 - lib/deploygate/config/credential.rb
 - lib/deploygate/deploy.rb
-- lib/deploygate/not_issue_error.rb
 - lib/deploygate/project.rb
+- lib/deploygate/raven_ignore_exception.rb
 - lib/deploygate/session.rb
 - lib/deploygate/user.rb
 - lib/deploygate/version.rb
@@ -419,7 +425,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.14.3
 signing_key: 
 specification_version: 4
 summary: A command-line interface for DeployGate