cheat 1.2 → 1.2.1

data/lib/cheat.rb

@@ -18,13 +18,13 @@ module Cheat
     uri = "http://#{cheat_uri}/y/"
 
     if %w[sheets all recent].include? @sheet
-      uri = uri.sub('/y/', sheet == 'recent' ? '/yr/' : '/ya/')
+      uri = uri.sub('/y/', @sheet == 'recent' ? '/yr/' : '/ya/')
       return open(uri) { |body| show(body.read) } 
     end
 
     return show(File.read(cache_file)) if File.exists?(cache_file) rescue clear_cache if cache_file 
 
-    fetch_sheet(uri, @sheet) if @sheet
+    fetch_sheet(uri + @sheet) if @sheet
   end
 
   def fetch_sheet(uri, try_to_cache = true)
@@ -62,7 +62,7 @@ module Cheat
 
   # $ cheat greader --versions
   def show_versions(sheet)
-    fetch_sheet("http://#{cheat_uri}/h/#{sheet}/")
+    fetch_sheet("http://#{cheat_uri}/h/#{sheet}/", false)
   end
 
   # $ cheat greader --diff 1[:3]
@@ -94,7 +94,7 @@ module Cheat
     puts sheet.first + ':'
     puts '  ' + sheet.last.gsub("\r",'').gsub("\n", "\n  ").wrap
   rescue
-    puts "That didn't work.  Try something else?"
+    puts "That didn't work.  Maybe try `$ cheat cheat' for help?"
   end
 
   def edit(sheet_yaml)

data/lib/cheat/commands.rb

@@ -0,0 +1,41 @@
+module Cheat
+  class Commands
+    def initialize(args)
+      @sheet = args.shift unless args.first =~ /^--/
+      parse_args(args)
+    end
+
+  private
+    def parse_args(args)
+      args.each_with_index do |arg, i|
+        if arg =~ /^--(.+)$/ && respond_to?(meth = $1)
+          if method(meth).arity.zero? || args[i+1] =~ /^--/
+            send(meth)
+          else
+            send(meth, args[i+1])
+          end
+        end
+      end
+    end
+
+  public
+    def help
+      puts self.class.public_instance_methods(false)
+    end
+
+    def diff
+    end
+
+    def add
+    end
+
+    def new
+    end
+
+    def clear_cache
+    end
+
+    def edit
+    end
+  end
+end

data/lib/new_cheat.rb

@@ -0,0 +1,163 @@
+$:.unshift File.dirname(__FILE__)
+%w[rubygems tempfile fileutils net/http yaml open-uri wrap].each { |f| require f }
+%w[cheat/commands].each { |f| require f }
+
+module Cheat
+  extend self
+
+  HOST = ARGV.include?('debug') ? 'localhost' : 'cheat.errtheblog.com'
+  PORT = ARGV.include?('debug') ? 3001 : 80
+  SUFFIX = ''
+
+  def sheets(args)
+    Commands.new(args)
+
+    return
+    return unless parse_args(args)
+
+    FileUtils.mkdir(cache_dir) unless File.exists?(cache_dir) if cache_dir
+
+    uri = "http://#{cheat_uri}/y/"
+
+    if %w[sheets all recent].include? @sheet
+      uri = uri.sub('/y/', sheet == 'recent' ? '/yr/' : '/ya/')
+      return open(uri) { |body| show(body.read) } 
+    end
+
+    return show(File.read(cache_file)) if File.exists?(cache_file) rescue clear_cache if cache_file 
+
+    fetch_sheet(uri, @sheet) if @sheet
+  end
+
+  def fetch_sheet(uri, try_to_cache = true)
+    open(uri, headers) do |body|
+      sheet = body.read
+      File.open(cache_file, 'w') { |f| f.write(sheet) } if try_to_cache && cache_file && !@edit 
+      @edit ? edit(sheet) : show(sheet)
+    end 
+  rescue OpenURI::HTTPError => e
+    puts "Whoa, some kind of Internets error!", "=> #{e} from #{uri}"
+  end
+
+  def parse_args(args)
+    puts "Looking for help?  Try http://cheat.errtheblog.com or `$ cheat cheat'" and return if args.empty?
+
+    if args.delete('--clear-cache') || args.delete('--new')
+      clear_cache
+      return if args.empty?
+    end
+
+    if i = args.index('--diff')
+      diff_sheets(args.first, args[i+1]) 
+      return
+    end
+
+    add(args.shift) and return if args.delete('--add')
+    clear_cache if @edit = args.delete('--edit')
+
+    @sheet = args.shift
+
+    true
+  end
+
+  # $ cheat greader --diff 1[:3]
+  def diff_sheets(sheet, version)
+    if version =~ /^(\d+)(:(\d+))?$/
+      old_version, new_version = $1, $3
+    else return
+    end
+
+    uri = "http://#{cheat_uri}/d/#{sheet}/#{old_version}"
+    uri += "/#{new_version}" if new_version
+
+    fetch_sheet(uri, false) 
+  end
+
+  def cache_file
+    "#{cache_dir}/#{@sheet}.yml" if cache_dir
+  end
+
+  def headers
+    { 'User-Agent' => 'cheat!', 'Accept' => 'text/yaml' } 
+  end
+
+  def cheat_uri
+    "#{HOST}:#{PORT}#{SUFFIX}"
+  end
+
+  def show(sheet_yaml)
+    sheet = YAML.load(sheet_yaml).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
+  end
+
+  def edit(sheet_yaml)
+    sheet = YAML.load(sheet_yaml).to_a.first
+    sheet[-1] = sheet.last.gsub("\r", '')
+    body, title = write_to_tempfile(*sheet), sheet.first
+    return if body.strip == sheet.last.strip
+    res = post_sheet(title, body)
+    check_errors(res, title, body)
+  end
+
+  def add(title)
+    body = write_to_tempfile(title)
+    res = post_sheet(title, body, true)
+    check_errors(res, title, body)
+  end
+
+  def post_sheet(title, body, new = false)
+    uri = "http://#{cheat_uri}/w/"
+    uri += title unless new
+    Net::HTTP.post_form(URI.parse(uri), "sheet_title" => title, "sheet_body" => body.strip, "from_gem" => true)
+  end
+
+  def write_to_tempfile(title, body = nil)
+    # god dammit i hate tempfile, this is so messy but i think it's
+    # the only way.
+    tempfile = Tempfile.new(title + '.cheat')
+    tempfile.write(body) if body
+    tempfile.close
+    system "#{editor} #{tempfile.path}"
+    tempfile.open
+    body = tempfile.read
+    tempfile.close
+    body
+  end
+
+  def check_errors(result, title, text)
+    if result.body =~ /<p class="error">(.+?)<\/p>/m
+      puts $1.gsub(/\n/, '').gsub(/<.+?>/, '').squeeze(' ').wrap(80)
+      puts 
+      puts "Here's what you wrote, so it isn't lost in the void:" 
+      puts text
+    else
+      puts "Success!  Try it!", "$ cheat #{title} --new"
+    end
+  end
+
+  def editor
+    ENV['VISUAL'] || ENV['EDITOR'] || "vim" 
+  end
+
+  def cache_dir
+    PLATFORM =~ /win32/ ? win32_cache_dir : File.join(File.expand_path("~"), ".cheat")
+  end
+
+  def win32_cache_dir
+    unless File.exists?(home = ENV['HOMEDRIVE'] + ENV['HOMEPATH'])
+      puts "No HOMEDRIVE or HOMEPATH environment variable.  Set one to save a" +
+           "local cache of cheat sheets."
+      return false
+    else
+      return File.join(home, 'Cheat')
+    end
+  end
+
+  def clear_cache
+    FileUtils.rm_rf(cache_dir) if cache_dir
+  end
+end
+
+Cheat.sheets(ARGV) if __FILE__ == $0

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: cheat
 version: !ruby/object:Gem::Version 
-  version: "1.2"
-date: 2006-11-09 00:00:00 -08:00
+  version: 1.2.1
+date: 2006-11-10 00:00:00 -08:00
 summary: Cheat is a simple command line utility reference program.
 require_paths: 
 - lib
@@ -32,11 +32,14 @@ files:
 - README
 - LICENSE
 - bin/cheat
+- lib/cheat
 - lib/cheat.rb
 - lib/diffr.rb
+- lib/new_cheat.rb
 - lib/responder.rb
 - lib/site.rb
 - lib/wrap.rb
+- lib/cheat/commands.rb
 - test/fixtures
 - test/test_cheat.rb
 test_files: []