deploygate 0.8.4 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a067b187ce090f469740902b25df05047db95908131057a995481c4a023b11bd
-  data.tar.gz: 8d67c1abb0a90436120bdfd45e0831b9002a7b2089c46a3d42cd3ac7d985143c
+  metadata.gz: 78a68445adce138ce74a627acc6f31cbab4d841eb42bd3cf859948a57b7101ab
+  data.tar.gz: a4b69205f86a86a59d26e7bf2233f8cd3cd8a686f09ef83ab994436615a92043
 SHA512:
-  metadata.gz: 7a10f3ec84688ac65572f3ffb77a70f231436ae8222a6d2c7534a6e5cfa126eca71b4c8f2319ca8f7583c4257ae90896605b093af69dbcdc353e70f667307303
-  data.tar.gz: e5abc3793a771f2c1ac96cbaa875a80ab47e665993c7f4a77790f45c983ab557fe4d94345e34d03c9b2ad2ecbfada109bc6e2cacc50881c983da038c54740745
+  metadata.gz: 44da777df37680c6005f5cdf17162dc5af6b27ee8a6be8ee007d19e1c1b7a77ddc3f82ac1f2cc94051bedd0206117200249e82d9d98b5923518e872d9b3cfc29
+  data.tar.gz: 89466928832a91a6bf35de91a60817793ee7032698878a64daa1f2149d87612cfb2f6b6d4adfb265560d9171c4ea8f7a2cf67b04ec08a74d4a7091241af999b0

data/.github/workflows/pull_request.yml

@@ -0,0 +1,21 @@
+name: Run jobs on every PR
+
+on:
+  pull_request:
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        ruby_version:
+          - 2.6
+          - 2.7
+          # - 3.0 # needs to upgrade fastlane and activesupport else
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version:  ${{ matrix.ruby_version }}
+          bundler-cache: true
+      - run: bundle exec rake

data/.github/workflows/release.yml

@@ -0,0 +1,28 @@
+name: Release built gem on tag-push
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - run: bundle exec rake build
+      - id: gem
+        run: echo "::set-output name=result::$(find pkg -name 'deploygate-*.gem' -type f | head -1)"
+      - run: |
+          gem push '${{ steps.gem.outputs.result }}'
+        env:
+          GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
+      - uses: slackapi/slack-github-action@v1.16.0
+        with:
+          payload: "{\"text\": \"Released a deploygate gem in <https://rubygems.org/gems/deploygate/|RubyGems>\"}"
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SHARED_FOR_RELEASE_ARTIFACT_SLACK_INCOMING_WEBHOOK_URL }}
+          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK

data/.ruby-version

@@ -1 +1 @@
-2.4.5
+2.6.9

data/README.md

@@ -9,7 +9,7 @@ dg: A command-line interface for DeployGate
 
 *dg* runs with a minimal set of requirements.
 
-- Ruby 2.4+ (Depends on [Ruby Maintenance Branches](https://www.ruby-lang.org/en/downloads/branches/))
+- Ruby 2.6+ (Depends on [Ruby Maintenance Branches](https://www.ruby-lang.org/en/downloads/branches/))
 
 ## Installation
 

data/config/locales/en.yml

@@ -18,12 +18,11 @@ en:
       scheme: 'Set Xcode build scheme (iOS app only)'
       open: 'Open a browser after the build uploaded (OS X only)'
       disable_notify: 'Disable email notification (iOS app only)'
+      xcodeproj: 'The path to the target Xcode project file (iOS app only)'
     add_devices:
       description: 'Register devices to your Apple Developer account and refresh your provisioning profile. (iOS only) By default, it automatically finds new devices added to your application on DeployGate and ask you which device to register. You can also specify which device to register via command line options.'
-      user: 'Owner user or organization name'
       udid: 'UDID to be registered'
       device_name: 'Device name to be registered'
-      distribution_key: 'If you also want to update distribution page, set the last part of the URL of the page'
       server:
         description: 'Start the add-devices server. When added new device automatically run add-devices command.'
         connecting: 'Connecting...'

data/lib/deploygate/add_devices_server.rb

@@ -44,7 +44,7 @@ module DeployGate
       puts HighLine.color(I18n.t('command_builder.add_devices.server.start_build'), HighLine::GREEN)
       pool.perform do
         DeployGate::Commands::AddDevices.register!(devices)
-        DeployGate::Commands::AddDevices.build!(bunlde_id, args, options)
+        DeployGate::Commands::AddDevices.build!(bunlde_id, member_center, args, options)
         puts HighLine.color(I18n.t('command_builder.add_devices.server.finish_build'), HighLine::GREEN)
         puts ''
       end

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

@@ -4,6 +4,10 @@ module DeployGate
       class Base
         BASE_URL     = ENV['DG_DEVELOP_URL'] || 'https://deploygate.com'
         API_BASE_URL = "#{BASE_URL}/api"
+        BASE_HEADERS = [
+          ['X-DEPLOYGATE-CLIENT-ID', "cli/#{::DeployGate::VERSION_CODE}"],
+          ['X-DEPLOYGATE-CLIENT-VERSION-NAME', ::DeployGate::VERSION],
+        ].freeze
 
         # @param [String] token
         # @return [DeployGate::API::V1::Base]
@@ -53,7 +57,8 @@ module DeployGate
         end
 
         def headers
-          extheaders = []
+          extheaders = BASE_HEADERS.dup
+
           unless @token.nil?
             extheaders.push(['AUTHORIZATION', @token])
           end

data/lib/deploygate/command_builder.rb

@@ -70,6 +70,7 @@ module DeployGate
         c.option '--scheme STRING', String, I18n.t('command_builder.deploy.scheme')
         c.option '--open', I18n.t('command_builder.deploy.open')
         c.option '--disable_notify', I18n.t('command_builder.deploy.disable_notify')
+        c.option '--xcodeproj STRING', I18n.t('command_builder.deploy.xcodeproj')
         c.action do |args, options|
           options.default :message => '', :user => nil, :open => false, 'disable_notify' => false, :command => nil
           begin
@@ -85,12 +86,15 @@ module DeployGate
       command ADD_DEVICES do |c|
         c.syntax = 'dg add-devices'
         c.description = I18n.t('command_builder.add_devices.description')
-        c.option '--user STRING', String, I18n.t('command_builder.add_devices.user')
+        c.option '--message STRING', String, I18n.t('command_builder.deploy.message')
+        c.option '--user STRING', String, I18n.t('command_builder.deploy.user')
         c.option '--udid STRING', String, I18n.t('command_builder.add_devices.udid')
         c.option '--device-name STRING', String, I18n.t('command_builder.add_devices.device_name')
-        c.option '--distribution-key STRING', String, I18n.t('command_builder.add_devices.distribution_key')
+        c.option '--distribution-key STRING', String, I18n.t('command_builder.deploy.distribution_key')
         c.option '--configuration STRING', String, I18n.t('command_builder.deploy.configuration')
         c.option '--server', I18n.t('command_builder.add_devices.server.description')
+        c.option '--disable_notify', I18n.t('command_builder.deploy.disable_notify')
+        c.option '--xcodeproj STRING', I18n.t('command_builder.deploy.xcodeproj')
         c.action do |args, options|
           options.default :user => nil, :server => false, :command => 'add_devices'
           begin

data/lib/deploygate/commands/add_devices.rb

@@ -21,9 +21,12 @@ module DeployGate
           distribution_key = options.distribution_key
           server           = options.server
 
+          build_configuration = options.configuration
+          xcodeproj_path = options.xcodeproj
+
           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)
+          analyze = DeployGate::Xcode::Analyze.new(workspaces, build_configuration, nil, xcodeproj_path)
           bundle_id = analyze.target_bundle_identifier
           developer_team = analyze.developer_team
           member_center = DeployGate::Xcode::MemberCenter.new(developer_team)

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

@@ -34,8 +34,9 @@ module DeployGate
             DeployGate::Xcode::Export.check_local_certificates
             build_configuration = options.configuration
             target_scheme = options.scheme
+            xcodeproj_path = options.xcodeproj
 
-            analyze = DeployGate::Xcode::Analyze.new(workspaces, build_configuration, target_scheme)
+            analyze = DeployGate::Xcode::Analyze.new(workspaces, build_configuration, target_scheme, xcodeproj_path)
             target_scheme = analyze.scheme
 
             code_sign_identity = nil

data/lib/deploygate/version.rb

@@ -1,3 +1,4 @@
 module DeployGate
-  VERSION = '0.8.4'
+  VERSION = '0.8.6'
+  VERSION_CODE = Gem::Version.new(VERSION).segments.reverse.each_with_index.map { |v, i| 100 ** i * v }.reduce(&:+)
 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, :xcodeproj
+      attr_reader :workspaces, :build_workspace, :scheme, :xcodeproj
 
       BASE_WORK_DIR_NAME = 'project.xcworkspace'
       DEFAULT_BUILD_CONFIGURATION = 'Release'
@@ -16,12 +16,11 @@ module DeployGate
       # @param [String] build_configuration
       # @param [String] target_scheme
       # @return [DeployGate::Xcode::Analyze]
-      def initialize(workspaces, build_configuration = nil, target_scheme = nil)
+      def initialize(workspaces, build_configuration = nil, target_scheme = nil, xcodeproj_path = nil)
         @workspaces = workspaces
         @build_configuration = build_configuration || DEFAULT_BUILD_CONFIGURATION
-        @scheme_workspace = find_scheme_workspace(workspaces)
         @build_workspace = find_build_workspace(workspaces)
-        @xcodeproj = File.dirname(@scheme_workspace)
+        @xcodeproj = xcodeproj_path.presence || find_xcodeproj(workspaces)
 
         config = FastlaneCore::Configuration.create(Gym::Options.available_options, { project: @xcodeproj })
         Gym.config = config
@@ -92,7 +91,8 @@ module DeployGate
 
       def resolve_build_configuration(&block)
         gym = Gym::CodeSigningMapping.new(project: @project)
-        specified_configuration = gym.detect_configuration_for_archive
+        specified_configuration = @build_configuration.presence ||
+                                  gym.detect_configuration_for_archive
 
         Xcodeproj::Project.open(@xcodeproj).targets.each do |target|
           target.build_configuration_list.build_configurations.each do |build_configuration|
@@ -114,18 +114,21 @@ module DeployGate
 
       # @param [Array] workspaces
       # @return [String]
-      def find_scheme_workspace(workspaces)
+      def find_xcodeproj(workspaces)
         return nil if workspaces.empty?
-        return workspaces.first if workspaces.count == 1
 
-        select = nil
-        workspaces.each do |workspace|
-          if BASE_WORK_DIR_NAME == File.basename(workspace)
-            select = workspace
+        if workspaces.count == 1
+          scheme_workspace = workspaces.first
+        else
+          scheme_workspace = nil
+          workspaces.each do |workspace|
+            if BASE_WORK_DIR_NAME == File.basename(workspace)
+              scheme_workspace = workspace
+            end
           end
         end
 
-        select
+        scheme_workspace != nil ? File.dirname(scheme_workspace) : nil
       end
 
       # @param [Array] workspaces

data/lib/deploygate.rb

@@ -36,6 +36,7 @@ require "xcodeproj"
 module DeployGate
 end
 
+require "deploygate/version"
 require "deploygate/raven_ignore_exception"
 require "deploygate/api/v1/base"
 require "deploygate/api/v1/session"
@@ -72,4 +73,3 @@ require "deploygate/xcode/ios"
 require "deploygate/android/gradle_deploy"
 require "deploygate/android/gradle_plugin_installer"
 require "deploygate/android/gradle_project"
-require "deploygate/version"

data/spec/deploygate/xcode/analyze_spec.rb

@@ -1,2 +1,70 @@
 describe DeployGate::Xcode::Analyze do
+  describe '#new' do
+    subject { described_class.new(workspaces, build_configuration, target_scheme, xcodeproj) }
+
+    let(:build_configuration) { nil }
+    let(:target_scheme) { nil }
+    let(:xcodeproj) { nil }
+
+    describe 'detect scheme workspace and build workspace' do
+      before do
+        allow(FastlaneCore::Configuration).to receive(:create)
+        project = instance_double(FastlaneCore::Project)
+        allow(project).to receive(:select_scheme)
+        allow(project).to receive(:schemes).and_return([])
+        allow(project).to receive(:options).and_return({})
+        allow(FastlaneCore::Project).to receive(:new).and_return(project)
+        allow(Gym).to receive(:config=)
+      end
+
+      context 'exists single xcodeproj files' do
+        let(:workspaces) do
+          %w[
+            /base_dir/Test/Test/Test.xcodeproj/project.xcworkspace
+          ]
+        end
+
+        context 'without scheme workspace arg' do
+          it 'build_workspace and xcodeproj is same' do
+            is_expected.to have_attributes(
+              build_workspace:  '/base_dir/Test/Test/Test.xcodeproj/project.xcworkspace',
+              xcodeproj:  '/base_dir/Test/Test/Test.xcodeproj'
+            )
+          end
+        end
+      end
+
+      context 'exists multiple xcodeproj files' do
+        let(:workspaces) do
+          %w[
+            /base_dir/Test/ALib/ALib.xcodeproj/project.xcworkspace
+            /base_dir/Test/Hoge/Hoge.xcodeproj/project.xcworkspace
+            /base_dir/Test/Test/Test.xcodeproj/project.xcworkspace
+            /base_dir/Test/Test.xcworkspace
+            /base_dir/Test/ZLib/ZLib.xcodeproj/project.xcworkspace
+          ]
+        end
+
+        context 'without scheme workspace arg' do
+          it 'scheme workspace is last workspace has project.xcworkspace' do
+            is_expected.to have_attributes(
+              build_workspace:  '/base_dir/Test/Test.xcworkspace',
+              xcodeproj: '/base_dir/Test/ZLib/ZLib.xcodeproj'
+            )
+          end
+        end
+
+        context 'with scheme workspace arg' do
+          let(:xcodeproj) { './ZLib.xcodeproj' }
+
+          it 'scheme workspace is last workspace has project.xcworkspace' do
+            is_expected.to have_attributes(
+              build_workspace:  '/base_dir/Test/Test.xcworkspace',
+              xcodeproj: './ZLib.xcodeproj'
+            )
+          end
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deploygate
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.6
 platform: ruby
 authors:
 - deploygate
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-07 00:00:00.000000000 Z
+date: 2022-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -332,10 +332,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/pull_request.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -424,8 +425,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: A command-line interface for DeployGate
 test_files:
@@ -448,3 +449,4 @@ test_files:
 - spec/deploygate/xcode/member_centers/provisioning_profile_spec.rb
 - spec/spec_helper.rb
 - spec/test_files/DeployGateSample.apk
+...

data/.travis.yml

@@ -1,25 +0,0 @@
-language: ruby
-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.4
-  - 2.5
-  - 2.6
-  - 2.7
-before_install:
-  - gem install bundler -v 2.1.4
-install: BUNDLER_VERSION=2.1.4 bundle install --jobs=3 --retry=3
-script:
-  - bundle exec rake
-deploy:
-  provider: rubygems
-  api_key:
-    secure: sy649ijrSPFvCtR7cg/Hy2I7iY3WQxROyyw3hjoOU5wFxjNYh+DoDXmZiMmdRSNjO2GQIbeuX5sPhgHTleIlOl0c8QtYxwiky6O9WnT3lwOkxtnhI1H+sQCJxWV9Ur99GtYCzosfOgqvoiXqOIllI/mNzhO4Vru3Nc+E9pM1aM9jU9TIulDxOCSyteXvX+23DaiW8CNicFWEGhT4rSdDGqKbmZTjDKP2SanEthUp1N0AqZR9ACvqGCz7Q/5cXjoUFz89uBaNwyp3UrYhfP1niVgR3dp8ev23RbMUGsmVz8WVMOkrBbA2nSBF+fRsxuj5YO+J0knQY32sXpNH06jvJ8GvnbOwWD6wm7q4h1UOjvb29PamtRF4lSfxhZb848eHtipkNyuqCfWaeCrlpn5b49poBPZ1FTOC8C6o1LbFPAJwchttj5fcVReNVsa8+xt6TO6p/vti0WMptVUUHU5xSxG7t3FzRF1WTM09oSNnmfyI/rOQv1qgOP2RmNaJQl9iRCbyCTgU8kpL8BR2vswntxILj5Q9zl2M83zGo7mYB8EjvbPjWqVURzvww5Jl5BSJfiIgeLBq/cjb7h/oqvRqgolkfqwaudagRUY+Fgtlmic15gjs8aA9OfzShBigf5We/aZRaXLWjtOwJ5+GKsBbmi73mkyTn0cMFbTpDv3RVNE=
-  gem: deploygate
-  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'