deploygate 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c7a9d3a21ab949bc31c5c7193684a256bf72515
-  data.tar.gz: a373351cda7d9ea2a43aa1bbb56aa7760c1d7a0c
+  metadata.gz: 4d4e48df0e61daf6cdbeed6389750ea02dc1d47c
+  data.tar.gz: 46dc7c9fd4c536b58aafd09665a5cef09992a366
 SHA512:
-  metadata.gz: 810651a47faf6673824a467c50ec396983e227d2394edd286f1fb967c58f6e76f653fb764caead90b094f71545cfc9bb2f9687383cfe29e3623a958d5e3872f3
-  data.tar.gz: d45e2210454cea075b77415f7a6bf8be863667bfcbd4bda275c5e9eb2cb1b05b57e12d38db91cfb2e5a855dd2b911625928ac44700775c387fdc4b105ccd1a92
+  metadata.gz: 8243028a3183bde7dfb72d265fad7d2a18c82be0a1db821b2dd8e34868b34d1621ba57fa31edaddf3418d45a904f6f01045bb5dff44596e34f4de6cd0bdbea3a
+  data.tar.gz: 7534091412ab6ceefd8c7920e10e5d2b5f19c9a47ab104775613582c6e783d889e8c3ff3ec03e88828af42910dff605f1a61398424966abf18e29d994489f3d5

data/deploygate.gemspec

@@ -33,6 +33,8 @@ POST_INSTALL_MESSAGE
   spec.add_dependency 'github_issue_request', '~> 0.0.2'
   spec.add_dependency 'highline', '~> 1.7.8'
   spec.add_dependency 'uuid', '~> 2.3.8'
+  spec.add_dependency 'gem_update_checker', '~> 0.2.0'
+  spec.add_dependency 'activesupport', '~> 4.2.4'
 
   # ios build
   spec.add_dependency 'gym', '~> 1.0.0'

data/lib/deploygate.rb

@@ -10,6 +10,8 @@ require "find"
 require "github_issue_request"
 require "highline"
 require "uuid"
+require "gem_update_checker"
+require "active_support/core_ext/time"
 
 # ios build
 require "gym"
@@ -23,20 +25,25 @@ end
 require "deploygate/api/v1/base"
 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/logout"
 require "deploygate/commands/deploy"
 require "deploygate/commands/deploy/push"
 require "deploygate/commands/deploy/build"
-require "deploygate/config"
+require "deploygate/config/base"
+require "deploygate/config/credential"
+require "deploygate/config/cache_version"
 require "deploygate/session"
 require "deploygate/deploy"
 require "deploygate/build"
+require "deploygate/user"
 require "deploygate/builds/ios"
 require "deploygate/builds/ios/export"
 require "deploygate/builds/ios/analyze"
 require "deploygate/builds/ios/set_profile"
 require "deploygate/message/error"
 require "deploygate/message/success"
+require "deploygate/message/warning"
 require "deploygate/version"

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

@@ -0,0 +1,43 @@
+module DeployGate
+  module API
+    module V1
+      class User
+
+        ENDPOINT = '/users'
+
+        class << self
+          # @param [String] name
+          # @param [String] email
+          # @param [String] password
+          # @return [Hash]
+          def create(name, email, password)
+            res = Base.new().post(ENDPOINT, {:name => name, :email => email, :password => password})
+
+            user_create_results = {
+                :error => res['error'],
+                :message => res['because']
+            }
+
+            results = res['results']
+            unless results.nil?
+              user_create_results.merge!({
+                                       :name => results['user']['name'],
+                                       :token => results['api_token']
+                                   })
+            end
+
+            user_create_results
+          end
+
+          # @param [String] name
+          # @param [String] email
+          # @return [Boolean]
+          def registered?(name, email)
+            res = Base.new().get("#{ENDPOINT}/registered", {:name => name, :email => email})
+            res['results']['registered']
+          end
+        end
+      end
+    end
+  end
+end

data/lib/deploygate/command_builder.rb

@@ -5,6 +5,7 @@ module DeployGate
 
     def run
       GithubIssueRequest::Url.config('deploygate', 'deploygate-cli')
+      check_update()
 
       program :name, 'dg'
       program :version,  VERSION
@@ -17,7 +18,7 @@ module DeployGate
           begin
             Commands::Init.run
           rescue => e
-            error_handling("Commands::Init Error: #{e.class}", create_error_issue_body(e), ['bug', 'Init'])
+            error_handling("Commands::Init Error: #{e.class}", create_error_issue_body(e))
             raise e
           end
         end
@@ -35,7 +36,7 @@ module DeployGate
           begin
             Commands::Deploy.run(args, options)
           rescue => e
-            error_handling("Commands::Deploy Error: #{e.class}", create_error_issue_body(e), ['bug', 'Deploy'])
+            error_handling("Commands::Deploy Error: #{e.class}", create_error_issue_body(e))
             raise e
           end
         end
@@ -49,7 +50,7 @@ module DeployGate
           begin
             Commands::Logout.run
           rescue => e
-            error_handling("Commands::Logout Error: #{e.class}", create_error_issue_body(e), ['bug', 'Logout'])
+            error_handling("Commands::Logout Error: #{e.class}", create_error_issue_body(e))
             raise e
           end
         end
@@ -62,6 +63,10 @@ module DeployGate
     # @return [String]
     def create_error_issue_body(error)
       return <<EOF
+
+# Status
+deploygate-cli ver #{DeployGate::VERSION}
+
 # Error message
 #{error.message}
 
@@ -75,11 +80,11 @@ EOF
     # @param [String] title
     # @param [String] body
     # @param [Array] labels
-    def error_handling(title, body, labels)
+    def error_handling(title, body, labels = [])
       options = {
           :title => title,
           :body  => body,
-          :labels => labels.push("v#{DeployGate::VERSION}")
+          :labels => labels
       }
       url = GithubIssueRequest::Url.new(options).to_s
       puts ''
@@ -89,5 +94,59 @@ EOF
       end
       puts ''
     end
+
+    # @return [void]
+    def check_update
+      current_version = DeployGate::VERSION
+
+      # check cache
+      if DeployGate::Config::CacheVersion.exist?
+        data = DeployGate::Config::CacheVersion.read
+        if Time.parse(data['check_date']) > 1.day.ago
+          # cache available
+          latest_version = data['latest_version']
+          if Gem::Version.new(latest_version) > Gem::Version.new(current_version)
+            show_update_message(latest_version)
+          end
+        else
+          request_gem_update_checker
+        end
+      else
+        request_gem_update_checker
+      end
+    end
+
+    # @return [void]
+    def request_gem_update_checker
+      gem_name = DeployGate.name.downcase
+      current_version = DeployGate::VERSION
+
+      checker = GemUpdateChecker::Client.new(gem_name, current_version)
+      if checker.update_available
+        show_update_message(checker.latest_version)
+      end
+      cache_data = {
+          :latest_version => checker.latest_version,
+          :check_date => Time.now
+      }
+      DeployGate::Config::CacheVersion.write(cache_data)
+    end
+
+    # @param [String] latest_version
+    # @return [void]
+    def show_update_message(latest_version)
+      gem_name = DeployGate.name.downcase
+      current_version = DeployGate::VERSION
+      update_message =<<EOF
+
+#################################################################
+# #{gem_name} #{latest_version} is available. You are on #{current_version}.
+# It is recommended to use the latest version.
+# Update using 'gem update #{gem_name}'.
+#################################################################
+
+EOF
+      DeployGate::Message::Warning.print(update_message)
+    end
   end
 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.login unless DeployGate::Session.new.login?
+          Init.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/deploy/build.rb

@@ -17,6 +17,9 @@ module DeployGate
               ios(workspaces, options)
             elsif DeployGate::Build.android?(work_dir)
               # TODO: support android build
+              print_no_target
+            else
+              print_no_target
             end
           end
 
@@ -55,6 +58,8 @@ module DeployGate
               ipa_path = DeployGate::Builds::Ios.build(analyze, target_scheme, codesigning_identity, method)
             rescue => e
               # TODO: build error handling
+              use_xcode_path = `xcode-select -p`
+              DeployGate::Message::Error.print("Current Xcode used to build: #{use_xcode_path} (via xcode-select)")
               raise e
             end
 
@@ -141,6 +146,16 @@ EOF
 
             DeployGate::Builds::Ios::Export.select_profile(provisioning_profiles)
           end
+
+          def print_no_target
+            message = <<EOF
+
+No deploy target found.
+Please run on the root directory of iOS project or specify .apk/.ipa file to deploy.
+
+EOF
+            DeployGate::Message::Warning.print(message)
+          end
         end
       end
     end

data/lib/deploygate/commands/init.rb

@@ -5,21 +5,33 @@ module DeployGate
 
         # @return [void]
         def run
-          login unless Session.new().login?
+          start_login_or_create_account() unless Session.new().login?
 
           finish
         end
 
         # @return [void]
-        def login
+        def start_login_or_create_account
           puts 'Welcome to DeployGate!'
           puts ''
-          print 'Email: '
-          email= STDIN.gets.chop
-          print 'Password: '
-          password = STDIN.noecho(&:gets).chop
+          email = ask("Email: ")
+
           puts ''
+          puts 'Checking for your account...'
+          if DeployGate::User.registered?('', email)
+            puts ''
+            password = input_password('Password: ')
+            puts ''
+            login(email, password)
+          else
+            create_account(email)
+          end
+        end
 
+        # @param [String] email
+        # @param [String] password
+        # @return [void]
+        def login(email, password)
           begin
             Session.login(email, password)
           rescue Session::LoginError => e
@@ -34,6 +46,61 @@ module DeployGate
           Message::Success.print("Hello #{session.name}!")
         end
 
+        # @param [String] email
+        # @return [void]
+        def create_account(email)
+          puts "Looks new to DeployGate. Let's set up your account, just choose your username and password."
+          puts ''
+
+          name = input_new_account_name()
+          puts ''
+
+          password = input_new_account_password()
+          puts ''
+
+          print 'Creating your account... '
+          if DeployGate::User.create(name, email, password).nil?
+            Message::Error.print('User create error')
+            Message::Error.print('Please try again')
+            raise 'User create error'
+          else
+            Message::Success.print('done! Your account has been set up successfully.')
+            login(email, password)
+          end
+        end
+
+        # @return [String]
+        def input_new_account_name
+          user_name = ask("Username: " )
+          print 'Checking for availability... '
+
+          if DeployGate::User.registered?(user_name, '')
+            Message::Error.print("Bad, #{user_name} is already used. Please try again.")
+            return input_new_account_name()
+          else
+            Message::Success.print("Good, #{user_name} is available.")
+            return user_name
+          end
+        end
+
+        # @return [String]
+        def input_new_account_password
+          password = input_password('Password: ')
+          secound_password = input_password('Type the same password: ')
+
+          if password == secound_password
+            return password
+          else
+            Message::Error.print("Password Please enter the same thing.")
+            return input_new_account_password()
+          end
+        end
+
+        # @return [String]
+        def input_password(message)
+          ask(message) { |q| q.echo = "*" }
+        end
+
         # @return [void]
         def finish
           Message::Success.print('Enjoy development!')

data/lib/deploygate/config/base.rb

@@ -0,0 +1,36 @@
+module DeployGate
+  module Config
+    class Base
+      class << self
+        def file_path
+          # Please override this method
+          raise NotImplementedError.new("You must implement #{self.class}##{__method__}")
+        end
+
+        # @param [Hash] config
+        # @return [void]
+        def write(config)
+          FileUtils.mkdir_p(File.dirname(file_path))
+
+          data = JSON.generate(config)
+          file = File.open(file_path, "w+")
+          file.print data
+          file.close
+        end
+
+        # @return [Hash]
+        def read
+          file = File.open(file_path)
+          data = file.read
+          file.close
+          JSON.parse(data)
+        end
+
+        # @return [Boolean]
+        def exist?
+          File.exist?(file_path)
+        end
+      end
+    end
+  end
+end

data/lib/deploygate/config/cache_version.rb

@@ -0,0 +1,12 @@
+module DeployGate
+  module Config
+    class CacheVersion < Base
+      class << self
+        # @return [String]
+        def file_path
+          File.join(ENV["HOME"], '.dg/version')
+        end
+      end
+    end
+  end
+end

data/lib/deploygate/config/credential.rb

@@ -0,0 +1,12 @@
+module DeployGate
+  module Config
+    class Credential < Base
+      class << self
+        # @return [String]
+        def file_path
+          File.join(ENV["HOME"], '.dg/credentials')
+        end
+      end
+    end
+  end
+end

data/lib/deploygate/message/warning.rb

@@ -0,0 +1,12 @@
+module DeployGate
+  module Message
+    class Warning
+      class << self
+        def print(message)
+          CE.once.ch :yellow
+          puts message
+        end
+      end
+    end
+  end
+end

data/lib/deploygate/session.rb

@@ -38,7 +38,7 @@ module DeployGate
           :name => name,
           :token => token
       }
-      Config.write(settings)
+      Config::Credential.write(settings)
     end
 
     # @return [void]
@@ -51,8 +51,8 @@ module DeployGate
 
     # @return [void]
     def load_setting
-      return unless Config.exist?
-      settings = Config.read
+      return unless Config::Credential.exist?
+      settings = Config::Credential.read
       @name = settings['name']
       @token = settings['token']
     end

data/lib/deploygate/user.rb

@@ -0,0 +1,28 @@
+module DeployGate
+  class User
+    attr_reader :name
+
+    # @param [String] name
+    # @return [DeployGate::User]
+    def initialize(name)
+      @name = name
+    end
+
+    # @param [String] name
+    # @param [String] email
+    # @param [String] password
+    # @return [DeployGate::User]
+    def self.create(name, email, password)
+      results = DeployGate::API::V1::User.create(name, email, password)
+      return if results[:error]
+      DeployGate::User.new(results[:name])
+    end
+
+    # @param [String] name
+    # @param [String] email
+    # @return [Boolean]
+    def self.registered?(name, email)
+      DeployGate::API::V1::User.registered?(name, email)
+    end
+  end
+end

data/lib/deploygate/version.rb

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

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

@@ -0,0 +1,58 @@
+describe DeployGate::API::V1::User do
+  describe "#create" do
+    it "success" do
+      name = 'test'
+      email = 'email'
+      password = 'password'
+      token = 'token'
+      response = {
+          :error => false,
+          :because => '',
+          :results => {
+              :user => {:name => name},
+              :api_token => token
+          }
+      }
+      stub_request(:post, "#{API_ENDPOINT}/users").
+          to_return(:body => response.to_json)
+
+      results = DeployGate::API::V1::User.create(name, email, password)
+      expect(results).to eq({
+                                :error => response[:error],
+                                :message => response[:because],
+                                :name => name,
+                                :token => token
+                            })
+    end
+  end
+
+  describe "#registered?" do
+    it "registered" do
+      name = 'test'
+      response = {
+          :error => false,
+          :because => '',
+          :results => {:registered => true}
+      }
+      stub_request(:get, "#{API_ENDPOINT}/users/registered?email=&name=#{name}").
+          to_return(:body => response.to_json)
+
+      result = DeployGate::API::V1::User.registered?(name, '')
+      expect(result).to be_truthy
+    end
+
+    it "not registered" do
+      name = 'test'
+      response = {
+          :error => false,
+          :because => '',
+          :results => {:registered => false}
+      }
+      stub_request(:get, "#{API_ENDPOINT}/users/registered?email=&name=#{name}").
+          to_return(:body => response.to_json)
+
+      result = DeployGate::API::V1::User.registered?(name, '')
+      expect(result).to be_falsey
+    end
+  end
+end

data/spec/deploygate/{config_spec.rb → config/base_spec.rb}

@@ -1,4 +1,8 @@
-describe DeployGate::Config do
+describe DeployGate::Config::Base do
+  before do
+    allow(DeployGate::Config::Base).to receive(:file_path).and_return(File.join(SPEC_FILE_PATH, 'test_files/.dg/base'))
+  end
+
   describe "#write" do
     it "write data" do
       write_data = {
@@ -6,9 +10,9 @@ describe DeployGate::Config do
           :token => 'token'
       }
       allow(File).to receive(:open).and_return(StringIO.new("", "w+"))
-      DeployGate::Config.write(write_data)
+      DeployGate::Config::Base.write(write_data)
 
-      file = File.open(DeployGate::Config.file_path)
+      file = File.open(DeployGate::Config::Base.file_path)
       expect(file.string).to eq(write_data.to_json.to_s)
     end
   end
@@ -20,7 +24,7 @@ describe DeployGate::Config do
           :token => 'token'
       }.to_json.to_s
       allow(File).to receive(:open).and_return(StringIO.new(write_data))
-      data = DeployGate::Config.read
+      data = DeployGate::Config::Base.read
 
       expect(data).to eq(JSON.parse(write_data))
     end

data/spec/deploygate/session_spec.rb

@@ -48,7 +48,7 @@ describe DeployGate::Session do
           :token => 'token'
       }
       call_config_write_and_fix_config = false
-      allow(DeployGate::Config).to receive(:write) { |c| call_config_write_and_fix_config = c == config_data}
+      allow(DeployGate::Config::Credential).to receive(:write) { |c| call_config_write_and_fix_config = c == config_data}
 
 
       DeployGate::Session.save(config_data[:name], config_data[:token])

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ require "deploygate"
 RSpec.configure do |config|
   config.before :each do
     # config file mock
-    allow(DeployGate::Config).to receive(:file_path).and_return(File.join(SPEC_FILE_PATH, 'test_files/.dg/credentials'))
+    allow(DeployGate::Config::Credential).to receive(:file_path).and_return(File.join(SPEC_FILE_PATH, 'test_files/.dg/credentials'))
     # config dir mock
     allow(FileUtils).to receive(:mkdir_p) {}
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deploygate
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - deploygate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -136,6 +136,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.8
+- !ruby/object:Gem::Dependency
+  name: gem_update_checker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.4
 - !ruby/object:Gem::Dependency
   name: gym
   requirement: !ruby/object:Gem::Requirement
@@ -255,6 +283,7 @@ files:
 - lib/deploygate/api/v1/base.rb
 - lib/deploygate/api/v1/push.rb
 - lib/deploygate/api/v1/session.rb
+- lib/deploygate/api/v1/user.rb
 - lib/deploygate/build.rb
 - lib/deploygate/builds/ios.rb
 - lib/deploygate/builds/ios/analyze.rb
@@ -266,20 +295,25 @@ files:
 - lib/deploygate/commands/deploy/push.rb
 - lib/deploygate/commands/init.rb
 - lib/deploygate/commands/logout.rb
-- lib/deploygate/config.rb
+- lib/deploygate/config/base.rb
+- lib/deploygate/config/cache_version.rb
+- lib/deploygate/config/credential.rb
 - lib/deploygate/deploy.rb
 - lib/deploygate/message/error.rb
 - lib/deploygate/message/success.rb
+- lib/deploygate/message/warning.rb
 - lib/deploygate/session.rb
+- lib/deploygate/user.rb
 - lib/deploygate/version.rb
 - spec/deploygate/api/v1/push_spec.rb
 - spec/deploygate/api/v1/session_spec.rb
+- spec/deploygate/api/v1/user_spec.rb
 - spec/deploygate/build_spec.rb
 - spec/deploygate/builds/ios/analyze_spec.rb
 - spec/deploygate/builds/ios/export_spec.rb
 - spec/deploygate/builds/ios/set_profile_spec.rb
 - spec/deploygate/builds/ios_spec.rb
-- spec/deploygate/config_spec.rb
+- spec/deploygate/config/base_spec.rb
 - spec/deploygate/deploy_spec.rb
 - spec/deploygate/session_spec.rb
 - spec/spec_helper.rb
@@ -320,12 +354,13 @@ summary: A command-line interface for DeployGate
 test_files:
 - spec/deploygate/api/v1/push_spec.rb
 - spec/deploygate/api/v1/session_spec.rb
+- spec/deploygate/api/v1/user_spec.rb
 - spec/deploygate/build_spec.rb
 - spec/deploygate/builds/ios/analyze_spec.rb
 - spec/deploygate/builds/ios/export_spec.rb
 - spec/deploygate/builds/ios/set_profile_spec.rb
 - spec/deploygate/builds/ios_spec.rb
-- spec/deploygate/config_spec.rb
+- spec/deploygate/config/base_spec.rb
 - spec/deploygate/deploy_spec.rb
 - spec/deploygate/session_spec.rb
 - spec/spec_helper.rb

data/lib/deploygate/config.rb

@@ -1,35 +0,0 @@
-module DeployGate
-  class Config
-    class << self
-
-      # @return [String]
-      def file_path
-        File.join(ENV["HOME"], '.dg/credentials')
-      end
-
-      # @param [Hash] config
-      # @return [void]
-      def write(config)
-        FileUtils.mkdir_p(File.dirname(file_path))
-
-        data = JSON.generate(config)
-        file = File.open(file_path, "w+")
-        file.print data
-        file.close
-      end
-
-      # @return [Hash]
-      def read
-        file = File.open(file_path)
-        data = file.read
-        file.close
-        JSON.parse(data)
-      end
-
-      # @return [Boolean]
-      def exist?
-        File.exist?(file_path)
-      end
-    end
-  end
-end