Merge pull request #38 from DeployGate/feature/v0.0.5

ver 0.0.5

Author: henteko

deploygate.gemspec

@@ -18,10 +18,6 @@ dg installed! To get started fast:
 
   $ dg deploy
 
-Or see the docs at:
-
- https://deploygate.com/docs/cli
-
 POST_INSTALL_MESSAGE
 
   spec.add_dependency 'json', '~> 1.8.2'
@@ -40,6 +36,7 @@ POST_INSTALL_MESSAGE
   spec.add_dependency 'gym', '~> 1.0.0'
   spec.add_dependency 'spaceship', '~> 0.12.3'
   spec.add_dependency 'sigh', '~> 1.1.0'
+  spec.add_dependency 'locale'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

lib/deploygate.rb

@@ -12,6 +12,7 @@
 require "uuid"
 require "gem_update_checker"
 require "active_support/core_ext/time"
+require "locale"
 
 # ios build
 require "gym"
@@ -27,8 +28,9 @@ module DeployGate
 require "deploygate/api/v1/push"
 require "deploygate/api/v1/user"
 require "deploygate/command_builder"
-require "deploygate/commands/init"
+require "deploygate/commands/login"
 require "deploygate/commands/logout"
+require "deploygate/commands/config"
 require "deploygate/commands/deploy"
 require "deploygate/commands/deploy/push"
 require "deploygate/commands/deploy/build"

lib/deploygate/api/v1/session.rb

@@ -6,14 +6,23 @@ class Session
 
         class << self
 
+          # @param [String] token
+          # @return [Hash]
+          def show(token)
+            res = Base.new(token).get(ENDPOINT + '/user', {})
+            return nil if res['error']
+
+            res['results']
+          end
+
           # @param [String] name
           # @param [String] token
           # @return [Boolean]
           def check(name, token)
-            res = Base.new(token).get(ENDPOINT + '/user', {})
-            return false if res['error']
+            results = show(token)
+            return false if results.nil?
 
-            name == res['results']['name']
+            name == results['name']
           end
 
           # @param [String] email

lib/deploygate/api/v1/user.rb

@@ -9,9 +9,10 @@ class << self
           # @param [String] name
           # @param [String] email
           # @param [String] password
+          # @param [String] locale
           # @return [Hash]
-          def create(name, email, password)
-            res = Base.new().post(ENDPOINT, {:name => name, :email => email, :password => password})
+          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'],

lib/deploygate/builds/ios/analyze.rb

@@ -28,6 +28,7 @@ def initialize(workspaces)
           @scheme = project.options[:scheme]
         end
 
+        # Support Xcode7 more
         # @return [String]
         def target_bundle_identifier
           product_name = target_product_name

lib/deploygate/builds/ios/export.rb

@@ -50,17 +50,17 @@ def installed_certificate?(profile_path)
               certificate_str = cert.read
               certificate =  OpenSSL::X509::Certificate.new certificate_str
               id = OpenSSL::Digest::SHA1.new(certificate.to_der).to_s.upcase!
-              installed_identies.include?(id)
+              installed_distribution_certificate_ids.include?(id)
             end
             certs.include?(true)
           end
 
           # @return [Array]
-          def installed_identies
-            available = `security find-identity -v -p codesigning`
+          def installed_distribution_certificate_ids
+            certificates = installed_certificates()
             ids = []
-            available.split("\n").each do |current|
-              next if current.include? "REVOKED"
+            certificates.each do |current|
+              next unless current.match(/iPhone Distribution:/)
               begin
                 (ids << current.match(/.*\) (.*) \".*/)[1])
               rescue
@@ -71,6 +71,43 @@ def installed_identies
             ids
           end
 
+          # @return [Array]
+          def installed_distribution_conflicting_certificates
+            certificates = installed_certificates()
+            names = []
+            certificates.each do |current|
+              begin
+                names << current.match(/(iPhone Distribution:.*)/)[1]
+              rescue
+              end
+            end
+
+            conflicting_names = names.select{|e| names.index(e) != names.rindex(e)}.uniq
+            conflicting_certificates = []
+            certificates.each do |current|
+              begin
+                name = current.match(/(iPhone Distribution:.*)/)[1]
+                next unless conflicting_names.include?(name)
+                conflicting_certificates << current
+              rescue
+              end
+            end
+
+            conflicting_certificates
+          end
+
+          # @return [Array]
+          def installed_certificates
+            available = `security find-identity -v -p codesigning`
+            certificates = []
+            available.split("\n").each do |current|
+              next if current.include? "REVOKED"
+              certificates << current
+            end
+
+            certificates
+          end
+
           # @param [Array] profile_paths
           # @return [String]
           def select_profile(profile_paths)

lib/deploygate/command_builder.rb

@@ -11,14 +11,14 @@ def run
       program :version,  VERSION
       program :description, 'You can control to DeployGate in your terminal.'
 
-      command :init do |c|
-        c.syntax = 'dg init'
-        c.description = 'project initial command'
+      command :login do |c|
+        c.syntax = 'dg login'
+        c.description = 'DeployGate login command'
         c.action do |args, options|
           begin
-            Commands::Init.run
+            Commands::Login.run
           rescue => e
-            error_handling("Commands::Init Error: #{e.class}", create_error_issue_body(e))
+            error_handling("Commands::Login Error: #{e.class}", create_error_issue_body(e))
             raise e
           end
         end
@@ -56,6 +56,22 @@ def run
         end
       end
 
+      command :config do |c|
+        c.syntax = 'dg config'
+        c.description = 'dg user login config'
+        c.option '--json', 'output json format'
+        c.option '--name STRING', String, 'your DeployGate user name'
+        c.option '--token STRING', String, 'your DeployGate api token'
+        c.action do |args, options|
+          begin
+            Commands::Config.run(args, options)
+          rescue => e
+            error_handling("Commands::Config Error: #{e.class}", create_error_issue_body(e))
+            raise e
+          end
+        end
+      end
+
       run!
     end
 

lib/deploygate/commands/config.rb

@@ -0,0 +1,118 @@
+module DeployGate
+  module Commands
+    class Config
+      class << self
+
+        # @param [Array] args
+        # @param [Commander::Command::Options] options
+        def run(args, options)
+          json_format  = options.json
+          name         = options.name
+          token        = options.token
+
+          if name.nil? || token.nil?
+            login_user = DeployGate::Session.new().show_login_user
+            if login_user.nil?
+              print_not_login(json_format)
+            else
+              print_login_user(login_user, json_format)
+            end
+          else
+            login(name, token, json_format)
+          end
+        end
+
+        # @param [String] name
+        # @param [String] token
+        # @param [Boolean] json_format
+        # @return [void]
+        def login(name, token, json_format)
+          if API::V1::Session.check(name, token)
+            DeployGate::Session.save(name, token)
+            login_user = DeployGate::Session.new().show_login_user
+            print_login_success(login_user, json_format)
+          else
+            print_login_failed(json_format)
+          end
+        end
+
+        # @param [Hash] login_user
+        # @param [Boolean] json_format
+        # @return [void]
+        def print_login_success(login_user, json_format)
+          message = 'Login success'
+          data = {:message => message, :error => false}
+
+          unless json_format
+            DeployGate::Message::Success.print(message)
+            puts ''
+          end
+
+          print_login_user(login_user, json_format, data)
+        end
+
+        # @param [Boolean] json_format
+        # @param [Hash] data
+        # @return [void]
+        def print_login_failed(json_format, data = {})
+          message = 'Login failed'
+          data[:error]   = true
+          data[:message] = message
+
+          if json_format
+            print_json(data)
+          else
+            DeployGate::Message::Error.print(message)
+            puts <<EOF
+
+Please check your name and api token.
+EOF
+          end
+        end
+
+        # @param [Boolean] json_format
+        # @param [Hash] data
+        # @return [void]
+        def print_not_login(json_format, data = {})
+          message = 'Not user login'
+          data[:error]   = true
+          data[:message] = message
+
+          if json_format
+            print_json(data)
+          else
+            DeployGate::Message::Warning.print(message)
+            puts <<EOF
+
+Please login to dg command.
+$ dg login
+EOF
+          end
+        end
+
+        # @param [Hash] login_user
+        # @param [Boolean] json_format
+        # @param [Hash] data
+        # @return [void]
+        def print_login_user(login_user, json_format, data = {})
+          data[:error] = data[:error].nil? ? false : data[:error]
+          data[:name]  = login_user['name']
+
+          if json_format
+            print_json(data)
+          else
+            puts <<EOF
+User name: #{data[:name]}
+EOF
+          end
+        end
+
+        # @param [Hash] data
+        # @return [void]
+        def print_json(data)
+          puts data.to_json
+        end
+      end
+    end
+  end
+end

lib/deploygate/commands/deploy.rb

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

lib/deploygate/commands/deploy/build.rb

@@ -12,6 +12,7 @@ def run(args, options)
             work_dir = args.first
 
             if DeployGate::Build.ios?(work_dir)
+              check_local_certificates()
               root_path = DeployGate::Builds::Ios.project_root_path(work_dir)
               workspaces = DeployGate::Builds::Ios.find_workspaces(root_path)
               ios(workspaces, options)
@@ -156,6 +157,38 @@ def print_no_target
 EOF
             DeployGate::Message::Warning.print(message)
           end
+
+          def check_local_certificates
+            if DeployGate::Builds::Ios::Export.installed_distribution_certificate_ids.count == 0
+              # not local install certificate
+              DeployGate::Message::Error.print("Error: Not local install distribution certificate")
+              puts <<EOF
+
+Not local install iPhone Distribution certificates.
+Please install certificate.
+
+Docs: https://developer.apple.com/library/ios/documentation/IDEs/Conceptual/AppDistributionGuide/MaintainingCertificates/MaintainingCertificates.html
+
+EOF
+              exit
+            end
+
+            conflicting_certificates = DeployGate::Builds::Ios::Export.installed_distribution_conflicting_certificates
+            if conflicting_certificates.count > 0
+              DeployGate::Message::Error.print("Error: Conflicting local install certificates")
+              puts <<EOF
+
+Conflicting local install certificates.
+Please uninstall certificates.
+EOF
+              conflicting_certificates.each do |certificate|
+                puts certificate
+              end
+              puts ""
+
+              exit
+            end
+          end
         end
       end
     end