yac 1.4.1 → 1.4.2

data/CHANGELOG

@@ -1,3 +1,6 @@
+=== 1.4.2 / 2009-2-1
+  * Ruby 1.9 compatible
+
 === 1.4.0 / 2008-12-28
  
   * highlight commands,e.g:  $ ls

data/lib/git.rb

@@ -34,8 +34,8 @@ class Git
       self.commit("#{cleanup_name(file)} Removed")
     end
 
-    def commit(msg,*args)
-      system("git commit #{args.to_s} -m '#{msg}' >/dev/null")
+    def commit(msg,args='')
+      system("git commit #{args} -m '#{msg}' >/dev/null")
     end
 
     def cleanup_name(f)

data/lib/yac.rb

@@ -5,7 +5,7 @@ module Yac
   include Format
   extend self
 
-  VERSION = '1.4.1'
+  VERSION = '1.4.2'
 
   @color = {
     'head1'       => "1;31",
@@ -34,22 +34,22 @@ module Yac
   @pri_path  = File.join(CONFIG["root"],"/private/")
 
   def new(args)
-    (help && exit) if args.empty?
-    operate,target = args.first,args[1,args.size].join(' ')
+    operate, target = args.shift.to_s , args.join(' ').to_s
+
     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 "-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 "-s" then shell  target
+    when "-r" then rm     target
+    when "-m" then mv     args
     when /^(help|-h|yac|--help)$/ then help
-    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(operate + ' ' + target)
+    else show  operate + ' ' + target
     end
   end
 
@@ -99,7 +99,22 @@ module Yac
   end
 
   def help
-    handle_file(File.dirname(__FILE__)+"/../README.rdoc")
+    puts <<-DOC.gsub(/^(\s*)/,'').gsub(/^\|(\s*)/,'\1')
+    Usage:
+    |   yac -i <keyword> init
+    |   yac -S <keyword> search
+    |   yac -u <keyword> update
+    |   yac -p <keyword> push
+    |   yac -l <keyword> log
+    |   yac -a <keyword> add
+    |   yac -e <keyword> edit
+    |   yac -s <keyword> shell
+    |   yac -r <keyword> delete<rm>
+    |   yac -m <keyword> rename<mv>
+    |   yac -h Show this help
+    |   yac -v Show Version
+    |   yac    <keyword> Show
+    DOC
   end
 
   def shell(args)
@@ -127,15 +142,14 @@ module Yac
   end
 
   protected
-  def add_file(args,*suffix)
-    suffix = suffix ? suffix.to_s : ''
-    if args.include?('/') && args =~ /(@?)(?:(.*)\/)(.+)/       #choose directory
+  def add_file(args,suffix='')
+    if args.include?('/') && args =~ /(@?)(?:(.*)\/)(.+)/   #choose directory
       prefix,path_name,file_name = $1,$2,$3
-      path = prefix.empty? ? @pri_path : @main_path             #choose git path
+      path = prefix.empty? ? @pri_path : @main_path         #choose git path
       # Use 'l/e' to choose 'linux/gentoo'
       all_path = %x{
         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
+      }.split("\n").map(&:strip).concat([prefix+path_name]).uniq
 
       colorful("Which directory do you want to use:","notice")
       choosed_path = choose_one(all_path)
@@ -184,7 +198,7 @@ module Yac
     path.each do |x|
       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 )
+      }.split("\n") )
     end
 
     if result.empty?
@@ -200,11 +214,11 @@ module Yac
     # If use @ as prefix , only search private repository
     result = args.sub!(/^@/,'') ? [] : %x(
       find "#{@main_path}" -not -iwholename '*\/.git\/*' | xargs grep -HniP '#{args}' --binary-files=without-match | sed 's/^/@/g'
-    ).to_a
+    ).split("\n")
 
     result.concat %x(
       find "#{@pri_path}" -not -iwholename '*\/.git\/*' | xargs grep -HniP '#{args}' --binary-files=without-match
-    ).to_a
+    ).split("\n")
 
     all_result = []
     result.each do |x|
@@ -228,8 +242,8 @@ module Yac
     return filename.strip
   end
 
-  def confirm(*msg)
-    colorful("#{msg.to_s}\nAre You Sure (Y/N) (q:quit):","notice",false)
+  def confirm(msg='')
+    colorful("#{msg}\nAre You Sure (Y/N) (q:quit):","notice",false)
     return (STDIN.gets || exit) =~ /n|q/i ? false : true
   end
 

data/yac.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yac}
-  s.version = "1.4.1"
+  s.version = "1.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jinzhu Zhang"]
-  s.date = %q{2009-01-06}
+  s.date = %q{2009-02-02}
   s.default_executable = %q{yac}
   s.description = %q{Yet Another Cheat: sexy command line tool for cheat sheet.}
   s.email = %q{wosmvp@gmail.com}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yac
 version: !ruby/object:Gem::Version 
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors: 
 - Jinzhu Zhang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-06 00:00:00 +08:00
+date: 2009-02-02 00:00:00 +08:00
 default_executable: 
 dependencies: []