am 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 723bbc87212ffce2be4477ad66898027961be8ce
-  data.tar.gz: 5183ecd4569cbc3341da6235dcaeeefd8c044308
+  metadata.gz: 6f536428a276df0fd09ec9937e8a5a32995c4e8b
+  data.tar.gz: dc5e19ae44f8d6957b67a9f138eb5edd86de37b6
 SHA512:
-  metadata.gz: 89e0b0383852903626c45183e1fcbe36365aed67d626d48f4a4b9f0a2976bc1f34672aa3f5b153141ba0b065fe26f67bdb24a8b5b59d01b0ffe6f56b9d751aec
-  data.tar.gz: 500a820faaf14e74861efef25981200358dfb64ef2d520e55c2ed6bc684f564137f3aabedf47750067b0fe802d49e4775d4818f8d866575fe9e02f9462356ba9
+  metadata.gz: 043ad037b3a430e61d3dca3e0dccaaac7019acf0ed714bfc469c33b793a7f3e655e32560db22d2528e27a956fce57e31f2a3d4c6c8ac5f1ec96be3c380d8c791
+  data.tar.gz: b1d21f7a283e740fc9cbe37aa834999fdea81b670b6b1a4a550db8817893256d77e069a9aa0ddf402ab52be69f76eddf8a12bd71df4d7c0540d4ca27b02f9d85

data/lib/am/version.rb

@@ -1,3 +1,3 @@
 module Am
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/tail.rb

@@ -3,19 +3,19 @@ require 'am'
 module AM
   class Tail
     def initialize(*args)
-      @sh_history_file = get_history_file
+      set_profile
     end
 
-    def get_history_file
+    def set_profile
       shell = `echo $SHELL`
       if shell =~ /zsh/
         @history_pattern = '.*;(.*)'
-        @command_col     = 1
-        return File.expand_path('~/.zsh_history')
+        @sh_history_file = File.expand_path('~/.zsh_history')
+        @tail_margin     = 0
       elsif shell =~ /bash/
-        @history_pattern = '(.*)\n'
-        @command_col     = 0
-        return File.expand_path('~/.bash_history')
+        @history_pattern = '(.*)'
+        @sh_history_file = File.expand_path('~/.bash_history')
+        @tail_margin     = 1
       else
         puts "does not support is #{shell}"
       end
@@ -25,9 +25,9 @@ module AM
       exit if @sh_history_file.nil?
 
       commands = []
-      last_commands = `tail -6  #{@sh_history_file} | head -5`.split("\n")
+      last_commands = `tail -#{6-@tail_margin} #{@sh_history_file} | head -5`.split("\n")
       last_commands.each_with_index  do |c,i|
-        record = c.split(/#{@history_pattern}/)[@command_col].strip
+        record = c.split(/#{@history_pattern}/)[COMMAND].strip
         puts " #{(i+1).to_s} : #{record.to_s}"
         commands << record
       end
@@ -36,7 +36,7 @@ module AM
 
     def get_last_command
       exit if @sh_history_file.nil?
-      `tail -2 #{@sh_history_file} | head -1`.split(/#{@history_pattern}/)[@command_col].strip
+      `tail -#{2-@tail_margin} #{@sh_history_file} | head -1`.split(/#{@history_pattern}/)[COMMAND].strip
     end
 
   end

metadata

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