am 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1c035e872c61d3c8de94e71e81b49d30fc26792
-  data.tar.gz: 42f8fa57dad2dd410c302a59a1cb105b30773772
+  metadata.gz: 852969fa27d5ac381cfbf936cdfa4fb066e65991
+  data.tar.gz: 9ec05aebec06d777801b59c495b72a91cf967cce
 SHA512:
-  metadata.gz: ebf1c71e6ccc74ef5ae1044c37bbead6ade425dfc4dafdd30ae637a21b6f852c4af53021d8453ce28da5da9aee7eac52bb07f7652e96e496aefad76554cc6240
-  data.tar.gz: 83331d4c739e1a5f7dfdbc2296801741acbe481fd3687d7879ef1622d0c51907dce6288dbff90f33452ac888c399138f4afba218c149af0a019d041699f7f9de
+  metadata.gz: 2a0275bb79a92fd03a219804b70c8f5326f42a7449617517fb71f9a39aa17d96f782f57cba55e66039beb6fb5df9037f4c4c34a5aace52d5ebc0743f63835bde
+  data.tar.gz: bab4c2b8d9af19f0ea0c112d5df871d019850a6d3bccbde1287cef0e18525177794c76a2ed55f7385bc73c08931efda3a414f170b35993ff63c8c62a3e7fbaf2

data/README.md

@@ -51,6 +51,17 @@ echo 'source ~/.am_config' >> ~/.bash_profile
 
     $ am del -l(list)
     delete alias select from current config
+
+### configure
+
+  * history file location(optional)
+
+  ```
+  # ~/.am_config
+  history_file=~/.custom_history
+  ```
+
+
 ## License
 * MIT
 

data/lib/am/cli.rb

@@ -9,14 +9,13 @@ module AM
     default_command :show
     def initialize(*args)
       super
-      config  = Config.new
-      @config = config.current
+      @config  = Config.new
       @ui     = Ui.new
     end
 
     desc "show", "show current alias"
     def show
-      if @config.empty?
+      if @config.al.empty?
         puts 'a blank config'
       else
         @ui.print_current_config(@config)
@@ -26,7 +25,8 @@ module AM
     desc "add", "add alias"
     option :list, :type => :boolean, :aliases => '-l'
     def add
-      tail = Tail.new
+      tail = Tail.new(@config)
+
       # registeration from history choice
       if options[:list]
         commands = tail.get_last_five_command
@@ -40,7 +40,7 @@ module AM
       end
 
       if uniq?(add_record) && valid?(add_record)
-        @config << add_record
+        @config.al << add_record
         add_config(add_record) 
       else
         AM.p1("")
@@ -52,7 +52,7 @@ module AM
     option :list, :type => :boolean, :aliases => '-l'
 
     def del(delete_alias=nil)
-      if @config.empty?
+      if @config.al.empty?
         puts 'a blank config'
         exit
       end
@@ -67,27 +67,27 @@ module AM
     no_commands do
 
       def add_config(add_record)
-        config  = Config.new
-        if config.save_config(@config)
+        if @config.save_config()
           AM.p1("[success] #{add_record[ALIAS]} / #{add_record[COMMAND]} added command")
           AM.p2("please run: [ source #{CONFIG_FILE} ]")
+
         else
           puts   "[error] #{add_record[ALIAS]} / #{add_record[COMMAND]} couldn't add command" 
         end
       end
 
       def delete_config(exclude)
-        config  = Config.new
-        if config.save_config(@config, exclude)
+        if @config.save_config(exclude)
           AM.p1("[success] delete alias #{exclude}")
           AM.p2("please run: [ source #{CONFIG_FILE} ]")
+
         else
           AM.p2("[error] failue delete alias #{exclude}}")
         end
       end
 
       def uniq?(add_record)
-        @config.each do |a,c|
+        @config.al.each do |a,c|
           if add_record[ALIAS] == a
             AM.p1("[error] not written as duplecate alias is '#{add_record[ALIAS]}'")
             return false

data/lib/am/version.rb

@@ -1,3 +1,3 @@
 module Am
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

data/lib/config.rb

@@ -2,27 +2,44 @@ require 'am'
 
 module AM
   class Config
-    def current
-      config = []
+    attr_accessor :al, :pg
+    def initialize
+      file_load
+    end
+
+    def file_load
+      @al = []
+      @pg = {}
       File.open(CONFIG_FILE, 'r') do |file|
+
         file.each_line do |line|
-          config << line.gsub(/^alias /, '').strip.split('=', 2)
+          @al  << line.gsub(/^alias /, '').strip.split('=', 2) if(line =~ /^alias/)
+          @pg   = Hash[*line.strip.split('=', 2)] if line =~ /^[^alias]/ && line =~ /^[^#.*]/
         end
+
       end if File.exists?(CONFIG_FILE)
-      config
     end
 
-    def save_config(config, exclude=nil)
+    def save_config(exclude=nil)
       tmp_file = CONFIG_FILE + '.tmp'
       file = File.open(tmp_file, "w")
+      new_al = []
 
-      config.each do |a,c|
+      file.puts("# alias config")
+      @al.each do |a,c|
         r = "alias #{a.to_s}=#{c.to_s}"
         if a.to_s != exclude
           file.puts(r)
+          new_al << [a, c]
         end
       end
+      @al = new_al
 
+      file.puts("\n# pg config")
+      @pg.each do |p,v|
+        r = "#{p.to_s}=#{v.to_s}"
+        file.puts(r)
+      end
       file.close
       File.rename(tmp_file, CONFIG_FILE)
     end

data/lib/tail.rb

@@ -2,32 +2,33 @@ require 'am'
 
 module AM
   class Tail
-    def initialize(*args)
-      set_profile
+    def initialize(config)
+      set_profile(config)
     end
 
-    def set_profile
-      shell = `echo $SHELL`
+    def set_profile(config)
+      shell = ENV['SHELL']
       @profile = {}
 
       if shell =~ /zsh/
         @profile = {
           pattern:  '.*;(.*)',
-          file:     File.expand_path('~/.zsh_history'),
           margin:   0,
           max_line: 5,
+          file:     '~/.zsh_history'
         }
       elsif shell =~ /bash/
         @profile = {
           pattern:  '(.*)',
-          file:     File.expand_path('~/.bash_history'),
           margin:   1,
           max_line: 5,
+          file:     '~/.bash_history'
         }
       else
         puts "does not support is #{shell}"
         exit
       end
+      @profile[:file] = config.pg['history_file'] unless config.pg['history_file'].nil?
     end
 
     def get_last_five_command

data/lib/ui.rb

@@ -3,14 +3,14 @@ require 'am'
 module AM
   class Ui
     def print_current_config(config)
-      aml = config.max_by{|c| c[0].length }[0].length #alias max length
-      iml = config.length.to_s.length                 #index max length
+      aml = config.al.max_by{|c| c[0].length }[0].length #alias max length
+      iml = config.al.length.to_s.length                 #index max length
 
       AM::p1("current commands of the config")
-      config.each_with_index do|r,i|
+      config.al.each_with_index do|r,i|
         # 1: name=command
         puts " #{' '*(iml - (i+1).to_s.length)}#{(i+1).to_s} : #{r[ALIAS].to_s}#{' '*(aml-r[ALIAS].length)} = #{r[COMMAND].to_s}"
-      end unless config.empty?
+      end unless config.al.empty?
       AM::p1
     end
 
@@ -38,7 +38,7 @@ module AM
       print 'please input delete command number: '
       number = please_input
       valid?(number, '^[^0-9]', '[error] input using number!')
-      delete_alias = config[number.to_i-1][ALIAS] if config.length >= number.to_i
+      delete_alias = config.al[number.to_i-1][ALIAS] if config.al.length >= number.to_i
     end
 
     def get_alias

data/spec/lib/config_spec.rb

@@ -1,29 +1,42 @@
 require 'spec_helper.rb'
 
 describe AM::Config do
-  describe 'config commands tests' do
-    before() do
-      @config= AM::Config.new
+  context 'zsh' do
+    before do
       `echo "alias test1='test az - AZ 09 _'" > #{AM::CONFIG_FILE}`
+      `echo "history_file=~/.zsh_history" >> #{AM::CONFIG_FILE}`
+      @config= AM::Config.new
     end
+
     it 'load config' do
-      @config.current
-      expect(@config.current[0][0]).to eq 'test1'
-      expect(@config.current[0][1]).to eq "'test az - AZ 09 _'"
+      expect(@config.al[0][0]).to eq 'test1'
+      expect(@config.al[0][1]).to eq "'test az - AZ 09 _'"
+      expect(@config.pg['history_file']).to eq "~/.zsh_history"
     end
+
     it 'save config'do
       # add
-      config = @config.current << ['test2',"'abcdefgeijklmn'"]
-      expect(@config.save_config(config)).to eql(0)
-      expect(@config.current.length).to eql(2)
+      config = @config.al << ['test2', "'abcdefgeijklmn'"]
+      expect(@config.save_config).to eql(0)
+      expect(@config.al.length).to eql(2)
 
       # delete
-      expect(@config.save_config(config,'test1')).to eql(0)
-      expect(@config.current.length).to eql(1)
+      expect(@config.save_config('test1')).to eql(0)
+      expect(@config.al.length).to eql(1)
+
+      # valu check
+      expect(@config.al[0][0]).to eq 'test2'
+      expect(@config.al[0][1]).to eq "'abcdefgeijklmn'"
+      expect(@config.pg['history_file']).to eq "~/.zsh_history"
+
+    end
 
-      # add check
-      expect(@config.current[0][0]).to eq 'test2'
-      expect(@config.current[0][1]).to eq "'abcdefgeijklmn'"
+    it 'pg config' do
+      # @config.pg_check
+      `echo "history_file=~/.csh_history" >> #{AM::CONFIG_FILE}`
+      config= AM::Config.new
+      expect(config.pg['history_file']).to eq "~/.csh_history"
+      `echo "" > #{AM::CONFIG_FILE}`
     end
   end
 end

data/spec/lib/tail_spec.rb

@@ -1,20 +1,36 @@
 require 'spec_helper.rb'
 
 describe AM::Tail do
-  describe 'tail commands tests' do
+  context 'tail commands tests' do
+    shared_examples_for "shell test" do
+      before do
+        config= AM::Config.new
+        config.pg['history_file'] = hist_file
+        ENV['SHELL'] = shell
+        @tail = AM::Tail.new(config)
+      end
 
-    before() do
-      @tail = AM::Tail.new
+      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
+        expect(@tail.get_last_command[0]).to match(/[a-z]+/)
+      end
     end
 
-    it 'print_last_commands' do
-      expect(@tail.get_last_five_command.length).to eq 5
-      expect(@tail.get_last_five_command[0]).to match(/[a-z]+/)
+    describe 'zsh' do
+      let(:hist_file) { '~/.zsh_history' }
+      let(:shell)     {'/bin/zsh' }
+      it_should_behave_like 'shell test'
     end
 
-    it 'get_last_command' do
-      expect(@tail.get_last_command.length).to be >= 1
-      expect(@tail.get_last_command[0]).to match(/[a-z]+/)
+    describe 'bash' do
+      let(:hist_file) { '~/.bash_history' }
+      let(:shell)     {'/bin/bash' }
+      it_should_behave_like 'shell test'
     end
   end
 end

metadata

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