yac 1.3.2 → 1.4.0

data/CHANGELOG

@@ -1,3 +1,13 @@
+=== 1.4.0 / 2008-12-28
+ 
+  * highlight commands,e.g:  $ ls
+  * <rename/add> use '@' as prefix will impact the main repository,otherwise private repository
+  * use built-in configure file,if ~/.yacrc doesn't exist
+  * doesn't init empty repository,if havn't provide 'clone-from'
+  * truncate filename when choose for tidiness
+  * if file is empty then delete <edit/add>
+  * ...
+
 === 1.3.0 / 2008-11-20
 
   * add office support (odf,odp,ods,uof,doc...)

data/Manifest

@@ -1,10 +1,10 @@
+Manifest
 CHANGELOG
 resources/yacrc
 bin/yac
 Rakefile
-yac.gemspec
 lib/git.rb
 lib/format.rb
+lib/symbol.rb
 lib/yac.rb
 README.rdoc
-Manifest

data/README.rdoc

@@ -13,79 +13,66 @@
 
 == How To Use
 
-=== To initialize repositories:
-    When you run any command,The repositories will be initialize automatically.
+=== Initialize repositories:
+  $ yac -i
 
-=== To show a cheat sheet:
-    $ yac (show) [cheatsheet] ( you can use * for any chars)
-    Eg:
-    $ yac lin*x
-    $ yac l/o/a    To show linux/gentoo/masked
+=== Show a cheat sheet:
+  $ yac /cheatsheet/	    ( * => any chars)
+  E.g:
+    $ yac lin*x    => linux  linux/welcome
+    $ yac l/o/a    => linux/gentoo/masked  linux/gentoo/layman
 
 === To edit a cheat sheet
-    $ yac -e [cheatsheet] (Yes,you can use * for any chars also,then choose one to edit)
+  $ yac -e /cheatsheet/	    ( * => any chars)
 
 === To add a cheat sheet
-    $ yac -a [cheatsheet] (OMG,you can also use *)
-    Eg:
+  $ yac -a /cheatsheet/	    ( * => any chars)
+  ('rename/add' use '@' as prefix will impact the main repository,otherwise private repository)
+  Eg:
     $ yac -a li*x/install
-    Then will display all directories match /li*x/,feel freely to choose one of them,
-    A new file named install.ch will be added to the directory!
     $ yac -a l/oo/install
-    Oh,no,you can choose linux/gentoo as the directory for the install file
 
 === To rm a cheat sheet
-    $ yac -r [cheatsheet] (Sure,you can use *)
+  $ yac -r [cheatsheet]	    ( * => any chars)
 
 === Search all sheets
-    $ yac -S [keyword] (@Take Attention:@ You are allowed to use perl-like Regex)
-    Eg:
+  $ yac -S [keyword] (@Take Attention:@ Perl-like Regexp)
+  Eg:
     $ yac -S lin.*x
-    $ yac -S '\$:'    To Search $:
-    And Even:
+    $ yac -S '\$:'          => To Search $:
     $ yac -S "r(uby|ails)"
 
 === Update repositories
-    $ yac -u main  => Update main repository
-    $ yac -u all => Update all repositories
-    $ yac -u => Update private repository
+  $ yac -u main => main repository
+  $ yac -u all  => all repositories
+  $ yac -u      => private repository
 
 === Shell
-    $ yac -s main => Open the main repository's shell
-    $ yac -s => Open the private repository's shell
+  $ yac -s main => Main repository's shell
+  $ yac -s      => Private repository's shell
 
 == Repository Push
-    $ yac -p main => Push the main repository
-    $ yac -p all => Push all repositories
-    $ yac -p => Push the private repository
+  $ yac -p main => Main repository
+  $ yac -p all  => All repositories
+  $ yac -p      => Private repository
 
 == Rename/mv a cheatsheet:
-    $ yac -m [orign_name] [new_name]
+  $ yac -m [orign_name] [new_name]
+  ('rename/add' use '@' as prefix impact the main repository,otherwise private repository)
 
 === Help (display this file)
-    $ yac -h
+  $ yac -h
 
 === Version
-    $ yac -v
-
-=== Documents format
-   All text file add ".ch" as suffix for butter editor highlight
-   (A very very simple vim script can be found here : http://www.vim.org/scripts/script.php?script_id=2399)
-
-   At the beginning of the row,plus N = for the N-class title
-
-   Words wrapped by @ for highlight
+  $ yac -v
 
 === The configure file
-   Default use $HOME/.yacrc , See the example file under resources directory
-
-=== Others
-   Add @ before [keyword] will only affect the main repository
+  <$HOME/.yacrc>  OR  <Example file under resources directory>
 
 == REQUIREMENTS:
 * Ruby
 * Git
-* rubygems
+* RubyGems
 
 == LICENSE:
 
@@ -94,5 +81,5 @@ This software is shared by GPL3 License
 Copyright (c) 2008 Jinzhu Zhang
 
 == BY: Jinzhu Zhang
-http://www.zhangjinzhu.com
-wosmvp (no-spam) gmail (no-spam) com
+  http://www.zhangjinzhu.com
+  wosmvp (no-spam) gmail (no-spam) com

data/bin/yac

@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
 require File.join(File.dirname(__FILE__), "..", "lib", "yac.rb")
+
 Yac.new(ARGV)

data/lib/format.rb

@@ -1,86 +1,57 @@
-class Symbol
-  def to_proc
-    Proc.new { |*args| args.shift.__send__(self, *args) }
+module Format
+
+  def Error(x)
+    colorful "Please Provide A Valid Command To Operate #{x} (~/.yacrc)",'warn'
   end
-end
 
-module Format
-  Pdf_Error = "Please Modify ~/.yacrc To Provide A Valid Command To Operate PDF Document"
-  Image_Error = "Please Modify ~/.yacrc To Provide A Valid Command To Operate Image Document"
-  Office_Error = "Please Modify ~/.yacrc To Provide A Valid Command To Operate Office Document"
-  Doc_Error = "Please Modify ~/.yacrc To Provide A Valid Command To Operate Text Document"
+  def handle_file(file,action = 'show')
+    colorful(file,"filename")
 
-  def format_file(file)
-    colorful(file,"filename") if file
     case `file "#{file}" 2>/dev/null`
     when / PDF document/
-      colorful(Pdf_Error,'warn') unless system("#{Yac::CONFIG["pdf_command"]||'evince'} '#{file}' 2>/dev/null")
+      Error('PDF')   unless system("#{Yac::CONFIG["#{action}_pdf"]} '#{file}' ")
     when /( image)|( bitmap)|(\.svg)/
-      colorful(Image_Error,'warn') unless system("#{Yac::CONFIG["image_command"]||'eog'} '#{file}' 2>/dev/null")
+      Error('Image') unless system("#{Yac::CONFIG["#{action}_image"]} '#{file}'")
     when /Office Document/
-      open_office(file)
+      Error('Office') unless system("#{Yac::CONFIG["#{action}_office"]} '#{file}'")
     else
-      if File.extname(file) =~ /^\.(od[tfspg]|uof)$/ #Support odf uof ods odp...
-        open_office(file)
+      if File.extname(file) =~ /^\.(od[tfspg]|uof)$/ # FileType: odf uof ods odp ...
+        Error('Office') unless system("#{Yac::CONFIG["#{action}_office"]} '#{file}'")
       else
-        File.new(file).each do |x|
-          format_section(x)
-        end
+        action =~ /show/ ? File.new(file).each {|x| format_text(x)} : edit_text(file)
       end
     end
   end
 
-  def format_section(section,empha_regexp = false)
-    if section =~ /^(=+)\s+(.*)/
-      level,stuff = $1.size,$2
-      # Highlight the keyword when searching
-      stuff = empha(stuff,"head#{level}",empha_regexp) if empha_regexp
-      colorful("\s"*(level-1) + stuff,"head#{level}")
-    else
-      section = empha(section,"text",empha_regexp) if empha_regexp
-      colorful(section)
-    end
+  def edit_text(file)
+    FileUtils.mkdir_p(File.dirname(file))   # Prepare Directory When Add File
+    Error('Text') unless system("#{Yac::CONFIG["editor"]||ENV['EDITOR']} '#{file}'")
   end
 
-  def edit_file(file)
-    case `file "#{file}" 2>/dev/null`
-    when / PDF /
-      colorful(Pdf_Error,'warn') unless system("#{Yac::CONFIG["pdf_edit_command"]||'ooffice'} '#{file}' 2>/dev/null")
-    when /( image )|(\.svg)/
-      colorful(Image_Error,'warn') unless system("#{Yac::CONFIG["image_edit_command"]||'gimp'} '#{file}' 2>/dev/null")
-    when /Office Document/
-      open_office(file)
+  def format_text(section,empha_regexp = false)
+    if section =~ /^(=+)\s+(.*)/
+      level,section = $1.size,$2
+      # Highlight keyword when searching
+      section = empha(section,"head#{level}",empha_regexp) if empha_regexp
+      colorful("\s"*(level-1) + section,"head#{level}")
     else
-      if File.extname(file) =~ /^\.(od[tfspg]|uof)$/ #Support odf uof ods odp...
-        open_office(file)
-      else
-        edit_text(file)
-      end
+      # command or plain text
+      level = (section =~ /^\s*\$\s+/) ? 'shell' : 'text'
+      section.sub!(/^(\s*\$\s+.*)/,"\e[#{@color['shell']}m"+'\1'+"\e[0m")
+      section = empha(section,level,empha_regexp) if empha_regexp
+      colorful(section)
     end
   end
 
-  def open_office(file)
-    colorful(Office_Error,'warn') unless system("#{Yac::CONFIG["office_command"]||'ooffice'} '#{file}' 2>/dev/null")
-  end
-
-  def edit_text(file)
-    prepare_dir(file)
-    colorful(Doc_Error,'warn') unless system("#{Yac::CONFIG["editor"] || ENV['EDITOR'] ||'vim'} '#{file}' 2>/dev/null")
-  end
-
   def colorful(stuff,level="text",line_break = true)
     stuff = empha(stuff,level)
-    print "\e[%sm%s\e[0m " % [Yac::CONFIG[level],stuff.rstrip]
+    print "\e[%sm%s\e[0m " % [@color[level],stuff.rstrip]
     print "\n" if line_break
   end
 
   def empha(stuff,level="text",empha_regexp=/(@(.*)@)/)
     stuff.to_s.scan(empha_regexp) do |x|
-      return stuff.gsub(x[0],"\e[0m\e[#{Yac::CONFIG["empha"]}m%s\e[0m\e[%sm" % [x[1],Yac::CONFIG[level]])
+      return stuff.gsub(x[0],"\e[0m\e[#{@color["empha"]}m%s\e[0m\e[%sm" % [x[1],@color[level]])
     end
   end
-
-  def prepare_dir(file)
-    FileUtils.mkdir_p(File.dirname(file))
-  end
 end

data/lib/git.rb

@@ -1,41 +1,45 @@
 class Git
-  def initialize(path)
-    @working_path = path
-  end
-
-  def self.clone(from,path,name)
-   `cd #{path} && git clone #{from} #{name}`
-  end
-
-  def self.init(path)
-   `cd #{path} && git init`
-  end
-
-  def mv(orig,new,with_commit = true)
-     `cd '#@working_path' && git mv #{orig} #{new}`
-     self.commit("#{clean_name(orig)} Renamed to #{clean_name(new)}") if with_commit
-  end
-
-  def add(file,with_commit = true)
-    `cd '#@working_path' && git add '#{file}'`
-    self.commit("#{clean_name(file)} Added") if with_commit
-  end
-
-  def edit(file,with_commit = true)
-    `cd '#@working_path' && git add '#{file}'`
-    self.commit("#{clean_name(file)} Updated") if with_commit
-  end
-
-  def rm(file,with_commit=true)
-    `cd '#@working_path' && git rm -f '#{file}'`
-    self.commit("#{clean_name(file)} Removed") if with_commit
-  end
-
-  def commit(msg,*args)
-     `cd '#@working_path' && git commit #{args.to_s} -m '#{msg}'`
-  end
-
-  def clean_name(f)
-    return f.sub(/^(.*)?\/(main|private)\/(.*)/,'\3').sub(/^@/,'')
+  class << self
+    def clone(from,path)
+      system("git clone #{from} #{path}")
+    end
+
+    def init(path)
+      system("mkdir -p #{path}")
+      system("cd #{path} && git init")
+    end
+
+    def mv(orig,new)
+      FileUtils.mkdir_p(File.dirname(new))
+      system("git mv #{orig} #{new}")
+      self.commit("#{cleanup_name(orig)} Renamed to #{cleanup_name(new)}")
+    end
+
+    def add(file)
+      if File.exist?(file)
+        return system("rm #{file}") if File.zero?(file)
+        system("git add '#{file}'")
+        self.commit("#{cleanup_name(file)} Added")
+      end
+    end
+
+    def edit(file)
+      return rm(file) if File.zero?(file)
+      system("git add '#{file}'")
+      self.commit("#{cleanup_name(file)} Updated")
+    end
+
+    def rm(file)
+      system("git rm -f '#{file}'")
+      self.commit("#{cleanup_name(file)} Removed")
+    end
+
+    def commit(msg,*args)
+      system("git commit #{args.to_s} -m '#{msg}' >/dev/null")
+    end
+
+    def cleanup_name(f)
+      return f.sub(/^(.*)?\/(main|private)\/(.*)/,'\3').sub(/^@/,'')
+    end
   end
 end

data/lib/symbol.rb

@@ -0,0 +1,5 @@
+class Symbol
+  def to_proc
+    Proc.new { |*args| args.shift.__send__(self, *args) }
+  end
+end

data/lib/yac.rb

@@ -1,188 +1,190 @@
 $LOAD_PATH << File.dirname(__FILE__)
-%w(git fileutils yaml format).each {|f| require f}
+%w(git fileutils yaml format symbol).each {|f| require f}
 
-module  Yac
+module Yac
   include Format
   extend self
-  VERSION = '1.3.2'
-  YACRC = File.join("#{ENV['HOME']}",".yacrc")
 
-  FileUtils.cp(File.join(File.dirname(__FILE__), "..","resources","yacrc"), YACRC) unless File.exist?(YACRC)
+  VERSION = '1.4.0'
+
+  @color = {
+    'head1'       => "1;31",
+    'head2'       => "1;36",
+    'head3'       => "1;33",
+    'head4'       => "1;32",
+    'head5'       => "1;34",
+    'head6'       => "1;35",
+    'head7'       => "1;37",
+
+    'shell'       => "01;35",
+    'warn'        => "31",
+    'notice'      => "33",
+    'empha'       => "31",
+    'filename'    => "34",
+    'line_number' => "32",
+  }
 
-  CONFIG = YAML.load_file(File.join(ENV['HOME'],".yacrc"))
+  YACRC = File.join("#{ENV['HOME']}",".yacrc")
+  CONFIG = YAML.load_file( File.exist?(YACRC) ? YACRC :
+              File.join(File.dirname(__FILE__), "..","resources","yacrc"))
 
   CONFIG["root"] ||= File.join(ENV['HOME'],".yac")
 
-  @main_path, @pri_path = File.join(CONFIG["root"],"/main/"), File.join(CONFIG["root"],"/private/")
-  @main_git = Git.new(@main_path)
-  @pri_git = Git.new(@pri_path)
+  @main_path = File.join(CONFIG["root"],"/main/")
+  @pri_path  = File.join(CONFIG["root"],"/private/")
 
   def new(args)
-    init unless File.exist?(@main_path) && File.exist?(@pri_path)
     (help && exit) if args.empty?
-    case args.first
-    when "-S" then search(args[1,args.size])
-    when "-u" then update(args[1,args.size])
-    when "-p" then push(args[1,args.size])
-    when "-l" then log(args[1,args.size])
-    when "-a" then add(args[1,args.size])
-    when "-e" then edit(args[1,args.size])
+    operate,target = args.first,args[1,args.size].join(' ')
+    case operate
+    when "-i" then init
+    when "-S" then search(target)
+    when "-u" then update(target)
+    when "-p" then push(target)
+    when "-l" then log(target)
+    when "-a" then add(target)
+    when "-e" then edit(target)
     when /^(help|-h|yac|--help)$/ then help
-    when "-s" then shell(args[1,args.size])
-    when "-r" then rm(args[1,args.size])
+    when "-s" then shell(target)
+    when "-r" then rm(target)
     when "-m" then mv(args[1,args.size])
     when "-v" then colorful("Yac Version: #{Yac::VERSION}",'notice')
-    else show(args)
+    else show(operate + ' ' + target)
     end
   end
 
   def init
-    FileUtils.mkdir_p(CONFIG['root'])
     {"main" => @main_path,"private" => @pri_path}.each do |name,path|
       if File.exist?(path)
         colorful("#{name} repository has already initialized.","notice")
-      else
-        if CONFIG["#{name}"] && CONFIG["#{name}"]['clone-from']
-          colorful("Initialize #{name} repository from #{CONFIG[name]['clone-from']} to #{CONFIG['root']}/#{name}","notice")
-          Git.clone(CONFIG["#{name}"]['clone-from'],CONFIG['root'],name)
-        else
-          colorful("Initialize #{name} repository from scratch to #{CONFIG['root']}/#{name}","notice")
-          prepare_dir(path)
-          Git.init(path)
-        end
+      elsif CONFIG["#{name}"] && CONFIG["#{name}"]['clone-from']
+        colorful("Initialize #{name} repository from #{CONFIG[name]['clone-from']}","notice")
+        Git.clone(CONFIG["#{name}"]['clone-from'],path)
       end
     end
   end
 
   def show(args)
-    args.each {|x| show_single(x)}
+    loop do
+      file = search_name(args,"Show")
+      file ? handle_file(file) : break
+    end
   end
 
   def search(args)
-    args.each {|x| search_content(x)}
-  end
-
-  def update(args)
-    git_command(args,'pull')
-  rescue
-    colorful("ERROR: can not update the repository,\n\n#{$!}","warn")
-  end
-
-  def push(args)
-    git_command(args,'push')
-  rescue
-    colorful("Usage:\nyac push ( main | all )\n\nTry `yac -h` for more help\n\n#{$1}","warn")
-  end
-
-  def log(args)
-    git_command(args,'log --color --date-order --reverse')
+    search_content(args)
   end
 
-  def git_command(env,command)
-    case env.to_s
-    when /main/ then git_path = [@main_path]
-    when /all/ then git_path = [@main_path,@pri_path]
-    else git_path = [@pri_path]
-    end
-
-    git_path.each do |x|
-      colorful(x,'filename')
-      colorful( `cd #{x} && git #{command}` ,"notice")
+  def add(args)
+    file = add_file(args,'.yac')
+    if file && confirm("You Are Adding #{file}")
+      edit_text(file)
+      Git.add(file)
     end
   end
 
   def edit(args)
-    args.each {|x| edit_single(x)}
-  end
-
-  def add(args)
-    args.each {|x| add_single(x)}
+    file = search_name(args,"Edit")
+    if file
+      handle_file(file,'edit')
+      Git.edit(file)
+    end
   end
 
   def rm(args)
-    args.each {|x| rm_single(x)}
+    file = search_name(args,"Remove")
+    if file && confirm("You Are Removing #{file}.")
+      Git.rm(file)
+    end
   end
 
   def help
-    format_file(File.dirname(__FILE__)+"/../README.rdoc")
+    handle_file(File.dirname(__FILE__)+"/../README.rdoc")
   end
 
   def shell(args)
-    case args.to_s
-    when /main/
+    if args.to_s =~ /main/
       colorful(" Welcome To The Main Yac Repository","notice")
-      system "cd '#{@main_path}'; sh"
+      system("cd '#{@main_path}'; sh")
     else
       colorful(" Welcome To The Private Yac Repository","notice")
-      system "cd '#{@pri_path}'; sh"
+      system("cd '#{@pri_path}'; sh")
     end
   end
 
   def mv(args)
-    (colorful("Usage:\nyac mv [orign_name] [new_name]\n\nTry `yac -h` for more help","warn");exit) unless args.size == 2
+    (colorful("Usage:\nyac mv [orign_name] [new_name]","warn");exit) unless args.size == 2
     file = search_name(args[0],"Rename")
-    #You can use $ yac mv linux.ch linux/ to rename linux.ch to linux/linux.ch
-    new_filename = args[1].sub(/\/$/,file.sub(/.*\/(.*)(\..*)/,'/\1')).sub(/^(@)?/,file =~ /^#{@main_path}/ ? "@":"")
-    new_name = add_file(new_filename ,file.sub(/.*(\..*)/,'\1'))
+
+    # You can use $ yac mv linux linux/ to rename linux to linux/linux
+    new_filename = args[1] =~ /\/$/ ? args[1] : args[1] + file.match(/[^\/]$/).to_s
+    new_filename = '@' + new_filename if file =~ /^#{@main_path}/
+    new_name = add_file(new_filename)
+
     if new_name && confirm("You Are Renaming #{file} To #{new_name}")
-      prepare_dir(new_name)
-      @working_git.mv(file,new_name)
+      Git.mv(file,new_name)
     end
   end
 
   protected
-  def add_single(args)
-    file = add_file(args)
-    if file && confirm("You Are Adding #{file}")
-      edit_text(file)
-      @working_git.add(file)
-    end
-  end
-
-  def add_file(args,suffix = ".ch")
-    if args.include?('/') && args =~ /(@?)(?:(.*)\/)(.+)/ #choose directory
+  def add_file(args,*suffix)
+    suffix = suffix ? suffix.to_s : ''
+    if args.include?('/') && args =~ /(@?)(?:(.*)\/)(.+)/       #choose directory
       prefix,path_name,file_name = $1,$2,$3
-      path = prefix.empty? ? @pri_path : @main_path           #choose git path
-      # Yes,you can use 'l/e' to choose 'linux/gentoo'
+      path = prefix.empty? ? @pri_path : @main_path             #choose git path
+      # Use 'l/e' to choose 'linux/gentoo'
       all_path = %x{
-        find #{path} -type d -iwholename '#{path}*#{path_name.gsub(/\//,'*/*')}*' -not -iwholename '*.git*'| sed 's/^.*\\/\\(private\\|main\\)\\//#{prefix}/'
+        find -L #{path} -type d -iwholename '#{path}*#{path_name.gsub(/\//,'*/*')}*' -not -iwholename '*\/.git\/*' | sed 's/^.*\\/\\(private\\|main\\)\\//#{prefix}/'
       }.to_a.map(&:strip).concat([prefix+path_name]).uniq
 
       colorful("Which directory do you want to use:","notice")
       choosed_path = choose_one(all_path)
-      return full_path(choosed_path + "/" + file_name + suffix) if choosed_path
+      return choosed_path ?  full_path(choosed_path + "/" + file_name + suffix) : false
     else
-      return full_path(args+suffix)
+      return full_path(args + suffix)
     end
   end
 
-  def show_single(args)
-    loop do
-      file = search_name(args,"Show")
-      file ? format_file(file) : break
-    end
+  #
+  # Git
+  #
+
+  def update(args)
+    git_command(args,'pull')
   end
 
-  def rm_single(args)
-    file = search_name(args,"Remove")
-    if file && confirm("You Are Removing #{file}.")
-      @working_git.rm(file)
-    end
+  def push(args)
+    git_command(args,'push')
   end
 
-  def edit_single(args)
-    file = search_name(args,"Edit")
-    if file
-      edit_file(file)
-      @working_git.edit(file)
+  def log(args)
+    git_command(args,'log --color')
+  end
+
+  def git_command(env,command)
+    case env.to_s
+    when /main/ then git_path = [@main_path]
+    when /all/ then git_path = [@main_path,@pri_path]
+    else git_path = [@pri_path]
+    end
+
+    git_path.each do |x|
+      colorful(x,'filename')
+      system("cd #{x} && git #{command}")
     end
   end
 
-  def search_name(args,msg = nil)
-    path = (args =~ /^(@)/) ? [@main_path] : [@main_path , @pri_path]
+  #
+  # Search
+  #
+
+  def search_name(args,msg)
+    path = (args =~ /^(@)/) ? [@pri_path] : [@main_path , @pri_path]
     result = []
     path.each do |x|
-      result.concat(`find "#{x}" -type f -iwholename '#{x}*#{args.gsub(/\//,'*/*').sub(/^@/,'').strip}*' -not -iwholename '*\/.git\/*'| sed 's/^.*\\/\\(private\\|main\\)\\//#{x=~/main/ ? '@':'' }/'`.to_a)
+      result.concat( %x{
+        find -L "#{x}" -type f -iwholename '#{x}*#{args.gsub(/\//,'*/*').sub(/^@/,'').strip}*' -not -iwholename '*\/.git\/*'| sed 's/^.*\\/\\(private\\|main\\)\\//#{x=~/main/ ? '@':'' }/'
+      }.to_a )
     end
 
     if result.empty?
@@ -195,58 +197,65 @@ module  Yac
   end
 
   def search_content(args)
-    result = `find "#{@pri_path}" -iname '*.ch' -not -iwholename '*\/.git\/*' -exec grep -HniP '#{args}' '{}' \\;`.to_a
-    result.concat(`find "#{@main_path}" -iname '*.ch' -not -iwholename '*\/.git\/*' -exec grep -HniP '#{args}' '{}' \\; | sed 's/^/@/g'`.to_a)
+    # find -type f -exec sh -c 'file="{}";type=$(file $file);[[ $type =~ " text" ]] && echo $file' \; => Too slow
+
+    # If use @ as prefix , only search private repository
+    result = args.sub!(/^@/,'') ? [] : %x(
+      find "#{@main_path}" -not -iwholename '*\/.git\/*' | grep -E '*\.[ch|yac|yml]'| xargs grep -HniP '#{args}' | sed 's/^/@/g'
+    ).to_a
+
+    result.concat %x(
+      find "#{@pri_path}" -not -iwholename '*\/.git\/*' | grep -E '*\.[ch|yac|yml]'| xargs grep -HniP '#{args}'
+    ).to_a
+
     all_result = []
     result.each do |x|
       stuff = x.split(':',3)
       colorful(File.basename(stuff[0]).sub(/\..*/,''),"filename",false)
       colorful(stuff[1],"line_number",false)
-      format_section(stuff[2],/((#{args}))/i)
+      format_text(stuff[2],/((#{args}))/i)
       all_result << stuff[0].sub(/(@?).*\/(?:main|private)\/(.*)/,'\1'+'\2')
     end
     all_result.uniq!
     loop do
-      colorful("All files Contain #{args.strip},Choose one to show","notice")
+      colorful("All files Contain #{args.strip}","notice")
       file = full_path(choose_one(all_result))
-      file ? format_file(file) : break
+      file ? handle_file(file) : break
     end
   end
 
-  def full_path(args)
-    return false unless args
-    if args =~ /^@/
-      @working_git = @main_git
-      file = @main_path + args.sub(/^@/,"")
-    else
-      @working_git = @pri_git
-      file = @pri_path + args
-    end
-    return file.strip
+  def full_path(filename)
+    return false unless filename
+    filename.sub!(/^@/,'') ? Dir.chdir(@main_path) : Dir.chdir(@pri_path)
+    return filename.strip
   end
 
   def confirm(*msg)
-    colorful("#{msg.to_s}\nAre You Sure (Y/N) (q to quit):","notice",false)
+    colorful("#{msg.to_s}\nAre You Sure (Y/N) (q:quit):","notice",false)
     return STDIN.gets.to_s =~ /n|q/i ? false : true
   end
 
-  def choose_one(stuff)
-    if stuff.size > 0
-      stuff.each_index do |x|
-        colorful("%2s" % (x+1).to_s,"line_number",false)
-        printf "%-22s\t" % [stuff[x].rstrip]
-        print "\n" if (x+1)%3 == 0
-      end
-      printf "\n"
-      num = choose_range(stuff.size)
-      return stuff[num-1].to_s.strip #return the filename
+  def choose_one(args)
+    return false unless args.size > 0
+
+    args.each_index do |x|
+      printf "\e[%dm%3s\e[0m" % [args[x] =~ /^@/ ? 36:34,x+1]
+      printf " %-22s" % [trancate_filename(args[x].strip)]
+      print "\n" if (x+1)%3 == 0
     end
-  rescue #Rescue for user input q to quit
+    puts "\n" if args.size%3 != 0
+
+    num = choose_range(args.size)
+    return num ? args[num-1].to_s.strip : false     #return the filename
+  end
+
+  def trancate_filename(name)
+    name.sub!(/\..*$/,'').sub!(/^@/,'')
+    content = name.size > 22 ? '..' + name.reverse[0,20].reverse : name
   end
 
-  #choose a valid number
   def choose_range(size)
-    colorful("Please Input A Valid Number To Choose (1..#{size}) (q to quit): ","notice",false)
+    colorful("Please Input A Valid Number (1..#{size}) (q:quit): ","notice",false)
     num = STDIN.gets
     return false if num =~ /q/i
     choosed_num = num.strip.empty? ? 1 : num.to_i

data/resources/yacrc

@@ -1,54 +1,19 @@
 #root:
-# add_if_not_exist: true
+
 main:
   clone-from: git://github.com/wosmvp/cheat.git
-#  push-to:
+# push-to:
 private:
-#  clone-from:
-#  push-to:
+# clone-from:
+# push-to:
 
-pdf_command: evince
-office_command: ooffice
-#image_command: evince
-#editor: vim
-#pdf_edit_command: ooffice
-#image_edit_command: gimp
 
-head1: "1;31"
-head2: "1;36"
-head3: "1;33"
-head4: "1;32"
-head5: "1;34"
-head6: "1;35"
-head7: "1;37"
+editor:  vim
 
-warn: "31"
-notice: "33"
-empha: "31;43"
-filename: "34"
-line_number: "32"
-text:
+show_pdf:  evince
+show_image:  eog
+show_office:  ooffice
 
-# How To Set Color
-#1   -   Change text to hicolor (bold) mode
-#4   -      "    "   "  Underline
-#5   -      "    "   "  Blink
-#8   -      "    "   "  Hidden (same color as bg)
-#30  -      "    "   "  Black
-#31  -      "    "   "  Red
-#32  -      "    "   "  Green
-#33  -      "    "   "  Yellow
-#34  -      "    "   "  Blue
-#35  -      "    "   "  Magenta
-#36  -      "    "   "  Cyan
-#37  -      "    "   "  White
-#40  -   Change background to Black
-#41  -      "       "      "  Red
-#42  -      "       "      "  Green
-#43  -      "       "      "  Yellow
-#44  -      "       "      "  Blue
-#45  -      "       "      "  Magenta
-#46  -      "       "      "  Cyan
-#47  -      "       "      "  White
-#0   -   Turn off all attributes.
-#7   -   Change to Black text on a White background
+edit_pdf:  ooffice
+edit_image:  gimp
+edit_office:  ooffice

data/yac.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yac}
-  s.version = "1.3.2"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jinzhu Zhang"]
-  s.date = %q{2008-12-15}
+  s.date = %q{2008-12-28}
   s.default_executable = %q{yac}
   s.description = %q{Yet Another Cheat: sexy command line tool for cheat sheet.}
   s.email = %q{wosmvp@gmail.com}
   s.executables = ["yac"]
-  s.extra_rdoc_files = ["CHANGELOG", "bin/yac", "lib/git.rb", "lib/format.rb", "lib/yac.rb", "README.rdoc"]
-  s.files = ["CHANGELOG", "resources/yacrc", "bin/yac", "Rakefile", "yac.gemspec", "lib/git.rb", "lib/format.rb", "lib/yac.rb", "README.rdoc", "Manifest"]
+  s.extra_rdoc_files = ["CHANGELOG", "bin/yac", "lib/git.rb", "lib/format.rb", "lib/symbol.rb", "lib/yac.rb", "README.rdoc"]
+  s.files = ["Manifest", "CHANGELOG", "resources/yacrc", "bin/yac", "Rakefile", "lib/git.rb", "lib/format.rb", "lib/symbol.rb", "lib/yac.rb", "README.rdoc", "yac.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://www.zhangjinzhu.com}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Yac", "--main", "README.rdoc"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yac
 version: !ruby/object:Gem::Version 
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors: 
 - Jinzhu Zhang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-15 00:00:00 +08:00
+date: 2008-12-28 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -24,19 +24,21 @@ extra_rdoc_files:
 - bin/yac
 - lib/git.rb
 - lib/format.rb
+- lib/symbol.rb
 - lib/yac.rb
 - README.rdoc
 files: 
+- Manifest
 - CHANGELOG
 - resources/yacrc
 - bin/yac
 - Rakefile
-- yac.gemspec
 - lib/git.rb
 - lib/format.rb
+- lib/symbol.rb
 - lib/yac.rb
 - README.rdoc
-- Manifest
+- yac.gemspec
 has_rdoc: true
 homepage: http://www.zhangjinzhu.com
 post_install_message: