am 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 852969fa27d5ac381cfbf936cdfa4fb066e65991
-  data.tar.gz: 9ec05aebec06d777801b59c495b72a91cf967cce
+  metadata.gz: c3b038cb3f81b74b7abb30a9eb3afb59f6b10e48
+  data.tar.gz: 90814812b84e90359a4d273ebab2d54062527ec2
 SHA512:
-  metadata.gz: 2a0275bb79a92fd03a219804b70c8f5326f42a7449617517fb71f9a39aa17d96f782f57cba55e66039beb6fb5df9037f4c4c34a5aace52d5ebc0743f63835bde
-  data.tar.gz: bab4c2b8d9af19f0ea0c112d5df871d019850a6d3bccbde1287cef0e18525177794c76a2ed55f7385bc73c08931efda3a414f170b35993ff63c8c62a3e7fbaf2
+  metadata.gz: fb82b1d037927e39fa815c22bd1ce52ee2f2101066e552fa03518ef5fd799beae8d2ddf515dc25e41d6d9fb8ea42829d3c35d1e95aa1be3ad9a99eda6e26def5
+  data.tar.gz: 20f892204a581542dc3aa7f491da70e48dc52869579e68d5f7aacf4fe1cd936240bc472d22efd389f2bf1a9bbc8669d2cde1cd3adbd1600cb54b92754950480e

data/README.md

@@ -57,7 +57,8 @@ echo 'source ~/.am_config' >> ~/.bash_profile
   * history file location(optional)
 
   ```
-  # ~/.am_config
+  => ~/.am_local_config
+
   history_file=~/.custom_history
   ```
 

data/lib/am/version.rb

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

data/lib/am.rb

@@ -2,9 +2,10 @@ require "am/version"
 require "am/cli"
 module AM 
 
-  CONFIG_FILE=File.expand_path('~/.am_config')
-  ALIAS   = 0
-  COMMAND = 1
+  CONFIG_FILE = File.expand_path('~/.am_config')
+  LOCAL_FILE  = File.expand_path('~/.am_local_config')
+  ALIAS       = 0
+  COMMAND     = 1
 
   def self.p1(message="")
     puts "\n#{message}"

data/lib/config.rb

@@ -8,21 +8,31 @@ module AM
     end
 
     def file_load
-      @al = []
-      @pg = {}
-      File.open(CONFIG_FILE, 'r') do |file|
+      @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/)
-          @pg   = Hash[*line.strip.split('=', 2)] if line =~ /^[^alias]/ && 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)
+
+      # 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?
     end
 
     def save_config(exclude=nil)
-      tmp_file = CONFIG_FILE + '.tmp'
-      file = File.open(tmp_file, "w")
+      config_tmp_file = CONFIG_FILE + '.tmp'
+      file = File.open(config_tmp_file, "w")
       new_al = []
 
       file.puts("# alias config")
@@ -34,14 +44,17 @@ module AM
         end
       end
       @al = new_al
+      file.close
 
+      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}"
         file.puts(r)
       end
       file.close
-      File.rename(tmp_file, CONFIG_FILE)
+      (File.rename(config_tmp_file, CONFIG_FILE) == 0 && File.rename(local_tmp_file, LOCAL_FILE) == 0)
     end
   end
 end

data/lib/tail.rb

@@ -28,7 +28,14 @@ module AM
         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])
+
+      unless File.exists?(@profile[:file])
+        puts "history file not found #{@profile[:file]}"
+        exit
+      end
     end
 
     def get_last_five_command

data/spec/lib/config_spec.rb

@@ -4,7 +4,7 @@ describe AM::Config do
   context 'zsh' do
     before do
       `echo "alias test1='test az - AZ 09 _'" > #{AM::CONFIG_FILE}`
-      `echo "history_file=~/.zsh_history" >> #{AM::CONFIG_FILE}`
+      `echo "history_file=~/.zsh_history" >  #{AM::LOCAL_FILE}`
       @config= AM::Config.new
     end
 
@@ -17,11 +17,11 @@ describe AM::Config do
     it 'save config'do
       # add
       config = @config.al << ['test2', "'abcdefgeijklmn'"]
-      expect(@config.save_config).to eql(0)
+      expect(@config.save_config).to be true
       expect(@config.al.length).to eql(2)
 
       # delete
-      expect(@config.save_config('test1')).to eql(0)
+      expect(@config.save_config('test1')).to be true
       expect(@config.al.length).to eql(1)
 
       # valu check
@@ -33,10 +33,10 @@ describe AM::Config do
 
     it 'pg config' do
       # @config.pg_check
-      `echo "history_file=~/.csh_history" >> #{AM::CONFIG_FILE}`
+      `echo "history_file=~/.csh_history" > #{AM::LOCAL_FILE}`
       config= AM::Config.new
       expect(config.pg['history_file']).to eq "~/.csh_history"
-      `echo "" > #{AM::CONFIG_FILE}`
+      `echo "" > #{AM::LOCAL_FILE}`
     end
   end
 end

metadata

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