am 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 315f5f6dd4042ccb59e3857fbdaf45963aa322b3
-  data.tar.gz: 1c91d2a92c83210ded459f4b0f86a6f4aef340ca
+  metadata.gz: 607457b961dba43878566b3a4bb32f656a4d3993
+  data.tar.gz: 04e5f824a7374a4f9569255ae44b853a8c2032b8
 SHA512:
-  metadata.gz: bc38956ce7f0e3c1265c13bbf8ed64da4700266e0c72fa96d9b7b2f6d9f63b71dbdff05621dc7d34604f383af2f62c7a8b00f369991ed4e0f842b152fcdd5f42
-  data.tar.gz: 11c2ad7c640b968e598d1e4c76379add8b5f6cd0b10494e81eb660571a4ae4cd194d65286b83071086178ceadbf8c205f0708f76f7297169810dfcca9e266d3d
+  metadata.gz: 4c78383e7b482182f52c12e265d083c16d6255305f22d587a4b33fcb68d0205e7f870f1529afcb1f8a3530fbfe91e38da6343c162ae998b0e00a17c42c7d9de5
+  data.tar.gz: e58d5542d42370b85ece05fc01b8d54ecc9fdb6f1e49bc8e5751c8ee72d33b4510dbb168edeffb3ff29fd6682a3f417cb2c51ec602bba74a36b7acb78eb7b154

data/README.md

@@ -44,15 +44,9 @@ echo 'source ~/.am_config' >> ~/.bash_profile
     print current config
 
     $ am add
-    add alias from last history command
+    add alias select last history command
 
-    $ am add -l(list)
-    add alias select from five line last history command
-
-    $ am del [alias_name)
-    delete alias from alias_name
-
-    $ am del -l(list)
+    $ am del
     delete alias select from current config
 
 ### configure

data/lib/am/cli.rb

@@ -39,7 +39,7 @@ module AM
       @ui.print_last_commands(commands)
       new_alias = @ui.add_command_with_number(commands)
 
-      unless new_alias
+      unless Hash.try_convert(new_alias)
         add
       else
         if uniq?(new_alias)
@@ -51,14 +51,12 @@ module AM
     desc "del", "delete alias"
     def del
       unless @config.al.empty?
-        arr =  @ui.print_current_config(@config)
-        delete_alias = @ui.del_command_with_number(arr)
-
-        if delete_alias && @config.al.key?(delete_alias)
+        @ui.print_current_config(@config)
+        delete_alias = @ui.delete_command_with_number(@config)
+        unless delete_alias.nil?
           @config.al.delete(delete_alias)
           @config.delete_config(delete_alias)
         else
-          warning(:empty_config_number)
           del
         end
       else

data/lib/am/version.rb

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

data/lib/message_control.rb

@@ -46,11 +46,11 @@ module AM
 
     def before_sepalate
       puts ''
-      puts '-'*60
+      puts '='*60
     end
 
     def after_sepalate
-      puts '-'*60
+      puts '='*60
       puts ''
     end
 

data/lib/ui.rb

@@ -10,23 +10,18 @@ module AM
     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
 
-      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
       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 " #{' '*(iml - (i+1).to_s.length)}#{(i+1).to_s} : #{c.to_s}"
@@ -45,14 +40,16 @@ module AM
         alias_name = get_alias
         {alias_name => quot(commands[number.to_i-1].strip)}
       end
-
     end
 
-    def del_command_with_number(arr)
+    def delete_command_with_number(config)
       number = get_number
-
       if valid?(number, "^[1-9]+$")
-        arr[number.to_i-1][1] if arr.length >= number.to_i
+        if config.al.length >= number.to_i && config.al.key?(config.al.to_a[number.to_i-1][0])
+          config.al.to_a[number.to_i-1][0]
+        else
+          warning(:empty_config_number)
+        end
       else
         warning(:validate_number)
       end

data/spec/spec_helper.rb

@@ -47,15 +47,13 @@ end
 
 def match_current_config
 return <<'EOS'
-
-------------------------------------------------------------
 current registered alias
  1 : hoge                                  = 'fuga'
  2 : 123                                   = '123'
  3 : ABC                                   = 'ABC'
  4 : aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
  5 : ほげ                                    = 'ふがふが'
-------------------------------------------------------------
+============================================================
 
 EOS
 end
@@ -77,15 +75,13 @@ end
 
 def match_delete_list
 return <<'EOS'
-
-------------------------------------------------------------
 current registered alias
  1 : hoge                                  = 'fuga'
  2 : 123                                   = '123'
  3 : ABC                                   = 'ABC'
  4 : aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
  5 : ほげ                                    = 'ふがふが'
-------------------------------------------------------------
+============================================================
 
 EOS
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: am
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - ka-yamashita