yac 1.0.4 → 1.1.0

data/lib/format.rb

@@ -1,3 +1,9 @@
+class Symbol
+  def to_proc
+    Proc.new { |*args| args.shift.__send__(self, *args) }
+  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"
@@ -47,19 +53,15 @@ module Format
     puts Doc_Error unless system("#{Yac::CONFIG["editor"] || ENV['EDITOR'] ||'vim'} \"#{file}\" 2>/dev/null")
   end
 
-  def clean_filename(f)
-    return f.sub(/^(.*)?(main|private)\/(.*)/,'\3').sub(/^@/,'')
-  end
-
   def colorful(stuff,level="text",line_break = true)
     stuff = empha(stuff,level)
-    print "\033[%sm%s\033[0m" % [Yac::CONFIG[level],stuff.rstrip]
+    print "\e[%sm%s\e[0m " % [Yac::CONFIG[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],"\033[0m\033[#{Yac::CONFIG["empha"].to_s}m%s\033[0m\033[%sm" % [x[1],Yac::CONFIG[level]])
+      return stuff.gsub(x[0],"\e[0m\e[#{Yac::CONFIG["empha"].to_s}m%s\e[0m\e[%sm" % [x[1],Yac::CONFIG[level]])
     end
   end
 

data/lib/git.rb

@@ -0,0 +1,41 @@
+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(/^@/,'')
+  end
+end

data/lib/yac.rb

@@ -1,6 +1,5 @@
 $:.unshift File.dirname(__FILE__)
-%w(rubygems git fileutils yaml format).each {|f| require f}
-
+%w(git fileutils yaml format).each {|f| require f}
 module  Yac
   include Format
   extend self
@@ -14,8 +13,8 @@ module  Yac
   CONFIG["root"] ||= File.join(ENV['HOME'],".yac")
 
   @main_path, @pri_path = File.join(CONFIG["root"],"/main/"), File.join(CONFIG["root"],"/private/")
-  @main_git = Git.open(@main_path) if File.exist?(@main_path)
-  @pri_git = Git.open(@pri_path)if File.exist?(@pri_path)
+  @main_git = Git.new(@main_path)
+  @pri_git = Git.new(@pri_path)
 
   def new(args)
     init unless File.exist?(@main_path) && File.exist?(@pri_path)
@@ -47,13 +46,12 @@ module  Yac
       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'], name, :path => CONFIG['root'])
+          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
-        @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
@@ -128,35 +126,34 @@ module  Yac
     #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'))
-    if confirm("You Are Renaming #{file} To #{new_name}")
+    if new_name && confirm("You Are Renaming #{file} To #{new_name}")
       prepare_dir(new_name)
-      `mv "#{file}" "#{new_name}"`
-      @working_git.add
-      @working_git.commit_all("#{clean_filename(file)} Renamed to #{clean_filename(new_name)}")
+      @working_git.mv(file,new_name)
     end
   end
 
   protected
   def add_single(args)
     file = add_file(args)
-    if confirm("You Are Adding #{file}")
+    if file && confirm("You Are Adding #{file}")
       edit_text(file)
-      @working_git.add
-      @working_git.commit_all("#{clean_filename(file)} Added")
+      @working_git.add(file)
     end
   end
 
   def add_file(args,suffix = ".ch")
-    if args.include?('/') && args =~ /(@?)(?:(.*)\/)(.+)/
-      path = $1.empty? ? @pri_path : @main_path
+    if args.include?('/') && args =~ /(@?)(?:(.*)\/)(.+)/ #choose directory
+      path = $1.empty? ? @pri_path : @main_path           #choose git path
       all_path = %x{
-        find #{path} -type d -iwholename '#{path}*#{$2}*' -not -iwholename '*.git*'| sed 's/^.*\\(private\\|main\\)\\//#{$1}/'
-      }.to_a
-        colorful("Which directory do you want to use:","notice") if all_path.size >1
-        choosed_path = choose_one(all_path.concat([$1+$2]).uniq)
-        args = choosed_path + "/" + $3 if choosed_path
+        find #{path} -type d -iwholename '#{path}*#{$2}*' -not -iwholename '*.git*'| sed 's/^.*\\/\\(private\\|main\\)\\//#{$1}/'
+      }.to_a.map(&:strip).concat([$1+$2]).uniq
+
+      colorful("Which directory do you want to use:","notice")
+      choosed_path = choose_one(all_path)
+      return full_path(choosed_path + "/" + $3 + suffix) if choosed_path
+    else
+      return full_path(args+suffix)
     end
-    file = full_path(args+suffix)
   end
 
   def show_single(args)
@@ -169,53 +166,43 @@ module  Yac
   def rm_single(args)
     file = search_name(args,"Remove")
     if confirm("You Are Removing #{file}.")
-      begin
-        @working_git.remove(file)
-        @working_git.commit_all("#{clean_filename(file)} Removed")
-      rescue Git::GitExecuteError
-        FileUtils.rm_rf(file)
-      end
+      @working_git.rm(file)
     end
   end
 
   def edit_single(args)
     file = search_name(args,"Edit")
     edit_file(file)
-    @working_git.add
-    @working_git.commit_all("#{clean_filename(file)} Updated")
+    @working_git.edit(file)
   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.sub(/^@/,'').strip}*' -not -iwholename '*.git*'| sed 's/^.*\\(private\\|main\\)\\//#{x=~/main/ ? '@':'' }/'`.to_a)
+      result.concat(`find "#{x}" -type f -iwholename '#{x}*#{args.sub(/^@/,'').strip}*' -not -iwholename '*.git*'| sed 's/^.*\\/\\(private\\|main\\)\\//#{x=~/main/ ? '@':'' }/'`.to_a)
     end
-    #For loop show filename
-    (format_file(full_path(result[0]));return nil) if msg =~ /show/i && result.size == 1
 
     return result.empty? ? (colorful("Nothing Found About < #{args} >","warn")) :
       (colorful("The Results About < #{args} > To #{msg || "Operate"} :","notice");full_path(choose_one(result)))
   end
 
   def search_content(args)
-    args.sub!(/^"(.*)"/,'\1')
+    args.sub!(/^"(.*)"/,'\1') #Remove the " for input Regex
     result = `cd "#{@pri_path}" && grep -n -i -P '#{args}' -R *.ch 2>/dev/null`.to_a
     result.concat(`cd "#{@main_path}" && grep -n -i -P '#{args}' -R *.ch 2>/dev/null | sed 's/^/@/g'`.to_a)
     all_result = []
     result.each do |x|
       stuff = x.split(':',3)
       colorful(stuff[0],"filename",false)
-      print " "
       colorful(stuff[1],"line_number",false)
-      print " "
       format_section(empha(stuff[2],nil,/((#{args}))/i),true)
       all_result.concat(stuff[0].to_a)
     end
     all_result.uniq!
     loop do
-      all_result.size > 1 ? (file = full_path(choose_one(all_result))) : (format_file(full_path(all_result[0]));break)
       colorful("All files Contain #{args.strip},Choose one to show","notice")
+      file = full_path(choose_one(all_result))
       file ? format_file(file) : break
     end
   end
@@ -234,39 +221,29 @@ module  Yac
 
   def confirm(*msg)
     colorful("#{msg.to_s}\nAre You Sure (Y/N) (q to quit):","notice",false)
-    case STDIN.gets
-    when /n|q/i
-      return false
-    when /y/i
-      return true
-    else
-      colorful("Please Input A Valid String,","warn")
-      confirm(msg)
-    end
+    return STDIN.gets.to_s =~ /n|q/i ? false : true
   end
 
-  # Choose one file to operate
   def choose_one(stuff)
-    if stuff.size == 1
-      return stuff[0]
-    elsif stuff.size > 1
+    if stuff.size > 0
       stuff.each_index do |x|
         colorful("%2s" % (x+1).to_s,"line_number",false)
-        printf " %-20s \t" % [stuff[x].rstrip]
-        print "\n" if (x+1)%4 == 0
+        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 stuff[num-1].to_s.strip #return the filename
     end
   rescue #Rescue for user input q to quit
   end
 
-  #choose a valid range
+  #choose a valid number
   def choose_range(size)
     colorful("Please Input A Valid Number To Choose (1..#{size}) (q to quit): ","notice",false)
     num = STDIN.gets
-    return if num =~ /q/i
-    (1..size).member?(num.to_i) ? (return num.to_i) : choose_range(size)
+    return false if num =~ /q/i
+    choosed_num = num.strip.empty? ? 1 : num.to_i
+    (1..size).member?(choosed_num) ? (return choosed_num) : choose_range(size)
   end
 end

data/yac.gemspec

@@ -1,5 +1,5 @@
 GEM = "yac"
-VER = "1.0.4"
+VER = "1.1.0"
 DATE = %q{2008-10-28}
 AUTHOR = "Jinzhu Zhang"
 EMAIL = "wosmvp@gmail.com"
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.autorequire = 'yac'
   s.executables = ["yac"]
  
-  s.files = %w[README.rdoc yac.gemspec resources/yacrc bin/yac lib/yac.rb lib/format.rb]
+  s.files = %w[README.rdoc yac.gemspec resources/yacrc bin/yac lib/yac.rb lib/format.rb lib/git.rb]
 
   #s.has_rdoc = true
   s.rdoc_options = ["--quiet", "--title", "YAC => Yet Another Cheat", "--opname", "index.html", "--line-numbers", "--main", "README.rdoc", "--inline-source"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yac
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jinzhu Zhang
@@ -37,6 +37,7 @@ files:
 - bin/yac
 - lib/yac.rb
 - lib/format.rb
+- lib/git.rb
 has_rdoc: false
 homepage: http://www.zhangjinzhu.com
 post_install_message: