cheatorious 0.2.1 → 0.3.0

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+#v0.3.0 (Jan/18 2012 22:28 -0200 by Luis Cipriani)
+
+    Changes:
+
+      - Removed bundler runtime dependency
+      - Simplified gemspec
+
+    Bugfixes:
+
+      - Added yaml require to cli (duh)
+      - Fixed lots of tiny bugs
+
+    Features:
+
+      - Colorful and better output for Text writer
+      - New commands to CLI: edit, reload and remove cheatsheets
+      - Added new Writer: Tree (using hirb)
 
 #v0.2.1 (Dec/29 2011 10:40 -0200 by Luis Cipriani)
 
@@ -51,4 +68,4 @@
         - simple text ouptut
 
 ----
-_this cheatsheet is generated by [step-up](https://github.com/kawamanza/step-up)_
+_this cheatsheet is generated by [step-up](https://github.com/kawamanza/step-up)_

data/LICENSE

@@ -1,8 +1,8 @@
-Copyright (c) 2011 Luis Cipriani
+Copyright (c) 2011-2012 Luis Cipriani
 
 The MIT License (MIT)
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,6 +1,6 @@
 # cheatorious
 
-_"Being victorious through a means so amazing it cannot possibly be achieved without cheating."_ 
+_"Being victorious through a means so amazing it cannot possibly be achieved without cheating."_
 (Urban Dictionary)
 
 [![Build Status](https://secure.travis-ci.org/lfcipriani/cheatorious.png)](http://travis-ci.org/lfcipriani/cheatorious)
@@ -12,7 +12,7 @@ Cheatsheets are very good to start learning or keep knowledge of some language o
 ## Install ##
 
     gem install cheatorious
-    
+
 Cheatorious is compatible with ruby 1.8.x, 1.9.x, rubinius, jruby, ree and more.
 
 ## Creating your Cheatsheet ##
@@ -29,7 +29,7 @@ Create a file and use the following syntax, shown in the example below:
         key :control, "^"
         key :esc    , "<esc>"
         key :leader , ","
-        
+
         # your prefered keyboard keys separators (default is empty string)
         key_separator " "
 
@@ -62,16 +62,18 @@ Create a file and use the following syntax, shown in the example below:
 
 ## Using cheatorious ##
 
-The CLI usage goes as follows:
+The basic CLI usage goes as follows:
 
     $ cheatorious                           # get help
     $ cheatorious help [TASK]               # get help for a specific task
     $ cheatorious import FILE               # import a cheatsheet description FILE (example above)
     $ cheatorious list                      # lists the available cheatsheets
     $ cheatorious view CHEATSHEET [OPTIONS] # view a CHEATSHEET
-    
+
+### Searching ###
+
 To search on your cheatsheets:
-    
+
     $ cheatorious help search
     Usage:
       cheatorious search CHEATSHEET [KEYWORD] [OPTIONS]
@@ -86,6 +88,8 @@ To search on your cheatsheets:
     The CHEATSHEET variable could be a name (for imported cheatsheets) or a file that describes a cheatsheet.
     Omit KEYWORD to view the full cheatsheet.
 
+### Alias ###
+
 If you are tired to type everything above to do a simple search, use the alias command:
 
     $ bin/cheatorious help alias
@@ -99,6 +103,12 @@ If you are tired to type everything above to do a simple search, use the alias c
 
 It will just **show** the alias command, it's up to you to decide where to put it.
 
+### Editing, reloading, removing ###
+
+    $ cheatorious edit CHEATSHEET    # edit an existent CHEATSHEET. Will open it in the default terminal editor, use CHEATORIOUS_EDITOR environment variable to use another.
+    $ cheatorious reload CHEATSHEET  # reload a CHEATSHEET after editing it with 'edit' command
+    $ cheatorious remove CHEATSHEET  # remove a CHEATSHEET. The original file is kept for later recovering
+
 ## Writers ##
 
 Cheatorious has a default Text writer to give a fairly nice output for your cheatsheet. Since we can have multiple writers avaiable, you can list and set a default writer through the command *writers*:
@@ -116,7 +126,6 @@ I'll work to provide more options of output as soon as possible (markdown, color
 
 ## Tips to improve the experience! ##
 
-* In Macs, cheatorious is very powerful if used with [DTerm](http://decimus.net/DTerm)
 * Create aliases to save typings in the cheatsheets you use more
 * Sync your cheatsheets with Dropbox by creating a symlink for the `~/.cheatorious` folder
 
@@ -139,4 +148,4 @@ You can also contribute in the Core or Writers, feel free to:
 * Pull request
 
 ----
-_Copyright (c) 2011 Luis Cipriani (under MIT license)_
+_Copyright (c) 2011-2012 Luis Cipriani (under MIT license)_

data/bin/cheatorious

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 require File.expand_path(File.dirname(__FILE__) + '/../lib/cheatorious')
 
 Cheatorious::CLI.start

data/cheatorious.gemspec

@@ -1,12 +1,8 @@
 # encoding: UTF-8
-lib = File.expand_path('../lib', __FILE__)
-$:.unshift lib unless $:.include?(lib)
+lib = File.expand_path('../lib' , __FILE__)
+$:.unshift(lib) unless $:.include?(lib)
 
-version_file = File.expand_path "../GEM_VERSION", __FILE__
-File.delete version_file if File.exists? version_file
-
-require 'step-up'
-require 'cheatorious'
+require 'cheatorious/version'
 
 Gem::Specification.new do |s|
   s.name          = "cheatorious"
@@ -24,15 +20,17 @@ Gem::Specification.new do |s|
     Rakefile
   ]
   tests = `git ls-files -- {script,test}/*`.split("\n")
-  s.files = `git ls-files`.split("\n") - excepts - tests + %w[GEM_VERSION]
+  s.files = `git ls-files`.split("\n") - excepts - tests
 
   s.author        = "Luis Cipriani"
   s.email         = "lfcipriani@gmail.com"
   s.homepage      = "https://github.com/abril/cheatorious"
 
   s.add_runtime_dependency('thor', '>= 0.14.6')
+  s.add_runtime_dependency('rainbow', '>= 1.1.3')
+  s.add_runtime_dependency('hirb', '>= 0.6.0')
+  s.add_runtime_dependency('hirb-unicode', '>= 0.0.5')
 
-  # s.add_development_dependency('cover_me')
-  # s.add_development_dependency('ruby-debug19')
   s.add_development_dependency('step-up')
+  s.add_development_dependency('rake')
 end

data/examples/writer_sample.rb

@@ -1,18 +1,21 @@
 module Cheatorious
-  module Writer    
+  module Writer
     # This is an example of a Writer
     #
-    # To implement your own Writer, just create a class inside 
-    # Cheatorious::Writer module and implement the interface 
+    # To implement your own Writer, just create a class inside
+    # Cheatorious::Writer module and implement the interface
     # represented by the public methods below.
     class WriterSample
       def initialize
         @section_stack = []
         @result        = ""
+        @query         = nil
+        @options       = {}
+        @color         = :yellow
+        @add_empty_line = true
       end
-      
+
       def header(name, author = "", version = "", description = "")
-        line
         line "-" * 80
         line "#{name} (#{version})"
         line
@@ -21,49 +24,75 @@ module Cheatorious
         line "-" * 80
         line
       end
-      
+
       def search_header(query, results_count, options)
-        search_type = options.keys.join(", ")
+        @query = query
+        @options = options
+        search_type = (options.keys - ["writer"]).join(", ")
         search_type += " " if search_type.size > 0
-        line
-        line "Your #{search_type}search for '#{query}' returned #{results_count} #{results_count > 1 ? "results" : "result"}:" if results_count != 0
-        line "Your #{search_type}search for '#{query}' doesn't returned any result. Try with another keyword." if results_count == 0
+        line "Your #{search_type}search for '#{query.dup.foreground(@color)}' returned #{results_count} #{results_count > 1 ? "results" : "result"}:" if results_count != 0
+        line "Your #{search_type}search for '#{query.dup.foreground(@color)}' doesn't returned any result. Try with another keyword." if results_count == 0
         line
       end
-      
+
       def footer
         line
         line "-" * 80
         line "generated by Cheatorious (https://github.com/lfcipriani/cheatorious)"
       end
-      
+
       def section_start(section)
         @section_stack.push(section)
-        line indentation("-") + " #{section}"
+        section = paint(section,@query) if @query && @options['section']
+        line
+        line indentation(" ") + "#".foreground(:red) + " #{section} "+ "#".foreground(:red)
       end
-      
+
       def section_end
         @section_stack.pop
+        line
       end
-      
+
       def entry(name, *values)
-        e = "#{indentation(" ")} - #{name}: "
-        e << values.join(", ")
+        value_text = values.join(", ")
+        if @options['reverse']
+          value_text = paint(value_text,@query) if @query
+        elsif !@options['section']
+          name = paint(name,@query) if @query
+        end
+        e = "#{indentation(" ")}   #{name} " + "=> ".foreground(:blue)
+        e << value_text
         line e
       end
-      
+
       def result
         @result
       end
-      
+
     private
-    
+
       def line(str = "")
-        @result += str + "\n"
+        if str.empty?
+          if @add_empty_line
+            @result += str + "\n"
+            @add_empty_line = false
+          end
+        else
+          @result += str + "\n"
+          @add_empty_line = true
+        end
       end
-      
+
       def indentation(char)
-        char * 2 * @section_stack.size
+        char * 3 * @section_stack.size
+      end
+
+      def paint(string, query)
+        string.gsub(regex_for(query)) {|q| q.foreground(@color)}
+      end
+
+      def regex_for(query)
+        Regexp.new(Regexp.escape(query), (@options['sensitive'] ? 0 : Regexp::IGNORECASE))
       end
     end
   end

data/lib/cheatorious.rb

@@ -3,13 +3,18 @@ $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__))
 
 # Dependencies
 require "rubygems"
-require "bundler/setup"
+require "rainbow"
 
 # Adding Dir.home method if it's not available
+# This method is the adapted from hirb rubygem
 unless Dir.respond_to?(:home)
   class Dir
     def self.home
-      File.expand_path(File.join("~"))
+      ['HOME', 'USERPROFILE'].each {|e| return ENV[e] if ENV[e] }
+      return "#{ENV['HOMEDRIVE']}#{ENV['HOMEPATH']}" if ENV['HOMEDRIVE'] && ENV['HOMEPATH']
+      File.expand_path("~")
+    rescue
+      File::ALT_SEPARATOR ? "C:/" : "/"
     end
   end
 end

data/lib/cheatorious/cli.rb

@@ -1,4 +1,6 @@
+# encoding: UTF-8
 require 'thor'
+require 'yaml'
 
 module Cheatorious
   module DslExecutor
@@ -6,22 +8,22 @@ module Cheatorious
       Cheatorious::CheatSheet.compile(name, @output, &block)
     end
   end
-  
+
   class CLI < Thor
     include Thor::Actions
-    
+
     desc "list", "lists the available cheatsheets. See 'import' command."
     def list
       ensure_workspace_exist
       puts (cheatsheet_list.empty? ? "You don't have imported cheatsheets. See 'import' command." : "You have #{cheatsheet_list.size} cheatsheet(s):")
       puts cheatsheet_list.join("\n")
     end
-    
-    desc "import FILE", "import a cheatsheet description FILE.\nCheck https://github.com/lfcipriani/cheatorious to learn how to create your own cheatsheets."
+
+    desc "import FILE", "import a cheatsheet description FILE.\nCheck https://github.com/lfcipriani/cheatorious to learn how to create your own cheatsheets.\nCheck https://github.com/lfcipriani/cheatorious-cheatsheets for cheatsheets created by the community."
     def import(file)
       ensure_workspace_exist
       name = File.basename(file, ".rb")
-      return if cheatsheet_list.include?(name) && 
+      return if cheatsheet_list.include?(name) &&
                 !yes?("Do you want to override the existent #{name} cheatsheet? (y/n)")
       if File.exist?(file)
         source = File.read(file)
@@ -33,13 +35,13 @@ module Cheatorious
         puts "The specified file doesn't exist: #{file}"
       end
     end
-    
+
     desc "view CHEATSHEET [OPTIONS]", "view a CHEATSHEET.\nThe CHEATSHEET variable could be a name (for imported cheatsheets) or a file that describes a cheatsheet."
     method_option :writer, :aliases => "-w", :type => :string, :desc => "writer to use for the output. If not set, uses the default."
     def view(cheatsheet)
       invoke :search
     end
-    
+
     desc "search CHEATSHEET [KEYWORD] [OPTIONS]", "search for KEYWORD in CHEATSHEET entries only.\nThe CHEATSHEET variable could be a name (for imported cheatsheets) or a file that describes a cheatsheet.\nOmit KEYWORD to view the full cheatsheet."
     method_option :section, :aliases => "-s", :type => :boolean, :desc => "matches KEYWORD only on section names, returning all entries and sections inside it."
     method_option :reverse, :aliases => "-r", :type => :boolean, :desc => "reverse means to search only the values of a cheatsheet (and not entries, as usual). For example, search by shortcuts."
@@ -81,7 +83,7 @@ module Cheatorious
         puts "\nUse -d option to set a default writer."
       end
     end
-    
+
     desc "alias NAME CHEATSHEET", "return a shell alias command with NAME for easy access to searching a CHEATSHEET.\nThe CHEATSHEET variable must be an imported cheatsheet.\nExample: cheatorious alias svim simple_vim >> ~/.bashrc\n         next time just use: svim KEYWORD [OPTIONS]"
     def alias(name, cheatsheet)
       ensure_workspace_exist
@@ -91,7 +93,42 @@ module Cheatorious
         puts "Invalid cheatsheet name: #{cheatsheet}"
       end
     end
-    
+
+    desc "edit CHEATSHEET", "edit an existent CHEATSHEET. Will open it in the default terminal editor, use CHEATORIOUS_EDITOR environment variable to use another."
+    def edit(cheatsheet)
+      ensure_workspace_exist
+      if cheatsheet_list.include?(cheatsheet)
+        editor = %w( CHEATORIOUS_EDITOR BUNDLER_EDITOR VISUAL EDITOR ).map { |var| ENV[var] }.compact.first || 'vi'
+        exec editor + " " + File.join(workspace_path, "originals", cheatsheet + ".rb")
+      else
+        puts "Invalid cheatsheet name: #{cheatsheet}. Use 'list' command to check the name."
+      end
+    end
+
+    desc "reload CHEATSHEET", "reload a CHEATSHEET after editing it with 'edit' command"
+    def reload(cheatsheet)
+      ensure_workspace_exist
+      if cheatsheet_list.include?(cheatsheet)
+        source = File.read(File.join(workspace_path, "originals", cheatsheet + ".rb"))
+        bytes = DslExecutor.module_eval("@output = :bytes\n"+source)
+        File.open(File.join(workspace_path, "compiled", cheatsheet), 'w') {|f| f.write(bytes) }
+        puts "Cheatsheet reloaded successfuly! Try 'cheatorious view #{cheatsheet}'"
+      else
+        puts "Invalid cheatsheet name: #{cheatsheet}. Use 'list' command to check the name."
+      end
+    end
+
+    desc "remove CHEATSHEET", "remove a CHEATSHEET. The original file is kept for later recovering"
+    def remove(cheatsheet)
+      ensure_workspace_exist
+      if cheatsheet_list.include?(cheatsheet)
+        FileUtils.rm(File.join(workspace_path, "compiled", cheatsheet))
+        puts "Cheatsheet removed successfuly! To recover it execute 'import' command for " + File.join(workspace_path, "originals", cheatsheet + ".rb")
+      else
+        puts "Invalid cheatsheet name: #{cheatsheet}. Use 'list' command to check the name."
+      end
+    end
+
   private
 
     def cheatsheet_list
@@ -105,7 +142,7 @@ module Cheatorious
     def default_writer
       writer_for(YAML.load(File.open(File.join(workspace_path, "config")))["default_writer"])
     end
-    
+
     def ensure_workspace_exist
       unless File.directory?(workspace_path)
         Dir.mkdir(workspace_path)
@@ -122,9 +159,9 @@ module Cheatorious
         FileUtils.cp(File.expand_path(File.join(__FILE__, "..", "..", "..", "examples", "simple_vim.rb")), File.join(workspace_path, "originals"))
       end
     end
-    
+
     def workspace_path
       @workspace ||= File.join(Dir.home, ".cheatorious")
     end
   end
-end
+end

data/lib/cheatorious/utils.rb

@@ -1,19 +1,19 @@
 module Cheatorious
   class Utils
     require "base64"
-    
+
     def self.serialize(object, to = nil)
       data = Marshal.dump(object)
       data = Base64.encode64(data) if to == :base64
       return data
     end
-    
+
     def self.deserialize(data, from = nil)
       data   = Base64.decode64(data) if from == :base64
       object = Marshal.load(data)
       return object
     end
-    
+
     def self.serialization_type(data)
       /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=|[A-Za-z0-9+\/]{4})$/ =~ data ? :base64 : :bytes
     end

data/lib/cheatorious/version.rb

@@ -1,19 +1,4 @@
 # encoding: UTF-8
 module Cheatorious
-  module VERSION #:nodoc:
-    version = nil
-    version_file = ::File.expand_path('../../../GEM_VERSION', __FILE__)
-    version = File.read(version_file) if ::File.exists?(version_file)
-    if version.nil? && ::File.exists?(::File.expand_path('../../../.git', __FILE__))
-      version = ::StepUp::Driver::Git.new.last_version_tag("HEAD", true) rescue "v0.0.0+0"
-      ::File.open(version_file, "w"){ |f| f.write version }
-    end
-
-    STRING = version.gsub(/^v([^\+]+)\+?\d*$/, '\1')
-    MAJOR, MINOR, PATCH, TINY = STRING.scan(/\d+/)
-
-    def self.to_s
-      STRING
-    end
-  end
+  VERSION = "0.3.0"
 end

data/lib/cheatorious/writer.rb

@@ -1,5 +1,6 @@
 module Cheatorious
-  module Writer    
+  module Writer
     autoload :Text, "cheatorious/writer/text"
+    autoload :Tree, "cheatorious/writer/tree"
   end
 end

data/lib/cheatorious/writer/text.rb

@@ -1,13 +1,18 @@
+# encoding: UTF-8
+
 module Cheatorious
-  module Writer    
+  module Writer
     class Text
       def initialize
         @section_stack = []
         @result        = ""
+        @query         = nil
+        @options       = {}
+        @color         = :yellow
+        @add_empty_line = true
       end
-      
+
       def header(name, author = "", version = "", description = "")
-        line
         line "-" * 80
         line "#{name} (#{version})"
         line
@@ -16,49 +21,75 @@ module Cheatorious
         line "-" * 80
         line
       end
-      
+
       def search_header(query, results_count, options)
-        search_type = options.keys.join(", ")
+        @query = query
+        @options = options
+        search_type = (options.keys - ["writer"]).join(", ")
         search_type += " " if search_type.size > 0
-        line
-        line "Your #{search_type}search for '#{query}' returned #{results_count} #{results_count > 1 ? "results" : "result"}:" if results_count != 0
-        line "Your #{search_type}search for '#{query}' doesn't returned any result. Try with another keyword." if results_count == 0
+        line "Your #{search_type}search for '#{query.dup.foreground(@color)}' returned #{results_count} #{results_count > 1 ? "results" : "result"}:" if results_count != 0
+        line "Your #{search_type}search for '#{query.dup.foreground(@color)}' doesn't returned any result. Try with another keyword." if results_count == 0
         line
       end
-      
+
       def footer
         line
         line "-" * 80
         line "generated by Cheatorious (https://github.com/lfcipriani/cheatorious)"
       end
-      
+
       def section_start(section)
         @section_stack.push(section)
-        line indentation("-") + " #{section}"
+        section = paint(section,@query) if @query && @options['section']
+        line
+        line indentation(" ") + "#".foreground(:red) + " #{section} "+ "#".foreground(:red)
       end
-      
+
       def section_end
         @section_stack.pop
+        line
       end
-      
+
       def entry(name, *values)
-        e = "#{indentation(" ")} - #{name}: "
-        e << values.join(", ")
+        value_text = values.join(", ")
+        if @options['reverse']
+          value_text = paint(value_text,@query) if @query
+        elsif !@options['section']
+          name = paint(name,@query) if @query
+        end
+        e = "#{indentation(" ")}   #{name} " + "=> ".foreground(:blue)
+        e << value_text
         line e
       end
-      
+
       def result
         @result
       end
-      
+
     private
-    
+
       def line(str = "")
-        @result += str + "\n"
+        if str.empty?
+          if @add_empty_line
+            @result += str + "\n"
+            @add_empty_line = false
+          end
+        else
+          @result += str + "\n"
+          @add_empty_line = true
+        end
       end
-      
+
       def indentation(char)
-        char * 2 * @section_stack.size
+        char * 3 * @section_stack.size
+      end
+
+      def paint(string, query)
+        string.gsub(regex_for(query)) {|q| q.foreground(@color)}
+      end
+
+      def regex_for(query)
+        Regexp.new(Regexp.escape(query), (@options['sensitive'] ? 0 : Regexp::IGNORECASE))
       end
     end
   end

data/lib/cheatorious/writer/tree.rb

@@ -0,0 +1,105 @@
+# encoding: UTF-8
+require "hirb"
+
+module Cheatorious
+  module Writer
+    class Tree
+      def initialize
+        @section_stack = []
+        @result        = ""
+        @header_footer = []
+        @tree          = []
+        @query         = nil
+        @options       = {}
+        @color         = :yellow
+        @add_empty_line = true
+      end
+
+      def header(name, author = "", version = "", description = "")
+        line "-" * 80
+        line "#{name} (#{version})"
+        line
+        line "Author     : #{author[0]} (#{author[1]})"
+        line "Description: #{description}"
+        line "-" * 80
+        line
+        @header_footer << @result
+        @add_empty_line = true
+        @result = ""
+      end
+
+      def search_header(query, results_count, options)
+        @query = query
+        @options = options
+        search_type = (options.keys - ["writer"]).join(", ")
+        search_type += " " if search_type.size > 0
+        line "Your #{search_type}search for '#{query.dup.foreground(@color)}' returned #{results_count} #{results_count > 1 ? "results" : "result"}:" if results_count != 0
+        line "Your #{search_type}search for '#{query.dup.foreground(@color)}' doesn't returned any result. Try with another keyword." if results_count == 0
+        line
+        @header_footer << @result
+        @add_empty_line = true
+        @result = ""
+      end
+
+      def footer
+        line
+        line "-" * 80
+        line "generated by Cheatorious (https://github.com/lfcipriani/cheatorious)"
+        @header_footer << @result
+        @result = nil
+      end
+
+      def section_start(section)
+        section = paint(section,@query) if @query && @options['section']
+        @tree << [@section_stack.size, "#".foreground(:red) + " " + section]
+        @section_stack.push(section)
+      end
+
+      def section_end
+        @section_stack.pop
+      end
+
+      def entry(name, *values)
+        value_text = values.join(", ")
+        if @options['reverse']
+          value_text = paint(value_text,@query) if @query
+        elsif !@options['section']
+          name = paint(name,@query) if @query
+        end
+        indent = @section_stack.size == 0 ? 0 : @section_stack.size+1
+        @tree << [indent, "=>".foreground(:blue) + " " + name]
+        value_text.split(", ").each do |v|
+          @tree << [indent+1, v]
+        end
+      end
+
+      def result
+        @result = @header_footer[0]
+        @result += Hirb::Helpers::Tree.render(@tree, :type => :directory, :multi_line_nodes => true)
+        @result += @header_footer[1] || ""
+      end
+
+    private
+
+      def line(str = "")
+        if str.empty?
+          if @add_empty_line
+            @result += str + "\n"
+            @add_empty_line = false
+          end
+        else
+          @result += str + "\n"
+          @add_empty_line = true
+        end
+      end
+
+      def paint(string, query)
+        string.gsub(regex_for(query)) {|q| q.foreground(@color)}
+      end
+
+      def regex_for(query)
+        Regexp.new(Regexp.escape(query), (@options['sensitive'] ? 0 : Regexp::IGNORECASE))
+      end
+    end
+  end
+end

metadata

@@ -1,45 +1,123 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: cheatorious
-version: !ruby/object:Gem::Version
-  version: 0.2.1
+version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
-authors:
+authors: 
 - Luis Cipriani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-29 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-19 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: thor
-  requirement: &2160967780 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 14
+        - 6
         version: 0.14.6
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rainbow
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 1
+        - 3
+        version: 1.1.3
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: hirb
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: hirb-unicode
   prerelease: false
-  version_requirements: *2160967780
-- !ruby/object:Gem::Dependency
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 0
+        - 5
+        version: 0.0.5
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: step-up
-  requirement: &2160965500 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: *2160965500
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: 
 email: lfcipriani@gmail.com
-executables:
+executables: 
 - cheatorious
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .travis.yml
 - CHANGELOG.md
 - LICENSE
@@ -58,32 +136,39 @@ files:
 - lib/cheatorious/version.rb
 - lib/cheatorious/writer.rb
 - lib/cheatorious/writer/text.rb
-- GEM_VERSION
+- lib/cheatorious/writer/tree.rb
 homepage: https://github.com/abril/cheatorious
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -297487151997060724
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: generator of simple, searchable, command line cheatsheets
 test_files: []
+

data/GEM_VERSION

@@ -1 +0,0 @@
-v0.2.1+1