am 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ac8121440319603d9c34a172b5bf701aa71f7e7
-  data.tar.gz: 40a62d1010f7798019f672535fc55a5451688a1c
+  metadata.gz: 3ed54a2838657b508701ab2bfeb4761cc46008e9
+  data.tar.gz: 7e18590971c2c43c4c39246b43a72d8e0f037e74
 SHA512:
-  metadata.gz: 6f6ac069e16b5ad8024520b63b6efa164eab40981ad6872d86abe4b94bc51a04324374a386a369bc289afd6a18f09470c70de7ffc62fd2e1e946f74ef771e916
-  data.tar.gz: ca6af85e41a5f392d4e7f693e6a4360880ba2f9a4ea77571cd39147ec5b41a3925d8e3ade6de0b1468fcef1f92f0171e7d499a88868345c57ad7cc0a5995f34e
+  metadata.gz: 13168b80a8a7d7348d92ce8e50db49b13c614c1925484d7d4120076e3ff988f7b8a2861a4373a2833f06be69d8de8a58cf1dd4e890d6420874e3f7c3507e2994
+  data.tar.gz: e400ea2db125f6c3d17db65be2d632f0fe17ab2fb0abcd593e7758d56dbca3c16607bc29f56da6790e9a11815a2417bf222e49d39dbfdc34b0520c956ebfbd3d

data/.travis.yml

@@ -6,4 +6,6 @@ script: bundle exec rspec
 before_script:
   - "touch ~/.zsh_history"
   - "touch ~/.bash_history"
-
+addons:
+  code_climate:
+    repo_token:12696de76803f797a3add017d83ea158a13fd6f3bde7fdffbc3218ccaf473a2a

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in am.gemspec
 gemspec
+gem "codeclimate-test-reporter", group: :test, require: nil

data/README.md

@@ -55,6 +55,10 @@ echo 'source ~/.am_config' >> ~/.bash_profile
     delete alias select from current config
 
 ### configure
+  * defoult alias
+  ```
+  aml = source ~/.am_config
+  ```
 
   * history file location(optional)
 

data/lib/am/cli.rb

@@ -1,12 +1,18 @@
-# encoding: utf-8 
+# encoding: utf-8
 require 'am'
 require 'tail'
 require 'config'
 require 'ui'
+require 'validate'
+require 'message_control'
 require 'thor'
 
 module AM
   class CLI < Thor
+
+    include MessageControl
+    include Validate
+
     default_command :show
     def initialize(*args)
       super
@@ -17,7 +23,7 @@ module AM
     desc "show", "show current alias"
     def show
       if @config.al.empty?
-        puts 'a blank config'
+        notice(:config_empty)
       else
         @ui.print_current_config(@config)
       end
@@ -32,20 +38,16 @@ module AM
       if options[:list]
         commands = tail.get_last_five_command
         @ui.print_last_commands(commands)
-        add_record = @ui.add_command_with_number(commands)
+        new_alias = @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)
+        new_alias   = @ui.add_command_with_last_history(last_command)
       end
 
-      if uniq?(add_record) && valid?(add_record)
-        @config.al.merge!(add_record)
-        add_config(add_record) 
-      else
-        AM.p1("")
-        show
+      if uniq?(new_alias) && valid?(new_alias)
+        @config.add_config(new_alias)
       end
     end
 
@@ -53,7 +55,7 @@ module AM
     option :list, :type => :boolean, :aliases => '-l'
     def del(delete_alias=nil)
       if @config.al.empty?
-        puts 'a blank config'
+        notice(:config_empty)
         exit
       end
 
@@ -62,56 +64,16 @@ module AM
         arr =  @ui.print_current_config(@config)
         delete_alias = @ui.del_command_with_number(arr)
       end
-      @config.al.delete(delete_alias)
-      delete_config(delete_alias)
+      if delete_alias && @config.al.key?(delete_alias)
+        @config.al.delete(delete_alias)
+      else
+        warning(:empty_config_number)
+        self.del
+      end
+      @config.delete_config(delete_alias)
     end
 
     no_commands do
-      # todo merge config
-      def add_config(add_record)
-        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] #{ak} / #{av} couldn't add command" 
-        end
-      end
-
-      def delete_config(exclude)
-        if @config.save_config
-          AM.p1("[success] delete alias #{exclude}")
-          AM.p2("please run: [ source #{CONFIG_FILE} ]")
-
-        else
-          AM.p2("[error] failue delete alias #{exclude}}")
-        end
-      end
-      # todo end
-      # todo move config class
-      def uniq?(add_record)
-        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 av == v
-            AM.p1("[error] not written as duplecate command is #{av}")
-            return false
-          end
-        end
-        true
-      end
-      # end
-      def valid?(add_record)
-        ak,av = add_record.first
-        unless ak.length > 0 || av.length > 0
-          puts   "[error] #{ak} / #{av} length equal 0"
-          return false 
-        end
-        true
-      end
     end
   end
 end

data/lib/am/version.rb

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

data/lib/config.rb

@@ -1,23 +1,44 @@
-# encoding: utf-8 
+# encoding: utf-8
 require 'am'
+require 'message_control'
 
 module AM
   class Config
+    include MessageControl
     attr_accessor :al, :pg
 
     def initialize
-      @al = {}
-      @pg = {}
       load_config
     end
 
     def load_config
       @al = file_load(CONFIG_FILE)
       @pg = file_load(LOCAL_FILE)
+      @al.delete('aml')
+    end
+
+    def add_config(new_alias)
+      @al.merge!(new_alias)
+      if save_config
+        notice(:success_add_command, [new_alias.first.to_a, CONFIG_FILE].flatten)
+      else
+        error(add_command,[ak, av])
+      end
+    end
+
+    def delete_config(del_alias)
+      @al.delete(del_alias)
+      if save_config
+        notice(:success_delete_command, [del_alias, CONFIG_FILE])
+      else
+        error(:fail_delete, del_alias)
+      end
     end
 
     def save_config
-      (file_write(CONFIG_FILE, @al, 'alias ') && file_write(LOCAL_FILE,  @pg))
+      (
+        file_write(CONFIG_FILE, @al.merge({"aml" => 'source ~/.am_config'}))
+      )
     end
 
     def file_write(file_name, config, prefix=nil)
@@ -38,7 +59,7 @@ module AM
       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 !~ /^#.*/
+          buf << line.gsub(/^alias /, '').split('=', 2) if line !~ /^$/ && line =~ /.+=.+/ && line !~ /^#.*/
         end
       end if File.exists?(file_name)
       Hash[buf]

data/lib/message_control.rb

@@ -0,0 +1,45 @@
+# encoding: utf-8
+require 'am'
+
+module AM
+  module MessageControl
+    NOTICE_MESSAGE = {
+      config_empty: 'config is empty',
+      success_add_command: "success! %s / %s added command\n       please run: [ source %s ]",
+      success_delete_command: "success! %s delete alias\n       please run: [ source %s ]"
+    }
+    WARNING_MESSAGE = {
+      add_command: "%s / %s couldn't add command",
+      empty_config_number: "selected number missing in current config",
+      duplecate_alias: "not written as duplecate alias is '%s'",
+      duplecate_command: "not written as duplecate command is %s",
+    }
+    ERROR_MESSAGE = {
+      add_command: "%s / %s couldn't add command",
+      validate_length_zero: "%s / %s length equal 0",
+      faile_delete: "failue delete alias %s",
+    }
+
+    def notice(code, val=nil)
+      puts "\n" + '-'*60
+      print(NOTICE_MESSAGE, 'info', code, val)
+      puts '-'*60
+    end
+
+    def warning(code, val=nil)
+      puts "\n" + '-'*60
+      print(WARNING_MESSAGE, 'warning', code, val)
+      puts '-'*60
+    end
+    def error(code, val=nil)
+      puts "\n" + '-'*60
+      print(ERROR_MESSAGE, 'error', code, val)
+      puts '-'*60
+      exit
+    end
+
+    def print(template, prefix, code, val=nil)
+      puts "[#{prefix}] #{template[code]}"%val
+    end
+  end
+end

data/lib/tail.rb

@@ -5,72 +5,62 @@ module AM
   class Tail
     attr_accessor :profile
     def initialize(config)
-      set_profile(config)
+      @profile = get_profile(config)
     end
 
-    def set_profile(config)
+    def get_profile(config)
       shell = ENV['SHELL']
-      @profile = {}
-
-      if shell =~ /zsh/
-        @profile = {
-          margin:   0,
-          max_line: 5,
-          file:     '~/.zsh_history'
-        }
-      elsif shell =~ /bash/
-        @profile = {
-          margin:   1,
-          max_line: 5,
-          file:     '~/.bash_history'
-        }
-      else
-        puts "does not support is #{shell}"
-        exit
+      h = case shell
+      when /zsh/  then set_hash(0, 5, '~/.zsh_history')
+      when /bash/ then set_hash(1, 5, '~/.bash_history')
+      else # todo raise
+          puts "does not support is #{shell}"
+          exit
       end
 
-      @profile[:file] = config.pg['history_file'] unless config.pg['history_file'].nil?
-      @profile[:file] = File.expand_path(@profile[:file])
+      h[:file] = f if f =  config.pg['history_file']
+      h[:file] = File.expand_path(h[:file])
 
-      unless File.exists?(@profile[:file])
-        puts "history file not found #{@profile[:file]}"
+      unless File.exists?(h[:file])
+        #todo raise
+        puts "history file not found #{h[:file]}"
         exit
       end
+      h
+    end
+
+    def set_hash(margin, max_line, history_file)
+      return { margin: margin, max_line: max_line, file: history_file }
     end
 
     def get_last_five_command
-      exit if @profile.empty?
       commands = []
+      r=""
       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|
-        if r = sampling(c)
-          commands << r
+      unless last_commands.empty?
+        last_commands.each_with_index do |c,i|
+          commands << r if r = sampling(c)
         end
-      end unless last_commands.empty?
-
-      commands
+        commands
+      end
     end
 
     def get_last_command
-      exit if @profile[:file].empty?
-
+      r=""
       if c = `tail -#{2-@profile[:margin]} #{@profile[:file]} | head -1`
-        if r = sampling(c)
-          r
-        end
+        sampling(c)
       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 !~ /^$/
+      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,4 +1,4 @@
-# encoding: utf-8 
+# encoding: utf-8
 require 'am'
 
 module AM

data/lib/validate.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+require 'am'
+
+module AM
+  module Validate
+    def uniq?(new_alias)
+      ak,av = new_alias.first
+      @config.al.each do |k,v|
+        if ak == k
+          warning(:duplecate_alias, ak)
+          return false
+        elsif av == v
+          warning(:duplecate_command, av)
+          return false
+        end
+      end
+      true
+    end
+
+    def valid?(new_alias)
+      ak,av = new_alias.first
+      unless ak.length > 0 || av.length > 0 || ak == 'aml'
+        error(:validate_lenght_zero, [ak,av])
+      end
+      true
+    end
+
+  end
+end

data/spec/lib/am/cli_spec.rb

@@ -1,11 +1,11 @@
-# encoding: utf-8 
+# 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])
+      add_history
     end
 
     before(:each) do

data/spec/lib/config_spec.rb

@@ -1,46 +1,69 @@
 require 'spec_helper.rb'
 
 describe AM::Config do
-  context 'zsh' do
+  shared_examples_for 'config test' do
     before 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
+      ENV['SHELL'] = shell
     end
+    describe 'alias config' do
+      describe 'load config' do
+        before do
+          file_write(AM::CONFIG_FILE,"alias test1='test az - AZ 09 _", 'w')
+          @config= AM::Config.new
+          @ak,@av = @config.al.first
+        end
+        it 'load' do
+          expect(@ak).to eq 'test1'
+          expect(@av).to eq "'test az - AZ 09 _"
+        end
+      end
 
-    it 'load config' do
-      expect(@ak).to eq 'test1'
-      expect(@av).to eq "'test az - AZ 09 _'"
-      expect(@config.pg['history_file']).to eq "~/.zsh_history"
+      describe 'save config'do
+        before do
+          file_write(AM::CONFIG_FILE,"alias test1='test az - AZ 09 _", 'w')
+          @config= AM::Config.new
+          @config.al.merge!({'test2' => "'abcdefgeijklmn'"})
+        end
+        it 'add' do
+          expect(@config.save_config).to be true
+          expect(@config.al.length).to eql(2)
+          expect(@config.al.key?('test2')).to be true
+          expect(@config.al['test2']).to eq "'abcdefgeijklmn'"
+        end
+        it 'delete' do
+          @config.al.delete('test1')
+          expect(@config.save_config()).to be true
+          expect(@config.al.length).to eql(1)
+          expect(@config.al.key?('test2')).to be true
+          expect(@config.al['test2']).to eq "'abcdefgeijklmn'"
+        end
+      end
     end
+  end
 
-    it 'save config'do
-      # add
-      @config.al.merge!({'test2' => "'abcdefgeijklmn'"})
-      expect(@config.save_config).to be true
-      expect(@config.al.length).to eql(2)
-
-      # delete
-      #
-      @config.al.delete('test1')
-      expect(@config.save_config()).to be true
-      expect(@config.al.length).to eql(1)
-
-      # 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"
-
+  describe 'pg config' do
+    describe 'load config' do
+      before do
+        file_write(AM::LOCAL_FILE, "history_file=~/.csh_history", 'w')
+        @config= AM::Config.new
+        @pk,@pv = @config.pg.first
+      end
+      it 'load config' do
+        expect(@pk).to eq 'history_file'
+        expect(@pv).to eq "~/.csh_history"
+      end
     end
-
-    it 'pg config' do
-      # @config.pg_check
-      `echo "history_file=~/.csh_history" > #{AM::LOCAL_FILE}`
-      config= AM::Config.new
-      expect(config.pg['history_file']).to eq "~/.csh_history"
-      `echo "" > #{AM::LOCAL_FILE}`
+    after do
+      file_write(AM::LOCAL_FILE, '','w');
     end
   end
-end
+  describe 'zsh' do
+    let(:shell)     {'/bin/zsh' }
+    it_should_behave_like 'config test'
+  end
 
+  describe 'bash' do
+    let(:shell)     {'/bin/bash' }
+    it_should_behave_like 'config test'
+  end
+end

data/spec/lib/tail_spec.rb

@@ -1,34 +1,31 @@
 require 'spec_helper.rb'
-
 describe AM::Tail do
-  context 'tail commands tests' do
-    shared_examples_for "shell test" do
-      before do
-        ENV['SHELL'] = shell
-        @tail = AM::Tail.new(AM::Config.new)
-        add_history(@tail.profile[:file])
-      end
-
-      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
+  shared_examples_for "tail test" do
+    before do
+      ENV['SHELL'] = shell
+      @tail = AM::Tail.new(AM::Config.new)
+      add_history
     end
 
-    describe 'zsh' do
-      let(:shell)     {'/bin/zsh' }
-      it_should_behave_like 'shell test'
+    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
 
-    describe 'bash' do
-      let(:shell)     {'/bin/bash' }
-      it_should_behave_like 'shell test'
+    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
+
+  describe 'zsh' do
+    let(:shell)     {'/bin/zsh' }
+    it_should_behave_like 'tail test'
+  end
+
+  describe 'bash' do
+    let(:shell)     {'/bin/bash' }
+    it_should_behave_like 'tail test'
+  end
 end
 

data/spec/spec_helper.rb

@@ -1,13 +1,21 @@
 # encoding: utf-8 
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
 require 'am'
 require 'am/cli'
 require 'tail'
 require 'config'
 
+def file_write(file_name, records, mode='a')
+  file_name = File.expand_path(file_name)
+  file = File.open(file_name, mode)
+    records.split("\n").each {|r| file.puts(r) }
+  file.close
+end
 
-def add_history(hist_file)
+def add_history
 
-record = <<'EOS'
+records = <<'EOS'
 : 1426499455:0;rake
 rake
 : 1426500006:0;rails
@@ -21,15 +29,13 @@ pepabo
 : 1426500618:0;abcd ABCD 1234 あいうえ
 abcd ABCD 1234 あいうえ"
 EOS
-  hist_file = File.expand_path(hist_file)
+  hist_file = File.expand_path(AM::Tail.new(AM::Config.new).profile[:file])
   type = File.exists?(hist_file)? 'a' : 'w'
-  file = File.open(hist_file, type)
-    record.split("\n").each {|r| file.puts(r) }
-  file.close
+  file_write(hist_file, records, type)
 end
 
 def add_alias_config
-record = <<'EOS'
+records = <<'EOS'
 alias hoge='fuga'
 alias 123='123'
 alias ABC='ABC'
@@ -38,9 +44,7 @@ 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
+  file_write(config_file, records, 'w')
 end
 
 def match_current_config

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: am
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - ka-yamashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,8 +86,10 @@ files:
 - lib/am/cli.rb
 - lib/am/version.rb
 - lib/config.rb
+- lib/message_control.rb
 - lib/tail.rb
 - lib/ui.rb
+- lib/validate.rb
 - spec/lib/am/cli_spec.rb
 - spec/lib/config_spec.rb
 - spec/lib/tail_spec.rb