bud 0.0.6 → 0.0.7

data/lib/bud/bud_meta.rb

@@ -57,7 +57,7 @@ class BudMeta #:nodoc: all
   def binaryrel2map(rel)
     map = {}
     rel.each do |s|
-      raise Bud::BudError unless s.length == 2
+      raise Bud::Error unless s.length == 2
       map[s[0]] = s[1]
     end
     return map

data/lib/bud/collections.rb

@@ -43,7 +43,7 @@ module Bud
       # user-specified schema.
       given_schema.each do |s|
         if s.to_s.start_with? "@"
-          raise BudError, "illegal use of location specifier (@) in column #{s} of non-channel collection #{tabname}"
+          raise Bud::Error, "illegal use of location specifier (@) in column #{s} of non-channel collection #{tabname}"
         end
       end
 
@@ -60,7 +60,7 @@ module Bud
     private
     def parse_schema(given_schema)
       if given_schema.respond_to? :keys
-        raise BudError, "invalid schema for #{tabname}" if given_schema.length != 1
+        raise Bud::Error, "invalid schema for #{tabname}" if given_schema.length != 1
         key_cols = given_schema.keys.first
         val_cols = given_schema.values.first
       else
@@ -71,11 +71,11 @@ module Bud
       cols = key_cols + val_cols
       cols.each do |c|
         if c.class != Symbol
-          raise BudError, "invalid schema element \"#{c}\", type \"#{c.class}\""
+          raise Bud::Error, "invalid schema element \"#{c}\", type \"#{c.class}\""
         end
       end
       if cols.uniq.length < cols.length
-        raise BudError, "schema for #{tabname} contains duplicate names"
+        raise Bud::Error, "schema for #{tabname} contains duplicate names"
       end
 
       return [cols, key_cols]
@@ -110,7 +110,7 @@ module Bud
         reserved = eval "defined?(#{colname})"
         unless (reserved.nil? or
           (reserved == "method" and method(colname).arity == -1 and (eval(colname))[0] == self.tabname))
-          raise BudError, "symbol :#{colname} reserved, cannot be used as column name for #{tabname}"
+          raise Bud::Error, "symbol :#{colname} reserved, cannot be used as column name for #{tabname}"
         end
       end
 
@@ -216,7 +216,7 @@ module Bud
         when :storage then @storage
         when :delta then @delta
         when :new_delta then @new_delta
-        else raise BudError, "bad symbol passed into each_from_sym"
+        else raise Bud::Error, "bad symbol passed into each_from_sym"
         end
       end
       each_from(bufs, &block)
@@ -289,10 +289,10 @@ module Bud
     private
     def prep_tuple(o)
       unless o.respond_to?(:length) and o.respond_to?(:[])
-        raise BudTypeError, "non-indexable type inserted into \"#{tabname}\": #{o.inspect}"
+        raise Bud::TypeError, "non-indexable type inserted into \"#{tabname}\": #{o.inspect}"
       end
       if o.class <= String
-        raise BudTypeError, "String value used as a fact inserted into \"#{tabname}\": #{o.inspect}"
+        raise Bud::TypeError, "String value used as a fact inserted into \"#{tabname}\": #{o.inspect}"
       end
 
       if o.length < cols.length then
@@ -336,7 +336,7 @@ module Bud
     private
     def check_enumerable(o)
       unless o.nil? or o.class < Enumerable
-        raise BudTypeError, "collection #{tabname} expected Enumerable value, not #{o.inspect} (class = #{o.class})"
+        raise Bud::TypeError, "collection #{tabname} expected Enumerable value, not #{o.inspect} (class = #{o.class})"
       end
     end
 
@@ -448,8 +448,8 @@ module Bud
     def tick  # :nodoc: all
       @storage = @pending
       @pending = {}
-      raise BudError, "orphaned tuples in @delta for #{@tabname}" unless @delta.empty?
-      raise BudError, "orphaned tuples in @new_delta for #{@tabname}" unless @new_delta.empty?
+      raise Bud::Error, "orphaned tuples in @delta for #{@tabname}" unless @delta.empty?
+      raise Bud::Error, "orphaned tuples in @new_delta for #{@tabname}" unless @new_delta.empty?
     end
 
     # move deltas to storage, and new_deltas to deltas.
@@ -487,7 +487,7 @@ module Bud
     public
     def argagg(aggname, gbkey_cols, collection)
       agg = bud_instance.send(aggname, nil)[0]
-      raise BudError, "#{aggname} not declared exemplary" unless agg.class <= Bud::ArgExemplary
+      raise Bud::Error, "#{aggname} not declared exemplary" unless agg.class <= Bud::ArgExemplary
       keynames = gbkey_cols.map do |k|
         if k.class == Symbol
           k.to_s
@@ -686,10 +686,10 @@ module Bud
         the_cols, the_key_cols = parse_schema(given_schema)
         spec_count = the_cols.count {|c| c.to_s.start_with? "@"}
         if spec_count == 0
-          raise BudError, "missing location specifier for channel '#{name}'"
+          raise Bud::Error, "missing location specifier for channel '#{name}'"
         end
         if spec_count > 1
-          raise BudError, "multiple location specifiers for channel '#{name}'"
+          raise Bud::Error, "multiple location specifiers for channel '#{name}'"
         end
 
         the_val_cols = the_cols - the_key_cols
@@ -725,7 +725,7 @@ module Bud
         lsplit[1] = lsplit[1].to_i
         return lsplit
       rescue Exception => e
-        raise BudError, "illegal location specifier in tuple #{t.inspect} for channel \"#{tabname}\": #{e.to_s}"
+        raise Bud::Error, "illegal location specifier in tuple #{t.inspect} for channel \"#{tabname}\": #{e.to_s}"
       end
     end
 
@@ -751,7 +751,7 @@ module Bud
           the_locspec = [ip, port]
         else
           the_locspec = split_locspec(t, @locspec_idx)
-          raise BudError, "'#{t[@locspec_idx]}', channel '#{@tabname}'" if the_locspec[0].nil? or the_locspec[1].nil? or the_locspec[0] == '' or the_locspec[1] == ''
+          raise Bud::Error, "'#{t[@locspec_idx]}', channel '#{@tabname}'" if the_locspec[0].nil? or the_locspec[1].nil? or the_locspec[0] == '' or the_locspec[1] == ''
         end
         @bud_instance.dsock.send_datagram([@tabname, t].to_msgpack, the_locspec[0], the_locspec[1])
       end
@@ -782,13 +782,13 @@ module Bud
     end
 
     superator "<+" do |o|
-      raise BudError, "illegal use of <+ with channel '#{@tabname}' on left"
+      raise Bud::Error, "illegal use of <+ with channel '#{@tabname}' on left"
     end
 
     undef merge
 
     def <=(o)
-      raise BudError, "illegal use of <= with channel '#{@tabname}' on left"
+      raise Bud::Error, "illegal use of <= with channel '#{@tabname}' on left"
     end
   end
 
@@ -842,14 +842,14 @@ module Bud
     public
     def tick #:nodoc: all
       @storage = {}
-      raise BudError, "orphaned pending tuples in terminal" unless @pending.empty?
+      raise Bud::Error, "orphaned pending tuples in terminal" unless @pending.empty?
     end
 
     undef merge
 
     public
     def <=(o) #:nodoc: all
-      raise BudError, "illegal use of <= with terminal '#{@tabname}' on left"
+      raise Bud::Error, "illegal use of <= with terminal '#{@tabname}' on left"
     end
 
     superator "<~" do |o|
@@ -860,26 +860,26 @@ module Bud
     def get_out_io
       rv = @bud_instance.options[:stdout]
       rv ||= $stdout
-      raise BudError, "attempting to write to terminal #{tabname} that was already closed" if rv.closed?
+      raise Bud::Error, "attempting to write to terminal #{tabname} that was already closed" if rv.closed?
       rv
     end
   end
 
   class BudPeriodic < BudCollection # :nodoc: all
     def <=(o)
-      raise BudError, "illegal use of <= with periodic '#{tabname}' on left"
+      raise Bud::Error, "illegal use of <= with periodic '#{tabname}' on left"
     end
 
     superator "<~" do |o|
-      raise BudError, "illegal use of <~ with periodic '#{tabname}' on left"
+      raise Bud::Error, "illegal use of <~ with periodic '#{tabname}' on left"
     end
 
     superator "<-" do |o|
-      raise BudError, "illegal use of <- with periodic '#{tabname}' on left"
+      raise Bud::Error, "illegal use of <- with periodic '#{tabname}' on left"
     end
 
     superator "<+" do |o|
-      raise BudError, "illegal use of <+ with periodic '#{tabname}' on left"
+      raise Bud::Error, "illegal use of <+ with periodic '#{tabname}' on left"
     end
   end
 

data/lib/bud/errors.rb

@@ -1,18 +1,18 @@
 module Bud
   # Root Bud exception type.
-  class BudError < StandardError; end
+  class Error < StandardError; end
 
   # Raised (at runtime) when a type mismatch occurs (e.g., supplying a
   # non-Enumerable object to the RHS of a Bud statement).
-  class BudTypeError < BudError; end
+  class TypeError < Error; end
 
   # Raised when a primary key constraint is violated.
-  class KeyConstraintError < BudError; end
+  class KeyConstraintError < Error; end
 
   # Raised when the input program fails to compile (e.g., due to illegal
   # syntax).
-  class CompileError < BudError; end
+  class CompileError < Error; end
   
   # Raised when evaluation halts with outstanding callbacks
-  class BudShutdownWithCallbacksError < BudError; end
+  class ShutdownWithCallbacksError < Error; end
 end

data/lib/bud/joins.rb

@@ -84,6 +84,19 @@ module Bud
       preds.uniq
     end
 
+    private_class_method
+    def self.positionwise_preds(bud_instance, rels)
+      preds = []
+      rels.each do |r|
+        rels.each do |s|
+          [r.cols.length, s.cols.length].min.times do |c|
+            preds << [bud_instance.send(r.tabname).send(r.cols[c]), bud_instance.send(s.tabname).send(s.cols[c])] unless r.tabname.to_s >= s.tabname.to_s
+          end
+        end
+      end
+      preds.uniq
+    end
+
     # flatten joined items into arrays, with attribute accessors inherited
     # from the input collections, disambiguated via suffix indexes as needed.
     # similar to <tt>SELECT * FROM ... WHERE...</tt> block in SQL.
@@ -120,7 +133,7 @@ module Bud
     public
     # map each (nested) item in the collection into a string, suitable for placement in stdio
     def inspected
-      raise BudError, "join left unconverted to binary" if @rels.length > 2
+      raise Bud::Error, "join left unconverted to binary" if @rels.length > 2
       tabnames = @origrels.map {|r| r.tabname.to_s}.join " * "
       [["(#{tabnames}): [#{self.map{|r1, r2| "\n  (#{r1.inspect}, #{r2.inspect})"}}]"]]
     end
@@ -221,15 +234,24 @@ module Bud
       @origpreds = preds
       # no projection involved here, so we can propagate the schema
       @cols = @rels[0].cols
+      if preds == [] and blk.nil? and @cols.length == @rels[1].cols.length
+        preds = BudJoin::positionwise_preds(@bud_instance, rels)
+      end
       setup_preds(preds)
       setup_state if self.class <= Bud::BudJoin
       if blk.nil?
-        @matches = map { |r, s| r }
+        if preds == [] # mismatched schemas -- no matches to be excluded
+          @exclude = [] 
+        else
+          # exclude those tuples of r that have a match
+          @exclude = map { |r, s| r }
+        end
       else
-        @matches = map { |r, s| r unless blk.call(r, s).nil? }.compact
+        # exclude tuples of r that pass the blk call
+        @exclude = map { |r, s| r unless blk.call(r, s).nil? }.compact
       end
-      # XXX: @matches is an Array, which makes include? O(n)
-      @rels[0].map {|r| (@matches.include? r) ? nil : r}
+      # XXX: @exclude is an Array, which makes include? O(n)
+      @rels[0].map {|r| (@exclude.include? r) ? nil : r}
     end
 
     private

data/lib/bud/metrics.rb

@@ -1,4 +1,4 @@
-require "bud/errors"
+require 'bud/errors'
 require 'faster_csv'
 
 # metrics are reported in a nested hash representing a collection of relational tables.
@@ -31,7 +31,7 @@ end
   
 # see http://en.wikipedia.org/wiki/Standard_deviation#Rapid_calculation_methods
 def running_stats(stats, elapsed)
-  raise Bud::BudError, "running_stats called with negative elapsed time" if elapsed < 0
+  raise Bud::Error, "running_stats called with negative elapsed time" if elapsed < 0
   stats[{:name=>:count}] += 1
   oldmean = stats[{:name=>:mean}]
   stats[{:name=>:mean}] = stats[{:name=>:mean}] + \

data/lib/bud/server.rb

@@ -1,47 +1,45 @@
 require 'socket'
 
-module Bud
-  class BudServer < EM::Connection #:nodoc: all
-    def initialize(bud)
-      @bud = bud
-      @pac = MessagePack::Unpacker.new
-      super
-    end
+class Bud::BudServer < EM::Connection #:nodoc: all
+  def initialize(bud)
+    @bud = bud
+    @pac = MessagePack::Unpacker.new
+    super
+  end
 
-    def receive_data(data)
-      # Feed the received data to the deserializer
-      @pac.feed data
+  def receive_data(data)
+    # Feed the received data to the deserializer
+    @pac.feed data
 
-      # streaming deserialize
-      @pac.each do |obj|
-        message_received(obj)
-      end
+    # streaming deserialize
+    @pac.each do |obj|
+      message_received(obj)
+    end
 
-      begin
-        @bud.tick_internal if @bud.running_async
-      rescue Exception
-        # If we raise an exception here, EM dies, which causes problems (e.g.,
-        # other Bud instances in the same process will crash). Ignoring the
-        # error isn't best though -- we should do better (#74).
-        puts "Exception handling network messages: #{$!}"
-        puts "Inbound messages:"
-        @bud.inbound.each do |m|
-          puts "    #{m[1].inspect} (channel: #{m[0]})"
-        end
-        @bud.inbound.clear
+    begin
+      @bud.tick_internal if @bud.running_async
+    rescue Exception
+      # If we raise an exception here, EM dies, which causes problems (e.g.,
+      # other Bud instances in the same process will crash). Ignoring the
+      # error isn't best though -- we should do better (#74).
+      puts "Exception handling network messages: #{$!}"
+      puts "Inbound messages:"
+      @bud.inbound.each do |m|
+        puts "    #{m[1].inspect} (channel: #{m[0]})"
       end
-
-      @bud.rtracer.sleep if @bud.options[:rtrace]
+      @bud.inbound.clear
     end
 
-    def message_received(obj)
-      unless (obj.class <= Array and obj.length == 2 and
-              @bud.tables.include?(obj[0].to_sym) and obj[1].class <= Array)
-        raise BudError, "bad inbound message of class #{obj.class}: #{obj.inspect}"
-      end
+    @bud.rtracer.sleep if @bud.options[:rtrace]
+  end
 
-      @bud.rtracer.recv(obj) if @bud.options[:rtrace]
-      @bud.inbound << obj
+  def message_received(obj)
+    unless (obj.class <= Array and obj.length == 2 and
+            @bud.tables.include?(obj[0].to_sym) and obj[1].class <= Array)
+      raise Bud::Error, "bad inbound message of class #{obj.class}: #{obj.inspect}"
     end
+
+    @bud.rtracer.recv(obj) if @bud.options[:rtrace]
+    @bud.inbound << obj
   end
 end

data/lib/bud/state.rb

@@ -55,7 +55,7 @@ module Bud
       @tables[name] = Bud::BudTcTable.new(name, self, schema)
       @tc_tables[name] = @tables[name]
     else
-      raise BudError, "unknown synchronous storage engine #{storage.to_s}"
+      raise Bud::Error, "unknown synchronous storage engine #{storage.to_s}"
     end
   end
   
@@ -65,12 +65,12 @@ module Bud
     when :zookeeper
       # treat "schema" as a hash of options
       options = schema
-      raise BudError, "Zookeeper tables require a :path option" if options[:path].nil?
+      raise Bud::Error, "Zookeeper tables require a :path option" if options[:path].nil?
       options[:addr] ||= "localhost:2181"
       @tables[name] = Bud::BudZkTable.new(name, options[:path], options[:addr], self)
       @zk_tables[name] = @tables[name]
     else
-      raise BudError, "unknown async storage engine #{storage.to_s}"
+      raise Bud::Error, "unknown async storage engine #{storage.to_s}"
     end
   end
 
@@ -118,14 +118,14 @@ module Bud
   # rhs of statements only.
   def periodic(name, period=1)
     define_collection(name)
-    raise BudError if @periodics.has_key? [name]
+    raise Bud::Error if @periodics.has_key? [name]
     @periodics << [name, period]
     @tables[name] = Bud::BudPeriodic.new(name, self)
   end
 
   def terminal(name) # :nodoc: all
     if defined?(@terminal) && @terminal != name
-      raise Bud::BudError, "can't register IO collection #{name} in addition to #{@terminal}"
+      raise Bud::Error, "can't register IO collection #{name} in addition to #{@terminal}"
     else
       @terminal = name
     end

data/lib/bud/storage/dbm.rb

@@ -5,9 +5,9 @@ module Bud
   class BudDbmTable < BudCollection # :nodoc: all
     def initialize(name, bud_instance, given_schema)
       dbm_dir = bud_instance.options[:dbm_dir]
-      raise BudError, "dbm support must be enabled via 'dbm_dir'" unless dbm_dir
+      raise Bud::Error, "dbm support must be enabled via 'dbm_dir'" unless dbm_dir
       if bud_instance.port.nil?
-        raise BudError, "use of dbm storage requires an explicit port to be specified in Bud initialization options"
+        raise Bud::Error, "use of dbm storage requires an explicit port to be specified in Bud initialization options"
       end
 
       unless File.exists?(dbm_dir)
@@ -30,7 +30,7 @@ module Bud
       end
       @dbm = DBM.open(db_fname, 0666, flags)
       if @dbm.nil?
-        raise BudError, "failed to open dbm database '#{db_fname}': #{@dbm.errmsg}"
+        raise Bud::Error, "failed to open dbm database '#{db_fname}': #{@dbm.errmsg}"
       end
     end
 

data/lib/bud/storage/tokyocabinet.rb

@@ -9,9 +9,9 @@ module Bud
   class BudTcTable < BudCollection # :nodoc: all
     def initialize(name, bud_instance, given_schema)
       tc_dir = bud_instance.options[:tc_dir]
-      raise BudError, "TC support must be enabled via 'tc_dir'" unless tc_dir
+      raise Bud::Error, "TC support must be enabled via 'tc_dir'" unless tc_dir
       if bud_instance.port.nil?
-        raise BudError, "use of dbm storage requires an explicit port to be specified in Bud initialization options"
+        raise Bud::Error, "use of dbm storage requires an explicit port to be specified in Bud initialization options"
       end
 
       unless File.exists?(tc_dir)
@@ -35,7 +35,7 @@ module Bud
         flags |= TokyoCabinet::HDB::OTRUNC
       end
       if !@hdb.open(db_fname, flags)
-        raise BudError, "failed to open TokyoCabinet DB '#{db_fname}': #{@hdb.errmsg}"
+        raise Bud::Error, "failed to open TokyoCabinet DB '#{db_fname}': #{@hdb.errmsg}"
       end
       @hdb.tranbegin
     end

data/lib/bud/storage/zookeeper.rb

@@ -9,7 +9,7 @@ module Bud
   class BudZkTable < BudCollection # :nodoc: all
     def initialize(name, zk_path, zk_addr, bud_instance)
       unless defined? HAVE_ZOOKEEPER
-        raise BudError, "zookeeper gem is not installed: zookeeper-backed stores cannot be used"
+        raise Bud::Error, "zookeeper gem is not installed: zookeeper-backed stores cannot be used"
       end
 
       # schema = {[:key] => [:val]}
@@ -37,7 +37,7 @@ module Bud
     end
 
     def clone_empty
-      raise BudError
+      raise Bud::Error
     end
 
     def stat_and_watch
@@ -164,15 +164,15 @@ module Bud
     end
 
     superator "<+" do |o|
-      raise BudError, "illegal use of <+ with zookeeper store '#{@tabname}' on left"
+      raise Bud::Error, "illegal use of <+ with zookeeper store '#{@tabname}' on left"
     end
 
     def <=(o)
-      raise BudError, "illegal use of <= with zookeeper store '#{@tabname}' on left"
+      raise Bud::Error, "illegal use of <= with zookeeper store '#{@tabname}' on left"
     end
 
     def <<(o)
-      raise BudError, "illegal use of << with zookeeper store '#{@tabname}' on left"
+      raise Bud::Error, "illegal use of << with zookeeper store '#{@tabname}' on left"
     end
   end
 end

data/lib/bud.rb

@@ -163,7 +163,7 @@ module Bud
     @rule_orig_src = []
     declaration
     @strata.each_with_index do |s,i|
-      raise BudError if s.class <= Array
+      raise Bud::Error if s.class <= Array
       @strata[i] = [s]
       # Don't try to record source text for old-style rule blocks
       @rule_src[i] = [""]
@@ -306,7 +306,7 @@ module Bud
 
     schedule_and_wait do
       if @running_async
-        raise BudError, "run_bg called on already-running Bud instance"
+        raise Bud::Error, "run_bg called on already-running Bud instance"
       end
       @running_async = true
 
@@ -331,8 +331,8 @@ module Bud
 
   private
   def do_startup
-    raise BudError, "EventMachine not started" unless EventMachine::reactor_running?
-    raise BudError unless EventMachine::reactor_thread?
+    raise Bud::Error, "EventMachine not started" unless EventMachine::reactor_running?
+    raise Bud::Error unless EventMachine::reactor_thread?
 
     @instance_id = Bud.init_signal_handlers(self)
     do_start_server
@@ -376,7 +376,7 @@ module Bud
     # If we're called from the EventMachine thread (and EM is running), blocking
     # the current thread would imply deadlocking ourselves.
     if Thread.current == EventMachine::reactor_thread and EventMachine::reactor_running?
-      raise BudError, "cannot invoke run_fg from inside EventMachine"
+      raise Bud::Error, "cannot invoke run_fg from inside EventMachine"
     end
 
     q = Queue.new
@@ -430,7 +430,7 @@ module Bud
 
   def cancel_shutdown_cb(id)
     schedule_and_wait do
-      raise Bud::BudError unless @shutdown_callbacks.has_key? id
+      raise Bud::Error unless @shutdown_callbacks.has_key? id
       @shutdown_callbacks.delete(id)
     end
   end
@@ -494,10 +494,10 @@ module Bud
     cb_id = nil
     schedule_and_wait do
       unless @tables.has_key? tbl_name
-        raise Bud::BudError, "no such table: #{tbl_name}"
+        raise Bud::Error, "no such table: #{tbl_name}"
       end
 
-      raise Bud::BudError if @callbacks.has_key? @callback_id
+      raise Bud::Error if @callbacks.has_key? @callback_id
       @callbacks[@callback_id] = [tbl_name, block]
       cb_id = @callback_id
       @callback_id += 1
@@ -508,7 +508,7 @@ module Bud
   # Unregister the callback that has the given ID.
   def unregister_callback(id)
     schedule_and_wait do
-      raise Bud::BudError, "missing callback: #{id.inspect}" unless @callbacks.has_key? id
+      raise Bud::Error, "missing callback: #{id.inspect}" unless @callbacks.has_key? id
       @callbacks.delete(id)
     end
   end
@@ -543,7 +543,7 @@ module Bud
     result = q.pop
     if result == :callback
       # Don't try to unregister the callbacks first: runtime is already shutdown
-      raise BudShutdownWithCallbacksError, "Bud instance shutdown before sync_callback completed"
+      raise Bud::ShutdownWithCallbacksError, "Bud instance shutdown before sync_callback completed"
     end
     unregister_callback(cb)
     cancel_shutdown_cb(shutdown_cb)
@@ -571,9 +571,9 @@ module Bud
     return if EventMachine::reactor_running?
 
     EventMachine::error_handler do |e|
-      # Only print a backtrace if a non-BudError is raised (this presumably
+      # Only print a backtrace if a non-Bud::Error is raised (this presumably
       # indicates an unexpected failure).
-      if e.class <= BudError
+      if e.class <= Bud::Error
         puts "#{e.class}: #{e}"
       else
         puts "Unexpected Bud error: #{e.inspect}"
@@ -664,7 +664,7 @@ module Bud
   # forwarding, and external_ip:local_port would be if you're in a DMZ, for
   # example.
   def ip_port
-    raise BudError, "ip_port called before port defined" if port.nil?
+    raise Bud::Error, "ip_port called before port defined" if port.nil?
     ip.to_s + ":" + port.to_s
   end
 
@@ -680,7 +680,7 @@ module Bud
 
   # Returns the internal IP and port.  See ip_port.
   def int_ip_port
-    raise BudError, "ip_port called before port defined" if @port.nil? and @options[:port] == 0
+    raise Bud::Error, "ip_port called before port defined" if @port.nil? and @options[:port] == 0
     @port.nil? ? "#{@ip}:#{@options[:port]}" : "#{@ip}:#{@port}"
   end
 
@@ -730,7 +730,7 @@ module Bud
   # this value is guaranteed to remain the same for the duration of a single
   # tick, but will likely change between ticks.
   def bud_clock
-    raise BudError, "bud_clock undefined outside tick" unless @inside_tick
+    raise Bud::Error, "bud_clock undefined outside tick" unless @inside_tick
     @tick_clock_time ||= Time.now
     @tick_clock_time
   end
@@ -742,7 +742,7 @@ module Bud
   # initialized before user-defined state.
   def builtin_state
     # We expect there to be no previously-defined tables
-    raise BudError unless @tables.empty?
+    raise Bud::Error unless @tables.empty?
 
     loopback  :localtick, [:col1]
     @stdio = terminal :stdio
@@ -837,8 +837,8 @@ module Bud
           end
 
           new_e = e
-          unless new_e.class <= BudError
-            new_e = BudError
+          unless new_e.class <= Bud::Error
+            new_e = Bud::Error
           end
           raise new_e, "exception during Bud evaluation.\nException: #{e.inspect}.#{src_msg}"
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bud
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Peter Alvaro
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-09 00:00:00 Z
+date: 2011-10-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: backports