nwcopy 0.0.7 → 0.0.8

data/Gemfile.lock

@@ -1,21 +1,23 @@
 PATH
   remote: .
   specs:
-    nwcopy (0.0.4)
-      sinatra
+    nwcopy (0.0.7)
+      gist
+      json
+      multipart-post
 
 GEM
   remote: http://rubygems.org/
   specs:
-    rack (1.2.1)
-    sinatra (1.1.2)
-      rack (~> 1.1)
-      tilt (~> 1.2)
-    tilt (1.2.2)
+    gist (2.0.0)
+    json (1.4.6)
+    multipart-post (1.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  gist
+  json
+  multipart-post
   nwcopy!
-  sinatra

data/README.rdoc

@@ -4,40 +4,44 @@ The fool proof network copy & paste program. Well, maybe someday.
 
 = Usage
 
-    > nwcopy
+  Copy data from the clipboard (pbpaste).
+    > nwcopy -p
     /Users/josh/Dropbox/nwcopy/f314eee55161b14f140ee07b358ba63ef54112ac
+  Pastes to disk
     > nwpaste
-    https://github.com/j05h/nwcopy
+    <Contents of clipboard>
 
+  Copy contents of a file to the clipboard (works with binaries)
     > nwcopy /path/to/file
     /Users/josh/Dropbox/nwcopy/e1c1675f009e65d8571bbab9243660da20a3b2a2
+  Paste the file to disk
     > nwpaste
-    Contents of file
+    Pasted to file
 
+  Pipe arbitrary whatever to the clipboard
     > echo 'pipes work' | nwcopy
     /Users/josh/Dropbox/nwcopy/5293e79627710caf507fb9b841df51356650c78d
+  Paste it back
     > nwpaste
     pipes work
 
 = Description
 
-nwcopy takes whatever is in the clipboard (or pipe or filename) 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 http://nwcopy.net. If you don't have nwcopy.net configured, it will copy to a file in your Dropbox folder ~/Dropbox/nwcopy/<sha1>
 
-nwpaste takes the contents of the most recent file, prints it to STDIN and puts it in the clipboard.
+nwpaste takes the contents of the most recent file (from nwcopy.net or your Dropbox), prints it to STDIN and puts it in the clipboard.
 
 = WTF?
 
 How in the world is this useful?
 
-I constantly want to copy and paste between machines which cannot directly talk to one another. However, they do both have Dropbox installed. My solution was simple, and this is it.
+I constantly want to copy and paste between machines which cannot directly talk to one another. My solution was simple, and this is it. It also happens to be really easy to use.
 
 = Is that all?
 
 Is that all? Well, yeah, right now. This is the initial version, and it works! However, here are my plans:
 
-* 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.
+* When multiple files are supplied, they should be pasted back with their original filename (tarball?)
+* Whatever folks deem useful.
 * Have some delicious brisket.

data/lib/nwcopy.rb

@@ -13,18 +13,20 @@ module Nwcopy
   end
 
   def self.copy
-    data = read_data
+    data = data_from_options
+
     unavailable = []
     plugins.each do |plugin|
       if plugin.available?
         return plugin.copy data
       else
-        STDERR << plugin.unavailable_message
+        STDERR << plugin.unavailable_message + "\n"
       end
     end
   end
 
   def self.paste
+    data_from_options
     unavailable = []
     plugins.each do |plugin|
       if plugin.available?
@@ -33,24 +35,41 @@ module Nwcopy
           return clipboard
         end
       else
-        STDERR << plugin.unavailable_message
+        STDERR << plugin.unavailable_message + "\n"
       end
     end
   end
 
   private
-  def self.read_data
-    if ARGF.file == STDIN
-      StringIO.new(STDIN.read_nonblock(1) + STDIN.read)
+  def self.data_from_options
+    if ARGV.empty?
+      nodata = ARGF.read_nonblock(1) rescue true
     else
-      ARGF
+      nodata = false
     end
-  rescue IO::WaitReadable => e
-    unless `which pbpaste`.empty?
-      StringIO.new(`pbpaste`)
+
+    if nodata || ARGV.include?('--help')
+      puts 'nwcopy: network copy and paste.'
+      puts 'Sign up at http://nwcopy.net.' unless Nwcopy::Client.available?
+      puts "nwcopy.net account: #{Nwcopy::Client.credentials.first}" if Nwcopy::Client.available? rescue ''
+      puts
+      puts '  nwcopy <file>'
+      puts '    Copies the file to nwcopy.net'
+      puts '  nwcopy -p'
+      puts '    Copies the contents of the clipboard (MacOS) to nwcopy.net'
+      puts '  command | nwcopy'
+      puts '    Copies the results of the piped command to nwcopy.net'
+      puts
+      puts '  nwpaste'
+      puts '    Pastes the last thing you copied to nwcopy.net'
+      puts '    If it is a file, it will be put into that file name.'
+      puts '    Any piped input or clipboard will be printed to STDOUT.'
+      puts
+      exit
+    elsif ARGV.include?('-p')
+      StringIO.new `pbpaste`
     else
-      STDERR << 'Nothing to do!'
+      ARGF
     end
   end
-
 end

data/lib/nwcopy/version.rb

@@ -1,3 +1,3 @@
 module Nwcopy
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/nwcopy.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'multipart-post'
   s.add_dependency 'gist'
+  s.add_dependency 'json'
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nwcopy
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Josh Kleinpeter
@@ -46,6 +46,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: Uses your Dropbox folder to facilitate copy and pasting between machines. More awesomesauce to come.
 email: 
 - josh@kleinpeter.org