yac 0.0.2 → 0.0.3

data/README.cn

@@ -27,7 +27,7 @@
     $ yac update 全部更新
 === 帮助
     $ yac help
-=== 打开仓库shell => Comming Soon :)
+=== 打开仓库shell
     $ yac shell main 打开主仓库的shell
     $ yac shell 打开个人仓库的shell
 === 文档格式

data/README.rdoc

@@ -27,7 +27,7 @@
     $ yac update => Update All
 === Help
     $ yac help
-=== Shell => Comming Soon :)
+=== Shell
     $ yac shell main => Open the main repository's shell
     $ yac shell => Open the private repository's shell
 === Documents format

data/lib/yac.rb

@@ -8,8 +8,7 @@ module  Yac
   CONFIG = YAML.load_file(File.join(ENV['HOME'],".yacrc"))
   CONFIG["root"] ||= File.join(ENV['HOME'],".yac")
 
-  @main_path = File.join(CONFIG["root"],"/main/")
-  @pri_path = File.join(CONFIG["root"],"/private/")
+  @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)
 
@@ -18,14 +17,13 @@ module  Yac
       return unless init
     end
     @all_result = []
-    help && exit if args.empty?
+    (help && exit) if args.empty?
     case args.first
     when "show" then show(args[1,args.size])
     when "name" then search(args[1,args.size],"name")
     when "content" then search(args[1,args.size],"content")
     when "update" then update(args[1,args.size])
-    when "add" then add(args[1,args.size])
-    when "edit" then edit(args[1,args.size])
+    when /^(add|edit)$/ then edit(args[1,args.size])
     when "help" then help
     when "shell" then shell(args[1,args.size])
     when "rm" then rm(args[1,args.size])
@@ -33,6 +31,7 @@ module  Yac
     else show(args)
     end
     show_possible_result
+  rescue
   end
 
   def show(args)
@@ -45,15 +44,15 @@ module  Yac
 
   def update(args)
     begin
-      if args
-        @main_path.pull if args.to_s =~ /main/
+      unless args.empty?
         @pri_git.pull if args.to_s =~ /pri/
+        @main_git.pull if args.to_s =~ /main/
       else
-        @main_path.pull
+        @main_git.pull
         @pri_git.pull
       end
     rescue
-      puts "ERROR: can not update #{args}"
+      puts "ERROR: can not update the repository,"
       puts $!
     end
   end
@@ -61,7 +60,6 @@ module  Yac
   def edit(args)
     args.each {|x| edit_single(x)}
   end
-  alias add edit
 
   def rm(args)
     args.each {|x| rm_single(x)}
@@ -71,14 +69,15 @@ module  Yac
     format_file(File.dirname(__FILE__)+"/../README.rdoc")
   end
 
-  def shell(args = "pri")
-    puts "Comming Soon :)"
-    #case args.to_s
-    #when /main/
-    #  system("cd #{@main_path}")
-    #when /pri/
-    #  system("cd #{@pri_path}")
-    #end
+  def shell(args)
+    case args.to_s
+    when /main/
+      puts "\033[31m Welcome To The Main Yac Repository \033[0m"
+      system "cd #{@main_path}; sh"
+    else
+      puts "\033[31m Welcome To The Private Yac Repository \033[0m"
+      system "cd #{@pri_path}; sh"
+    end
   end
 
   protected
@@ -122,12 +121,10 @@ module  Yac
 
   def edit_single(args)
     full_path(args)
+    prepare_dir
     system("#{editor} #{@file_path}")
-    begin
-      @working_git.add
-      @working_git.commit_all(" #{args.sub(/^@/,"")}.ch Updated")
-    rescue
-    end
+    @working_git.add
+    @working_git.commit_all(" #{args.sub(/^@/,"")}.ch Updated")
   end
 
   def editor
@@ -234,4 +231,9 @@ module  Yac
     @pri_git = Git.open(@pri_path)if File.exist?(@pri_path)
     puts "Repository init done."
   end
+
+  def prepare_dir
+    dirseparator = @file_path.rindex(File::Separator)+1
+    FileUtils.mkdir_p(@file_path[0,dirseparator])
+  end
 end

data/yac.gemspec

@@ -1,5 +1,6 @@
 GEM = "yac"
-VER = "0.0.2"
+VER = "0.0.3"
+DATE = %q{2008-10-11}
 AUTHOR = "Jinzhu Zhang"
 EMAIL = "wosmvp@gmail.com"
 HOMEPAGE = "http://www.zhangjinzhu.com"
@@ -13,7 +14,7 @@ Gem::Specification.new do |s|
   s.name = GEM
   s.version = VER
   s.author = AUTHOR
-  s.date = %q{2008-10-10}
+  s.date = DATE
   s.email = EMAIL
   s.homepage = HOMEPAGE
   s.summary = SUMMARY

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yac
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jinzhu Zhang
@@ -9,7 +9,7 @@ autorequire: yac
 bindir: bin
 cert_chain: []
 
-date: 2008-10-10 00:00:00 +08:00
+date: 2008-10-11 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency