nowa-chit 0.0.5 → 0.0.6

data/Manifest.txt

@@ -4,4 +4,6 @@ Rakefile
 bin/chit
 lib/chit.rb
 lib/wrap.rb
-resources/chitrc
+resources/chitrc
+tools/chit-bash-completion.sh
+tools/chit.tmCommand

data/README.txt

@@ -30,8 +30,6 @@ 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/-e switch.
 
 $ cheat [cheatsheet] --edit
@@ -42,11 +40,11 @@ $ cheat [cheatsheet] --add
 
 During editing a cheat sheet, empty the content will get the cheat sheet removed.
 
-A prefix '@' indicates the cheat sheet is in private mode. A private cheat sheet is kept in another repository.
+A prefix '@' indicates the cheat sheet is in special mode. In this mode cheat sheet is kept in another repositories.
 
-To get your private cheat sheet:
+To specified repository cheat sheet in:
 
-$ chit @[cheatsheet]
+$ chit @[repos_name] cheatsheet
 
 The prefix '@' works the same for both --edit/-e and --add/-a.
 
@@ -62,11 +60,19 @@ $ chit [all|sheets]
 
 To show all the private cheat sheets:
 
-$ chit @[all|sheets]
+$ chit @[repos_name] 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
 
-To search cheat sheets begin with 'name', use the --search/-s switch
+To move or rename a sheet, use '--mv/-m' switch
 
-$ chit name --search
+$ chit zsh_if zsh/if -m
 
 == INSTALL:
 
@@ -79,6 +85,7 @@ 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.
 * respo: you can set not only one repository
 * 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/.

data/lib/chit.rb

@@ -3,15 +3,15 @@ $:.unshift File.dirname(__FILE__)
 
 module Chit
   extend self
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
   
   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,9 +32,16 @@ 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)
+      format = 'html' if args.delete('--html')
+      show(sheet_file,format)
     end
   end
   
@@ -47,17 +54,26 @@ module Chit
     is_private = (@sheet =~ /^@(.*)/)
     if is_private
       @curr_repos = $1
-      @sheet = args.length > 1 ? args.shift : 'chit'
+      @sheet = args.length > 0 ? args.shift : 'chit'
     end
 
-    working_dir = is_private ? repos_path(@curr_repos) : main_path
-    @git = Git.open(working_dir)
+    @working_dir = is_private ? repos_path(@curr_repos) : main_path
+    @git = Git.open(@working_dir)
 
-    @fullpath = File.join(working_dir, "#{@sheet}.yml")
+    @fullpath = File.join(@working_dir, "#{@sheet}.yml")
     
     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 and return if (args.delete('--search')||args.delete('-s'))
+    rm(sheet_file) and return if (args.delete('--delete')||args.delete('-d'))
+    search_title and return if (args.delete('--find')||args.delete('-f'))
+    search_content and return if (args.delete('--search')||args.delete('-s'))
+    
+    if (args.delete('--mv') || args.delete('-m'))
+      target = args.shift
+      mv_to(target) and return if target
+      puts "Target not specified!"
+      return
+    end
     true
   end
   
@@ -65,10 +81,34 @@ module Chit
     puts all_sheets.sort.join("\n")
   end
   
-  def search
+  def mv_to(target)
+    if target =~ /^@(.*)/
+      target = $1
+    end
+    target_path = File.join(@working_dir, "#{target}.yml")
+    prepare_dir(target_path)
+    @git.lib.mv(sheet_file, target_path)
+    sheet = YAML.load(IO.read(target_path)).to_a.first
+    body = sheet[-1]
+    title = parse_title(target)
+    open(target_path,'w') {|f| f << {title => body}.to_yaml}
+    @git.add
+    @git.commit_all(" #{@sheet} moved to #{target}")
+  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")
+    puts "  " + files.sort.join("\n  ")
     true
   end
   
@@ -98,7 +138,10 @@ module Chit
         puts "Private chit initialized."
       else
         puts "Initialize private chit from scratch to #{CONFIG['root']}/private"
-        Git.init(private_path)
+        git = Git.init(private_path)
+        FileUtils.touch(File.join(CONFIG['root'],'private','.gitignore'))
+        git.add
+        git.commit_all("init private repository")
         puts "Private chit initialized."
       end
     else
@@ -135,7 +178,7 @@ module Chit
         CONFIG['repos'][$1] ||= {}
         CONFIG['repos'][$1][$2] = $3
         unless File.exist?(repos_path($1))
-          puts "Initialize chit repository $1 to #{CONFIG['root']}/$1"
+          puts "Initialize chit repository #{$1} to #{CONFIG['root']}/#{$1}"
           Git.init(repos_path($1))
           puts "Private chit initialized."
         end
@@ -161,47 +204,67 @@ module Chit
     File.join(CONFIG['root'], 'private')
   end
   
-  def show(sheet_file)
-    sheet = YAML.load(IO.read(sheet_file)).to_a.first
+  def show(file,format=nil)
+    sheet = YAML.load(IO.read(file)).to_a.first
     sheet[-1] = sheet.last.join("\n") if sheet[-1].is_a?(Array)
-    puts sheet.first + ':'
-    puts '  ' + sheet.last.gsub("\r",'').gsub("\n", "\n  ").wrap
+    case format
+    when 'html'
+      puts "<h1>#{sheet.first}</h1>"
+      puts "<pre>#{sheet.last.gsub("\r",'').gsub("\n", "\n  ").wrap}</pre>"
+    else
+      puts sheet.first + ':'
+      puts '  ' + sheet.last.gsub("\r",'').gsub("\n", "\n  ").wrap      
+    end
   end
   
-  def rm(sheet_file)
-    @git.remove(sheet_file)
-    @git.commit_all("-")
+  def rm(file)
+    @git.remove(file)
+    @git.commit_all("#{@sheet} removed")
   rescue Git::GitExecuteError
-    FileUtils.rm_rf(sheet_file)
+    FileUtils.rm_rf(file)
   end
   
-  def add(sheet_file)
-    unless File.exist?(sheet_file)
-      breaker = sheet_file.rindex('/')+1
-      path = sheet_file[0,breaker]
-      title = @sheet.gsub(/\//,'::')
-      FileUtils.mkdir_p(path)
+  def add(file)
+    unless File.exist?(file)
+      prepare_dir(file)
+      title = parse_title(@sheet)
       yml = {"#{title}" => ''}.to_yaml
-      open(sheet_file, 'w') {|f| f << yml}
+      open(file, 'w') {|f| f << yml}
     end
-    edit(sheet_file)
+    edit(file)
   end
   
-  def edit(sheet_file)
-    sheet = YAML.load(IO.read(sheet_file)).to_a.first
+  def edit(file)
+    sheet = YAML.load(IO.read(file)).to_a.first
     sheet[-1] = sheet.last.gsub("\r", '')
     body, title = write_to_tempfile(*sheet), sheet.first
     if body.strip.empty?
-      rm(sheet_file)
+      rm(file)
     else
-      open(sheet_file,'w') {|f| f << {title => body}.to_yaml}
-      @git.add
-      @git.commit_all("-")
+      begin
+        open(file,'w') {|f| f << {title => body}.to_yaml}
+        @git.add
+        st = @git.status
+        unless st.added.empty? && st.changed.empty? && st.deleted.empty? && st.untracked.empty?
+          @git.commit_all(" #{@sheet} updated")
+      rescue Git::GitExecuteError
+        puts "ERROR: can not commit #{@curr_repos} chit."
+        puts $!
+      end
     end
     true
   end
   
   private
+    def parse_title(sheet_name)
+      sheet_name.split(File::Separator).join('::')
+    end
+  
+    def prepare_dir(file)
+      breaker = file.rindex(File::Separator)+1
+      path = file[0,breaker]
+      FileUtils.mkdir_p(path)
+    end
   
     def editor
       ENV['VISUAL'] || ENV['EDITOR'] || "vim"
@@ -223,7 +286,11 @@ module Chit
   
     def all_sheets
       @git.ls_files.to_a.map {|f| 
-        f[0][0..((f[0].rindex('.')||0) - 1)]}
+        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
 repos:
   main:
     clone-from: git://github.com/robin/chitsheet.git

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nowa-chit
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Robin Lu
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: chit
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Chit is A command line tool for cheat sheet utility based on git.