cheat 1.3.0 → 1.3.1

data/lib/cheat.rb

@@ -1,7 +1,9 @@
 %w( tempfile fileutils net/http yaml open-uri cheat/wrap ).each { |f| require f }
+require 'pager'
 RUBY_PLATFORM = PLATFORM unless defined? RUBY_PLATFORM   # Ruby 1.8 compatibility
 
 module Cheat
+  include Pager
   extend self
 
   HOST = ARGV.include?('debug') ? 'localhost' : 'cheat.errtheblog.com'
@@ -22,7 +24,7 @@ module Cheat
       return open(uri, headers) { |body| process(body.read) }
     end
 
-    return process(File.read(cache_file)) if File.exists?(cache_file) rescue clear_cache if cache_file 
+    return process(File.read(cache_file)) if File.exists?(cache_file) rescue clear_cache if cache_file
 
     fetch_sheet(uri + @sheet) if @sheet
   end
@@ -31,9 +33,9 @@ module Cheat
     open(uri, headers) do |body|
       sheet = body.read
       FileUtils.mkdir_p(cache_dir) unless File.exists?(cache_dir)
-      File.open(cache_file, 'w') { |f| f.write(sheet) } if try_to_cache && has_content(sheet) && cache_file && !@edit 
+      File.open(cache_file, 'w') { |f| f.write(sheet) } if try_to_cache && has_content(sheet) && cache_file && !@edit
       @edit ? edit(sheet) : show(sheet)
-    end 
+    end
     exit
   rescue OpenURI::HTTPError => e
     puts "Whoa, some kind of Internets error!", "=> #{e} from #{uri}"
@@ -48,14 +50,14 @@ module Cheat
     end
 
     if i = args.index('--diff')
-      diff_sheets(args.first, args[i+1]) 
+      diff_sheets(args.first, args[i+1])
     end
 
     show_versions(args.first) if args.delete('--versions')
 
     add(args.shift) and return if args.delete('--add')
     incoming_file = true if @edit = args.delete('--edit')
-    
+
     @execute = true if args.delete("--execute") || args.delete("-x")
     @sheet = args.shift
 
@@ -76,7 +78,7 @@ module Cheat
     uri = "http://#{cheat_uri}/d/#{sheet}/#{old_version}"
     uri += "/#{new_version}" if new_version
 
-    fetch_sheet(uri, false) 
+    fetch_sheet(uri, false)
   end
 
   def has_content(sheet)
@@ -91,9 +93,9 @@ module Cheat
   end
 
   def headers
-    { 'User-Agent' => 'cheat!', 'Accept' => 'text/yaml' } 
+    { 'User-Agent' => 'cheat!', 'Accept' => 'text/yaml' }
   end
-  
+
   def cheat_uri
     "#{HOST}:#{PORT}#{SUFFIX}"
   end
@@ -126,7 +128,7 @@ module Cheat
   def show(sheet_yaml)
     sheet = YAML.load(sheet_yaml).to_a.first
     sheet[-1] = sheet.last.join("\n") if sheet[-1].is_a?(Array)
-    run_pager
+    page
     puts sheet.first + ':'
     puts '  ' + sheet.last.gsub("\r",'').gsub("\n", "\n  ").wrap
   rescue Errno::EPIPE
@@ -172,8 +174,8 @@ module Cheat
   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
+      puts "Here's what you wrote, so it isn't lost in the void:"
       puts text
     else
       puts "Success!  Try it!", "$ cheat #{title}"
@@ -181,7 +183,7 @@ module Cheat
   end
 
   def editor
-    ENV['VISUAL'] || ENV['EDITOR'] || "vim" 
+    ENV['VISUAL'] || ENV['EDITOR'] || "vim"
   end
 
   def cache_dir
@@ -203,36 +205,9 @@ module Cheat
   end
 
   def clear_cache_file
-    FileUtils.rm(cache_file) if File.exists?(cache_file) 
+    FileUtils.rm(cache_file) if File.exists?(cache_file)
   end
 
-  def run_pager
-    return if RUBY_PLATFORM =~ /win32/
-    return unless STDOUT.tty?
-
-    read, write = IO.pipe
-
-    unless Kernel.fork # Child process
-      STDOUT.reopen(write)
-      STDERR.reopen(write) if STDERR.tty?
-      read.close
-      write.close
-      return
-    end
-
-    # Parent process, become pager
-    STDIN.reopen(read)
-    read.close
-    write.close
-
-    ENV['LESS'] = 'FSRX' # Don't page if the input is short enough
-
-    # wait until we have input before we start the pager
-    Kernel.select [STDIN]
-    pager = ENV['PAGER'] || 'less'
-    exec pager rescue exec "/bin/sh", "-c", pager
-  rescue
-  end
 end
 
 Cheat.sheets(ARGV) if __FILE__ == $0

data/lib/cheat/version.rb

@@ -1,3 +1,3 @@
 module Cheat
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/lib/cheat/wrap.rb

@@ -6,9 +6,9 @@ class String
 
     lines.collect! do |line|
 
-      if magic_lists 
+      if magic_lists
         line =~ /^([\s\-\d\.\:]*\s)/
-      else 
+      else
         line =~ /^([\s]*\s)/
       end
 
@@ -18,12 +18,12 @@ class String
       first = true
 
       while line.length > 0
-        first ? (i, first = 0, false) : i = indent              
+        first ? (i, first = 0, false) : i = indent
         pos = width - i
 
         if line.length > pos and line[0..pos] =~ /^(.+)\s/
           subline = $1
-        else 
+        else
           subline = line[0..pos]
         end
         buffer += " " * i + subline + "\n"

metadata

@@ -1,32 +1,40 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cheat
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 3
-  - 0
-  version: 1.3.0
+version: !ruby/object:Gem::Version
+  version: 1.3.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Chris Wanstrath
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-07-24 00:00:00 -07:00
-default_executable: 
-dependencies: []
-
-description: "  cheat prints cheat sheets from cheat.errtheblog.com, a wiki-like\n  repository of programming knowledge.\n"
+date: 2012-12-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: pager
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+description: ! "  cheat prints cheat sheets from cheat.errtheblog.com, a wiki-like\n
+  \ repository of programming knowledge.\n"
 email: chris@ozmm.org
-executables: 
+executables:
 - cheat
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README
 - LICENSE
 - lib/ambition/init.rb
@@ -59,35 +67,28 @@ files:
 - lib/cheat/wrap.rb
 - lib/cheat.rb
 - bin/cheat
-has_rdoc: true
 homepage: http://cheat.errtheblog.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: cheat prints cheat sheets from cheat.errtheblog.com
 test_files: []
-