nwcopy 0.0.2 → 0.0.3

data/README.rdoc

@@ -5,17 +5,25 @@ The fool proof network copy & paste program. Well, maybe someday.
 = Usage
 
     > nwcopy
-    Copied clipboard to /Users/josh/Dropbox/nwcopy/f314eee55161b14f140ee07b358ba63ef54112ac
+    /Users/josh/Dropbox/nwcopy/f314eee55161b14f140ee07b358ba63ef54112ac
     > nwpaste
-    Clipboard now contains
     https://github.com/j05h/nwcopy
 
+    > nwcopy /path/to/file
+    /Users/josh/Dropbox/nwcopy/e1c1675f009e65d8571bbab9243660da20a3b2a2
+    > nwpaste
+    Contents of file
+
+    > echo 'pipes work' | nwcopy
+    /Users/josh/Dropbox/nwcopy/5293e79627710caf507fb9b841df51356650c78d
+    > nwpaste
+    pipes work
 
 = Description
 
-nwcopy takes whatever is in the clipboard and copies it to a file in your Dropbox folder ~/Dropbox/nwcopy/<sha1>
+nwcopy takes whatever is in the clipboard (or pipe or filename) and copies it to a file in your Dropbox folder ~/Dropbox/nwcopy/<sha1>
 
-nwpaste takes the contents of the most recent file and puts it in the clipboard.
+nwpaste takes the contents of the most recent file, prints it to STDIN and puts it in the clipboard.
 
 = WTF?
 
@@ -27,6 +35,9 @@ I constantly want to copy and paste between machines which cannot directly talk
 
 Is that all? Well, yeah, right now. This is the initial version, and it works! However, here are my plans:
 
-* Integrate with github/pastebin so that you don't need a Dropbox account.
+* Write some tests
+* Support multiple files with globbing and whatnot.
+* When files are supplied, they should be pasted back with their original filename (tarball?)
+* Integrate with github/pastebin/skitch/etc so that you don't need a Dropbox account.
 * Add a server component which can be easily used with curl.
 * Have some delicious brisket.

data/bin/nwcopy

@@ -1,6 +1,9 @@
 #!/usr/bin/env ruby
 
-require File.join(File.dirname(__FILE__), '..', 'lib/nwcopy')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib/nwcopy'))
 
-file = Nwcopy.copy
-puts "Copied clipboard to #{file}"
+if file = Nwcopy.copy
+  puts file
+else
+  puts "No data copied"
+end

data/bin/nwpaste

@@ -1,6 +1,9 @@
 #!/usr/bin/env ruby
 
-require File.join(File.dirname(__FILE__), '..', 'lib/nwcopy')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib/nwcopy'))
 
-data = Nwcopy.paste
-puts "Clipboard now contains \n#{data}\n"
+if data = Nwcopy.paste
+  puts data
+else
+  puts "No data pasted"
+end

data/lib/nwcopy.rb

@@ -1,44 +1,43 @@
-require 'digest/sha1'
+$:.unshift(File.dirname(__FILE__)) unless
+  $:.include?(File.dirname(__FILE__)) ||
+  $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-module Nwcopy
-  def self.dropbox_dir
-    File.expand_path '~/Dropbox'
-  end
-
-  def self.nwcopy_dir
-    File.join dropbox_dir, 'nwcopy'
-  end
+require 'nwcopy/dropbox'
 
-  def self.init
-    unless File.exists? dropbox_dir
-      $stderr << "You must have Dropbox installed to use this version of nwcopy. (http://getdropbox.com/)\n"
-      exit
-    end
-
-    unless File.exists? nwcopy_dir
-      puts "Creating nwcopy directory at #{nwcopy_dir}"
-      Dir.mkdir nwcopy_dir
+module Nwcopy
+  def self.copy
+    data = read_data
+    if Nwcopy::Dropbox.available?
+      Nwcopy::Dropbox.copy data
+    else
+      STDERR << NwCopy::Dropbox.unavailable_message
     end
   end
 
-  def self.copy clipboard = `pbpaste`
-    digest = Digest::SHA1.hexdigest clipboard
-    nwcopy_file = File.join nwcopy_dir, digest
-    File.open(nwcopy_file, 'w+') do |f|
-      f << clipboard
+  def self.paste
+    if Nwcopy::Dropbox.available?
+      if clipboard = Nwcopy::Dropbox.paste
+        `echo "#{clipboard}" | pbcopy` unless `which pbcopy`.empty?
+        clipboard
+      end
+    else
+      STDERR << NwCopy::Dropbox.unavailable_message
     end
-    nwcopy_file
   end
 
-  def self.paste
-    files = Dir.glob(File.join(nwcopy_dir,'*')).sort do |file1, file2|
-      File.new(file2).mtime <=> File.new(file1).mtime
+  private
+  def self.read_data
+    if ARGF.file == STDIN
+      STDIN.read_nonblock(1) + STDIN.read
+    else
+      ARGF.read
+    end
+  rescue IO::WaitReadable => e
+    unless `which pbpaste`.empty?
+      `pbpaste`
+    else
+      STDERR << 'Nothing to do!'
     end
-
-    clipboard = File.new(files.first).read
-    `echo #{clipboard} | pbcopy`
-    clipboard
   end
-end
 
-Nwcopy.init
+end

data/lib/nwcopy/dropbox.rb

@@ -0,0 +1,61 @@
+require 'digest/sha1'
+
+module Nwcopy
+  class Dropbox
+    def self.unavailable_message
+      "Dropbox was not found at #{nwcopy_dir}. Get it at http://getdropbox.com/"
+    end
+
+    def self.available?
+      return false unless File.exists? dropbox_dir
+
+      unless File.exists? nwcopy_dir
+        STDERR << "Creating nwcopy directory at #{nwcopy_dir}"
+        Dir.mkdir nwcopy_dir
+      end
+
+      File.exists? nwcopy_dir
+    end
+
+    def self.copy clipboard
+      digest = Digest::SHA1.hexdigest clipboard
+      nwcopy_file = File.join nwcopy_dir, digest
+      File.open(nwcopy_file, 'w+') do |f|
+        f << clipboard
+      end
+      nwcopy_file
+    end
+
+    # Used to determine which plugin has the newest file.
+    def self.time
+      latest_file.mtime
+    end
+
+    def self.paste
+      File.new(latest_file).read
+    end
+
+    private # These methods are not part of the API
+
+    def self.files
+      Dir.glob(File.join(nwcopy_dir,'*')).map do |f|
+        File.new(f)
+      end
+    end
+
+    def self.latest_file
+      files.sort do |file1, file2|
+        file2.mtime <=> file1.mtime
+      end.first
+    end
+
+    def self.dropbox_dir
+      File.expand_path '~/Dropbox'
+    end
+
+    def self.nwcopy_dir
+      File.join dropbox_dir, 'nwcopy'
+    end
+
+  end
+end

data/lib/nwcopy/version.rb

@@ -1,3 +1,3 @@
 module Nwcopy
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Josh Kleinpeter
@@ -36,6 +36,7 @@ files:
 - bin/nwcopy
 - bin/nwpaste
 - lib/nwcopy.rb
+- lib/nwcopy/dropbox.rb
 - lib/nwcopy/version.rb
 - nwcopy.gemspec
 has_rdoc: true