yac 0.1.2 → 0.1.5

data/lib/yac.rb

@@ -1,6 +1,8 @@
-%w(rubygems git fileutils yaml).each {|f| require f}
+$:.unshift File.dirname(__FILE__)
+%w(rubygems git fileutils yaml format).each {|f| require f}
 
 module  Yac
+  include Format
   extend self
 
   YACRC = File.join("#{ENV['HOME']}",".yacrc")
@@ -34,6 +36,26 @@ module  Yac
   rescue
   end
 
+  def init
+    FileUtils.mkdir_p(CONFIG['root'])
+    {"main" => @main_path,"private" => @pri_path}.each do |name,path|
+      unless File.exist?(path)
+        if CONFIG["#{name}"] && CONFIG["#{name}"]['clone-from']
+          puts "Initialize #{name} repository from #{CONFIG[name]['clone-from']} to #{CONFIG['root']}/#{name}"
+          Git.clone(CONFIG["#{name}"]['clone-from'], name, :path => CONFIG['root'])
+        else
+          puts "Initialize #{name} repository from scratch to #{CONFIG['root']}/#{name}"
+          git = Git.init(path)
+          git.add
+          git.commit_all("init #{name} repository")
+        end
+        puts "#{name} repository initialized."
+        @main_git = Git.open(@main_path) if File.exist?(@main_path)
+        @pri_git = Git.open(@pri_path)if File.exist?(@pri_path)
+      end
+    end
+  end
+
   def show(args)
     args.each {|x| show_single(x)}
   end
@@ -43,18 +65,14 @@ module  Yac
   end
 
   def update(args)
-    begin
-      unless args.empty?
-        @pri_git.pull if args.to_s =~ /pri/
+    unless args.empty?
+      @pri_git.pull if args.to_s =~ /pri/
         @main_git.pull if args.to_s =~ /main/
-      else
-        @main_git.pull
-        @pri_git.pull
-      end
-    rescue
-      puts "ERROR: can not update the repository,"
-      puts $!
+    else
+      @main_git.pull && @pri_git.pull
     end
+  rescue
+    puts "ERROR: can not update the repository,\n #{$!}"
   end
 
   def edit(args)
@@ -72,50 +90,15 @@ module  Yac
   def shell(args)
     case args.to_s
     when /main/
-      puts "\033[31m Welcome To The Main Yac Repository \033[0m"
+      colorful(" Welcome To The Main Yac Repository","head1")
       system "cd #{@main_path}; sh"
     else
-      puts "\033[31m Welcome To The Private Yac Repository \033[0m"
+      colorful(" Welcome To The Private Yac Repository","head1")
       system "cd #{@pri_path}; sh"
     end
   end
 
   protected
-  def format_file(file)
-    @level = 0
-    case `file #{file}`
-    when / PDF /
-      puts "Please Modify ~/.yacrc To Provide A Valid Command To Open PDF Document" unless system("#{CONFIG["pdf_command"]||'evince'} #{file}")
-    when /( image )|(\.svg)/
-      puts "Please Modify ~/.yacrc To Provide A Valid Command To Open Image Document" unless system("#{CONFIG["pic_command"]||'eog'} #{file}")
-    else
-      File.new(file).each do |x|
-        format_section(x)
-      end
-    end
-  end
-
-  def format_section(section)
-    case section
-    when /^(=+)\s+(.*)/
-      @level = $1.size
-      puts "\033[" + CONFIG["level#{@level}"].to_s + "m" + "\s"*2*(@level-1) + $2 +"\033[0m"
-    when /^(\s*)#/
-    else
-      puts section.sub(/^\#/,"#").sub(/^\s*/, "\s" * @level * 2 ).gsub(/@@@(.*)@@@/,"\033[" + CONFIG["empha"].to_s + "m" + '\1' + "\033[0m")
-    end
-  end
-
-  def full_path(args)
-    if args =~ /^@/
-      @file_path = @main_path + args.sub(/^@/,"") + ".ch"
-      @working_git = @main_git
-    else
-      @file_path = @pri_path + args + ".ch"
-      @working_git = @pri_git
-    end
-  end
-
   def rm_single(args)
     full_path(args)
     begin
@@ -124,7 +107,7 @@ module  Yac
     rescue Git::GitExecuteError
       FileUtils.rm_rf(@file_path)
     end
-  end
+  end 
 
   def edit_single(args)
     full_path(args)
@@ -134,19 +117,15 @@ module  Yac
     @working_git.commit_all(" #{args.sub(/^@/,"")}.ch Updated")
   end
 
-  def editor
-    CONFIG["editor"] || ENV['EDITOR'] || "vim"
-  end
-
   def show_single(args)
     result = search_single(args)
     if result.size == 1
-      puts "\n\033[#{CONFIG["filename"]}m#{result.first}\033[0m\n"
+      colorful(result.first,"filename")
       format_file(result.first)
     else
       result.map do |x|
-        if x =~ /\/#{args}\.\w+/
-          puts "\n\033[#{CONFIG["filename"]}m#{x}\033[0m\n"
+        if x =~ /\/#{args.sub(/^@/,"")}\.\w+/
+          colorful(x,"filename")
           format_file(x)
         end
       end
@@ -169,58 +148,24 @@ module  Yac
       @private_result = @pri_git.ls_files.keys.grep(/#{args}/)
         @main_result = @main_git.ls_files.keys.grep(/#{args}/)
     end
-    #ADD to all possible result
-    @all_result << @main_result.collect {|x| "@" + x}
-    @all_result << @private_result
+    @all_result << @main_result.collect {|x| "@" + x} << @private_result
 
-    #Remove duplicate files
     @private_result.map do |x|
       @main_result.delete(x)
     end
-    #Return full path
     return (@main_result.collect {|x| @main_path +x}).concat(@private_result.collect {|x| @pri_path +x})
   end
 
   def search_content(args)
-    @main_git.grep(args).each do |file, lines|
-      title = title_of_file(file.split(':')[1])
-      lines.each do |l|
-        puts "@#{title}:#{l[0]}:  #{l[1]}"
-      end
-    end
-    @pri_git.grep(args).each do |file, lines|
-      title = title_of_file(file.split(':')[1])
-      lines.each do |l|
-        puts "#{title}:#{l[0]}:  #{l[1]}"
-      end
-    end
-  end
-
-  def title_of_file(f)
-    f[0..((f.rindex('.')||0) - 1)]
-  end
-
-  def show_possible_result
-    puts "\n\033[" + CONFIG["possible_result_title"].to_s + "mALL POSSIBLE RESULT:\033[0m\n \033[" +CONFIG["possible_result_content"].to_s + "m" + @all_result.join("\s"*2) + "\033[0m" unless @all_result.to_s.empty?
-  end
-
-  def init
-    FileUtils.mkdir_p(CONFIG['root'])
-    {"main" => @main_path,"private" => @pri_path}.each do |name,path|
-      unless File.exist?(path)
-        if CONFIG["#{name}"] && CONFIG["#{name}"]['clone-from']
-          puts "Initialize #{name} repository from #{CONFIG[name]['clone-from']} to #{CONFIG['root']}/#{name}"
-          Git.clone(CONFIG["#{name}"]['clone-from'], name, :path => CONFIG['root'])
-        else
-          puts "Initialize #{name} repository from scratch to #{CONFIG['root']}/#{name}"
-          git = Git.init(path)
-          git.add
-          git.commit_all("init #{name} repository")
-        end
-        puts "#{name} repository initialized."
-        @main_git = Git.open(@main_path) if File.exist?(@main_path)
-        @pri_git = Git.open(@pri_path)if File.exist?(@pri_path)
-      end
+    result = `cd #{@pri_path} && grep -n #{args} -R *.ch 2>/dev/null`
+    result << `cd #{@main_path} && grep -n #{args} -R *.ch 2>/dev/null | sed 's/^/@/g'`
+    result.each do |x|
+      stuff = x.split(':',3)
+      colorful(title_of_file(stuff[0]),"filename",false)
+      print " "
+      colorful(stuff[1],"line_number",false)
+      print " "
+      format_section(empha(stuff[2],nil,/((#{args}))/),true)
     end
   end
 
@@ -228,4 +173,14 @@ module  Yac
     dirseparator = @file_path.rindex(File::Separator)+1
     FileUtils.mkdir_p(@file_path[0,dirseparator])
   end
+
+  def full_path(args)
+    if args =~ /^@/
+      @file_path = @main_path + args.sub(/^@/,"") + ".ch"
+      @working_git = @main_git
+    else
+      @file_path = @pri_path + args + ".ch"
+      @working_git = @pri_git
+    end
+  end 
 end

data/resources/yacrc

@@ -35,15 +35,17 @@ private:
 #0   -   Turn off all attributes.
 #7   -   Change to Black text on a White background
 
-level1: 31
-level2: 32
-level3: 33
-level4: 34
-level5: 0;31;40
-level6: 0;31;40
-level7: 0;31;40
+head1: 31
+head2: 32
+head3: 33
+head4: 34
+head5: 0;31;40
+head6: 0;31;40
+head7: 0;31;40
 
 empha: 32;40
 possible_result_title: 33;41
 possible_result_content: 31
 filename: 31
+line_number: 32
+text:

data/yac.gemspec

@@ -1,5 +1,5 @@
 GEM = "yac"
-VER = "0.1.2"
+VER = "0.1.5"
 DATE = %q{2008-10-18}
 AUTHOR = "Jinzhu Zhang"
 EMAIL = "wosmvp@gmail.com"
@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
+  s.rubyforge_project = 'yac'
   s.name = GEM
   s.version = VER
   s.author = AUTHOR
@@ -26,7 +27,7 @@ Gem::Specification.new do |s|
  
   s.files = %w[README.rdoc README.cn yac.gemspec resources/yacrc bin/yac lib/yac.rb]
 
-  s.has_rdoc = true
+  #s.has_rdoc = true
   s.rdoc_options = ["--quiet", "--title", "YAC => Yet Another Cheat", "--opname", "index.html", "--line-numbers", "--main", "README.rdoc", "--inline-source"]
   s.extra_rdoc_files = "README.rdoc"
  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yac
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.5
 platform: ruby
 authors: 
 - Jinzhu Zhang
@@ -37,7 +37,7 @@ files:
 - resources/yacrc
 - bin/yac
 - lib/yac.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://www.zhangjinzhu.com
 post_install_message: 
 rdoc_options: 
@@ -66,8 +66,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.2.0
+rubyforge_project: yac
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: Yet Another Cheat