am 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3b038cb3f81b74b7abb30a9eb3afb59f6b10e48
-  data.tar.gz: 90814812b84e90359a4d273ebab2d54062527ec2
+  metadata.gz: 0ac8121440319603d9c34a172b5bf701aa71f7e7
+  data.tar.gz: 40a62d1010f7798019f672535fc55a5451688a1c
 SHA512:
-  metadata.gz: fb82b1d037927e39fa815c22bd1ce52ee2f2101066e552fa03518ef5fd799beae8d2ddf515dc25e41d6d9fb8ea42829d3c35d1e95aa1be3ad9a99eda6e26def5
-  data.tar.gz: 20f892204a581542dc3aa7f491da70e48dc52869579e68d5f7aacf4fe1cd936240bc472d22efd389f2bf1a9bbc8669d2cde1cd3adbd1600cb54b92754950480e
+  metadata.gz: 6f6ac069e16b5ad8024520b63b6efa164eab40981ad6872d86abe4b94bc51a04324374a386a369bc289afd6a18f09470c70de7ffc62fd2e1e946f74ef771e916
+  data.tar.gz: ca6af85e41a5f392d4e7f693e6a4360880ba2f9a4ea77571cd39147ec5b41a3925d8e3ade6de0b1468fcef1f92f0171e7d499a88868345c57ad7cc0a5995f34e

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+- 2.0.0
+- 2.1.4
+script: bundle exec rspec
+before_script:
+  - "touch ~/.zsh_history"
+  - "touch ~/.bash_history"
+

data/README.md

@@ -1,4 +1,6 @@
 # Am(Alias Manager)
+[![Build Status](https://travis-ci.org/ka-yamashita/am.svg?branch=master)](https://travis-ci.org/ka-yamashita/am)
+[![Code Climate](https://codeclimate.com/github/ka-yamashita/am/badges/gpa.svg)](https://codeclimate.com/github/ka-yamashita/am)
 
 `alias` command wrapper
 

data/Rakefile

@@ -1,2 +1,10 @@
 require "bundler/gem_tasks"
 
+task :default => [:spec]
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec) do |spec|
+    spec.pattern = 'spec/**/*_spec.rb'
+  end
+rescue LoadError => e
+end

data/lib/am.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8 
 require "am/version"
 require "am/cli"
 module AM 

data/lib/am/cli.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8 
 require 'am'
 require 'tail'
 require 'config'
@@ -10,7 +11,7 @@ module AM
     def initialize(*args)
       super
       @config  = Config.new
-      @ui     = Ui.new
+      @ui      = Ui.new
     end
 
     desc "show", "show current alias"
@@ -40,7 +41,7 @@ module AM
       end
 
       if uniq?(add_record) && valid?(add_record)
-        @config.al << add_record
+        @config.al.merge!(add_record)
         add_config(add_record) 
       else
         AM.p1("")
@@ -50,7 +51,6 @@ module AM
 
     desc "del", "delete alias"
     option :list, :type => :boolean, :aliases => '-l'
-
     def del(delete_alias=nil)
       if @config.al.empty?
         puts 'a blank config'
@@ -58,26 +58,29 @@ module AM
       end
 
       if options[:list] || delete_alias == nil
-        @ui.print_current_config(@config)
-        delete_alias = @ui.del_command_with_number(@config)
+        # convert array
+        arr =  @ui.print_current_config(@config)
+        delete_alias = @ui.del_command_with_number(arr)
       end
-        delete_config(delete_alias)
+      @config.al.delete(delete_alias)
+      delete_config(delete_alias)
     end
 
     no_commands do
-
+      # todo merge config
       def add_config(add_record)
-        if @config.save_config()
-          AM.p1("[success] #{add_record[ALIAS]} / #{add_record[COMMAND]} added command")
+        ak,av = add_record.first
+        if @config.save_config
+          AM.p1("[success] #{ak} / #{av} added command")
           AM.p2("please run: [ source #{CONFIG_FILE} ]")
 
         else
-          puts   "[error] #{add_record[ALIAS]} / #{add_record[COMMAND]} couldn't add command" 
+          puts   "[error] #{ak} / #{av} couldn't add command" 
         end
       end
 
       def delete_config(exclude)
-        if @config.save_config(exclude)
+        if @config.save_config
           AM.p1("[success] delete alias #{exclude}")
           AM.p2("please run: [ source #{CONFIG_FILE} ]")
 
@@ -85,23 +88,26 @@ module AM
           AM.p2("[error] failue delete alias #{exclude}}")
         end
       end
-
+      # todo end
+      # todo move config class
       def uniq?(add_record)
-        @config.al.each do |a,c|
-          if add_record[ALIAS] == a
-            AM.p1("[error] not written as duplecate alias is '#{add_record[ALIAS]}'")
+        ak,av = add_record.first
+        @config.al.each do |k,v|
+          if ak == k
+            AM.p1("[error] not written as duplecate alias is '#{ak}'")
             return false
-          elsif add_record[COMMAND] == c
-            AM.p1("[error] not written as duplecate command is #{add_record[COMMAND]}")
+          elsif av == v
+            AM.p1("[error] not written as duplecate command is #{av}")
             return false
           end
         end
         true
       end
-
+      # end
       def valid?(add_record)
-        unless add_record[ALIAS].length > 0 || add_record[COMMAND].length > 0
-          puts   "[error] #{add_record[ALIAS]} / #{add_record[COMMAND]} length equal 0"
+        ak,av = add_record.first
+        unless ak.length > 0 || av.length > 0
+          puts   "[error] #{ak} / #{av} length equal 0"
           return false 
         end
         true

data/lib/am/version.rb

@@ -1,3 +1,3 @@
 module Am
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/config.rb

@@ -1,60 +1,47 @@
+# encoding: utf-8 
 require 'am'
 
 module AM
   class Config
     attr_accessor :al, :pg
+
     def initialize
-      file_load
+      @al = {}
+      @pg = {}
+      load_config
     end
 
-    def file_load
-      @al    = []
-      @pg    = {} 
-      pg_buf = []
-
-      # load alias config
-      File.open(CONFIG_FILE, 'r') do |file|
-        file.each_line do |line|
-          @al    << line.gsub(/^alias /, '').strip.split('=', 2) if(line =~ /^alias/)
-          # migration
-          pg_buf << line.strip.split('=', 2) if line.strip =~ /^[^alias]/ && line.strip =~ /^[^#.*]/ && line.strip !~ /^$/
-        end
-      end if File.exists?(CONFIG_FILE)
+    def load_config
+      @al = file_load(CONFIG_FILE)
+      @pg = file_load(LOCAL_FILE)
+    end
 
-      # load program config
-      File.open(LOCAL_FILE, 'r') do |file|
-        file.each_line do |line|
-          pg_buf << line.strip.split('=', 2) if line.strip =~ /^[^alias]/ && line.strip =~ /^[^#.*]/ && line.strip !~ /^$/
-        end
-      end if File.exists?(LOCAL_FILE)
-      @pg   = Hash[pg_buf] unless pg_buf.empty?
+    def save_config
+      (file_write(CONFIG_FILE, @al, 'alias ') && file_write(LOCAL_FILE,  @pg))
     end
 
-    def save_config(exclude=nil)
-      config_tmp_file = CONFIG_FILE + '.tmp'
-      file = File.open(config_tmp_file, "w")
-      new_al = []
-
-      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.close
+    def file_write(file_name, config, prefix=nil)
+      tmp_file = file_name + '.tmp'
+      file = File.open(tmp_file, "w")
 
-      local_tmp_file = LOCAL_FILE + '.tmp'
-      file = File.open(local_tmp_file, "w")
-      file.puts("\n# pg config")
-      @pg.each do |p,v|
-        r = "#{p.to_s}=#{v.to_s}"
+      config.each do |k,v|
+        r = "#{prefix}#{k.to_s}=#{v.to_s}"
         file.puts(r)
       end
+
       file.close
-      (File.rename(config_tmp_file, CONFIG_FILE) == 0 && File.rename(local_tmp_file, LOCAL_FILE) == 0)
+      (File.rename(tmp_file, file_name) == 0)
+    end
+
+    def file_load(file_name)
+      buf = []
+      File.open(file_name, 'r') do |file|
+        file.each_line do |line|
+          line = line.strip
+          buf    << line.gsub(/^alias /, '').split('=', 2) if line !~ /^$/ && line =~ /.+=.+/ && line !~ /^#.*/
+        end
+      end if File.exists?(file_name)
+      Hash[buf]
     end
   end
 end

data/lib/tail.rb

@@ -1,7 +1,9 @@
+# encoding: utf-8 
 require 'am'
 
 module AM
   class Tail
+    attr_accessor :profile
     def initialize(config)
       set_profile(config)
     end
@@ -12,14 +14,12 @@ module AM
 
       if shell =~ /zsh/
         @profile = {
-          pattern:  '.*;(.*)',
           margin:   0,
           max_line: 5,
           file:     '~/.zsh_history'
         }
       elsif shell =~ /bash/
         @profile = {
-          pattern:  '(.*)',
           margin:   1,
           max_line: 5,
           file:     '~/.bash_history'
@@ -44,8 +44,9 @@ module AM
       last_commands = `tail -#{@profile[:max_line] + 1 - @profile[:margin]} #{@profile[:file]} | head -#{@profile[:max_line]}`.split("\n")
 
       last_commands.each_with_index  do |c,i|
-        record = c.split(/#{@profile[:pattern]}/)[COMMAND].strip
-        commands << record
+        if r = sampling(c)
+          commands << r
+        end
       end unless last_commands.empty?
 
       commands
@@ -54,9 +55,22 @@ module AM
     def get_last_command
       exit if @profile[:file].empty?
 
-      if last_row = `tail -#{2-@profile[:margin]} #{@profile[:file]} | head -1`.split(/#{@profile[:pattern]}/)
-        last_row[COMMAND].strip
+      if c = `tail -#{2-@profile[:margin]} #{@profile[:file]} | head -1`
+        if r = sampling(c)
+          r
+        end
       end
     end
+
+    def sampling(command)
+      zsh  = '[0-9]+:[0-0];(.*)'
+      bash = '(.*)'
+        if command =~ /#{zsh}/
+          p = zsh
+        else
+          p = bash
+        end
+        command.split(/#{p}/)[COMMAND].strip if command.strip !~ /^$/
+    end
   end
 end

data/lib/ui.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8 
 require 'am'
 
 module AM
@@ -5,13 +6,15 @@ 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
       AM::p1("current commands of the config")
-      config.al.each_with_index do|r,i|
+      config.al.each_with_index do|(k,v),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}"
+        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
+      arr
     end
 
     def print_last_commands(commands)
@@ -25,26 +28,27 @@ module AM
       number     = please_input
       valid?(number, '^[^1-5]', '[error] input using number!')
       alias_name = get_alias
-      [alias_name, quot(commands[number.to_i-1].strip)]
+      {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)]
+      {alias_name => quot(command)}
     end
 
-    def del_command_with_number(config)
+    def del_command_with_number(arr)
       print 'please input delete command number: '
       number = please_input
       valid?(number, '^[^0-9]', '[error] input using number!')
-      delete_alias = config.al[number.to_i-1][ALIAS] if config.al.length >= number.to_i
+      # return delete hash key
+      arr[number.to_i-1][1] if arr.length >= number.to_i
     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 -!')
+      valid?(name, '[^\w-]', '[error] input using a-z or 0-9 or _ or -')
       name.strip
     end
 
@@ -57,7 +61,7 @@ module AM
 
     def please_input
       while val = STDIN.gets
-        break if /\n$/ =~ val 
+        break if /\n$/ =~ val
       end
       val.strip
     end

data/spec/lib/am/cli_spec.rb

@@ -0,0 +1,79 @@
+# encoding: utf-8 
+require 'spec_helper.rb'
+
+describe AM::CLI do
+  shared_examples_for "shell test" do
+    before do
+      ENV['SHELL'] = shell
+      add_history(AM::Tail.new(AM::Config.new).profile[:file])
+    end
+
+    before(:each) do
+      add_alias_config
+      @cli = AM::CLI.new
+    end
+
+    describe 'show' do
+      it 'current' do
+        expect { @cli.show }.to output(match_current_config).to_stdout
+      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
+          allow(STDIN).to receive(:gets).and_return("1\n","last_command_alias\n")
+          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
+        end
+
+      end
+      describe 'del' do
+        before do
+          allow(STDIN).to receive(:gets).and_return("1\n")
+          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
+        end
+      end
+    end
+  end
+  describe 'zsh' do
+    let(:shell)     {'/bin/zsh' }
+    it_should_behave_like 'shell test'
+  end
+
+  describe 'bash' do
+    let(:shell)     {'/bin/bash' }
+    it_should_behave_like 'shell test'
+  end
+end
+

data/spec/lib/config_spec.rb

@@ -6,27 +6,30 @@ describe AM::Config do
       `echo "alias test1='test az - AZ 09 _'" > #{AM::CONFIG_FILE}`
       `echo "history_file=~/.zsh_history" >  #{AM::LOCAL_FILE}`
       @config= AM::Config.new
+      @ak,@av = @config.al.first
     end
 
     it 'load config' do
-      expect(@config.al[0][0]).to eq 'test1'
-      expect(@config.al[0][1]).to eq "'test az - AZ 09 _'"
+      expect(@ak).to eq 'test1'
+      expect(@av).to eq "'test az - AZ 09 _'"
       expect(@config.pg['history_file']).to eq "~/.zsh_history"
     end
 
     it 'save config'do
       # add
-      config = @config.al << ['test2', "'abcdefgeijklmn'"]
+      @config.al.merge!({'test2' => "'abcdefgeijklmn'"})
       expect(@config.save_config).to be true
       expect(@config.al.length).to eql(2)
 
       # delete
-      expect(@config.save_config('test1')).to be true
+      #
+      @config.al.delete('test1')
+      expect(@config.save_config()).to be true
       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'"
+      # value check
+      expect(@config.al.key?('test2')).to be true
+      expect(@config.al['test2']).to eq "'abcdefgeijklmn'"
       expect(@config.pg['history_file']).to eq "~/.zsh_history"
 
     end

data/spec/lib/tail_spec.rb

@@ -4,10 +4,9 @@ describe AM::Tail 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)
+        @tail = AM::Tail.new(AM::Config.new)
+        add_history(@tail.profile[:file])
       end
 
       it 'get_last_five_commands' do
@@ -22,13 +21,11 @@ describe AM::Tail do
     end
 
     describe 'zsh' do
-      let(:hist_file) { '~/.zsh_history' }
       let(:shell)     {'/bin/zsh' }
       it_should_behave_like 'shell test'
     end
 
     describe 'bash' do
-      let(:hist_file) { '~/.bash_history' }
       let(:shell)     {'/bin/bash' }
       it_should_behave_like 'shell test'
     end

data/spec/spec_helper.rb

@@ -1,3 +1,78 @@
+# encoding: utf-8 
 require 'am'
+require 'am/cli'
 require 'tail'
 require 'config'
+
+
+def add_history(hist_file)
+
+record = <<'EOS'
+: 1426499455:0;rake
+rake
+: 1426500006:0;rails
+rails
+: 1426500107:0;cd /hoge/fuga/hoge/fuga
+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 あいうえ"
+EOS
+  hist_file = File.expand_path(hist_file)
+  type = File.exists?(hist_file)? 'a' : 'w'
+  file = File.open(hist_file, type)
+    record.split("\n").each {|r| file.puts(r) }
+  file.close
+end
+
+def add_alias_config
+record = <<'EOS'
+alias hoge='fuga'
+alias 123='123'
+alias ABC='ABC'
+alias aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa='bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
+alias ほげ='ふがふが'
+EOS
+
+  config_file = File.expand_path(AM::CONFIG_FILE)
+  file = File.open(config_file, "w")
+  record.split("\n").each {|r| file.puts(r) }
+  file.close
+end
+
+def match_current_config
+return <<'EOS'
+
+current commands of the config
+ 1 : hoge                                  = 'fuga'
+ 2 : 123                                   = '123'
+ 3 : ABC                                   = 'ABC'
+ 4 : aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
+ 5 : ほげ                                    = 'ふがふが'
+
+EOS
+end
+
+def match_last_five_command
+return <<'EOS'
+ 1 : cat /hoge | grep 'hoge'
+ 2 : cat /hoge | grep 'hoge'
+ 3 : pepabo
+ 4 : pepabo
+ 5 : abcd ABCD 1234 あいうえ
+EOS
+end
+
+def match_delete_list
+return <<'EOS'
+current commands of the config
+ 1 : hoge                                  = 'fuga'
+ 2 : 123                                   = '123'
+ 3 : ABC                                   = 'ABC'
+ 4 : aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
+ 5 : ほげ                                    = 'ふがふが'
+EOS
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: am
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - ka-yamashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-15 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -87,6 +88,7 @@ files:
 - lib/config.rb
 - lib/tail.rb
 - lib/ui.rb
+- spec/lib/am/cli_spec.rb
 - spec/lib/config_spec.rb
 - spec/lib/tail_spec.rb
 - spec/spec_helper.rb
@@ -115,6 +117,7 @@ signing_key:
 specification_version: 4
 summary: command note command.
 test_files:
+- spec/lib/am/cli_spec.rb
 - spec/lib/config_spec.rb
 - spec/lib/tail_spec.rb
 - spec/spec_helper.rb