RubyGems - bcat - Versions diffs - 0.5.1 → 0.5.2 - Mend

bcat 0.5.1 → 0.5.2

Files changed (10) hide show

data/bcat.gemspec CHANGED

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'bcat'
-  s.version = '0.5.1'
-  s.date = '2010-07-11'
+  s.version = '0.5.2'
+  s.date = '2010-08-23'
   s.description = "pipe to browser utility"
   s.summary =
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
     bin/a2h
     bin/bcat
     bin/btee
+    contrib/bman
     lib/bcat.rb
     lib/bcat/ansi.rb
     lib/bcat/browser.rb
@@ -44,7 +45,7 @@ Gem::Specification.new do |s|
   # = MANIFEST =
   s.default_executable = 'bcat'
-  s.executables = ['bcat']
+  s.executables = ['a2h', 'bcat', 'btee']
   s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/}
   s.add_dependency 'rack', '< 1.2'

data/bin/bcat CHANGED

@@ -22,7 +22,7 @@ options = {
   :Host    => '127.0.0.1',
   :Port    => 0,
   :format  => nil,
-  :title   => Dir.pwd,
+  :title   => nil,
   :browser => (ENV['BCAT_BROWSER'].to_s.size > 0 ? ENV['BCAT_BROWSER'] : 'default'),
   :ansi    => false,
   :debug   => false,

data/contrib/bman ADDED

@@ -0,0 +1,26 @@
+#!/bin/sh
+# Usage: bman <man-args>
+# Open manual page in browser with bcat.
+#
+# Original zsh version by Nick Stenning <http://github.com/nickstenning>
+# http://github.com/rtomayko/bcat/issues#issue/8
+#
+# Ported to POSIX shell by Ryan Tomayko <http://github.com/rtomayko>
+set -e
+# we use normal bold and underline
+BOLD="\033[1m"
+EM="\033[3m"
+RESET="\033[0m"
+# pass argv directly over to man
+man "$@" |
+# replace ^H based bold and underline with ansi equivelants
+sed "
+    s/_\(.\)/"$(echo "$EM")"\1"$(echo "$RESET")"/g
+    s/\(.\)\1/"$(echo "$BOLD")"\1"$(echo "$RESET")"/g
+"        |
+# pipe it into bcat
+bcat

data/lib/bcat.rb CHANGED

@@ -6,7 +6,7 @@ require 'bcat/server'
 require 'bcat/browser'
 class Bcat
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
   include Rack::Utils
   attr_reader :format
@@ -57,6 +57,7 @@ class Bcat
         yield buf
       elsif head_parser.feed(buf)
         yield content_for_head(inject=head_parser.head)
+        yield "\n"
         yield head_parser.body
         head_parser = nil
       end
@@ -64,6 +65,7 @@ class Bcat
     if head_parser
       yield content_for_head(inject=head_parser.head) +
+            "\n" +
             head_parser.body
     end
@@ -83,14 +85,15 @@ class Bcat
       "<html>",
       "<head>",
       "<!-- bcat was here -->",
-      "<title>#{self[:title] || 'bcat'}</title>",
       inject.to_s,
+      "<link href=\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAYAAABPYyMiAAAABmJLR0T///////8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAF0lEQVRIx2NgGAWjYBSMglEwCkbBSAcACBAAAeaR9cIAAAAASUVORK5CYII=\" rel=\"icon\" type=\"image/x-icon\" />",
+      "<title>#{self[:title] || 'bcat'}</title>",
       "</head>"
     ].join("\n")
   end
   def foot
-    "</body></html>"
+    "</body>\n</html>\n"
   end
   def escape_js(string)

data/lib/bcat/ansi.rb CHANGED

@@ -102,8 +102,8 @@ class Bcat
             when 0        ; yield reset_styles if @stack.any?
             when 1        ; yield push_tag("b") # bright
             when 2        ; #dim
-            when 3        ; yield push_tag("u")
-            when 5        ; yield push_tag("blink")
+            when 3, 4     ; yield push_tag("u")
+            when 5, 6     ; yield push_tag("blink")
             when 7        ; #reverse
             when 8        ; yield push_style("display:none")
             when 9        ; yield push_tag("strike")

data/lib/bcat/browser.rb CHANGED

@@ -45,7 +45,7 @@ class Bcat
     def open(url)
       command = browser_command
       fork do
-        [$stdin, $stdout].each { |fd| fd.close }
+        $stdin.close
         exec "#{command} '#{shell_quote(url)}'"
       end
     end

data/lib/bcat/html.rb CHANGED

@@ -28,7 +28,7 @@ class Bcat
       !@body.nil?
     end
-    # Determine if the input is HTML. This nil before the first non-whitespace
+    # Determine if the input is HTML. This is nil before the first non-whitespace
     # character is received, true if the first non-whitespace character is a
     # '<', and false if the first non-whitespace character is something other
     # than '<'.
@@ -37,7 +37,7 @@ class Bcat
     end
     # The head contents without any DOCTYPE, <html>, or <head> tags. This should
-    # consist of only <style>, <script>, <link>, <meta>, and <title> tags.
+    # consist of only <style>, <script>, <link>, <meta>, <base>, and <title> tags.
     def head
       @head.join.gsub(/<\/?(?:html|head|!DOCTYPE).*?>/mi, '')
     end
@@ -59,14 +59,14 @@ class Bcat
       /\A(<title.*?>.*?<\/title>)/mi,
       /\A(<script.*?>.*?<\/script>)/mi,
       /\A(<style.*?>.*?<\/style>)/mi,
-      /\A(<(?:html|head|meta|link).*?>)/mi,
-      /\A(<\/(?:html|head|meta|link|script|style|title)>)/mi,
+      /\A(<(?:html|head|meta|link|base).*?>)/mi,
+      /\A(<\/(?:html|head|meta|link|base|script|style|title)>)/mi,
       /\A(<!--(.*?)-->)/m
     ]
     BODY_TOKS = [
       /\A[^<]/,
-      /\A<(?!html|head|meta|link|script|style|title).*?>/
+      /\A<(?!html|head|meta|link|base|script|style|title).*?>/
     ]
     # Parses buf into head and body parts. Basic approach is to eat anything

data/man/bcat.1.ronn CHANGED

@@ -136,6 +136,9 @@ Use with `makeprg`:
     set makeprg=markdown\ %\ \\\|bcat
     set makeprg=testrb\ %\ \\\|bcat
+(Note that you may need to escape the `%` character with quotes if there's
+spaces in the pathname. For example: `!markdown '%' |bcat`.)
 ## SEE ALSO
 cat(1), tee(1), open(1)

data/man/btee.1.ronn CHANGED

@@ -136,6 +136,9 @@ Use with `makeprg`:
     set makeprg=markdown\ %\ \\\|bcat
     set makeprg=testrb\ %\ \\\|bcat
+(Note that you may need to escape the `%` character with quotes if there's
+spaces in the pathname. For example: `!markdown '%' |bcat`.)
 ## SEE ALSO
 cat(1), tee(1), open(1)

metadata CHANGED

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bcat
 version: !ruby/object:Gem::Version
-  hash: 9
+  hash: 15
   prerelease: false
   segments:
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors:
 - Ryan Tomayko
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-07-11 00:00:00 -07:00
+date: 2010-08-23 00:00:00 -07:00
 default_executable: bcat
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -36,7 +36,9 @@ dependencies:
 description: pipe to browser utility
 email: rtomayko@gmail.com
 executables:
+- a2h
 - bcat
+- btee
 extensions: []
 extra_rdoc_files:
@@ -51,6 +53,7 @@ files:
 - bin/a2h
 - bin/bcat
 - bin/btee
+- contrib/bman
 - lib/bcat.rb
 - lib/bcat/ansi.rb
 - lib/bcat/browser.rb