yay 0.0.7 → 0.0.8

data/data/yay/dna.yay

@@ -0,0 +1,24 @@
+#!/usr/bin/yay
+
+# Latin characters used DNA and RNA sequences have poor legibility. This script
+# helps with that by giving each character a distinct colour, vaguely similar
+# to the florescent dyes used during sequencing.
+# 
+# The colours I have chosen were taken from [1] and work best on a black screen.
+# This will have to do until AmbiScript [2] characters have been given Unicode
+# codepoints!
+#
+# 1. http://biology.kenyon.edu/courses/biol114/Chap08/Chapter_08a.html
+# 2. http://www.biotechniques.com/multimedia/archive/00003/BTN_A_000112727_O_3654a.pdf
+
+"a" is @adenine
+"g" is @guanine
+"c" is @cytosine
+"t" is @thymine
+"u" is @uracil
+
+@adenine  is green
+@cytosine is blue
+@guanine  is yellow
+@thymine  is red
+@uracil   is @thymine

data/data/yay/types.yay

@@ -0,0 +1,23 @@
+#!/usr/bin/yay
+
+# Matches common filenames and extensions so that you can quickly discover
+# information about a directory structure using ls or tree
+
+/\b\w*\.(png|gif|jpg|jpeg|svg)\b/i          is @image
+/\b\w*\.(txt|html|md|css)\b/i               is @doc
+/\b\w*\.(xml|json|properties|manifest)\b/i  is @config
+
+/\b\w*\.(sh|bash|yay)\b/i                      is @shell
+/\b\w*\.(php|py|rb|pl|r|pm|ssi|shtml)\b/i      is @script
+/\b\w*\.(java|scala)\b/i                       is @jvm
+/\b\w*\.(h|c|cc|cpp|cxx)\b/i                   is @c
+
+@image    is @resource
+@config   is @resource
+@doc      is @resource
+@resource is green
+
+@shell  is dim
+@jvm    is red
+@c      is blue
+@script is magenta

data/lib/yay/application.rb

@@ -50,7 +50,8 @@ class Yay
       begin      
 
         @parser = Yay::Parser.new
-				@parser.allow_all = true
+        # allow restricted commands such as installation of new scripts
+				@parser.allow_restricted = true
         @parser.parse_array(@args)
         @rules = @parser.get_rules
 

data/lib/yay/autoformatter.rb

@@ -0,0 +1,31 @@
+require 'yay/rule_set'
+
+class Yay
+  class Autoformatter
+    
+    # the colour wheel can be retrieved for unit testing, etc
+    attr_reader :wheel
+    
+    def initialize
+      @wheel = [
+        [Yay::ColourWheel::FG[:red],   Yay::ColourWheel::MISC[:bold]],
+        [Yay::ColourWheel::FG[:green], Yay::ColourWheel::MISC[:bold]],
+        [Yay::ColourWheel::FG[:blue],  Yay::ColourWheel::MISC[:bold]],
+      ]
+      @index = 0
+    end
+    
+    def get_rules strings
+      raise ArgumentError, "Cannot be an empty array" unless 
+        strings.class == Array and strings.length > 0
+      ruleset = Yay::RuleSet.new
+      strings.each { |string| 
+        colour = @wheel[@index % @wheel.length]
+        ruleset.add_match [string], colour, false
+        # iterate the index
+        @index += 1
+      }
+      return ruleset.get_rules
+    end
+  end
+end

data/lib/yay/colour_wheel.rb

@@ -17,6 +17,7 @@ class Yay
 			:invert      => 7, #alias
 			:inverted    => 7, #alias
 			:underscored => 4, #alias
+      :bold        => 1, #alias
 		}
 
 		# foreground colours

data/lib/yay/colourizer.rb

@@ -10,6 +10,12 @@ class Yay
       colourize_rules rules
       @input   = input
       @output  = output
+      
+      # this is the colour we'll use when we haven't already applied a colour
+      # we remember the previous choice as we can colourize words within a line
+      # that's already been coloured
+      @default_end_colour = ColourWheel::end_colour
+      @end_colour = @default_end_colour
     end
     
     # get the rules that are applied to a whole line if it contains matching text
@@ -46,39 +52,45 @@ class Yay
         end
       }
     end
-
+    
+    # apply all rules that span the entire line
+    def apply_line_rules line
+      # track the line_rules end colour so we can return to this after each
+      # match
+      @line_rules.each { |rule| 
+        if line.match(rule[0])
+          line = "#{rule[1]}#{line.rstrip}#{@default_end_colour}"
+          @end_colour = rule[1]
+          # leave loop; only allow one line match per line
+          break
+        end
+      }
+      return line
+    end
+    
+    # apply all partial rules
+    def apply_word_rules line
+      @part_rules.each { |rule|
+        line = line.gsub(rule[0], "#{rule[1]}\\0#{@end_colour}")
+      }
+      return line
+    end
+    
     # create a pipe between the input and output streams, applying colour rules
     # to every line that appears. only an interrupt, end of file or exception 
     # will end this process
     def colourize_pipe
-      # this is the colour we'll use when we haven't already applied a colour
-      # we remember the previous colour as we can colourize words within a line
-      # that's already been coloured
-      default_end_colour = ColourWheel::end_colour
-      
-      @input.each_line { |line|
-
-        # track the line_rules end colour so we can return to this after each
-        # match
-        end_colour = default_end_colour
-
-        # apply all line rules
-        @line_rules.each { |rule| 
-          if line.match(rule[0])
-            line = "#{rule[1]}#{line.rstrip}#{default_end_colour}"
-            end_colour = rule[1]
-            # leave loop; only allow one line match per line
-            break
-          end
+      @end_colour = @default_end_colour
+      begin
+        @input.each_line { |line|
+          line = apply_line_rules(line)
+          line = apply_word_rules(line)
+          @output.puts line
         }
-
-        # apply all partial rules
-        @part_rules.each { |rule|
-          line.gsub!(rule[0], "#{rule[1]}\\0#{end_colour}")
-        }
-
-        @output.puts line
-      }
+      rescue Errno::EPIPE
+        # ignore the Broken Pipe error that is caused by tools like head
+      end
     end
+    
   end
 end

data/lib/yay/loader.rb

@@ -18,7 +18,7 @@ class Yay
     def parse_string string, context_name
       # invoke a new parser and return the rules it finds
       parser = Yay::Parser.new context_name
-			parser.allow_include = true
+      parser.allow_include = true
       return parser.parse string
     end
     	

data/lib/yay/parser.rb

@@ -1,6 +1,7 @@
 require 'yay/parser_gen'
 require 'yay/lexer'
 require 'yay/colour_wheel'
+require 'yay/autoformatter'
 require 'yay/rule_set'
 require 'yay/loader'
 require 'yay/installer'
@@ -15,20 +16,12 @@ class Yay
 	# ruby code
 	class Parser < Yay::ParserGen   
 
-		# allow this parser to load the default rule file if the rule body is empty
-		attr_accessor :allow_default
-
-		# allow this parser to install new rule files from remote sources. beware
-		# the consequences. this should be allowed from the command line only!
-		attr_accessor :allow_install
-
-		# allow this parser to include rule files that are installed. including
-		# ones in the gem folders, globally and locally
-		attr_accessor :allow_include
-
-		# allow this parser to search for and print out all the rules that are
-		# installed
-		attr_accessor :allow_list
+		# restricted mode is on by default. this prevents people from doing things
+    # like installing new files from within files
+		attr_accessor :allow_restricted
+    
+    # a subset of restricted mode which allows include files
+    attr_accessor :allow_include
 
 		# set to true to signal to the application or parent parser that it's time
 		# to shut down
@@ -39,6 +32,23 @@ class Yay
 			@lexer.context_name = context_name
 		end
 
+    # tries to include a file if it exists; otherwise autoformats
+    def include_or_autoformat strings
+      begin
+        include_file strings[0].source
+      rescue Yay::CouldntFindFileError
+        # autoformat if we're on the commandline otherwise this doesn't make
+        # sense
+        autoformat strings if @allow_restricted
+      end
+    end
+    
+    # takes strings without colours and automatically assigns one to each
+    def autoformat strings
+      autoformatter = Yay::Autoformatter.new
+      @ruleset.merge autoformatter.get_rules strings
+    end
+    
 		# load a file from a url
 		def include_file filename
 			raise NotAllowedError.new "include #{filename}", current_position unless @allow_include
@@ -49,7 +59,7 @@ class Yay
 
 		# install a file from a url
 		def install_file file_name, url
-			raise NotAllowedError.new "install #{url}", current_position unless @allow_install
+			raise NotAllowedError.new "install #{url}", current_position unless @allow_restricted
 			installer = Yay::Installer.new file_name, url
 			installer.install
 			@shutdown = true
@@ -57,21 +67,26 @@ class Yay
 
 		# print the full list of yay files
 		def list_installed
-			raise NotAllowedError.new "list installed yay files", current_position unless @allow_list
+			raise NotAllowedError.new "list installed yay files", current_position unless @allow_restricted
 			lister = Yay::Lister.new 
       lister.print
       @shutdown = true
 		end
 
 		# allow all parser actions
-		def allow_all= value
-			@allow_default = @allow_install = @allow_include = @allow_list = value
+		def allow_restricted= value
+			@allow_include = @allow_restricted = value
 		end
 
+    # allow the including of files
+		def allow_include= value
+			@allow_include = value
+		end
+    
 		# load the default file. used when the commandline is empty
 		def use_default_file
 			# don't throw an error in this case. it's legitimate for a file to be empty
-			return unless @allow_default
+			return unless @allow_restricted
 			loader = Yay::Loader.default_file_loader
 			loader.load
 			@ruleset.merge loader.get_rules
@@ -108,6 +123,8 @@ class Yay
 		# for lack of a better function, this will take a string like "/abc/" and
 		# transform it in to a regex object
 		def string_to_regex string, escape=true
+      # extract the constituent part of the regexp. in ruby 1.8 we can't just
+      # create a regex from a perl-style regex literal like /abc/i
 			matches = /\/([^\/\\\r\n]*(?:\\.[^\/\\\r\n]*)*)\/([a-z]\b)*/.match string
 			return nil if matches[1].nil?
 			content = matches[1]

data/lib/yay/parser_gen.rb

@@ -15,76 +15,76 @@ module_eval(<<'...end grammar.y/module_eval...', 'grammar.y', 54)
 ##### State transition tables begin ###
 
 racc_action_table = [
-    -7,   -25,    33,    17,    25,    17,   -25,    12,    22,    22,
-    33,    20,    30,     9,    10,    12,     2,     4,     8,     9,
-    10,    12,    28,    36,    31,    29,    29,    19,    -2,    17,
-    38,    29,    38 ]
+    -4,    -7,   -25,     4,    27,    26,   -25,    12,    20,    25,
+    20,    21,     2,     4,     8,     9,    11,    12,     4,    21,
+     9,    11,    12,    31,    34,    21,    32,    32,    18,    17,
+    38,    32,    38,    21 ]
 
 racc_action_check = [
-     7,     6,    21,    17,    10,     9,     6,    21,     6,     7,
-    23,     4,    19,    23,    23,    23,     0,     0,     0,     0,
-     0,     0,    18,    24,    20,    18,    24,     3,     2,     1,
-    27,    29,    35 ]
+     7,    10,     6,    19,    18,    17,     6,    19,     6,    11,
+    10,     7,     0,     0,     0,     0,     0,     0,    24,    21,
+    24,    24,    24,    22,    23,     9,    22,    23,     3,     2,
+    30,    32,    33,    36 ]
 
 racc_action_pointer = [
-    14,    18,    28,    27,     9,   nil,    -1,     0,   nil,    -6,
-     2,   nil,   nil,   nil,   nil,   nil,   nil,    -8,    17,    12,
-    22,     0,   nil,     8,    18,   nil,   nil,    20,   nil,    23,
-   nil,   nil,   nil,   nil,   nil,    22,   nil,   nil,   nil,   nil,
+    10,   nil,    26,    28,   nil,   nil,    -1,     0,   nil,    14,
+     1,     6,   nil,   nil,   nil,   nil,   nil,     2,     4,     0,
+   nil,     8,    18,    19,    15,   nil,   nil,   nil,   nil,   nil,
+    20,   nil,    23,    22,   nil,   nil,    22,   nil,   nil,   nil,
    nil ]
 
 racc_action_default = [
-    -5,   -29,   -20,   -30,   -30,    -1,   -19,   -25,    -4,   -29,
-   -30,    -8,   -21,    -9,   -10,   -11,   -12,   -29,   -30,   -30,
-   -30,   -30,   -24,   -30,   -30,   -17,   -28,   -27,   -14,   -23,
-    41,    -3,   -18,   -20,    -6,   -27,   -16,   -13,   -26,   -22,
+    -5,   -12,   -30,   -30,   -20,    -1,   -19,   -29,    -3,   -29,
+   -25,   -30,   -21,    -8,    -9,   -10,   -11,   -30,   -30,   -30,
+   -24,   -29,   -30,   -30,   -30,   -17,    -2,    41,   -18,   -28,
+   -27,   -14,   -23,   -27,   -16,    -6,   -29,   -13,   -26,   -22,
    -15 ]
 
 racc_goto_table = [
-     5,    18,    27,    37,    21,    23,    32,     3,    35,    24,
-   nil,    40,   nil,    39,   nil,   nil,   nil,    26,   nil,   nil,
-   nil,   nil,   nil,    34 ]
+     7,     5,    23,    30,    33,    19,     3,    37,   nil,    24,
+    40,   nil,   nil,    39,    29,   nil,   nil,   nil,   nil,    28,
+   nil,   nil,   nil,   nil,    36,    35 ]
 
 racc_goto_check = [
-     2,    11,    12,    13,     4,     4,    10,     1,    12,    11,
-   nil,    13,   nil,    12,   nil,   nil,   nil,    11,   nil,   nil,
-   nil,   nil,   nil,     2 ]
+     3,     2,    11,    12,    12,     5,     1,    13,   nil,     5,
+    13,   nil,   nil,    12,    11,   nil,   nil,   nil,   nil,     3,
+   nil,   nil,   nil,   nil,     3,     2 ]
 
 racc_goto_pointer = [
-   nil,     7,     0,   nil,    -2,   nil,   nil,   nil,   nil,   nil,
-   -15,     0,   -16,   -24,   nil ]
+   nil,     6,     1,     0,   nil,    -1,   nil,   nil,   nil,   nil,
+   nil,    -7,   -19,   -23,   nil ]
 
 racc_goto_default = [
-   nil,   nil,   nil,     7,   nil,    11,    13,    14,    15,    16,
-     1,   nil,   nil,   nil,     6 ]
+   nil,   nil,   nil,   nil,    10,   nil,    13,    14,    15,    16,
+     1,    22,   nil,   nil,     6 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
   1, 13, :_reduce_1,
-  1, 13, :_reduce_2,
-  3, 13, :_reduce_3,
+  3, 13, :_reduce_2,
+  1, 13, :_reduce_3,
   1, 13, :_reduce_4,
   0, 13, :_reduce_5,
   3, 14, :_reduce_6,
   1, 14, :_reduce_7,
-  1, 15, :_reduce_none,
-  1, 15, :_reduce_none,
-  1, 15, :_reduce_none,
-  1, 15, :_reduce_none,
-  1, 15, :_reduce_none,
-  4, 17, :_reduce_13,
-  3, 18, :_reduce_14,
-  4, 19, :_reduce_15,
-  3, 20, :_reduce_16,
-  2, 21, :_reduce_17,
-  3, 22, :_reduce_18,
-  1, 22, :_reduce_19,
+  1, 16, :_reduce_none,
+  1, 16, :_reduce_none,
+  1, 16, :_reduce_none,
+  1, 16, :_reduce_none,
+  1, 16, :_reduce_none,
+  4, 18, :_reduce_13,
+  3, 19, :_reduce_14,
+  4, 20, :_reduce_15,
+  3, 21, :_reduce_16,
+  2, 22, :_reduce_17,
+  3, 15, :_reduce_18,
+  1, 15, :_reduce_19,
   1, 26, :_reduce_20,
   1, 26, :_reduce_21,
   2, 24, :_reduce_22,
   1, 24, :_reduce_23,
-  1, 16, :_reduce_24,
-  0, 16, :_reduce_25,
+  1, 17, :_reduce_24,
+  0, 17, :_reduce_25,
   1, 25, :_reduce_26,
   0, 25, :_reduce_27,
   2, 23, :_reduce_28,
@@ -97,8 +97,8 @@ racc_shift_n = 41
 racc_token_table = {
   false => 0,
   :error => 1,
-  :literal => 2,
-  :install => 3,
+  :install => 2,
+  :literal => 3,
   :list_installed => 4,
   :variable => 5,
   :include => 6,
@@ -131,8 +131,8 @@ Racc_arg = [
 Racc_token_to_s_table = [
   "$end",
   "error",
-  "literal",
   "install",
+  "literal",
   "list_installed",
   "variable",
   "include",
@@ -144,6 +144,7 @@ Racc_token_to_s_table = [
   "$start",
   "body",
   "command_list",
+  "string_list",
   "command",
   "and_opt",
   "match",
@@ -151,7 +152,6 @@ Racc_token_to_s_table = [
   "substitution",
   "equivalence",
   "include_file",
-  "string_list",
   "verbs_opt",
   "colour_list",
   "line_opt",
@@ -172,21 +172,21 @@ module_eval(<<'.,.,', 'grammar.y', 5)
 
 module_eval(<<'.,.,', 'grammar.y', 6)
   def _reduce_2(val, _values, result)
-     include_file val[0] 
+     install_file val[1], val[2] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'grammar.y', 7)
   def _reduce_3(val, _values, result)
-     install_file val[1], val[2] 
+     list_installed 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'grammar.y', 8)
   def _reduce_4(val, _values, result)
-     list_installed 
+     include_or_autoformat val[0] 
     result
   end
 .,.,

data/lib/yay/paths.rb

@@ -20,13 +20,17 @@ class Yay
 
 		# get all the paths where we might be able to find .yay files
 		def yay_paths
-			result = [local_yay_path,global_yay_path]
+			result = [current_path,local_yay_path,global_yay_path]
 			gempaths.each { |v| 
 				result.push gempath_to_yaypath(v)
 			}
 			return result
 		end
 
+    def current_path
+      return '.'
+    end
+
 		def global_yay_path
 			return '/etc/yay'
 		end

data/lib/yay/version.rb

@@ -3,7 +3,7 @@ require 'open3'
 class Yay
 
   # the gem version. increment to make a new release!
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 
   # yoinked from chef. this gives us the git revision number of the current
   # build if possible. used for --version

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: yay
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - jon davey
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-22 00:00:00 +00:00
+date: 2012-01-26 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -31,12 +31,15 @@ files:
 - LICENSE
 - data/yay/log4x.yay
 - data/yay/syslog.yay
+- data/yay/dna.yay
+- data/yay/types.yay
 - data/yay/default.yay
 - lib/yay/parser_gen.rb
 - lib/yay/rule_set.rb
 - lib/yay/version.rb
 - lib/yay/lister.rb
 - lib/yay/lexer.rb
+- lib/yay/autoformatter.rb
 - lib/yay/loader.rb
 - lib/yay/application.rb
 - lib/yay/colour_wheel.rb