jbarnette-pastejour 1.0.0.200808041733 → 1.0.2

data/README.rdoc

@@ -1,31 +1,21 @@
 = Pastejour
 
-Broadcast standard out using Bonjour.
+Broadcast standard out.
 
 == Installation
 
-  sudo gem install dnssd
   sudo gem install jbarnette-pastejour --source=http://gems.github.com
   
 == Usage
 
   alice$ git diff | pastejour
-  bob$ pastejour alice
+  bob$ pastejour alice | cat
   
   alice$ git diff | pastejour bob
-  bob$ pastejour
+  bob$ pastejour | cat
   
   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$ pastejour | pbcopy
+  bob$ pastejour alice-monkeys | cat
   
 == ORLY?
 
@@ -61,4 +51,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/Rakefile

@@ -30,16 +30,18 @@ Rake::GemPackageTask.new(pastejour_gemspec) do |pkg|
 end
 
 namespace :gem do
-  desc "Update pastejour.gemspec"
-  task :spec do
-    File.open("pastejour.gemspec", "w") do |f|
-      f.puts(pastejour_gemspec.to_ruby)
+  namespace :spec do
+    desc "Update pastejour.gemspec"
+    task :generate do
+      File.open("pastejour.gemspec", "w") do |f|
+        f.puts(pastejour_gemspec.to_ruby)
+      end
     end
   end
 end
 
 task :install => :package do
-  sh %{sudo gem install --local pkg/pastejour-#{Pastejour::VERSION}}
+  sh %{sudo gem install pkg/pastejour-#{Pastejour::VERSION}}
 end
 
 desc "Run all specs"

data/bin/pastejour

@@ -4,19 +4,13 @@ require "rubygems"
 require "pastejour"
 
 multiple = ARGV.delete("-m")
-find = ARGV.delete("-f")
-teeing = ARGV.delete("-t") || false
 name = ARGV.shift
 
-if find
-  Pastejour.list
-elsif $stdin.tty?
+if $stdin.tty?
   name = /#{ENV["USER"]}$/ if name.nil? || name.empty?
   $stdout.write(Pastejour.get(name))
   $stdout.flush
 else
   name = [ENV["USER"], name].compact.join("-")
-  contents = $stdin.read
-  Pastejour.serve(name, multiple, contents)
-  puts contents if teeing
+  Pastejour.serve(name, multiple, $stdin.read)
 end

data/lib/pastejour/version.rb

@@ -1,5 +1,3 @@
 module Pastejour
-  major, minor, tiny = 1, 0, 0
-  nano = ENV['RELEASE'] ? nil : Time.now.strftime("%Y%m%d%H%M")
-  VERSION = [major, minor, tiny, nano].compact.join('.').freeze
+  VERSION = "1.0.2".freeze
 end

data/lib/pastejour.rb

@@ -1,8 +1,7 @@
 require "dnssd"
-require "set"
 require "socket"
 require "webrick"
-
+require "set"
 require "pastejour/version"
 
 Thread.abort_on_exception = true
@@ -14,22 +13,6 @@ module Pastejour
   PORT    = 42424
   SERVICE = "_pastejour._tcp"
 
-  def self.list
-    servers = {}
-    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 ":" 
-      STDERR.puts "Found pastejour at '#{name}'"
-    }
-  end
-  
-
   def self.find(name, first=true)
     hosts = Set.new
 
@@ -68,14 +51,17 @@ 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"] = "A paste."
+    tr['description'] = File.read("#{path}/.git/description") rescue "a git project"
     
     DNSSD.register(name, SERVICE, "local", PORT, tr.encode) do |reply|
-      STDERR.puts "Pasting #{name}..."
+      puts "Pasting #{name}..."
     end
 
     log = WEBrick::Log.new(true) # true fools it
@@ -83,11 +69,9 @@ module Pastejour
 
     server = WEBrick::GenericServer.new(:Port => PORT, :Logger => log)
 
-    %w(INT TERM).each do |signal|
-      trap signal do
-        server.shutdown
-        exit!
-      end
+    trap "INT" do
+      server.shutdown
+      exit!
     end
 
     server.start do |socket|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jbarnette-pastejour
 version: !ruby/object:Gem::Version 
-  version: 1.0.0.200808041733
+  version: 1.0.2
 platform: ruby
 authors: 
 - John Barnette
@@ -10,7 +10,7 @@ autorequire: pastejour
 bindir: bin
 cert_chain: []
 
-date: 2008-08-04 00:00:00 -07:00
+date: 2008-06-03 00:00:00 -07:00
 default_executable: pastejour
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
 summary: Broadcast standard out.