deploygate 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d4e48df0e61daf6cdbeed6389750ea02dc1d47c
-  data.tar.gz: 46dc7c9fd4c536b58aafd09665a5cef09992a366
+  metadata.gz: bcbc0cf5a40dedda39f5a8133e251de4c6c8d955
+  data.tar.gz: 17e3f2da919f53adf2d2506d89a0e9c9c3b6f180
 SHA512:
-  metadata.gz: 8243028a3183bde7dfb72d265fad7d2a18c82be0a1db821b2dd8e34868b34d1621ba57fa31edaddf3418d45a904f6f01045bb5dff44596e34f4de6cd0bdbea3a
-  data.tar.gz: 7534091412ab6ceefd8c7920e10e5d2b5f19c9a47ab104775613582c6e783d889e8c3ff3ec03e88828af42910dff605f1a61398424966abf18e29d994489f3d5
+  metadata.gz: 7f9aac5b243a50fb6978e2fbd4d949dcb8cf89e668072d8d677344e1d052c8d60bcf970f7191ae2ace4d37cb4e63019b456912e8bac2cb3d846db00cb1c850cf
+  data.tar.gz: 0ac60a3e559e6330e0f5e7114e1eda5cbf8e133cdc1775f7d4bcabcd5ab76e512351e3c19f09b67d23ff05af6fc98088c19fe050ef647ca6cae340eacc855e68

data/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"

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

@@ -6,14 +6,23 @@ module DeployGate
 
         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

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

@@ -9,9 +9,10 @@ module DeployGate
           # @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'],

data/lib/deploygate/builds/ios/analyze.rb

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

data/lib/deploygate/builds/ios/export.rb

@@ -50,17 +50,17 @@ module DeployGate
               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 @@ module DeployGate
             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)

data/lib/deploygate/command_builder.rb

@@ -11,14 +11,14 @@ module DeployGate
       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 @@ module DeployGate
         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
 

data/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

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

@@ -12,6 +12,7 @@ module DeployGate
             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 @@ Please run on the root directory of iOS project or specify .apk/.ipa file to dep
 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

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

@@ -12,7 +12,7 @@ module DeployGate
           def upload(args, options)
             session = DeployGate::Session.new()
             unless session.login?
-              Init.login
+              Login.start_login_or_create_account()
               session = DeployGate::Session.new()
             end
 

data/lib/deploygate/commands/deploy.rb

@@ -6,7 +6,7 @@ module DeployGate
         # @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?

data/lib/deploygate/commands/{init.rb → login.rb}

@@ -1,18 +1,17 @@
 module DeployGate
   module Commands
-    class Init
+    class Login
       class << self
 
         # @return [void]
         def run
-          start_login_or_create_account() unless Session.new().login?
-
-          finish
+          start_login_or_create_account()
         end
 
         # @return [void]
         def start_login_or_create_account
           puts 'Welcome to DeployGate!'
+          print_deploygate_aa()
           puts ''
           email = ask("Email: ")
 
@@ -22,7 +21,7 @@ module DeployGate
             puts ''
             password = input_password('Password: ')
             puts ''
-            login(email, password)
+            start(email, password)
           else
             create_account(email)
           end
@@ -31,7 +30,7 @@ module DeployGate
         # @param [String] email
         # @param [String] password
         # @return [void]
-        def login(email, password)
+        def start(email, password)
           begin
             Session.login(email, password)
           rescue Session::LoginError => e
@@ -65,7 +64,7 @@ module DeployGate
             raise 'User create error'
           else
             Message::Success.print('done! Your account has been set up successfully.')
-            login(email, password)
+            start(email, password)
           end
         end
 
@@ -101,9 +100,16 @@ module DeployGate
           ask(message) { |q| q.echo = "*" }
         end
 
-        # @return [void]
-        def finish
-          Message::Success.print('Enjoy development!')
+        def print_deploygate_aa
+          puts <<'EOF'
+         _            _                       _
+        | |          | |                     | |
+      __| | ___  ___ | | ___ _   ,____   ___ | |_ ___
+     / _` |/ _ \' _ \| |/ _ \ \ / / _ \ / _ `| __/ _ \
+    | (_| |  __/ |_) | | (_) \ v / (_| | (_| | |_' __/
+     \___, \___| .__/|_|\___/ ` / \__, |\__,_|\__\___`
+               |_|           /_/  |___/
+EOF
         end
       end
     end

data/lib/deploygate/session.rb

@@ -17,6 +17,10 @@ module DeployGate
       @@login = @@login.nil? ? API::V1::Session.check(@name, @token) : @@login
     end
 
+    def show_login_user
+      API::V1::Session.show(@token)
+    end
+
     # @param [String] email
     # @param [String] password
     # @return [void]

data/lib/deploygate/user.rb

@@ -13,7 +13,8 @@ module DeployGate
     # @param [String] password
     # @return [DeployGate::User]
     def self.create(name, email, password)
-      results = DeployGate::API::V1::User.create(name, email, password)
+      locale = Locale.current.language
+      results = DeployGate::API::V1::User.create(name, email, password, locale)
       return if results[:error]
       DeployGate::User.new(results[:name])
     end

data/lib/deploygate/version.rb

@@ -1,3 +1,3 @@
 module DeployGate
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/deploygate.rb

@@ -12,6 +12,7 @@ require "highline"
 require "uuid"
 require "gem_update_checker"
 require "active_support/core_ext/time"
+require "locale"
 
 # ios build
 require "gym"
@@ -27,8 +28,9 @@ require "deploygate/api/v1/session"
 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"

data/spec/deploygate/api/v1/session_spec.rb

@@ -1,25 +1,24 @@
 describe DeployGate::API::V1::Session do
-  describe "#check" do
+  describe "#show" do
     it "logined" do
       token = 'token'
       name = 'test'
       response = {
           :error => false,
           :because => '',
-          :results => {:name => name}
+          :results => {'name' => name}
       }
       stub_request(:get, "#{API_ENDPOINT}/sessions/user").
           with(:headers => { 'AUTHORIZATION' => token }).
           to_return(:body => response.to_json)
 
 
-      result = DeployGate::API::V1::Session.check(name, token)
-      expect(result).to be_truthy
+      results = DeployGate::API::V1::Session.show(token)
+      expect(results).to eql response[:results]
     end
 
     it "not login" do
       token = 'token'
-      name = 'test'
       response = {
           :error => true,
           :because => 'error message'
@@ -28,6 +27,26 @@ describe DeployGate::API::V1::Session do
           with(:headers => { 'AUTHORIZATION' => token }).
           to_return(:body => response.to_json)
 
+      results = DeployGate::API::V1::Session.show(token)
+      expect(results).to eql response[:results]
+    end
+  end
+  describe "#check" do
+    it "logined" do
+      token = 'token'
+      name = 'test'
+      results = {'name' => name}
+      allow(DeployGate::API::V1::Session).to receive(:show).and_return(results)
+
+      result = DeployGate::API::V1::Session.check(name, token)
+      expect(result).to be_truthy
+    end
+
+    it "not login" do
+      token = 'token'
+      name = 'test'
+      allow(DeployGate::API::V1::Session).to receive(:show).and_return(nil)
+
       result = DeployGate::API::V1::Session.check(name, token)
       expect(result).to be_falsey
     end

data/spec/deploygate/builds/ios/export_spec.rb

@@ -56,4 +56,41 @@ describe DeployGate::Builds::Ios::Export do
       expect(DeployGate::Builds::Ios::Export.inhouse?('path')).to be_falsey
     end
   end
+
+  describe "#installed_distribution_certificate_ids" do
+    before do
+      @distribution_certificate_id = 'distribution_certificate_id'
+      @distribution_certificate = "  1) #{@distribution_certificate_id} \"iPhone Distribution: DeployGate Inc.\""
+      @not_distribution_certificate = "  1) xxxxxxxxxxxxxx \"iPhone Developer: DeployGate Inc.\""
+    end
+    it "not installed distribution certificate" do
+      allow(DeployGate::Builds::Ios::Export).to receive(:installed_certificates).and_return([@not_distribution_certificate])
+      expect(DeployGate::Builds::Ios::Export.installed_distribution_certificate_ids.count).to eql 0
+    end
+
+    it "installed distribution certificate" do
+      allow(DeployGate::Builds::Ios::Export).to receive(:installed_certificates).and_return([@distribution_certificate, @not_distribution_certificate])
+
+      ids = DeployGate::Builds::Ios::Export.installed_distribution_certificate_ids
+      expect(ids).to eql([@distribution_certificate_id])
+    end
+  end
+
+  describe "#installed_distribution_conflicting_certificates" 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.\""
+    end
+
+    it "conflicting" do
+      allow(DeployGate::Builds::Ios::Export).to receive(:installed_certificates).and_return([@distribution_certificate, @distribution_certificate2])
+      expect(DeployGate::Builds::Ios::Export.installed_distribution_conflicting_certificates.count).to eql 2
+    end
+
+    it "not conflicting" do
+      allow(DeployGate::Builds::Ios::Export).to receive(:installed_certificates).and_return([@distribution_certificate, @distribution_certificate3])
+      expect(DeployGate::Builds::Ios::Export.installed_distribution_conflicting_certificates.count).to eql 0
+    end
+  end
 end

data/spec/deploygate/user_spec.rb

@@ -0,0 +1,3 @@
+describe DeployGate::User do
+  # TODO: add test
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deploygate
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - deploygate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -206,6 +206,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: locale
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -290,10 +304,11 @@ files:
 - lib/deploygate/builds/ios/export.rb
 - lib/deploygate/builds/ios/set_profile.rb
 - lib/deploygate/command_builder.rb
+- lib/deploygate/commands/config.rb
 - lib/deploygate/commands/deploy.rb
 - lib/deploygate/commands/deploy/build.rb
 - lib/deploygate/commands/deploy/push.rb
-- lib/deploygate/commands/init.rb
+- lib/deploygate/commands/login.rb
 - lib/deploygate/commands/logout.rb
 - lib/deploygate/config/base.rb
 - lib/deploygate/config/cache_version.rb
@@ -316,6 +331,7 @@ files:
 - spec/deploygate/config/base_spec.rb
 - spec/deploygate/deploy_spec.rb
 - spec/deploygate/session_spec.rb
+- spec/deploygate/user_spec.rb
 - spec/spec_helper.rb
 - spec/test_files/DeployGateSample.apk
 homepage: https://deploygate.com
@@ -328,10 +344,6 @@ post_install_message: |2+
 
     $ dg deploy
 
-  Or see the docs at:
-
-   https://deploygate.com/docs/cli
-
 rdoc_options: []
 require_paths:
 - lib
@@ -347,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A command-line interface for DeployGate
@@ -363,5 +375,6 @@ test_files:
 - spec/deploygate/config/base_spec.rb
 - spec/deploygate/deploy_spec.rb
 - spec/deploygate/session_spec.rb
+- spec/deploygate/user_spec.rb
 - spec/spec_helper.rb
 - spec/test_files/DeployGateSample.apk