robin-chit 0.0.3 → 0.0.4

data/README.txt

@@ -29,13 +29,11 @@ To get a cheat sheet:
 
 $ chit [cheatsheet]
 
-If it does not exist, a new one will be created and waiting for editing. Leave it blank and quit the editor if you don't want to add a new one.
-
-To edit a cheat sheet, use the --edit switch.
+To edit a cheat sheet, use the --edit/-e switch.
 
 $ cheat [cheatsheet] --edit
 
-To add a cheat sheet, use the --add switch.
+To add a cheat sheet, use the --add/-a switch.
 
 $ cheat [cheatsheet] --add
 
@@ -47,7 +45,7 @@ To get your private cheat sheet:
 
 $ chit @[cheatsheet]
 
-The prefix '@' works the same for both --edit and --add.
+The prefix '@' works the same for both --edit/-e and --add/-a.
 
 The cheat sheet can be in a path. For example:
 
@@ -57,11 +55,19 @@ will get the cheat sheet 'select' under mysql.
 
 To show all the cheat sheets:
 
-$ chit [all|show]
+$ chit [all|sheets]
 
 To show all the private cheat sheets:
 
-$ chit @[all|show]
+$ chit @[all|sheets]
+
+To find cheat sheets begin with 'name', use the --find/-f switch
+
+$ chit name --find
+
+To search cheat sheets content with 'text', use the --search/-s switch
+
+$ chit text --search
 
 == INSTALL:
 
@@ -74,6 +80,8 @@ chit --init
 Before run 'chit', you may want to config ~/.chitrc which is a YAML file.
 
 * root: local path to store the cheat sheet. By default, it is ~/.chit
+* add_if_not_exist: when set as 'true', if no sheets found, a new one will be created and waiting for editing. Leave it blank and quit the editor if you don't 
+want to add a new one.
 * main: 
 * clone-from: where to get the public cheat sheets. You can use git://github.com/robin/chitsheet.git, which is a snap shoot of http://cheat.errtheblog.com/.
 * private:

data/lib/chit.rb

@@ -3,15 +3,15 @@ $:.unshift File.dirname(__FILE__)
 
 module Chit
   extend self
-  VERSION = '0.0.2'
+  VERSION = '0.0.4'
   
   defaults = {
-    'root'  => "#{ENV['HOME']}/.chit"
+    'root'  => File.join("#{ENV['HOME']}",".chit")
   }
   
-  CHITRC = "#{ENV['HOME']}/.chitrc"
+  CHITRC = File.join("#{ENV['HOME']}",".chitrc")
   
-  FileUtils.cp(File.join(File.dirname(__FILE__), "../resources/chitrc"), CHITRC) unless File.exist?(CHITRC)
+  FileUtils.cp(File.join(File.dirname(__FILE__), "..","resources","chitrc"), CHITRC) unless File.exist?(CHITRC)
   
   CONFIG = defaults.merge(YAML.load_file(CHITRC))
   
@@ -32,7 +32,13 @@ module Chit
     end
     
     unless File.exist?(sheet_file)
-      add(sheet_file)
+      if args.delete('--no-add').nil? && CONFIG['add_if_not_exist']
+        add(sheet_file)
+      else
+        puts "Error!:\n  #{@sheet} not found"
+        puts "Possible sheets:"
+        search_title
+      end
     else
       show(sheet_file)
     end
@@ -51,15 +57,31 @@ module Chit
 
     @fullpath = File.join(working_dir, "#{@sheet}.yml")
     
-    add(sheet_file) and return if args.delete('--add')
-    edit(sheet_file) and return if args.delete('--edit')
+    add(sheet_file) and return if (args.delete('--add')||args.delete('-a'))
+    edit(sheet_file) and return if (args.delete('--edit')||args.delete('-e'))
+    search_title and return if (args.delete('--find')||args.delete('-f'))
+    search_content and return if (args.delete('--search')||args.delete('-s'))
     true
   end
   
   def list_all
-    files = @git.ls_files.to_a.map {|f| 
-      f[0][0..((f[0].rindex('.')||0) - 1)]}
+    puts all_sheets.sort.join("\n")
+  end
+  
+  def search_content
+    @git.grep(@sheet).each {|file, lines|
+      title = title_of_file(file.split(':')[1])
+      lines.each {|l|
+        puts "#{title}:#{l[0]}:  #{l[1]}"
+      }
+    }
+  end
+  
+  def search_title
+    reg = Regexp.compile("^#{@sheet}")
+    files = all_sheets.select {|sheet| sheet =~ reg }
     puts files.sort.join("\n")
+    true
   end
   
   def sheet_file
@@ -132,9 +154,9 @@ module Chit
   
   def add(sheet_file)
     unless File.exist?(sheet_file)
-      breaker = sheet_file.rindex('/')+1
+      breaker = sheet_file.rindex(File::Separator)+1
       path = sheet_file[0,breaker]
-      title = @sheet.gsub(/\//,'::')
+      title = @sheet.split(File::Separator).join('::')
       FileUtils.mkdir_p(path)
       yml = {"#{title}" => ''}.to_yaml
       open(sheet_file, 'w') {|f| f << yml}
@@ -153,8 +175,10 @@ module Chit
       @git.add
       @git.commit_all("-")
     end
+    true
   end
   
+  private
   def editor
     ENV['VISUAL'] || ENV['EDITOR'] || "vim"
   end
@@ -172,4 +196,14 @@ module Chit
     tempfile.close
     body
   end
+  
+  def all_sheets
+    @git.ls_files.to_a.map {|f| 
+      title_of_file(f[0])}
+  end
+  
+  def title_of_file(f)
+    f[0..((f.rindex('.')||0) - 1)]
+  end
+  
 end

data/resources/chitrc

@@ -1,4 +1,5 @@
 # root: 
+# add_if_not_exist: true
 main:
   clone-from: git://github.com/robin/chitsheet.git
 #  push-to:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: robin-chit
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Robin Lu