pastejour 1.1.0 → 1.2.0

data/CHANGELOG.rdoc

@@ -1,3 +1,11 @@
-=== 1.0.0 (2009-02-27)
+=== 1.2.0 / 2009-06-22
+
+* Update docs.
+* Standardize project structure.
+* Switch to correct MiniTest.
+* Switch to new Hoe.
+* Improve the command-line tool.
+
+=== 1.0.0 / 2009-02-27
 
 * Birthday!

data/Manifest.txt

@@ -5,5 +5,4 @@ Rakefile
 bin/pastejour
 lib/pastejour.rb
 lib/pastejour/cli.rb
-lib/pastejour/version.rb
-test/pastejour/cli_test.rb
+test/test_cli.rb

data/README.rdoc

@@ -1,26 +1,31 @@
 = Pastejour
 
-Broadcast standard out using Bonjour.
+* http://github.com/jbarnette/pastejour
+
+== Description
+
+Broadcast standard out using Bonjour. Pipe output to other people.
+Pastejour is like pbcopy, but over the network!
 
 == Examples
 
-  alice$ git diff | pastejour
-  bob$ pastejour alice
-  
-  alice$ git diff | pastejour bob
-  bob$ pastejour
-  
-  alice$ git diff | pastejour monkeys
-  bob$ pastejour alice-monkeys
-  
-  alice$ git diff | pastejour monkeys
-  bob$ pastejour -f
-  Searching for servers (3 seconds)
-  alice-monkeys
-  
-  # Copy the clipboard contents from one machine to another
-  alice$ pbpaste | pastejour bob
-  bob$ pastejour | pbcopy
+    alice$ git diff | pastejour
+    bob$ pastejour alice
+
+    alice$ git diff | pastejour bob
+    bob$ pastejour
+
+    alice$ git diff | pastejour monkeys
+    bob$ pastejour alice-monkeys
+
+    alice$ git diff | pastejour monkeys
+    bob$ pastejour -f
+    Searching for servers (3 seconds)
+    alice-monkeys
+
+    # Copy the clipboard contents from one machine to another
+    alice$ pbpaste | pastejour bob
+    bob$ pastejour | pbcopy
 
 == ORLY?
 
@@ -29,15 +34,19 @@ and out. By default, Pastejour will only stay up until the first
 person grabs your paste. If you want to let a bunch of people grab the
 same thing, shoot it out in multiple mode:
 
-  alice$ git diff | pastejour -m # keeps on serving 'til you CTRL-C
-  
+    alice$ git diff | pastejour -m # keeps on serving 'til you CTRL-C
+
 == Awesome!
 
 You know it.
 
 == Installation
 
-    $ sudo gem install pastejour
+    $ gem install pastejour
+
+== TODO
+
+* Stop using dnssd, it's Mac OS X only.
 
 == License
 

data/Rakefile

@@ -1,18 +1,14 @@
 require "rubygems"
 require "hoe"
 
-require "./lib/pastejour/version.rb"
+Hoe.spec "pastejour" do
+  developer "John Barnette", "jbarnette@rubyforge.org"
+  developer "Evan Phoenix",  "evan@fallingsnow.net"
 
-Hoe.new "pastejour", Pastejour::VERSION do |p|
-  p.developer "John Barnette", "jbarnette@rubyforge.org"
+  self.extra_rdoc_files = FileList["*.rdoc"]
+  self.history_file     = "CHANGELOG.rdoc"
+  self.readme_file      = "README.rdoc"
+  self.testlib          = :minitest
 
-  p.url              = "http://github.com/jbarnette/pastejour"
-  p.history_file     = "CHANGELOG.rdoc"
-  p.readme_file      = "README.rdoc"
-  p.extra_rdoc_files = [p.readme_file]
-  p.need_tar         = false
-  p.test_globs       = %w(test/**/*_test.rb)
-  p.testlib          = :minitest
-
-  p.extra_deps << "dnssd"
+  extra_deps << "dnssd"
 end

data/bin/pastejour

@@ -2,19 +2,17 @@
 
 require "pastejour/cli"
 
-opts = Pastejour::Cli.new STDOUT, ARGV
-
-if opts.run?
-  if opts.list?
+Pastejour::Cli.new STDOUT, ARGV do |cli|
+  if cli.list?
     Pastejour.list
   elsif $stdin.tty?
-    name = /#{ENV["USER"]}$/ if opts.name.nil? || opts.name.empty?
+    name = /#{ENV["USER"]}$/ if cli.name.nil? || cli.name.empty?
     $stdout.write Pastejour.get(name)
     $stdout.flush
   else
-    name = [ENV["USER"], opts.name].compact.join "-"
+    name = [ENV["USER"], cli.name].compact.join "-"
     contents = $stdin.read
-    Pastejour.serve name, opts.multiple?, contents
-    $stdout.puts contents if opts.tee?
+    Pastejour.serve name, cli.multiple?, contents
+    $stdout.puts contents if cli.tee?
   end
 end

data/lib/pastejour/cli.rb

@@ -1,6 +1,5 @@
 require "optparse"
 require "pastejour"
-require "pastejour/version"
 
 module Pastejour
   class Cli
@@ -39,9 +38,11 @@ module Pastejour
         end
 
         opts.separator ""
-
         opts.parse! args
+
         @name = args.shift
+
+        yield self if @run && block_given?
       end
     end
 

data/lib/pastejour.rb

@@ -1,4 +1,3 @@
-require "rubygems"
 require "dnssd"
 require "set"
 require "socket"
@@ -7,6 +6,8 @@ require "webrick"
 Thread.abort_on_exception = true
 
 module Pastejour
+  VERSION = "1.2.0"
+
   include Socket::Constants
 
   Paste   = Struct.new(:name, :host, :port)
@@ -18,12 +19,15 @@ module Pastejour
     service = DNSSD.browse(SERVICE) do |reply|
       servers[reply.name] ||= reply
     end
+
     STDERR.puts "Searching for servers (3 seconds)"
+
     # Wait for something to happen
     sleep 3
+
     service.stop
-    servers.each { |string,obj| 
-      name, port = string.split ":" 
+    servers.each { |string,obj|
+      name, port = string.split ":"
       STDERR.puts "Found pastejour at '#{name}'"
     }
   end
@@ -59,7 +63,6 @@ module Pastejour
         STDERR.puts "  #{host.name} (#{host.host}:#{host.port})"
       end
     else
-      # Set is weird. There is no #[] or #at
       hosts.each do |host|
         STDERR.puts "(#{host.name} from #{host.host}:#{host.port})"
         sock = TCPSocket.open host.host, host.port
@@ -71,7 +74,7 @@ module Pastejour
   def self.serve(name, multiple, contents)
     tr = DNSSD::TextRecord.new
     tr["description"] = "A paste."
-    
+
     DNSSD.register(name, SERVICE, "local", PORT, tr.encode) do |reply|
       STDERR.puts "Pasting #{name}..."
     end

data/test/{pastejour/cli_test.rb → test_cli.rb}

@@ -1,6 +1,5 @@
-require "minitest/unit"
+require "minitest/autorun"
 require "pastejour/cli"
-require "pastejour/version"
 
 module Pastejour
   class CliTest < MiniTest::Unit::TestCase

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: pastejour
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - John Barnette
+- Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-02-27 00:00:00 -08:00
+date: 2009-06-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,17 +31,21 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.9.0
+        version: 2.2.0
     version: 
-description: ""
+description: |-
+  Broadcast standard out using Bonjour. Pipe output to other people.
+  Pastejour is like pbcopy, but over the network!
 email: 
 - jbarnette@rubyforge.org
+- evan@fallingsnow.net
 executables: 
 - pastejour
 extensions: []
 
 extra_rdoc_files: 
 - Manifest.txt
+- CHANGELOG.rdoc
 - README.rdoc
 files: 
 - CHANGELOG.rdoc
@@ -50,10 +55,11 @@ files:
 - bin/pastejour
 - lib/pastejour.rb
 - lib/pastejour/cli.rb
-- lib/pastejour/version.rb
-- test/pastejour/cli_test.rb
+- test/test_cli.rb
 has_rdoc: true
 homepage: http://github.com/jbarnette/pastejour
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -75,9 +81,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: pastejour
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
-summary: ""
+specification_version: 3
+summary: Broadcast standard out using Bonjour
 test_files: 
-- test/pastejour/cli_test.rb
+- test/test_cli.rb

data/lib/pastejour/version.rb

@@ -1,3 +0,0 @@
-module Pastejour
-  VERSION = "1.1.0"
-end