deploygate 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzM2OGRjMTVmYWJmODU1YTc0MDI3MzZjNTIwMDMyOThhNjNmMGQ1OQ==
+    ZWQyZmNkNWY5MDkxMjc2YmUxOTM4MTMwZTY4MmFlMTZiNzc4MTQxNg==
   data.tar.gz: !binary |-
-    ZWZmMTNjMzA0YmY0YmI0NjEwZjgzOWEyZjk4YmExYmZjNTg3ZjE1Mg==
+    MWU0NWVmZDViMTYxZWJjNjg1NTc3YTc1MWExNTM4YWMyYTE5NDgxNA==
 SHA512:
   metadata.gz: !binary |-
-    NzY5MDBhZjU4NDliNzM4NDg0Yjg4NDE0NWZhYjFiYTE0ZjIyMWZmODZjNzY2
-    NGU2MThmNjVmNDhmMDMwMmM0NTFhY2Y4Y2RjOGI0ZjYxMTQ3MTRkODI5MmZm
-    ZGNhNzczMmNmMjE1NTM5YzMzY2ZlY2JkZjliMmZiNDFhZGM3ZjA=
+    MDkxMmZiYzVkYWQ0NjhhNjM3YzNmNTAzMjExODY0NmJhZDFiNDhiNTZiZWM1
+    ZDZjZTZkOGRhZTgzOGUyZDMxMGQ4YTBmZDM1MTJlMTg2OGQ5OTJkNmEyMmVh
+    NTM5Yjg4ODU1ZDJlMzA0MWU4YThkZmYyZmY3MDA4MDFjZTJjNzA=
   data.tar.gz: !binary |-
-    NzVkMWE5ZTdkNWI4NzQ1NTM5MDg2MjlkZmM1MGFlNTMzMzBkYjBkZjZlMzNi
-    Yzg5NmQxOTM4MGM1ZjQ2MzA3Nzc5Nzg3YWJhNGE2M2E2MWRjNzAzM2ZiNjIy
-    NmRjMTVlZjZhMzIyZjc5ZDI1ZWY5YzFlMWQ4YjFjODEzY2JkZTg=
+    MWVjOGRhNWFiNTE1ODcyNzk2MzlhMGI1OGFhYzRjNDkzMDE4MzdmODg5NjFk
+    NTk5Y2NiZDAzMjEyNDRhYjJlZGYxNDBjMDNhOTAyZDE4MGZkNTE2ZDIwNmJj
+    NzJhOTIyODZjMWVlZTEzMzdlYjI3MDQ2ZGY4NzU4MGQ3NDdhZmE=

data/config/locales/en.yml

@@ -5,6 +5,7 @@ en:
     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'
@@ -30,6 +31,7 @@ en:
       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}'
     show_update_message: |

data/deploygate.gemspec

@@ -31,6 +31,7 @@ POST_INSTALL_MESSAGE
   spec.add_dependency 'gem_update_checker', '~> 0.2.0'
   spec.add_dependency 'activesupport', '~> 4.2.4'
   spec.add_dependency 'i18n'
+  spec.add_dependency 'launchy'
 
   # ios build
   spec.add_dependency 'gym', '~> 1.0.0'

data/lib/deploygate.rb

@@ -16,6 +16,8 @@ require "tempfile"
 require "open3"
 require "open-uri"
 require "rexml/document"
+require "launchy"
+require "webrick"
 
 require "i18n"
 I18n.load_path = Dir[File.join(File.dirname(__FILE__), '../config/locales/*.yml')]
@@ -49,6 +51,7 @@ require "deploygate/session"
 require "deploygate/deploy"
 require "deploygate/project"
 require "deploygate/user"
+require "deploygate/browser_login"
 require "deploygate/xcode/member_center"
 require "deploygate/xcode/member_centers/app"
 require "deploygate/xcode/member_centers/provisioning_profile"

data/lib/deploygate/browser_login.rb

@@ -0,0 +1,72 @@
+module DeployGate
+  class BrowserLogin
+    DEFAULT_PORT = 64126
+    LOGIN_URL = "#{DeployGate::API::V1::Base::BASE_URL}/cli/login"
+    CREDENTIAL_URL = "#{DeployGate::API::V1::Base::BASE_URL}/cli/credential"
+    NOTIFY_URL = "#{DeployGate::API::V1::Base::BASE_URL}/cli/notify"
+
+    # @param [Fixnum] port
+    def initialize(port = nil)
+      @port = port || DEFAULT_PORT
+      @login_uri = URI(LOGIN_URL)
+      @login_uri.query = {port: @port, client: 'dg'}.to_query
+
+      @credential_uri = URI(CREDENTIAL_URL)
+      @notify_uri = URI(NOTIFY_URL)
+    end
+
+    def start
+      server = WEBrick::HTTPServer.new(
+          :Port => @port,
+          :BindAddress =>"localhost",
+          :Logger => WEBrick::Log.new(STDOUT, 0),
+          :AccessLog => []
+      )
+
+      begin
+        Signal.trap("INT") { server.shutdown }
+
+        server.mount_proc '/' do |req, res|
+          res.status = WEBrick::HTTPStatus::RC_NO_CONTENT
+
+          cancel = req.query['cancel']
+          notify_key = req.query['key']
+
+          unless cancel
+            credential = get_credential(notify_key)
+            DeployGate::Session.save(credential['name'], credential['token'])
+            notify_finish(notify_key)
+
+            DeployGate::Commands::Login.login_success()
+          end
+
+          server.stop
+        end
+
+        Launchy.open(@login_uri.to_s)
+        server.start
+      ensure
+        server.shutdown
+      end
+    end
+
+    private
+
+    # @param [String] notify_key
+    # @return [Hash]
+    def get_credential(notify_key)
+      res = HTTPClient.new(:agent_name => "dg/#{DeployGate::VERSION}").get(@credential_uri.to_s, {key: notify_key})
+      JSON.parse(res.body)
+    end
+
+    # @param [String] notify_key
+    def notify_finish(notify_key)
+      notify_post(notify_key, 'credential_saved')
+      notify_post(notify_key, 'finished')
+    end
+
+    def notify_post(notify_key, action)
+      HTTPClient.new(:agent_name => "dg/#{DeployGate::VERSION}").post(@notify_uri.to_s, {key: notify_key, command_action: action})
+    end
+  end
+end

data/lib/deploygate/command_builder.rb

@@ -3,6 +3,12 @@ module DeployGate
     include Commander::Methods
     attr_reader :arguments
 
+    LOGIN       = 'login'
+    LOGOUT      = 'logout'
+    DEPLOY      = 'deploy'
+    ADD_DEVICES = 'add-devices'
+    CONFIG      = 'config'
+
     def run
       Signal.trap(:INT){
         puts ''
@@ -16,20 +22,22 @@ module DeployGate
       program :version,  VERSION
       program :description, I18n.t('command_builder.description')
 
-      command :login do |c|
+      command LOGIN do |c|
         c.syntax = 'dg login'
         c.description = I18n.t('command_builder.login.description')
+        c.option '--terminal', I18n.t('command_builder.login.terminal')
         c.action do |args, options|
+          options.default :terminal => false
           begin
-            Commands::Login.run
+            Commands::Login.run(args, options)
           rescue => e
-            error_handling(I18n.t('command_builder.login.error', e: e.class), create_error_issue_body(e))
+            error_handling(LOGIN, e)
             raise e
           end
         end
       end
 
-      command :deploy do |c|
+      command DEPLOY do |c|
         c.syntax = 'dg deploy /path/to/app'
         c.description = I18n.t('command_builder.deploy.description')
         c.option '--message STRING', String, I18n.t('command_builder.deploy.message')
@@ -42,14 +50,14 @@ module DeployGate
           begin
             Commands::Deploy.run(args, options)
           rescue => e
-            error_handling(I18n.t('command_builder.deploy.error', e: e.class), create_error_issue_body(e))
+            error_handling(DEPLOY, e)
             raise e
           end
         end
       end
       alias_command :'push', :deploy
 
-      command 'add-devices' do |c|
+      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')
@@ -60,26 +68,26 @@ module DeployGate
           begin
             Commands::AddDevices.run(args, options)
           rescue => e
-            error_handling(I18n.t('command_builder.add_devices.error', e: e.class), create_error_issue_body(e))
+            error_handling(ADD_DEVICES, e)
             raise e
           end
         end
       end
 
-      command :logout do |c|
+      command LOGOUT do |c|
         c.syntax = 'dg logout'
         c.description = I18n.t('command_builder.logout.description')
         c.action do |args, options|
           begin
             Commands::Logout.run
           rescue => e
-            error_handling(I18n.t('command_builder.logout.error', e: e.class), create_error_issue_body(e))
+            error_handling(LOGOUT, e)
             raise e
           end
         end
       end
 
-      command :config do |c|
+      command CONFIG do |c|
         c.syntax = 'dg config'
         c.description = I18n.t('command_builder.config.description')
         c.option '--json', I18n.t('command_builder.config.json')
@@ -89,7 +97,7 @@ module DeployGate
           begin
             Commands::Config.run(args, options)
           rescue => e
-            error_handling(I18n.t('command_builder.config.error', e: e.class), create_error_issue_body(e))
+            error_handling(CONFIG, e)
             raise e
           end
         end
@@ -116,18 +124,38 @@ deploygate-cli ver #{DeployGate::VERSION}
 EOF
     end
 
-    # @param [String] title
-    # @param [String] body
-    # @param [Array] labels
-    def error_handling(title, body, labels = [])
+    # @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  => body,
-          :labels => labels
+          :body  => create_error_issue_body(error),
       }
-      url = GithubIssueRequest::Url.new(options).to_s
+      GithubIssueRequest::Url.new(options).to_s
+    end
+
+    # @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)
+
       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

data/lib/deploygate/commands/login.rb

@@ -4,14 +4,23 @@ module DeployGate
       class << self
 
         # @return [void]
-        def run
-          start_login_or_create_account()
+        def run(args, options)
+          welcome()
+
+          if options.terminal
+            start_login_or_create_account()
+          else
+            DeployGate::BrowserLogin.new().start()
+          end
         end
 
-        # @return [void]
-        def start_login_or_create_account
+        def welcome
           puts I18n.t('commands.login.start_login_or_create_account.welcome')
           print_deploygate_aa()
+        end
+
+        # @return [void]
+        def start_login_or_create_account
           puts ''
           email = ask(I18n.t('commands.login.start_login_or_create_account.email'))
 
@@ -39,7 +48,10 @@ module DeployGate
             raise e
           end
 
-          # login success
+          login_success()
+        end
+
+        def login_success
           session = Session.new
           puts HighLine.color(I18n.t('commands.login.start.success', name: session.name), HighLine::GREEN)
         end

data/lib/deploygate/version.rb

@@ -1,3 +1,3 @@
 module DeployGate
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deploygate
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - deploygate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -164,6 +164,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gym
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +332,7 @@ files:
 - lib/deploygate/api/v1/session.rb
 - lib/deploygate/api/v1/user.rb
 - lib/deploygate/api/v1/users/app.rb
+- lib/deploygate/browser_login.rb
 - lib/deploygate/command_builder.rb
 - lib/deploygate/commands/add_devices.rb
 - lib/deploygate/commands/config.rb