jbarnette-pastejour 1.0.3 → 1.0.4

data/README.rdoc

@@ -1,6 +1,6 @@
 = Pastejour
 
-Broadcast standard out.
+Broadcast standard out using Bonjour.
 
 == Installation
 
@@ -52,4 +52,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/bin/pastejour

@@ -4,6 +4,7 @@ require "rubygems"
 require "pastejour"
 
 multiple = ARGV.delete("-m")
+teeing = ARGV.delete("-t") || false
 name = ARGV.shift
 
 if $stdin.tty?
@@ -12,5 +13,7 @@ if $stdin.tty?
   $stdout.flush
 else
   name = [ENV["USER"], name].compact.join("-")
-  Pastejour.serve(name, multiple, $stdin.read)
+  contents = $stdin.read
+  Pastejour.serve(name, multiple, contents)
+  puts contents if teeing
 end

data/lib/pastejour.rb

@@ -1,7 +1,8 @@
 require "dnssd"
+require "set"
 require "socket"
 require "webrick"
-require "set"
+
 require "pastejour/version"
 
 Thread.abort_on_exception = true
@@ -51,17 +52,14 @@ module Pastejour
         return sock.read
       end
     end
-    
-    # FIXME: actually read the paste contents
-    # TCPSocket.open("localhost", PORT).read
   end
 
   def self.serve(name, multiple, contents)
     tr = DNSSD::TextRecord.new
-    tr['description'] = File.read("#{path}/.git/description") rescue "a git project"
+    tr["description"] = "A paste."
     
     DNSSD.register(name, SERVICE, "local", PORT, tr.encode) do |reply|
-      puts "Pasting #{name}..."
+      STDERR.puts "Pasting #{name}..."
     end
 
     log = WEBrick::Log.new(true) # true fools it
@@ -69,9 +67,11 @@ module Pastejour
 
     server = WEBrick::GenericServer.new(:Port => PORT, :Logger => log)
 
-    trap "INT" do
-      server.shutdown
-      exit!
+    %w(INT TERM).each do |signal|
+      trap signal do
+        server.shutdown
+        exit!
+      end
     end
 
     server.start do |socket|

data/lib/pastejour/version.rb

@@ -1,3 +1,3 @@
 module Pastejour
-  VERSION = "1.0.3".freeze
+  VERSION = "1.0.4".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jbarnette-pastejour
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - John Barnette
@@ -10,7 +10,7 @@ autorequire: pastejour
 bindir: bin
 cert_chain: []
 
-date: 2008-06-03 00:00:00 -07:00
+date: 2008-06-04 00:00:00 -07:00
 default_executable: pastejour
 dependencies: 
 - !ruby/object:Gem::Dependency