goat 0.3.6 → 0.3.7

data/bin/channel-srv

@@ -27,7 +27,7 @@ module Goat
         if pusher
           pusher.statesrv_message_received(msg)
         else
-          logw "Page #{msg['pgid'].inspect} doesn't appear to be connected to this chsrv"
+          Goat.logw "Page #{msg['pgid'].inspect} doesn't appear to be connected to this chsrv"
         end
       end
     end
@@ -80,7 +80,7 @@ module Goat
       end
 
       def cleanup
-        logw "connection for #{@pgid}/#{@jsonp} closed"
+        Goat.logw "connection for #{@pgid}/#{@jsonp} closed"
         @finished = true
         self.class.pushers.delete(pgid)
         @channel.unsubscribe(@sub) if @sub

data/bin/state-srv

@@ -73,7 +73,7 @@ module Goat
           @last_connected[pgid] = Time.now
           @page_connections[pgid] = {:chsrv => chsrv, :version => ver}
         else
-          logw "Page #{pgid} has been deleted"
+          Goat.logw "Page #{pgid} has been deleted"
           raise PageDeleted
         end
       end
@@ -122,7 +122,7 @@ module Goat
         if cs
           cs.each {|c| delete_component(c)}
         else
-          logw "(No components for #{pgid})"
+          Goat.logw "(No components for #{pgid})"
         end
 
         @page_updates.delete(pgid)
@@ -200,7 +200,7 @@ module Goat
             @registry.add_component(pgid, ComponentSkeleton.from_hash(c))
           end
 
-          logd("registered #{msg['components'].count} components")
+          Goat.logd("registered #{msg['components'].count} components")
 
           @registry.initialize_page(pgid)
 
@@ -230,7 +230,7 @@ module Goat
           if chsrv
             chsrv.send_message(type, msg)
           else
-            logw "send_message fail: #{chsrv_id} no longer connected"
+            Goat.logw "send_message fail: #{chsrv_id} no longer connected"
           end
         end
 
@@ -264,7 +264,7 @@ module Goat
 
             send_message(chsrv_id, 'page_updated', {'pgid' => pgid, 'messages' => msgs}) unless msgs.empty?
           else
-            logw "No chsrv connection for page #{pgid}"
+            Goat.logw "No chsrv connection for page #{pgid}"
           end
         end
 
@@ -342,7 +342,7 @@ module Goat
       def run
         @registry.connected_pages.each do |pgid|
           if @registry.last_connected_delta(pgid) > 300
-            logd "Deleting page #{pgid}"
+            Goat.logd "Deleting page #{pgid}"
             @registry.delete_page(pgid)
           end
         end
@@ -365,7 +365,7 @@ module Goat
         if type == 'register_chsrv'
           Delegate.register_chsrv(self, msg)
           @chsrv = msg
-          logw "#{@chsrv['chsrv']} connected"
+          Goat.logw "#{@chsrv['chsrv']} connected"
         elsif Delegate.respond_to?(type)
           if resp = Delegate.send(type, msg)
             send_message('response', 'response' => resp)
@@ -387,7 +387,7 @@ module Goat
 
       def unbind
         if @chsrv
-          logw "#{@chsrv['chsrv']} disconnected"
+          Goat.logw "#{@chsrv['chsrv']} disconnected"
           Delegate.unregister_chsrv(self, @chsrv)
         end
       end

data/goat.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'goat'
-  s.version = '0.3.6'
+  s.version = '0.3.7'
   s.summary = 'Pre-release beta version of Goat'
   s.author = 'Patrick Collison'
   s.email = 'patrick@collison.ie'

data/lib/goat.rb

@@ -62,6 +62,8 @@ end
 module Goat
   class HTMLString < String; end
 
+  include Goat::Log
+
   class << self
     inline do |builder|
       builder.c 'VALUE new_without_initialize(VALUE klass) {
@@ -176,7 +178,7 @@ module Goat
       @messages = []
 
       self.errback do
-        logd "Channel closed"
+        Goat.logd "Channel closed"
         @finished = true
       end
 
@@ -306,8 +308,8 @@ module Goat
           @error_handler_binding ||= App.bind(app.class.error_handler)
           resp = @error_handler_binding.call(app, e)
         else
-          loge e.inspect
-          loge e.backtrace.join("\n")
+          Goat.loge e.inspect
+          Goat.loge e.backtrace.join("\n")
 
           resp = Rack::Response.new
           resp.status = 500
@@ -630,7 +632,7 @@ module Goat
         kls = app.class
 
         unless kls.instance_methods.include?(mname)
-          logd "defining #{mname} on #{kls}"
+          Goat.logd "defining #{mname} on #{kls}"
           kls.send(:define_method, mname, hook)
           hook = kls.instance_method(mname)
         end

data/lib/goat/net-common.rb

@@ -1,29 +1,29 @@
 require 'term/ansicolor'
 
-module Log
-  def self.logname; File.basename($0); end
-  def self.logpath; "/tmp/#{logname}.log"; end
-  def self.lockpath; "/tmp/#{logname}.lock"; end
-  def self.logf; @log ||= File.open(logpath, 'a'); end
+module Goat
+  def self.logd(msg); Log.log(:debug, msg); end
+  def self.logw(msg); Log.log(:warn, msg); end
+  def self.loge(msg); Log.log(:error, msg); end
 
-  def self.log(lvl, msg, termmsg=nil)
-    logf.puts("#{Time.now.asctime} #{msg}")
-    logf.flush
+  module Log
+    def self.logname; File.basename($0); end
+    def self.logpath; "/tmp/#{logname}.log"; end
+    def self.lockpath; "/tmp/#{logname}.lock"; end
+    def self.logf; @log ||= File.open(logpath, 'a'); end
 
-    termmsg ||= msg
-    $stderr.puts(termmsg[0..90])
-  end
+    def self.log(lvl, msg, termmsg=nil)
+      logf.puts("#{Time.now.asctime} #{msg}")
+      logf.flush
 
-  def self.log_message(msg)
-    log("#{msg['type']} #{msg.inspect}", "#{Term::ANSIColor.green(msg['type'])}: #{msg.inspect}")
-  end
-end
+      termmsg ||= msg
+      $stderr.puts(termmsg[0..90])
+    end
 
-def logd(msg); Log.log(:debug, msg); end
-def logw(msg); Log.log(:warn, msg); end
-def loge(msg); Log.log(:error, msg); end
+    def self.log_message(msg)
+      log("#{msg['type']} #{msg.inspect}", "#{Term::ANSIColor.green(msg['type'])}: #{msg.inspect}")
+    end
+  end
 
-module Goat
   # for use with EM::Connection
   module JSONMessages
     def send_message(type, msg)

data/lib/goat/notifications.rb

@@ -8,7 +8,7 @@ module Goat
       def self.start(host, port)
         EM.connect(host, port, self)
       rescue RuntimeError => e
-        log :live, "Couldn't connect to notification server at #{host}:#{port}"
+        Goat.log :live, "Couldn't connect to notification server at #{host}:#{port}"
         raise e
       end
 
@@ -17,7 +17,7 @@ module Goat
       end
 
       def unbind
-        logw "Lost notification server connection"
+        Goat.logw "Lost notification server connection"
         EM.add_timer(1) do
           NotificationCenter.start_receiver
         end
@@ -63,7 +63,7 @@ module Goat
     def self.receive(line)
       notif = load_notif(line)
       nid = notif['_nid']
-      logd "received notif #{notif.inspect}" if $verbose
+      Goat.logd "received notif #{notif.inspect}" if $verbose
 
       raise "No _nid" unless nid
 

data/lib/goat/state-srv.rb

@@ -56,7 +56,7 @@ module Goat
       s = TCPSocket.open(@host, @port)
       s.write(msg.to_json + "\n")
       resp = s.readline
-      logd("=> #{resp.inspect}") if $verbose
+      Goat.logd("=> #{resp.inspect}") if $verbose
       s.close
       resp
     end
@@ -73,14 +73,14 @@ module Goat
 
     def connection_completed
       @was_connected = true
-      logw "Connected to StateSrv"
+      Goat.logw "Connected to StateSrv"
       StateSrvConnection.connection = self
     end
 
     def receive_line(line)
       msg = JSON.load(line)
 
-      logd("=> #{msg.inspect}") if $verbose
+      Goat.logd("=> #{msg.inspect}") if $verbose
 
       if msg.is_a?(Array) 
         msg.each{|m| message_received(m)}
@@ -92,7 +92,7 @@ module Goat
     def send_message(t, msg, sync=false)
       msg = msg.merge('type' => t)
 
-      logd(">> #{msg.inspect}") if $verbose
+      Goat.logd(">> #{msg.inspect}") if $verbose
 
       if sync
         self.class.send_message_sync(msg) # TODO better way to do this?
@@ -107,9 +107,9 @@ module Goat
 
     def unbind
       if @was_connected
-        logw "Lost StateSrv connection"
+        Goat.logw "Lost StateSrv connection"
       else
-        logw "Couldn't open StateSrv connection"
+        Goat.logw "Couldn't open StateSrv connection"
       end
 
       StateSrvConnection.connection = nil

data/lib/goat/yodel.rb

@@ -13,7 +13,7 @@ module Yodel
     end
 
     def post_init
-      logw "listener connected"
+      Goat.logw "listener connected"
       @sub = NotifChannel.subscribe do |msg|
         send_data(msg + "\n")
       end
@@ -32,7 +32,7 @@ module Yodel
     end
 
     def receive_line(line)
-      logd "got #{line}"
+      Goat.logd "got #{line}"
       NotifChannel << line
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: goat
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Patrick Collison