yac 1.2.1 → 1.3.0

data/CHANGELOG

@@ -1,12 +1,22 @@
-V1.2.0 <2008-11-9>
+=== 1.3.0 / 2008-11-20
+
+  * add office support (odf,odp,ods,uof,doc...)
+  * words wrapped by @ to highlight
+  * Fix some minor bug.
+
+=== 1.2.0 / 2008-11-18
+
   * modify all commands search => -S , add => -a ,edit => -e and so on
-V1.1.1 <2008-11-8>
+
+=== 1.1.1 / 2008-11-8
+
   * $ yac l/oo/t           To choose linux/gentoo/install
   * $ yac add l/oo/t       To choose linux/gentoo/ As the directory for file t
 
-V1.1.0 <2008-11-8>
+=== 1.1.0 / 2008-11-8
+
   * Don't need schacon-git anymore
   * When Choose files You can Just press enter to choose the first one
   * When Confirm You can Just press enter to answer Yes
 
-Version Below V1.1.0 Please See README
+Version previous 1.1.0 Please See README

data/README.rdoc

@@ -1,5 +1,5 @@
 =  YAC => Yet Another Cheet (Powered By Ruby)
-  YAC was inspired by 'chit' (http://github.com/robin/chit) by robin and 'cheat' (http://cheat.errtheblog.com/) by Chris Wanstrath,But @@@Colorful and Sexy!!!@@@
+  YAC was inspired by 'chit' (http://github.com/robin/chit) by robin and 'cheat' (http://cheat.errtheblog.com/) by Chris Wanstrath,But @Colorful and Sexy!!!@
 
 == What?
   Cheat sheet is a concise set of notes used for quick reference.
@@ -38,9 +38,10 @@
     $ yac -r [cheatsheet] (Sure,you can use *)
 
 === Search all sheets
-    $ yac -S [keyword] (@@@Take Attention:@@@ You are allowed to use perl-like Regex)
+    $ yac -S [keyword] (@Take Attention:@ You are allowed to use perl-like Regex)
     Eg:
     $ yac -S lin.*x
+    $ yac -S '\$:'    To Search $:
     And Even:
     $ yac -S "r(uby|ails)"
 
@@ -64,15 +65,16 @@
 === Help (display this file)
     $ 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
 
-   Use '#' at the beginning of a row to comment the line,You can use '\#' for '#'
-
-   Words wrapped by three @ for highlight
+   Words wrapped by @ for highlight
 
 === The configure file
    Default use $HOME/.yacrc , See the example file under resources directory

data/lib/format.rb

@@ -7,50 +7,65 @@ 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 format_file(file)
-    @level = 0
     colorful(file,"filename") if file
     case `file "#{file}" 2>/dev/null`
     when / PDF document/
-      puts Pdf_Error unless system("#{Yac::CONFIG["pdf_command"]||'evince'} \"#{file}\" 2>/dev/null")
+      puts Pdf_Error unless system("#{Yac::CONFIG["pdf_command"]||'evince'} '#{file}' 2>/dev/null")
     when /( image )|(\.svg)/
-      puts Image_Error unless system("#{Yac::CONFIG["image_command"]||'eog'} \"#{file}\" 2>/dev/null")
+      puts Image_Error unless system("#{Yac::CONFIG["image_command"]||'eog'} '#{file}' 2>/dev/null")
+    when /Office Document/
+      open_office(file)
     else
-      File.new(file).each do |x|
-        format_section(x)
+      if File.extname(file) =~ /^\.(od[tfspg]|uof)$/ #Support odf uof ods odp...
+        open_office(file)
+      else
+        File.new(file).each do |x|
+          format_section(x)
+        end
       end
     end
-  rescue
   end
 
-  def format_section(section,search = false)
-    case section
-    when /^(=+)\s+(.*)/
-      @level = search ? 1 : $1.size
-      colorful("\s"*2*(@level-1) + $2,"head#{@level}")
-    when /^(\s*)#/
-      colorful(section.sub(/^\s*/,'')) if search
+  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
-      colorful(section.sub(/^\#/,"#").sub(/^\s*/, "\s" * ( @level||0 ) * 2 ))
+      section = empha(section,"text",empha_regexp) if empha_regexp
+      colorful(section)
     end
   end
 
   def edit_file(file)
     case `file "#{file}" 2>/dev/null`
     when / PDF /
-      puts Pdf_Error unless system("#{Yac::CONFIG["pdf_edit_command"]||'ooffice'} \"#{file}\" 2>/dev/null")
+      puts Pdf_Error unless system("#{Yac::CONFIG["pdf_edit_command"]||'ooffice'} '#{file}' 2>/dev/null")
     when /( image )|(\.svg)/
-      puts Image_Error unless system("#{Yac::CONFIG["image_edit_command"]||'gimp'} \"#{file}\" 2>/dev/null")
+      puts Image_Error unless system("#{Yac::CONFIG["image_edit_command"]||'gimp'} '#{file}' 2>/dev/null")
+    when /Office Document/
+      open_office(file)
     else
-      edit_text(file)
+      if File.extname(file) =~ /^\.(od[tfspg]|uof)$/ #Support odf uof ods odp...
+        open_office(file)
+      else
+        edit_text(file)
+      end
     end
   end
 
+  def open_office(file)
+    puts Office_Error unless system("#{Yac::CONFIG["office_command"]||'ooffice'} '#{file}' 2>/dev/null")
+  end
+
   def edit_text(file)
     prepare_dir(file)
-    puts Doc_Error unless system("#{Yac::CONFIG["editor"] || ENV['EDITOR'] ||'vim'} \"#{file}\" 2>/dev/null")
+    puts Doc_Error unless system("#{Yac::CONFIG["editor"] || ENV['EDITOR'] ||'vim'} '#{file}' 2>/dev/null")
   end
 
   def colorful(stuff,level="text",line_break = true)
@@ -59,14 +74,13 @@ module Format
     print "\n" if line_break
   end
 
-  def empha(stuff,level="text",empha_regexp=/(@@@(.*)@@@)/)
+  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"].to_s}m%s\e[0m\e[%sm" % [x[1],Yac::CONFIG[level]])
+      return stuff.gsub(x[0],"\e[0m\e[#{Yac::CONFIG["empha"]}m%s\e[0m\e[%sm" % [x[1],Yac::CONFIG[level]])
     end
   end
 
   def prepare_dir(file)
-    dirseparator = file.rindex(File::Separator)+1
-    FileUtils.mkdir_p(file[0,dirseparator])
+    FileUtils.mkdir_p(File.dirname(file))
   end
 end

data/lib/yac.rb

@@ -4,7 +4,7 @@ $LOAD_PATH << File.dirname(__FILE__)
 module  Yac
   include Format
   extend self
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
   YACRC = File.join("#{ENV['HOME']}",".yacrc")
 
   FileUtils.cp(File.join(File.dirname(__FILE__), "..","resources","yacrc"), YACRC) unless File.exist?(YACRC)
@@ -34,7 +34,6 @@ module  Yac
     when "-v" then colorful("Yac Version: #{Yac::VERSION}",'notice')
     else show(args)
     end
-  rescue
   end
 
   def init
@@ -112,10 +111,10 @@ module  Yac
     case args.to_s
     when /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
 
@@ -173,32 +172,38 @@ module  Yac
 
   def edit_single(args)
     file = search_name(args,"Edit")
-    edit_file(file)
-    @working_git.edit(file)
+    if file
+      edit_file(file)
+      @working_git.edit(file)
+    end
   end
 
   def search_name(args,msg = nil)
     path = (args =~ /^(@)/) ? [@main_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(`find "#{x}" -type f -iwholename '#{x}*#{args.gsub(/\//,'*/*').sub(/^@/,'').strip}*' -not -iwholename '*\/.git\/*'| sed 's/^.*\\/\\(private\\|main\\)\\//#{x=~/main/ ? '@':'' }/'`.to_a)
     end
 
-    return result.empty? ? (colorful("Nothing Found About < #{args} >","warn")) :
-      (colorful("The Results About < #{args} > To #{msg || "Operate"} :","notice");full_path(choose_one(result)))
+    if result.empty?
+      colorful("Nothing Found About < #{args} >","warn")
+      return false
+    else
+      colorful("The Results About < #{args} > To #{msg} :","notice")
+      return full_path(choose_one(result))
+    end
   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)
+    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)
     all_result = []
     result.each do |x|
       stuff = x.split(':',3)
-      filename = stuff[0].sub(/(@?).*\/(?:main|private)\/(.*)/,'\1'+'\2')
-      colorful(filename,"filename",false)
+      colorful(File.basename(stuff[0]).sub(/\..*/,''),"filename",false)
       colorful(stuff[1],"line_number",false)
-      format_section(empha(stuff[2],nil,/((#{args}))/i),true)
-      all_result.concat(filename.to_a)
+      format_section(stuff[2],/((#{args}))/i)
+      all_result << stuff[0].sub(/(@?).*\/(?:main|private)\/(.*)/,'\1'+'\2')
     end
     all_result.uniq!
     loop do

data/yac.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yac}
-  s.version = "1.2.1"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jinzhu Zhang"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yac
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors: 
 - Jinzhu Zhang