am 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f536428a276df0fd09ec9937e8a5a32995c4e8b
-  data.tar.gz: dc5e19ae44f8d6957b67a9f138eb5edd86de37b6
+  metadata.gz: c1c035e872c61d3c8de94e71e81b49d30fc26792
+  data.tar.gz: 42f8fa57dad2dd410c302a59a1cb105b30773772
 SHA512:
-  metadata.gz: 043ad037b3a430e61d3dca3e0dccaaac7019acf0ed714bfc469c33b793a7f3e655e32560db22d2528e27a956fce57e31f2a3d4c6c8ac5f1ec96be3c380d8c791
-  data.tar.gz: b1d21f7a283e740fc9cbe37aa834999fdea81b670b6b1a4a550db8817893256d77e069a9aa0ddf402ab52be69f76eddf8a12bd71df4d7c0540d4ca27b02f9d85
+  metadata.gz: ebf1c71e6ccc74ef5ae1044c37bbead6ade425dfc4dafdd30ae637a21b6f852c4af53021d8453ce28da5da9aee7eac52bb07f7652e96e496aefad76554cc6240
+  data.tar.gz: 83331d4c739e1a5f7dfdbc2296801741acbe481fd3687d7879ef1622d0c51907dce6288dbff90f33452ac888c399138f4afba218c149af0a019d041699f7f9de

data/am.gemspec

@@ -20,5 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec"
   spec.add_dependency 'thor'
 end

data/lib/am/cli.rb

@@ -19,7 +19,7 @@ module AM
       if @config.empty?
         puts 'a blank config'
       else
-        @ui.current_config(@config)
+        @ui.print_current_config(@config)
       end
     end
 
@@ -29,19 +29,21 @@ module AM
       tail = Tail.new
       # registeration from history choice
       if options[:list]
-        commands = tail.print_last_commands
+        commands = tail.get_last_five_command
+        @ui.print_last_commands(commands)
         add_record = @ui.add_command_with_number(commands)
+
       # registeration from last history
       else
         last_command = tail.get_last_command
         add_record   = @ui.add_command_with_last_history(last_command)
       end
 
-      if uniq?(add_record)
+      if uniq?(add_record) && valid?(add_record)
         @config << add_record
         add_config(add_record) 
       else
-        AM.before_break("")
+        AM.p1("")
         show
       end
     end
@@ -56,7 +58,7 @@ module AM
       end
 
       if options[:list] || delete_alias == nil
-        @ui.current_config(@config)
+        @ui.print_current_config(@config)
         delete_alias = @ui.del_command_with_number(@config)
       end
         delete_config(delete_alias)
@@ -67,8 +69,8 @@ module AM
       def add_config(add_record)
         config  = Config.new
         if config.save_config(@config)
-          AM.before_break("[success] #{add_record[ALIAS]} / #{add_record[COMMAND]} added command")
-          AM.after_break("please run: [ source #{CONFIG_FILE} ]")
+          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
@@ -77,26 +79,33 @@ module AM
       def delete_config(exclude)
         config  = Config.new
         if config.save_config(@config, exclude)
-          AM.before_break("[success] delete alias #{exclude}")
-          AM.after_break("please run: [ source #{CONFIG_FILE} ]")
+          AM.p1("[success] delete alias #{exclude}")
+          AM.p2("please run: [ source #{CONFIG_FILE} ]")
         else
-          AM.after_break("[error] failue delete alias #{exclude}}")
+          AM.p2("[error] failue delete alias #{exclude}}")
         end
       end
 
       def uniq?(add_record)
-        @config.each do |al, command|
-          if add_record[ALIAS] == al
-            AM.before_break("[error] not written as duplecate alias is '#{add_record[ALIAS]}'")
+        @config.each do |a,c|
+          if add_record[ALIAS] == a
+            AM.p1("[error] not written as duplecate alias is '#{add_record[ALIAS]}'")
             return false
-          elsif add_record[COMMAND] == command
-            AM.before_break("[error] not written as duplecate command is #{add_record[COMMAND]}")
+          elsif add_record[COMMAND] == c
+            AM.p1("[error] not written as duplecate command is #{add_record[COMMAND]}")
             return false
           end
         end
-        return true
+        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"
+          return false 
+        end
+        true
+      end
+    end
   end
 end

data/lib/am/version.rb

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

data/lib/am.rb

@@ -1,14 +1,16 @@
 require "am/version"
 require "am/cli"
 module AM 
-  # Your code goes here...
+
   CONFIG_FILE=File.expand_path('~/.am_config')
   ALIAS   = 0
   COMMAND = 1
-  def self.before_break(message)
+
+  def self.p1(message="")
     puts "\n#{message}"
   end
-  def self.after_break(message)
+
+  def self.p2(message="")
     puts "#{message}\n\n"
   end
 end

data/lib/config.rb

@@ -2,7 +2,6 @@ require 'am'
 
 module AM
   class Config
-
     def current
       config = []
       File.open(CONFIG_FILE, 'r') do |file|
@@ -13,17 +12,17 @@ module AM
       config
     end
 
-    def save_config(cache, exclude=nil)
+    def save_config(config, exclude=nil)
       tmp_file = CONFIG_FILE + '.tmp'
       file = File.open(tmp_file, "w")
 
-      cache.each do |al, command|
-        record = "alias #{al.to_s.strip}=#{command.to_s.strip}"
-        if al.to_s.strip != exclude
-          file.puts(record) 
+      config.each do |a,c|
+        r = "alias #{a.to_s}=#{c.to_s}"
+        if a.to_s != exclude
+          file.puts(r)
         end
-        `#{record}`
       end
+
       file.close
       File.rename(tmp_file, CONFIG_FILE)
     end

data/lib/tail.rb

@@ -8,36 +8,47 @@ module AM
 
     def set_profile
       shell = `echo $SHELL`
+      @profile = {}
+
       if shell =~ /zsh/
-        @history_pattern = '.*;(.*)'
-        @sh_history_file = File.expand_path('~/.zsh_history')
-        @tail_margin     = 0
+        @profile = {
+          pattern:  '.*;(.*)',
+          file:     File.expand_path('~/.zsh_history'),
+          margin:   0,
+          max_line: 5,
+        }
       elsif shell =~ /bash/
-        @history_pattern = '(.*)'
-        @sh_history_file = File.expand_path('~/.bash_history')
-        @tail_margin     = 1
+        @profile = {
+          pattern:  '(.*)',
+          file:     File.expand_path('~/.bash_history'),
+          margin:   1,
+          max_line: 5,
+        }
       else
         puts "does not support is #{shell}"
+        exit
       end
     end
 
-    def print_last_commands
-      exit if @sh_history_file.nil?
-
+    def get_last_five_command
+      exit if @profile.empty?
       commands = []
-      last_commands = `tail -#{6-@tail_margin} #{@sh_history_file} | head -5`.split("\n")
+      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(/#{@history_pattern}/)[COMMAND].strip
-        puts " #{(i+1).to_s} : #{record.to_s}"
+        record = c.split(/#{@profile[:pattern]}/)[COMMAND].strip
         commands << record
-      end
+      end unless last_commands.empty?
+
       commands
     end
 
     def get_last_command
-      exit if @sh_history_file.nil?
-      `tail -#{2-@tail_margin} #{@sh_history_file} | head -1`.split(/#{@history_pattern}/)[COMMAND].strip
-    end
+      exit if @profile[:file].empty?
 
+      if last_row = `tail -#{2-@profile[:margin]} #{@profile[:file]} | head -1`.split(/#{@profile[:pattern]}/)
+        last_row[COMMAND].strip
+      end
+    end
   end
 end

data/lib/ui.rb

@@ -2,27 +2,22 @@ require 'am'
 
 module AM
   class Ui
-    def current_config(config)
-      al_max_len = 0
+    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
 
-      AM::after_break("current commands of the config")
-
-      config.each do |al,command|
-        al_max_len  = max(al.to_s.length, al_max_len)
-      end
-
-      index_max_len = config.length.to_s.length
-
-      config.each_with_index do|record,index|
-
-        as = ''
-        (al_max_len - record[ALIAS].length.to_i).times do as = as + ' ' end
-        is = ''
-        (index_max_len - (index+1).to_s.length).times  do is = is + ' ' end
+      AM::p1("current commands of the config")
+      config.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?
+      AM::p1
+    end
 
-        puts " #{is}#{(index+1).to_s} : #{record[ALIAS].to_s}#{as} = #{record[COMMAND].to_s}"
-      end
-      AM::before_break("")
+    def print_last_commands(commands)
+      commands.each_with_index  do |c,i|
+        puts " #{(i+1).to_s} : #{c.to_s}"
+      end unless commands.empty?
     end
 
     def add_command_with_number(commands)
@@ -30,11 +25,11 @@ 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])]
+      [alias_name, quot(commands[number.to_i-1].strip)]
     end
 
     def add_command_with_last_history(command)
-      puts "add command is #{quot(command)}"
+      puts "add command is #{quot(command.strip)}"
       alias_name   = get_alias
       [alias_name, quot(command)]
     end
@@ -50,7 +45,7 @@ module AM
       print "please input add command alias: "
       name = please_input
       valid?(name, '^[^\w-]', '[error] input using a-z or 0-9 or _ or -!')
-      name
+      name.strip
     end
 
     def valid?(val, pattern, message)

data/spec/lib/config_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper.rb'
+
+describe AM::Config do
+  describe 'config commands tests' do
+    before() do
+      @config= AM::Config.new
+      `echo "alias test1='test az - AZ 09 _'" > #{AM::CONFIG_FILE}`
+    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 _'"
+    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)
+
+      # delete
+      expect(@config.save_config(config,'test1')).to eql(0)
+      expect(@config.current.length).to eql(1)
+
+      # add check
+      expect(@config.current[0][0]).to eq 'test2'
+      expect(@config.current[0][1]).to eq "'abcdefgeijklmn'"
+    end
+  end
+end
+

data/spec/lib/tail_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper.rb'
+
+describe AM::Tail do
+  describe 'tail commands tests' do
+
+    before() do
+      @tail = AM::Tail.new
+    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]+/)
+    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
+end
+

data/spec/spec_helper.rb

@@ -0,0 +1,3 @@
+require 'am'
+require 'tail'
+require 'config'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: am
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - ka-yamashita
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +87,9 @@ files:
 - lib/config.rb
 - lib/tail.rb
 - lib/ui.rb
+- spec/lib/config_spec.rb
+- spec/lib/tail_spec.rb
+- spec/spec_helper.rb
 homepage: http://ten-snapon.com
 licenses:
 - MIT
@@ -97,4 +114,7 @@ rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: command note command.
-test_files: []
+test_files:
+- spec/lib/config_spec.rb
+- spec/lib/tail_spec.rb
+- spec/spec_helper.rb