yay 0.0.3 → 0.0.4

data/lib/yay/application.rb

@@ -46,6 +46,7 @@ class Yay
       begin      
       
         @parser = Yay::Parser.new
+				@parser.allow_all = true
         @parser.parse_array(@args)
         @rules = @parser.get_rules
 

data/lib/yay/errors.rb

@@ -11,9 +11,9 @@ class Yay
       array  = @position
       return "" unless @position
       length = array.length
-      return " at word #{array[0]}" if length == 1
-      return " on line #{array[1]}, word #{array[0]}" if length == 2
-      return " in file #{array[2]}, line #{array[1]}, word #{array[0]}" if length == 3
+      return " in file #{array[2]}, line #{array[1]}, word #{array[0]}" if array[2]
+      return " on line #{array[1]}, word #{array[0]}" if array[1]
+      return " at word #{array[0]}" if array[0]
       raise "junk position given to exception"
     end
   end
@@ -30,6 +30,20 @@ class Yay
     end
   end
   
+  class NotAllowedError < Error
+    attr :action
+    attr :path
+    
+    def initialize action, path
+      @action = action
+      @path   = path
+    end
+
+    def printable_message
+      return "You can't #{action} from here"
+    end
+  end
+	
   class CircularReferenceError < Error
     attr :current
     attr :path
@@ -66,7 +80,7 @@ class Yay
     end
     
     def printable_message
-      return "Failed to load file \"#{filename}\"#{printable_position}\nPlaced looked: #{tried.join(', ')}"
+      return "Failed to load file \"#{filename}\"#{printable_position}\nPlaced looked:\n #{tried.join("\n ")}"
     end
   end
   

data/lib/yay/lexer.rb

@@ -3,16 +3,22 @@ require 'yay/lexer_regex'
 
 class Yay  
   class Lexer
+		attr :context_name
     
-    def initialize(string="")
-      @position = 0
-      @line     = 1
+    def initialize(string="", context_name=nil)
+      @position     = 0
+      @line         = 1
+			@context_name = context_name
       
       # default to an empty string scanner. this provides us an endless number
       # of eofs
       use_string(string)
     end
-    
+   
+	def context_name= value
+		@context_name = value
+	end
+
     # take a string and begin scanning it
     def use_string(string)
       @scanner = StringScanner.new string
@@ -57,4 +63,4 @@ class Yay
       return [type, value]
     end
   end
-end
+end

data/lib/yay/lexer_regex.rb

@@ -18,7 +18,7 @@ class Yay
       # keywords
       [:line           , /\bline[s]?\b/i],
       [:install        , /\binstall\b/i],
-      [:installed      , /\binstalled\b/i],
+      [:list_installed , /\b(list|installed)\b/i],
       [:include        , /\b(include|use|load)\b/i],
       [:and            , /(\b(and|but)\b)|,/i],
       [:verb           , /\b(is|are|a|an)\b/],

data/lib/yay/loader.rb

@@ -1,41 +1,52 @@
+require 'yay/paths'
 
 class Yay
   class Loader
     def initialize filename
       @filename = filename
     end
+		
+		def self.default_file_loader
+			return Yay::Loader.new Yay::Paths::DEFAULT_YAYFILE
+		end
     
     # invoking a new parser and process a string of yay commands
     # any variables inside the parser context will not affect our own
     # this is particularly useful when loading files
-    def load_string string
+    def parse_string string, context_name
       # invoke a new parser and return the rules it finds
-      parser = Yay::Parser.new
+      parser = Yay::Parser.new context_name
+			parser.allow_include = true
       return parser.parse string
     end
-    
-    # 
-    def load_file full_path
+    	
+    # parse a file
+    def parse_file full_path
       file = File.open(full_path, "rb")
       contents = file.read
-      return load_string(contents)
+      return parse_string contents, full_path
     end
     
-    def resolve_targets filename
-      return [
-        "./#{filename}.yay",
-        "~/.yay/#{filename}.yay",
-#        "#{$GEM_HOME}/yay/#{filename}.yay"
-      ]      
-    end
+		# get the potential target paths
+    def get_potential_resolutions filename
+			paths = Yay::Paths.new
+			dirs  = paths.yay_paths
+			
+			result = []
+			dirs.each { |path| 
+				result.push("#{path}/#{filename}.yay")
+			}
+
+			return result
+		end
     
-    # stat for the file locally and globally
+    # try to determine the location of our file
     def resolve_file filename
-      paths = resolve_targets filename
+      paths = get_potential_resolutions filename
       paths.each { |file_name| 
         begin
           stat = File.stat(file_name)
-          return file_name if stat
+          return file_name if stat.readable?
         rescue Errno::ENOENT 
         end
       }
@@ -45,8 +56,8 @@ class Yay
     # load a file
     def load
       resolved = resolve_file @filename
-      raise Yay::CouldntFindFileError.new @filename, resolve_targets(@filename) unless resolved
-      @rules = load_file resolved
+      raise Yay::CouldntFindFileError.new @filename, get_potential_resolutions(@filename) unless resolved
+      @rules = parse_file resolved
       return @rules
     end
 

data/lib/yay/parser.rb

@@ -5,23 +5,58 @@ require 'yay/rule_set'
 require 'yay/loader'
 require 'yay/installer'
 require 'yay/errors'
+require 'yay/paths'
 
 class Yay
   class Parser < Yay::ParserGen   
-    def load_file filename
+		attr :allow_default
+		attr :allow_install
+		attr :allow_include
+		attr :allow_print
+
+		def initialize context_name=nil
+      @lexer = Yay::Lexer.new
+			@lexer.context_name = context_name
+		end
+
+		def allow_include= value
+			@allow_include = value
+		end
+		
+		# load a file from a url
+    def include_file filename
+			raise NotAllowedError.new "include #{filename}", current_position unless @allow_include
       loader = Yay::Loader.new filename
       loader.load
       @ruleset.merge loader.get_rules
     end
 
+		# install a file from a url
     def install_file url
+			raise NotAllowedError.new "install #{url}", current_position unless @allow_install
       installer = Yay::Installer.new url
       installer.install
     end
     
-    def print_installed
+		# print the full list of yay files
+    def list_installed
+			raise NotAllowedError.new "list installed yay files", current_position unless @allow_print
       # TODO
     end
+		
+		# allow all parser actions
+		def allow_all= value
+			@allow_default = @allow_install = @allow_include = @allow_print = 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
+      loader = Yay::Loader.default_file_loader
+      loader.load
+      @ruleset.merge loader.get_rules
+		end
     
     def handle_string string
       string = Regexp::escape(string)
@@ -77,7 +112,7 @@ class Yay
           bg = ColourWheel::BG[colour]
           result.push bg
         else
-          raise Yay::TooManyColoursError.new fg, bg, colour, [@lexer.position, @lexer.line]
+          raise Yay::TooManyColoursError.new fg, bg, colour, current_position
         end
       }
       result
@@ -95,7 +130,6 @@ class Yay
     
     # parse a string
     def parse(str)
-      @lexer = Yay::Lexer.new unless @lexer
       @lexer.use_string(str)
       @ruleset = Yay::RuleSet.new
 
@@ -108,9 +142,13 @@ class Yay
       @lexer.next_token
     end
 
-    def on_error error_token_id, error_value, value_stack
+		def current_position
+			return [@lexer.position, @lexer.line, @lexer.context_name]
+		end
+		
+    def on_error error_token_id, error_value, cant_touch_this
       type = token_to_str error_token_id
-      raise Yay::UnexpectedTokenError.new type, error_value, [@lexer.position, @lexer.line]
+      raise Yay::UnexpectedTokenError.new type, error_value, current_position
     end
   end
 end

data/lib/yay/parser_gen.rb

@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by racc 1.4.5
-# from racc grammer file "scripts/../data/grammar.y".
+# from racc grammer file "./../data/grammar.y".
 #
 
 require 'racc/parser'
@@ -18,8 +18,8 @@ racc_reduce_table = [
  1, 13, :_reduce_none,
  1, 13, :_reduce_2,
  2, 13, :_reduce_3,
- 3, 13, :_reduce_4,
- 0, 13, :_reduce_none,
+ 1, 13, :_reduce_4,
+ 0, 13, :_reduce_5,
  3, 14, :_reduce_none,
  1, 14, :_reduce_none,
  1, 15, :_reduce_none,
@@ -47,50 +47,48 @@ racc_reduce_table = [
 
 racc_reduce_n = 30
 
-racc_shift_n = 41
+racc_shift_n = 40
 
 racc_action_table = [
-    -7,   -25,    33,    19,    16,    20,   -25,    11,    22,    22,
-    33,    25,    16,     8,     9,    11,     2,     4,    30,     8,
-     9,    11,    36,    28,    31,    29,    29,    18,    -2,    16,
-    38,    29,    38 ]
+    -7,   -25,    32,    17,    25,    17,   -25,    12,    22,    22,
+    32,    20,    30,     9,    10,    12,     2,     4,     8,     9,
+    10,    12,    28,    35,    19,    29,    29,    -2,    17,    37,
+    29,    37 ]
 
 racc_action_check = [
-     7,     6,    21,     4,    16,     4,     6,    21,     6,     7,
-    23,     9,     8,    23,    23,    23,     0,     0,    18,     0,
-     0,     0,    24,    17,    20,    24,    17,     3,     2,     1,
-    27,    29,    35 ]
+     7,     6,    21,    17,    10,     9,     6,    21,     6,     7,
+    23,     4,    19,    23,    23,    23,     0,     0,     0,     0,
+     0,     0,    18,    24,     3,    18,    24,     2,     1,    27,
+    29,    34 ]
 
 racc_action_pointer = [
-    14,    18,    28,    27,     1,   nil,    -1,     0,     1,     9,
-   nil,   nil,   nil,   nil,   nil,   nil,    -7,    18,    18,   nil,
-    22,     0,   nil,     8,    17,   nil,   nil,    20,   nil,    23,
-   nil,   nil,   nil,   nil,   nil,    22,   nil,   nil,   nil,   nil,
-   nil ]
+    14,    17,    27,    24,     9,   nil,    -1,     0,   nil,    -6,
+     2,   nil,   nil,   nil,   nil,   nil,   nil,    -8,    17,    12,
+   nil,     0,   nil,     8,    18,   nil,   nil,    19,   nil,    22,
+   nil,   nil,   nil,   nil,    21,   nil,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
-    -5,   -29,   -20,   -30,   -30,    -1,   -19,   -25,   -29,   -30,
-    -8,   -21,    -9,   -10,   -11,   -12,   -29,   -30,   -30,    -3,
-   -30,   -30,   -24,   -30,   -30,   -17,   -28,   -27,   -14,   -23,
-    41,    -4,   -18,   -20,    -6,   -27,   -16,   -13,   -26,   -22,
-   -15 ]
+    -5,   -29,   -20,   -30,   -30,    -1,   -19,   -25,    -4,   -29,
+   -30,    -8,   -21,    -9,   -10,   -11,   -12,   -29,   -30,   -30,
+    -3,   -30,   -24,   -30,   -30,   -17,   -28,   -27,   -14,   -23,
+    40,   -18,   -20,    -6,   -27,   -16,   -13,   -26,   -22,   -15 ]
 
 racc_goto_table = [
-     5,    17,    27,    37,    21,    23,    32,     3,    24,    35,
-   nil,    40,   nil,   nil,    39,   nil,    26,   nil,   nil,   nil,
-   nil,   nil,   nil,    34 ]
+     5,    18,    27,    36,    21,    23,    31,     3,    34,    24,
+    39,   nil,   nil,    38,   nil,   nil,   nil,    26,   nil,   nil,
+   nil,   nil,   nil,    33 ]
 
 racc_goto_check = [
-     2,    11,    12,    13,     4,     4,    10,     1,    11,    12,
-   nil,    13,   nil,   nil,    12,   nil,    11,   nil,   nil,   nil,
+     2,    11,    12,    13,     4,     4,    10,     1,    12,    11,
+    13,   nil,   nil,    12,   nil,   nil,   nil,    11,   nil,   nil,
    nil,   nil,   nil,     2 ]
 
 racc_goto_pointer = [
    nil,     7,     0,   nil,    -2,   nil,   nil,   nil,   nil,   nil,
-   -15,     0,   -15,   -24,   nil ]
+   -15,     0,   -16,   -24,   nil ]
 
 racc_goto_default = [
-   nil,   nil,   nil,     7,   nil,    10,    12,    13,    14,    15,
+   nil,   nil,   nil,     7,   nil,    11,    13,    14,    15,    16,
      1,   nil,   nil,   nil,     6 ]
 
 racc_token_table = {
@@ -98,7 +96,7 @@ racc_token_table = {
  Object.new => 1,
  :literal => 2,
  :install => 3,
- :local => 4,
+ :list_installed => 4,
  :variable => 5,
  :include => 6,
  :regex => 7,
@@ -132,7 +130,7 @@ Racc_token_to_s_table = [
 'error',
 'literal',
 'install',
-'local',
+'list_installed',
 'variable',
 'include',
 'regex',
@@ -164,28 +162,33 @@ Racc_debug_parser = false
 
  # reduce 1 omitted
 
-module_eval <<'.,.,', 'scripts/../data/grammar.y', 6
+module_eval <<'.,.,', './../data/grammar.y', 6
   def _reduce_2( val, _values, result )
- load_file val[0]
+ include_file val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'scripts/../data/grammar.y', 7
+module_eval <<'.,.,', './../data/grammar.y', 7
   def _reduce_3( val, _values, result )
- install_file val[1], true
+ install_file val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'scripts/../data/grammar.y', 8
+module_eval <<'.,.,', './../data/grammar.y', 8
   def _reduce_4( val, _values, result )
- install_file val[2], false
+ list_installed
    result
   end
 .,.,
 
- # reduce 5 omitted
+module_eval <<'.,.,', './../data/grammar.y', 9
+  def _reduce_5( val, _values, result )
+ use_default_file
+   result
+  end
+.,.,
 
  # reduce 6 omitted
 
@@ -201,84 +204,84 @@ module_eval <<'.,.,', 'scripts/../data/grammar.y', 8
 
  # reduce 12 omitted
 
-module_eval <<'.,.,', 'scripts/../data/grammar.y', 20
+module_eval <<'.,.,', './../data/grammar.y', 20
   def _reduce_13( val, _values, result )
  @ruleset.add_match val[0], handle_colours(val[2]), val[3]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'scripts/../data/grammar.y', 22
+module_eval <<'.,.,', './../data/grammar.y', 22
   def _reduce_14( val, _values, result )
  @ruleset.add_assignment val[0], val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'scripts/../data/grammar.y', 24
+module_eval <<'.,.,', './../data/grammar.y', 24
   def _reduce_15( val, _values, result )
  @ruleset.add_substitution val[0], handle_colours(val[2]), val[3]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'scripts/../data/grammar.y', 26
+module_eval <<'.,.,', './../data/grammar.y', 26
   def _reduce_16( val, _values, result )
  @ruleset.add_equivalence val[0], val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'scripts/../data/grammar.y', 28
+module_eval <<'.,.,', './../data/grammar.y', 28
   def _reduce_17( val, _values, result )
- load_file val[0]
+ include_file val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'scripts/../data/grammar.y', 30
+module_eval <<'.,.,', './../data/grammar.y', 30
   def _reduce_18( val, _values, result )
  val[2].unshift(val[0]); result = val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'scripts/../data/grammar.y', 31
+module_eval <<'.,.,', './../data/grammar.y', 31
   def _reduce_19( val, _values, result )
  result = [val[0]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'scripts/../data/grammar.y', 33
+module_eval <<'.,.,', './../data/grammar.y', 33
   def _reduce_20( val, _values, result )
  result = handle_string(val[0])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'scripts/../data/grammar.y', 34
+module_eval <<'.,.,', './../data/grammar.y', 34
   def _reduce_21( val, _values, result )
  result = handle_regex(val[0])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'scripts/../data/grammar.y', 36
+module_eval <<'.,.,', './../data/grammar.y', 36
   def _reduce_22( val, _values, result )
  val[1].unshift(val[0].to_sym); result = val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'scripts/../data/grammar.y', 37
+module_eval <<'.,.,', './../data/grammar.y', 37
   def _reduce_23( val, _values, result )
  result = [val[0].to_sym]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'scripts/../data/grammar.y', 39
+module_eval <<'.,.,', './../data/grammar.y', 39
   def _reduce_24( val, _values, result )
  result = nil
    result
@@ -287,21 +290,21 @@ module_eval <<'.,.,', 'scripts/../data/grammar.y', 39
 
  # reduce 25 omitted
 
-module_eval <<'.,.,', 'scripts/../data/grammar.y', 42
+module_eval <<'.,.,', './../data/grammar.y', 42
   def _reduce_26( val, _values, result )
  result = true
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'scripts/../data/grammar.y', 43
+module_eval <<'.,.,', './../data/grammar.y', 43
   def _reduce_27( val, _values, result )
  result = false
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'scripts/../data/grammar.y', 45
+module_eval <<'.,.,', './../data/grammar.y', 45
   def _reduce_28( val, _values, result )
  result = nil
    result

data/lib/yay/paths.rb

@@ -0,0 +1,38 @@
+require 'rubygems'
+require 'yay/version'
+
+class Yay
+	
+	# some utility functions for finding the current install and .yay paths
+	class Paths
+		
+		DEFAULT_YAYFILE = 'default'
+
+		# get the paths to installed gems
+		def gempaths
+			return Gem.path
+		end
+
+		# try to determine where yayfiles might be installed based on a gem path
+		def gempath_to_yaypath gem_path
+			return "#{gem_path}/gems/yay-#{Yay::VERSION}/data/yay"
+		end
+
+		# get all the paths where we might be able to find .yay files
+		def yay_paths
+			result = [local_yay_path]
+			gempaths.each { |v| 
+				result.push gempath_to_yaypath(v)
+			}
+			return result
+		end
+
+		# get the path we store local .yay files
+		def local_yay_path
+			raise "ENV[HOME] not found!" unless ENV['HOME']
+			return "#{ENV['HOME']}/.yay"
+		end
+
+	end
+		
+end

data/lib/yay/version.rb

@@ -2,7 +2,7 @@ require 'open3'
 
 class Yay
 
-	VERSION = "0.0.3"
+	VERSION = "0.0.4"
 
 	def self.version
 		@rev ||= begin
@@ -16,4 +16,4 @@ class Yay
 		"#{VERSION}#@rev"
 	end
 
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: yay
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - jon davey
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-15 00:00:00 +00:00
+date: 2011-11-17 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -40,6 +40,7 @@ files:
 - lib/yay/errors.rb
 - lib/yay/parser.rb
 - lib/yay/loader.rb
+- lib/yay/paths.rb
 - lib/yay/colour_wheel.rb
 - lib/yay/installer.rb
 - lib/yay/rule_set.rb
@@ -78,6 +79,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: makes your logs colourful!
+summary: echo "i like apples" | yay apples are red
 test_files: []