deploygate 0.6.7 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 683c37a3388ad0e42e4fdb860fe3cc7d705831fa912bee34f415fb5dbda634bc
-  data.tar.gz: d8c5c1f552dc84cb7ade0c76cdcd20ff0b6f438048c1c714c5211f17e5336917
+SHA1:
+  metadata.gz: 152c8d51b8026027e006abf851587d585ea1e9db
+  data.tar.gz: a2ecbe04a60241e3bace5f4a71ca21cb2b720d68
 SHA512:
-  metadata.gz: a602970427fef7d236d40914d948f5aafc9a4404d52c514b0859c1aa4ad3647408814eaa8c80d215ed46cc07b57ef9f406be9f543b2a9615886bb09ed76ae101
-  data.tar.gz: 7e1ac49b8bd8d8549a9ce45857ff9252b3249d2d367d0d1dad3e632ccebbde77b80857da76ddfdb333752cd8c7c72b73b09b0dab03511d454c182ad2e193dbe6
+  metadata.gz: d3753c438e061fe68140654852dc2dab3de06e69647f5b4771f6159fd448232c6735b36520f6334f38a21b0cfb62ef8d711173f906d896a5165afe6cc5a8c23f
+  data.tar.gz: 0275cdfea85a1c763406aaf0650c37e30e01c3d1311037f52fa297896b7d248842bf41c1de26dd413118c78237c8a075951fd2f904b6d990474a6f1589d6a587

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
+  - 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,12 +1,13 @@
 ---
 en:
+  errors:
+    check_update_failure: 'Checking update failed'
   command_builder:
     name: 'dg'
     description: 'Control DeployGate from your terminal.'
     login:
       description: 'Log in to DeployGate'
       terminal: 'Login in terminal'
-      error: 'Commands::Login Error: %{e}'
     deploy:
       description: 'Build and upload a new build'
       message: 'Build description message'
@@ -16,14 +17,12 @@ 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)'
-      error: 'Commands::Deploy Error: %{e}'
     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'
-      error: 'Commands::AddDevices Error: %{e}'
       server:
         description: 'Start the add-devices server. When added new device automatically run add-devices command.'
         connecting: 'Connecting...'
@@ -32,17 +31,15 @@ en:
         finish_build: 'add-devices completed successfully.'
     logout:
       description: 'Log out current session'
-      error: 'Commands::Logout Error: %{e}'
     config:
       description: "Configure login session of `dg` command. Usually, the session automatically created on the installation process so you don't need to use this command."
       json: 'Set output format to JSON'
       name: 'DeployGate user name'
       token: 'DeployGate API token'
-      error: 'Commands::Config Error: %{e}'
     error_handling:
       message: 'Error: %{message}'
-      agree: 'Do you want to report this issue on GitHub? (y/n) '
-      please_open: 'Please open GitHub issue: %{url}'
+      agree: 'Do you want to this error report to DeployGate? (y/n) '
+      thanks: 'Thank you feedback! We will improve based on it.'
     show_update_message: |
       #################################################################
       # %{gem_name} %{latest_version} is available. You are on %{current_version}.
@@ -147,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:
@@ -182,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,12 +20,11 @@ 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'
-  spec.add_runtime_dependency 'xcodeproj', '~> 1.5.1'
-  spec.add_runtime_dependency 'github_issue_request', '~> 0.1'
+  spec.add_runtime_dependency 'xcodeproj', '~> 1.7'
   spec.add_runtime_dependency 'highline', '~> 1.7'
   spec.add_runtime_dependency 'uuid', '~> 2.3'
   spec.add_runtime_dependency 'gem_update_checker', '~> 0.2'
@@ -36,11 +35,12 @@ POST_INSTALL_MESSAGE
   spec.add_runtime_dependency 'net-ping', '~> 2.0'
   spec.add_runtime_dependency 'socket.io-client-simple', '~> 1.2'
   spec.add_runtime_dependency 'workers', '~> 0.6'
+  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.13'
+  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"
@@ -6,11 +7,11 @@ require "rbconfig"
 require "openssl"
 require "plist"
 require "find"
-require "github_issue_request"
 require "highline"
 require "uuid"
 require "gem_update_checker"
 require "active_support/core_ext/time"
+require "active_support/core_ext/hash"
 require "locale"
 require "tempfile"
 require "open3"
@@ -21,6 +22,7 @@ require "webrick"
 require "net/ping"
 require "socket.io-client-simple"
 require "workers"
+require "sentry-raven"
 
 require "i18n"
 I18n.load_path = Dir[File.join(File.dirname(__FILE__), '../config/locales/*.yml')]
@@ -34,7 +36,7 @@ require "xcodeproj"
 module DeployGate
 end
 
-require "deploygate/not_issue_error"
+require "deploygate/raven_ignore_exception"
 require "deploygate/api/v1/base"
 require "deploygate/api/v1/session"
 require "deploygate/api/v1/push"
@@ -55,6 +57,7 @@ require "deploygate/config/cache_version"
 require "deploygate/session"
 require "deploygate/deploy"
 require "deploygate/project"
+require "deploygate/raven_ignore_exception"
 require "deploygate/user"
 require "deploygate/browser_login"
 require "deploygate/add_devices_server"

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

@@ -3,7 +3,7 @@ module DeployGate
     include Commander::Methods
     attr_reader :arguments
 
-    class NotInternetConnectionError < DeployGate::NotIssueError
+    class NotInternetConnectionError < DeployGate::RavenIgnoreException
     end
 
     PING_URL = 'https://deploygate.com'
@@ -15,6 +15,13 @@ module DeployGate
     CONFIG      = 'config'
 
     def setup
+      # sentry config
+      Raven.configure do |config|
+        config.dsn = 'https://e0b4dda8fe2049a7b0d98c6d2759e067@sentry.io/1371610'
+        config.logger = Raven::Logger.new('/dev/null') # hide sentry log
+        config.excluded_exceptions = Raven::Configuration::IGNORE_DEFAULT + [DeployGate::RavenIgnoreException.name]
+      end
+
       # set Ctrl-C trap
       Signal.trap(:INT){
         puts ''
@@ -27,14 +34,13 @@ module DeployGate
         exit
       end
 
-      # check update
-      GithubIssueRequest::Url.config('deploygate', 'deploygate-cli')
       check_update()
     end
 
     def run
       setup()
 
+      program :help_paging, false
       program :name, I18n.t('command_builder.name')
       program :version,  VERSION
       program :description, I18n.t('command_builder.description')
@@ -49,7 +55,7 @@ module DeployGate
             Commands::Login.run(args, options)
           rescue => e
             error_handling(LOGIN, e)
-            raise e
+            exit 1
           end
         end
       end
@@ -70,7 +76,7 @@ module DeployGate
             Commands::Deploy.run(args, options)
           rescue => e
             error_handling(DEPLOY, e)
-            raise e
+            exit 1
           end
         end
       end
@@ -91,7 +97,7 @@ module DeployGate
             Commands::AddDevices.run(args, options)
           rescue => e
             error_handling(ADD_DEVICES, e)
-            raise e
+            exit 1
           end
         end
       end
@@ -104,7 +110,7 @@ module DeployGate
             Commands::Logout.run
           rescue => e
             error_handling(LOGOUT, e)
-            raise e
+            exit 1
           end
         end
       end
@@ -120,7 +126,7 @@ module DeployGate
             Commands::Config.run(args, options)
           rescue => e
             error_handling(CONFIG, e)
-            raise e
+            exit 1
           end
         end
       end
@@ -128,62 +134,54 @@ module DeployGate
       run!
     end
 
+    # @param [String] command
     # @param [Exception] error
-    # @return [String]
-    def create_error_issue_body(error)
-      return <<EOF
-
-# Status
-deploygate-cli ver #{DeployGate::VERSION}
+    def error_handling(command, error)
+      STDERR.puts HighLine.color(I18n.t('command_builder.error_handling.message', message: error.message), HighLine::RED)
+      return if ENV['CI'] # When run ci server
+      return if error.kind_of?(DeployGate::RavenIgnoreException)
 
-# Error message
-#{error.message}
+      dg_version = DeployGate::VERSION
+      tags = {
+          command: command,
+          dg_version: dg_version
+      }
+      version = Gym::Xcode.xcode_version
+      tags[:xcode_version] = version if version.present?
 
-# Backtrace
-```
-#{error.backtrace.join("\n")}
-```
-EOF
+      puts ''
+      puts error_report(error, dg_version, version)
+      if HighLine.agree(I18n.t('command_builder.error_handling.agree')) {|q| q.default = "y"}
+        tags = {
+            command: command,
+            dg_version: DeployGate::VERSION
+        }
+        version = Gym::Xcode.xcode_version
+        tags[:xcode_version] = version if version.present?
+
+        Raven.capture_exception(error, tags: tags)
+        puts HighLine.color(I18n.t('command_builder.error_handling.thanks'), HighLine::GREEN)
+      end
     end
 
-    # @param [Symbol] command
-    # @param [Exception] error
-    # @return [String]
-    def create_issue_url(command, error)
-      title = case command
-                   when LOGIN
-                     I18n.t('command_builder.login.error', e: error.class)
-                   when LOGOUT
-                     I18n.t('command_builder.logout.error', e: error.class)
-                   when DEPLOY
-                     I18n.t('command_builder.deploy.error', e: error.class)
-                   when ADD_DEVICES
-                     I18n.t('command_builder.add_devices.error', e: error.class)
-                   when CONFIG
-                     I18n.t('command_builder.config.error', e: error.class)
-                 end
-
-      options = {
-          :title => title,
-          :body  => create_error_issue_body(error),
-      }
-      GithubIssueRequest::Url.new(options).to_s
-    end
+    def error_report(error, dg_version, xcode_version)
+      meta_info = "dg version: #{dg_version}"
+      meta_info += "\nXcode version: #{xcode_version}" if xcode_version.present?
 
-    # @param [Symbol] command
-    # @param [Exception] error
-    def error_handling(command, error)
-      STDERR.puts HighLine.color(I18n.t('command_builder.error_handling.message', message: error.message), HighLine::RED)
+      backtrace = error.backtrace.take(5).join("\n")
+      backtrace += "\nand more ..." if error.backtrace.count > 5
 
-      return if ENV['CI'] # When run ci server
-      return if error.kind_of?(DeployGate::NotIssueError)
-      puts ''
-      if HighLine.agree(I18n.t('command_builder.error_handling.agree')) {|q| q.default = "n"}
-        url = create_issue_url(command, error)
-        puts I18n.t('command_builder.error_handling.please_open', url: url)
-        system('open', url) if Commands::Deploy::Push.openable?
-      end
-      puts ''
+      <<EOF
+------------------------
+DeployGate Error Report 
+
+Title: #{error}
+#{meta_info}
+
+Stack trace:
+#{backtrace}
+------------------------
+EOF
     end
 
     # @return [void]
@@ -205,6 +203,8 @@ EOF
       else
         request_gem_update_checker
       end
+    rescue => e
+      STDERR.puts I18n.t('errors.check_update_failure')
     end
 
     # @return [void]