gaman 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40a768a67a7739110460fb58aa4c1d24cac884aa
-  data.tar.gz: da2e0c0166ca96bdd4959704255d03e8535badc8
+  metadata.gz: c581bb32b307b6fbdb24c968574ce7fe11d17d21
+  data.tar.gz: b61a1645e5954e84f4088e707fded95ca48cd8d5
 SHA512:
-  metadata.gz: 92e127fa721b6d534570000af39cb85e0a33d9276b9bc49cae078684406b8a3965724d1493fbea639afbe4c9b1c44e0d3ab304e18c9d6b6a031bce803d679fe7
-  data.tar.gz: a91d174a923bbf6f39eec11b0812a19223c0d502030cf25d1fb41c19724683d47fea988cd594a0368ba6e18df0e31b06fc754aeba3123bb676fb6132c7fe41ee
+  metadata.gz: 67b8d2c74000cbad9c98ce945d8139f2ad939ebf7cb8227b411c8d766ec4ea4327d9152837ef149e80a0ae0d168d70a39df3072e1d52b920bc896c1beb5fff11
+  data.tar.gz: 1e8f89881d16ec8a0ebdb419c7b2ca521ba47f71948e0ac7f3f380ed8f90255a0233e4d81d177a986167b3835be5e17359259d8ca940160fbc291188d55dcdc8

data/README.md

@@ -41,6 +41,12 @@ Install as you would any other ruby gem:
 
 And then follow the inline-instruction.
 
+Or
+
+    $ gaman switch key_index
+
+with key_index is a `number` shown in `list` method.
+
 ### Create new ssh key
 
     $ gaman new -e your_email@domain.com
@@ -49,16 +55,19 @@ And then follow the inline-instruction.
 
     $ gaman current_user
 
+### Check Gaman version
+
+    $ gaman -v (or `--version`)
 
 Params: `--server` (or `-s`): github/bitbucket
 
 If there is no param passed, github will be used as default
 
 ## Contributors
-[@at-binhcq](https://github.com/CQBinh) from [AsianTech](http://asiantech.vn) with love.
+[@CQBinh](https://github.com/CQBinh) from [AsianTech](http://asiantech.vn) with love.
 ## Contributing
 
-1. Fork [the project](https://github.com/CQBinh/gaman)
+1. Fork [https://github.com/CQBinh/gaman](https://github.com/CQBinh/gaman)
 2. Create your feature branch (`git checkout -b my-awesome-feature`)
 3. Commit your changes (`git commit -m 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/bin/gaman

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 require 'gaman'
-Gaman::GithubAccountManager.start(ARGV)
+Gaman::GitAccountManager.start(ARGV)

data/gaman.gemspec

@@ -6,11 +6,13 @@ require 'gaman/version'
 Gem::Specification.new do |spec|
   spec.name          = 'gaman'
   spec.version       = Gaman::VERSION
+  spec.platform      = Gem::Platform::RUBY
   spec.authors       = ['CAO Quang Binh']
-  spec.email         = ['binhcq@asiantech.vn']
+  spec.email         = ['binh.cao@appconus.com']
 
-  spec.summary       = 'Github account manager.'
-  spec.description   = 'Switch ssh github'
+  spec.summary       = 'Git Account MANager.'
+  spec.description   = 'Switch git ssh connection'
+  spec.homepage      = 'https://github.com/CQBinh/gaman'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -23,7 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.11.2'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rubocop'
 
   # comment linter directly on pull request
@@ -32,4 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop-checkstyle_formatter'
 
   spec.add_dependency 'thor'
+  spec.add_dependency 'pry'
 end

data/lib/gaman/cli.rb

@@ -4,10 +4,17 @@ require_relative 'messenger'
 require_relative 'file_helper'
 
 module Gaman
-  class GithubAccountManager < Thor
+  class GitAccountManager < Thor
     include Gaman::Messenger
     include Gaman::FileHelper
 
+    desc 'version', 'Show the Gaman version'
+    map %w(-v --version) => :version
+
+    def version
+      puts "Gaman version #{::Gaman::VERSION} on Ruby #{RUBY_VERSION}"
+    end
+
     desc 'current_user', 'Show current github account that ssh connects to'
     long_desc <<-current_user
 
@@ -18,33 +25,22 @@ module Gaman
     current_user
     method_option :server, aliases: '-s'
     def current_user
-      server = options[:server]
-      case server
-      when 'github'
-        check_current_user_github
-      when 'bitbucket'
-        check_current_user_bitbucket
-      else
-        check_current_user_github
-      end
+      check_current_user options.fetch('server', 'github')
     end
 
     desc 'show', 'Show public key so you can copy to clipboard'
     def show
-      system('eval "$(ssh-agent -s)"')
-      ssh_keys = all_public_ssh_file
-      if ssh_keys.nil?
-        error_message('There is no ssh key to show. Exiting...')
-      else
-        get_user_input_number_and_then_show(ssh_keys)
+      eval_ssh_agent_s
+
+      get_user_input_number(all_public_ssh_file) do |number, ssh_keys|
+        show_ssh_key(number, ssh_keys)
       end
     end
 
     desc 'list', 'Check list ssh keys on machine'
     def list
       notice_message('Checking ssh keys in your machine...')
-      ssh_keys = all_public_ssh_file
-      display_ssh_keys(ssh_keys)
+      display_ssh_keys(all_public_ssh_file)
     end
 
     desc 'new', 'Generate new ssh key'
@@ -53,37 +49,81 @@ module Gaman
       system("ssh-keygen -t rsa -b 4096 -C #{options[:email]}")
     end
 
-    desc 'switch', 'Switch to another ssh key'
-    def switch
-      system('eval "$(ssh-agent -s)"')
-      ssh_keys = all_public_ssh_file
-      if ssh_keys.nil?
-        error_message('There is no ssh key to switch. Exiting...')
+    desc 'switch', 'Switch to another ssh key (pass key_index to directly switch)'
+    long_desc <<-switch
+
+    Params: key_index: key index from "list" method
+
+    switch
+    def switch(key_index = nil)
+      if key_index.nil?
+        switch_by_showing_list_keys
       else
-        get_user_input_number_and_then_check_switch(ssh_keys)
+        switch_by_key_index(key_index.to_i)
       end
     end
 
+    no_commands{
+      def display_ssh_keys(ssh_keys)
+        fail ArgumentError, 'ssh_keys must be an Array' unless ssh_keys.is_a? Array
+
+        notice_message('You have no ssh key.') if ssh_keys.empty?
+
+        ssh_keys.each_with_index do |key, index|
+          puts "[#{Rainbow(index).underline.bright.cyan}] - #{key}"
+        end
+      end
+    }
+
     private
 
+    def switch_by_key_index(key_index)
+      ssh_keys = all_public_ssh_file
+      return error_message('There are no ssh keys. Exiting...') if ssh_keys.empty?
+      check_number_and_yield_if_valid(key_index, ssh_keys) do |number, ssh_keys|
+        switch_ssh_key(number, ssh_keys)
+      end
+    end
+
+    def switch_by_showing_list_keys
+      eval_ssh_agent_s
+
+      get_user_input_number(all_public_ssh_file) do |number, ssh_keys|
+        switch_ssh_key(number, ssh_keys)
+      end
+    end
+
+    def eval_ssh_agent_s
+      system('eval "$(ssh-agent -s)"')
+    end
+
     def all_public_ssh_file
       if File.exist?(ssh_path)
-        files = Dir.entries(ssh_path)
-        files = files.select { |f| f.include?('.pub') && files.include?(f[0..-5]) }
-        files
+        Dir["#{ssh_path}/*.pub"]
       else
         notice_message('You have no ssh key. To create new one, run this command:')
         puts Rainbow('$ gaman new -e your_email@domain.com').blue
-        nil
+        []
       end
     end
 
-    def get_user_input_number_and_then_check_switch(ssh_keys)
-      notice_message('Current ssh keyson your system:')
+    def get_user_input_number(ssh_keys)
+      return error_message('There are no ssh keys. Exiting...') if ssh_keys.empty?
+
+      notice_message('Current ssh keys on your system:')
       message = 'Which key do you want to switch? [Input number]'
       number = input_number(ssh_keys, message)
       if number_valid?(number, ssh_keys)
-        perform_switch_ssh_key(number, ssh_keys)
+        block_given? ? yield(number, ssh_keys) : [number, ssh_keys]
+      else
+        error_message('Wrong value. Exiting...')
+      end
+      # check_number_and_yield_if_valid(number, ssh_keys)
+    end
+
+    def check_number_and_yield_if_valid(number, ssh_keys)
+      if number_valid?(number, ssh_keys)
+        block_given? ? yield(number, ssh_keys) : [number, ssh_keys]
       else
         error_message('Wrong value. Exiting...')
       end
@@ -103,42 +143,23 @@ module Gaman
       !number.nil? && number >= 0 && number <= ssh_keys.size - 1
     end
 
-    def perform_switch_ssh_key(number, ssh_keys)
-      key = ssh_keys[number]
-      key_path = "#{ssh_path}/#{key[0..-5]}"
+    def switch_ssh_key(number, ssh_keys)
+      key = ssh_keys[number][0..-5]
       system('ssh-add -D')
-      notice_message("Adding #{key_path}")
-      system("ssh-add #{key_path}")
+      notice_message("Adding #{key}")
+      system("ssh-add #{key}")
       current_user
     end
 
-    def check_current_user_github
-      notice_message('Checking ssh conection to github...')
-      check_ssh_github = 'ssh -T git@github.com'
-      system(check_ssh_github)
-    end
-
-    def check_current_user_bitbucket
-      notice_message('Checking ssh conection to bitbucket...')
-      check_ssh_github = 'ssh -T git@bitbucket.org'
-      system(check_ssh_github)
-    end
-
-    def get_user_input_number_and_then_show(ssh_keys)
-      notice_message('Current ssh keyson your system:')
-      message = 'Which key do you want to show? [Input number]'
-      number = input_number(ssh_keys, message)
-      if number_valid?(number, ssh_keys)
-        perform_show_ssh_key(number, ssh_keys)
-      else
-        error_message('Wrong value. Exiting...')
-      end
+    def check_current_user(server)
+      servers = { 'github' => 'github.com', 'bitbucket' => 'bitbucket.org' }
+      notice_message("Checking ssh conection to #{server}...")
+      system("ssh -T git@#{servers[server]}")
     end
 
-    def perform_show_ssh_key(number, ssh_keys)
+    def show_ssh_key(number, ssh_keys)
       key = ssh_keys[number]
-      key_path = "#{ssh_path}/#{key}"
-      system("cat #{key_path}")
+      system("cat #{key}")
     end
   end
 end

data/lib/gaman/messenger.rb

@@ -7,16 +7,5 @@ module Gaman
     def error_message(message)
       puts Rainbow(message).red
     end
-
-    def display_ssh_keys(ssh_keys)
-      if ssh_keys.nil?
-        notice_message('You have no ssh key.')
-      else
-        fail ArgumentError, 'ssh_keys must be an Array' unless ssh_keys.class.eql? Array
-        ssh_keys.each_with_index do |key, index|
-          puts "[#{Rainbow(index).underline.bright.cyan}] - #{key}"
-        end
-      end
-    end
   end
 end

data/lib/gaman/version.rb

@@ -1,3 +1,3 @@
 module Gaman
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'.freeze
 end

data/spec/file_helper_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'gaman/file_helper'
 
 RSpec.describe 'FileHelper' do
-  let(:gaman) { Gaman::GithubAccountManager.new }
+  let(:gaman) { Gaman::GitAccountManager.new }
 
   context 'ssh_path' do
     it 'right ssh path' do

data/spec/messenger_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 require 'gaman/messenger'
 
 RSpec.describe 'Messenger' do
-  let(:gaman) { Gaman::GithubAccountManager.new }
+  let(:gaman) { Gaman::GitAccountManager.new }
 
   context 'display_ssh_keys' do
-    it 'notice when nil ssh_keys passed' do
-      expect { gaman.display_ssh_keys(nil) }.to output(/no ssh key/).to_stdout
+    it 'notice when empty array passed' do
+      expect { gaman.display_ssh_keys([]) }.to output(/no ssh key/).to_stdout
     end
 
     it 'raise ArgumentError when ssh_keys are not Array' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gaman
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - CAO Quang Binh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: saddler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: saddler
+  name: saddler-reporter-github
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: saddler-reporter-github
+  name: rubocop-checkstyle_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,13 +123,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-checkstyle_formatter
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -150,9 +150,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Switch ssh github
+description: Switch git ssh connection
 email:
-- binhcq@asiantech.vn
+- binh.cao@appconus.com
 executables:
 - checker.sh
 - console
@@ -187,7 +187,7 @@ files:
 - spec/gaman_spec.rb
 - spec/messenger_spec.rb
 - spec/spec_helper.rb
-homepage: 
+homepage: https://github.com/CQBinh/gaman
 licenses:
 - MIT
 metadata: {}
@@ -207,10 +207,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Github account manager.
+summary: Git Account MANager.
 test_files:
 - spec/file_helper_spec.rb
 - spec/gaman_spec.rb