am 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d2e53ad6a321f7951f515ed2300015b68e4c781
-  data.tar.gz: 55d4870231f2333634c71dd4af4347c00de77c4a
+  metadata.gz: 315f5f6dd4042ccb59e3857fbdaf45963aa322b3
+  data.tar.gz: 1c91d2a92c83210ded459f4b0f86a6f4aef340ca
 SHA512:
-  metadata.gz: e1ebc90929226e09fb9598c15edd8e0ea96ed399e1b0256a45b8291f3c4244272bd363e76a6d3ea05eec895b5e3c99bcc1c5ac13f914746d7cd60f790ff2a3fc
-  data.tar.gz: 8f21b5cd9c8da7c896a08a8c7d26762ebaef517cbb67b50112382a2d5bef5d4604b7380dbf1d3a7105abb1e649cc90315a85580b14553ea200361bbbca1c7863
+  metadata.gz: bc38956ce7f0e3c1265c13bbf8ed64da4700266e0c72fa96d9b7b2f6d9f63b71dbdff05621dc7d34604f383af2f62c7a8b00f369991ed4e0f842b152fcdd5f42
+  data.tar.gz: 11c2ad7c640b968e598d1e4c76379add8b5f6cd0b10494e81eb660571a4ae4cd194d65286b83071086178ceadbf8c205f0708f76f7297169810dfcca9e266d3d

data/README.md

@@ -11,6 +11,7 @@
 ## Usage
 
 * zsh user
+
 run this command
 ```
 echo 'source ~/.am_config'  >> ~/.zprofile
@@ -31,7 +32,7 @@ shopt -u histappend
 export HISTSIZE=9999
 ```
 
-run this commnad
+run this command
 
 ```
 echo 'source ~/.am_config' >> ~/.bash_profile
@@ -55,7 +56,7 @@ echo 'source ~/.am_config' >> ~/.bash_profile
     delete alias select from current config
 
 ### configure
-  * defoult alias
+  * default alias
   ```
   aml = source ~/.am_config
   ```

data/lib/am/cli.rb

@@ -18,6 +18,7 @@ module AM
       super
       @config  = Config.new
       @ui      = Ui.new
+      @tail    = Tail.new(@config)
     end
 
     desc "show", "show current alias"
@@ -30,50 +31,39 @@ module AM
     end
 
     desc "add", "add alias"
-    option :list, :type => :boolean, :aliases => '-l'
     def add
-      tail = Tail.new(@config)
+      commands = @tail.get_last_command
 
-      # registeration from history choice
-      if options[:list]
-        commands = tail.get_last_five_command
-        @ui.print_last_commands(commands)
-        new_alias = @ui.add_command_with_number(commands)
+      error(:not_exists_history_record) if commands.nil?
 
-      # registeration from last history
-      else
-        last_command = tail.get_last_command
-        new_alias   = @ui.add_command_with_last_history(last_command)
-      end
+      @ui.print_last_commands(commands)
+      new_alias = @ui.add_command_with_number(commands)
 
-      if uniq?(new_alias) && valid?(new_alias)
-        @config.add_config(new_alias)
+      unless new_alias
+        add
+      else
+        if uniq?(new_alias)
+          @config.add_config(new_alias)
+        end
       end
     end
 
     desc "del", "delete alias"
-    option :list, :type => :boolean, :aliases => '-l'
-    def del(delete_alias=nil)
-      if @config.al.empty?
-        notice(:config_empty)
-        exit
-      end
-
-      if options[:list] || delete_alias == nil
-        # convert array
+    def del
+      unless @config.al.empty?
         arr =  @ui.print_current_config(@config)
         delete_alias = @ui.del_command_with_number(arr)
-      end
-      if delete_alias && @config.al.key?(delete_alias)
-        @config.al.delete(delete_alias)
+
+        if delete_alias && @config.al.key?(delete_alias)
+          @config.al.delete(delete_alias)
+          @config.delete_config(delete_alias)
+        else
+          warning(:empty_config_number)
+          del
+        end
       else
-        warning(:empty_config_number)
-        self.del
+        notice(:config_empty)
       end
-      @config.delete_config(delete_alias)
-    end
-
-    no_commands do
     end
   end
 end

data/lib/am/version.rb

@@ -1,3 +1,3 @@
 module Am
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/am.rb

@@ -1,18 +1,11 @@
-# encoding: utf-8 
+# encoding: utf-8
 require "am/version"
 require "am/cli"
-module AM 
+module AM
 
   CONFIG_FILE = File.expand_path('~/.am_config')
   LOCAL_FILE  = File.expand_path('~/.am_local_config')
   ALIAS       = 0
   COMMAND     = 1
-
-  def self.p1(message="")
-    puts "\n#{message}"
-  end
-
-  def self.p2(message="")
-    puts "#{message}\n\n"
-  end
+  TAIL_LINE = 10
 end

data/lib/config.rb

@@ -14,7 +14,7 @@ module AM
     def load_config
       @al = file_load(CONFIG_FILE)
       @pg = file_load(LOCAL_FILE)
-      @al.delete('aml')
+      @al.delete('aml')            #delete default alias
     end
 
     def add_config(new_alias)
@@ -22,7 +22,7 @@ module AM
       if save_config
         notice(:success_add_command, [new_alias.first.to_a, CONFIG_FILE].flatten)
       else
-        error(add_command,[ak, av])
+        error(:add_command_fail,new_alias.flatten)
       end
     end
 
@@ -31,14 +31,12 @@ module AM
       if save_config
         notice(:success_delete_command, [del_alias, CONFIG_FILE])
       else
-        error(:fail_delete, del_alias)
+        error(:delete_command_fail, del_alias)
       end
     end
 
     def save_config
-      (
-        file_write(CONFIG_FILE, @al.merge({"aml" => "'source ~/.am_config'"}))
-      )
+      (file_write(CONFIG_FILE, @al.merge({"aml" => "'source ~/.am_config'"})))
     end
 
     def file_write(file_name, config)
@@ -49,9 +47,8 @@ module AM
         r = "alias #{k.to_s}=#{v.to_s}"
         file.puts(r)
       end
-
       file.close
-      (File.rename(tmp_file, file_name) == 0)
+      File.rename(tmp_file, file_name) == 0
     end
 
     def file_load(file_name)

data/lib/message_control.rb

@@ -5,41 +5,54 @@ module AM
   module MessageControl
     NOTICE_MESSAGE = {
       config_empty: 'config is empty',
-      success_add_command: "success! %s / %s added command\n       please run: [ source %s ]",
+      success_add_command: "success! %s / %s added command\n       please run: [ aml ] or [ source %s ]",
       success_delete_command: "success! %s delete alias\n       please run: [ source %s ]"
     }
     WARNING_MESSAGE = {
       add_command: "%s / %s couldn't add command",
       empty_config_number: "selected number missing in current config",
-      duplecate_alias: "not written as duplecate alias is '%s'",
-      duplecate_command: "not written as duplecate command is %s",
+      validate_number: "please input using number",
+      validate_number_range: "please input number 1-%s",
+      validate_alias: 'input using a-z or 0-9 or _ or -',
     }
     ERROR_MESSAGE = {
-      add_command: "%s / %s couldn't add command",
+      add_command_fail: "%s / %s couldn't add command",
       validate_length_zero: "%s / %s length equal 0",
-      faile_delete: "failue delete alias %s",
+      delete_command_fail: "fail delete alias %s",
+      duplicate_alias: "duplicate alias is '%s'",
+      duplicate_command: "duplicate command is %s",
+      no_support: "does not support is %s",
+      not_exists_history_file: "history file not found %s",
+      not_exists_history_record: "history record not exists"
     }
 
     def notice(code, val=nil)
-      puts "\n" + '-'*60
-      print(NOTICE_MESSAGE, 'info', code, val)
-      puts '-'*60
+      print_message(NOTICE_MESSAGE, 'info', code, val)
     end
 
     def warning(code, val=nil)
-      puts "\n" + '-'*60
-      print(WARNING_MESSAGE, 'warning', code, val)
-      puts '-'*60
+      print_message(WARNING_MESSAGE, 'warning', code, val)
     end
     def error(code, val=nil)
-      puts "\n" + '-'*60
-      print(ERROR_MESSAGE, 'error', code, val)
-      puts '-'*60
+      print_message(ERROR_MESSAGE, 'error', code, val)
       exit
     end
 
-    def print(template, prefix, code, val=nil)
+    def print_message(template, prefix, code, val=nil)
+      before_sepalate
       puts "[#{prefix}] #{template[code]}"%val
+      after_sepalate
     end
+
+    def before_sepalate
+      puts ''
+      puts '-'*60
+    end
+
+    def after_sepalate
+      puts '-'*60
+      puts ''
+    end
+
   end
 end

data/lib/tail.rb

@@ -1,66 +1,60 @@
-# encoding: utf-8 
+# encoding: utf-8
 require 'am'
+require 'message_control'
 
 module AM
   class Tail
+    include MessageControl
     attr_accessor :profile
+
     def initialize(config)
       @profile = get_profile(config)
     end
 
     def get_profile(config)
       shell = ENV['SHELL']
-      h = case shell
-      when /zsh/  then set_hash(0, 5, '~/.zsh_history')
-      when /bash/ then set_hash(1, 5, '~/.bash_history')
-      else # todo raise
-          puts "does not support is #{shell}"
-          exit
+      profile = case shell
+      when /zsh/  then set_hash(0, '~/.zsh_history')
+      when /bash/ then set_hash(1, '~/.bash_history')
+      else
+          error(:no_support, shell)
       end
+      f = config.pg['history_file']
+      profile[:file] = f if f
+      profile[:file] = File.expand_path(profile[:file])
 
-      h[:file] = f if f =  config.pg['history_file']
-      h[:file] = File.expand_path(h[:file])
-
-      unless File.exists?(h[:file])
-        #todo raise
-        puts "history file not found #{h[:file]}"
+      unless File.exists?(profile[:file])
+        error(:not_exists_history_file, profile[:file])
         exit
       end
-      h
+      profile
     end
 
-    def set_hash(margin, max_line, history_file)
-      return { margin: margin, max_line: max_line, file: history_file }
+    def set_hash(margin,  history_file)
+      return { margin: margin, file: history_file }
     end
 
-    def get_last_five_command
+    def get_last_command
       commands = []
-      r=""
-      last_commands = `tail -#{@profile[:max_line] + 1 - @profile[:margin]} #{@profile[:file]} | head -#{@profile[:max_line]}`.split("\n")
+      last_commands = `tail -#{TAIL_LINE + 1 - @profile[:margin]} #{@profile[:file]} | head -#{TAIL_LINE}`.split("\n")
       unless last_commands.empty?
         last_commands.each_with_index do |c,i|
-          commands << r if r = sampling(c)
+          r = sampling(c)
+          commands << r if r
         end
         commands
       end
     end
 
-    def get_last_command
-      r=""
-      if c = `tail -#{2-@profile[:margin]} #{@profile[:file]} | head -1`
-        sampling(c)
-      end
-    end
-
     def sampling(command)
       zsh  = '[0-9]+:[0-0];(.*)'
       bash = '(.*)'
       if command =~ /#{zsh}/
-        p = zsh
+        pattern = zsh
       else
-        p = bash
+        pattern = bash
       end
-      command.split(/#{p}/)[COMMAND].strip if command.strip !~ /^$/
+      command.split(/#{pattern}/)[COMMAND].strip if command.strip !~ /^$/
     end
   end
 end

data/lib/ui.rb

@@ -1,65 +1,81 @@
 # encoding: utf-8
 require 'am'
+require 'validate'
 
 module AM
   class Ui
+    include MessageControl
+    include Validate
+
     def print_current_config(config)
       aml = config.al.max_by{|c| c[0].length }[0].length #alias max length
       iml = config.al.length.to_s.length                 #index max length
       arr = []                                           #use delete number
-      AM::p1("current commands of the config")
+
+      before_sepalate
+      puts 'current registered alias'
       config.al.each_with_index do|(k,v),i|
         # 1: name=command
         puts " #{' '*(iml - (i+1).to_s.length)}#{(i+1).to_s} : #{k.to_s}#{' '*(aml-k.length)} = #{v.to_s}"
         arr << [i,k]
-      end unless config.al.empty?
-      AM::p1
+      end
+      after_sepalate
       arr
     end
 
     def print_last_commands(commands)
+      iml = commands.length.to_s.length                 #index max length
+
+      before_sepalate
+      puts 'current history commands'
       commands.each_with_index  do |c,i|
-        puts " #{(i+1).to_s} : #{c.to_s}"
-      end unless commands.empty?
+        puts " #{' '*(iml - (i+1).to_s.length)}#{(i+1).to_s} : #{c.to_s}"
+      end
+      after_sepalate
     end
 
     def add_command_with_number(commands)
-      print 'please input add command number: '
-      number     = please_input
-      valid?(number, '^[^1-5]', '[error] input using number!')
-      alias_name = get_alias
-      {alias_name => quot(commands[number.to_i-1].strip)}
-    end
+      number = get_number
+
+      if valid?(number, "^[^0-9]+$")
+        warning(:validate_number)
+      elsif number.to_i > TAIL_LINE || number.to_i <= 0
+        warning(:validate_number_range, TAIL_LINE)
+      else
+        alias_name = get_alias
+        {alias_name => quot(commands[number.to_i-1].strip)}
+      end
 
-    def add_command_with_last_history(command)
-      puts "add command is #{quot(command.strip)}"
-      alias_name   = get_alias
-      {alias_name => quot(command)}
     end
 
     def del_command_with_number(arr)
-      print 'please input delete command number: '
-      number = please_input
-      valid?(number, '^[^0-9]', '[error] input using number!')
-      # return delete hash key
-      arr[number.to_i-1][1] if arr.length >= number.to_i
+      number = get_number
+
+      if valid?(number, "^[1-9]+$")
+        arr[number.to_i-1][1] if arr.length >= number.to_i
+      else
+        warning(:validate_number)
+      end
     end
 
-    def get_alias
-      print "please input add command alias: "
-      name = please_input
-      valid?(name, '[^\w-]', '[error] input using a-z or 0-9 or _ or -')
-      name.strip
+    def get_number
+      print 'please select number: '
+      get_stdin
     end
 
-    def valid?(val, pattern, message)
-      if /#{pattern}/ =~ val || val.length == 0
-        puts message
-        exit
+    def get_alias
+      print "please input command alias name: "
+      alias_name = get_stdin
+      if valid?(alias_name, '^[\w-]+$')
+        alias_name.strip
+      else
+        warning(:validate_alias)
+        get_alias
       end
     end
 
-    def please_input
+
+    def get_stdin
       while val = STDIN.gets
         break if /\n$/ =~ val
       end

data/lib/validate.rb

@@ -3,27 +3,21 @@ require 'am'
 
 module AM
   module Validate
+    include MessageControl
     def uniq?(new_alias)
       ak,av = new_alias.first
       @config.al.each do |k,v|
         if ak == k
-          warning(:duplecate_alias, ak)
-          return false
+          error(:duplicate_alias, ak)
         elsif av == v
-          warning(:duplecate_command, av)
-          return false
+          error(:duplicate_command, av)
         end
       end
       true
     end
 
-    def valid?(new_alias)
-      ak,av = new_alias.first
-      unless ak.length > 0 || av.length > 0 || ak == 'aml'
-        error(:validate_lenght_zero, [ak,av])
-      end
-      true
+    def valid?(val, pattern)
+      /#{pattern}/ =~ val && val.to_s.length != 0
     end
-
   end
 end

data/spec/lib/am/cli_spec.rb

@@ -3,11 +3,6 @@ require 'spec_helper.rb'
 
 describe AM::CLI do
   shared_examples_for "shell test" do
-    before do
-      ENV['SHELL'] = shell
-      add_history
-    end
-
     before(:each) do
       add_alias_config
       @cli = AM::CLI.new
@@ -19,29 +14,6 @@ describe AM::CLI do
       end
     end
 
-    describe 'register' do
-      describe 'add' do
-        before do
-          allow(STDIN).to receive(:gets) { "add_command_alias\n" }
-          expect { @cli.show }.not_to output(/add_command_alias/).to_stdout
-        end
-        it 'single' do
-          expect { @cli.add }.to  output(/success/).to_stdout
-          expect { @cli.add }.to  output(/duplecate/).to_stdout
-          expect { @cli.show }.to output(/add_command_alias/).to_stdout
-        end
-      end
-      describe 'delete' do
-        before do
-          expect { @cli.show }.to output(/ほげ/).to_stdout
-        end
-        it 'single' do
-          expect { @cli.del('ほげ') }.to output(/success/).to_stdout
-          expect { @cli.show }.not_to    output(/ほげ/).to_stdout
-        end
-      end
-    end
-
     describe 'register option' do
       describe 'add' do
         before do
@@ -49,10 +21,9 @@ describe AM::CLI do
           expect { @cli.show }.to_not output(/last_command_alias/).to_stdout
         end
         it 'list' do
-          expect { @cli.invoke(:add, [], {list: true}) }.to output(/#{match_last_five_command}/).to_stdout
-          expect { AM::CLI.new.show }.to output(/last_command_alias/).to_stdout
+          expect { @cli.add }.to output(/#{match_last_command}/).to_stdout
+          expect { @cli.show }.to output(/last_command_alias/).to_stdout
         end
-
       end
       describe 'del' do
         before do
@@ -60,19 +31,23 @@ describe AM::CLI do
           expect { @cli.show }.to output(/hoge/).to_stdout
         end
         it 'list' do
-          expect { @cli.invoke(:del, [], {list: true}) }.to output(/#{match_delete_list}/).to_stdout
-          expect { AM::CLI.new.show }.to_not output(/hoge/).to_stdout
+          expect { @cli.del }.to output(/#{match_delete_list}/).to_stdout
+          expect { @cli.show }.to_not output(/hoge/).to_stdout
         end
       end
     end
   end
   describe 'zsh' do
-    let(:shell)     {'/bin/zsh' }
+    ENV['SHELL'] = '/bin/zsh'
+    add_history
+    hist_file = File.expand_path('~/.zsh_history')
+    file_write(hist_file,'abcd ABCD 1234 あいうえ', 'a')
     it_should_behave_like 'shell test'
   end
 
   describe 'bash' do
-    let(:shell)     {'/bin/bash' }
+    ENV['SHELL'] = '/bin/bash'
+    add_history
     it_should_behave_like 'shell test'
   end
 end

data/spec/lib/tail_spec.rb

@@ -7,15 +7,11 @@ describe AM::Tail do
       add_history
     end
 
-    it 'get_last_five_commands' do
-      expect(@tail.get_last_five_command.length).to eq 5
-      expect(@tail.get_last_five_command[0]).to match(/[a-z]+/)
-    end
-
-    it 'get_last_command' do
-      expect(@tail.get_last_command.length).to be >= 1
+    it 'get_last_commands' do
+      expect(@tail.get_last_command.length).to eq AM::TAIL_LINE
       expect(@tail.get_last_command[0]).to match(/[a-z]+/)
     end
+
   end
 
   describe 'zsh' do

data/spec/spec_helper.rb

@@ -24,10 +24,8 @@ rails
 cd /hoge/fuga/hoge/fuga
 : 1426500307:0;cat /hoge | grep 'hoge'
 cat /hoge | grep 'hoge'
-: 1426500358:0;pepabo
-pepabo
 : 1426500618:0;abcd ABCD 1234 あいうえ
-abcd ABCD 1234 あいうえ"
+abcd ABCD 1234 あいうえ
 EOS
   hist_file = File.expand_path(AM::Tail.new(AM::Config.new).profile[:file])
   type = File.exists?(hist_file)? 'a' : 'w'
@@ -50,34 +48,45 @@ end
 def match_current_config
 return <<'EOS'
 
-current commands of the config
+------------------------------------------------------------
+current registered alias
  1 : hoge                                  = 'fuga'
  2 : 123                                   = '123'
  3 : ABC                                   = 'ABC'
  4 : aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
  5 : ほげ                                    = 'ふがふが'
+------------------------------------------------------------
 
 EOS
 end
 
-def match_last_five_command
+def match_last_command
 return <<'EOS'
- 1 : cat /hoge | grep 'hoge'
- 2 : cat /hoge | grep 'hoge'
- 3 : pepabo
- 4 : pepabo
- 5 : abcd ABCD 1234 あいうえ
+  1 : rake
+  2 : rake
+  3 : rails
+  4 : rails
+  5 : cd /hoge/fuga/hoge/fuga
+  6 : cd /hoge/fuga/hoge/fuga
+  7 : cat /hoge | grep 'hoge'
+  8 : cat /hoge | grep 'hoge'
+  9 : abcd ABCD 1234 あいうえ
+ 10 : abcd ABCD 1234 あいうえ
 EOS
 end
 
 def match_delete_list
 return <<'EOS'
-current commands of the config
+
+------------------------------------------------------------
+current registered alias
  1 : hoge                                  = 'fuga'
  2 : 123                                   = '123'
  3 : ABC                                   = 'ABC'
  4 : aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
  5 : ほげ                                    = 'ふがふが'
+------------------------------------------------------------
+
 EOS
 end
 def file_load(file_name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: am
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - ka-yamashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler