nwcopy 0.0.8 → 0.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nwcopy (0.0.7)
+    nwcopy (0.0.8)
       gist
       json
       multipart-post
@@ -10,14 +10,11 @@ GEM
   remote: http://rubygems.org/
   specs:
     gist (2.0.0)
-    json (1.4.6)
+    json (1.5.1)
     multipart-post (1.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  gist
-  json
-  multipart-post
   nwcopy!

data/README.rdoc

@@ -4,27 +4,34 @@ The fool proof network copy & paste program. Well, maybe someday.
 
 = Usage
 
-  Copy data from the clipboard (pbpaste).
+Copy data from the clipboard (pbpaste).
     > nwcopy -p
     /Users/josh/Dropbox/nwcopy/f314eee55161b14f140ee07b358ba63ef54112ac
-  Pastes to disk
+
+Paste to STDOUT and the clipboard (pbcopy)
     > nwpaste
     <Contents of clipboard>
 
-  Copy contents of a file to the clipboard (works with binaries)
+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
+
+Paste the file to disk
     > nwpaste
     Pasted to file
 
-  Pipe arbitrary whatever to the clipboard
+Pipe arbitrary whatever to the clipboard
     > echo 'pipes work' | nwcopy
     /Users/josh/Dropbox/nwcopy/5293e79627710caf507fb9b841df51356650c78d
-  Paste it back
+
+Paste to STDOUT and the clipboard (pbcopy)
     > nwpaste
     pipes work
 
+Paste a hash from nwcopy.net (shared or otherwise)
+    > nwpaste <hash>
+    Whatever that hash represented
+
 = Description
 
 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>

data/lib/nwcopy.rb

@@ -13,7 +13,7 @@ module Nwcopy
   end
 
   def self.copy
-    data = data_from_options
+    data = copy_data_from_options
 
     unavailable = []
     plugins.each do |plugin|
@@ -26,11 +26,11 @@ module Nwcopy
   end
 
   def self.paste
-    data_from_options
+    data = paste_data_from_options
     unavailable = []
     plugins.each do |plugin|
       if plugin.available?
-        if clipboard = plugin.paste
+        if clipboard = plugin.paste(data)
           `echo "#{clipboard}" | pbcopy` unless `which pbcopy`.empty?
           return clipboard
         end
@@ -41,7 +41,15 @@ module Nwcopy
   end
 
   private
-  def self.data_from_options
+  def self.paste_data_from_options
+    if ARGV.include? '--help'
+      help
+    else
+      ARGV.shift
+    end
+  end
+
+  def self.copy_data_from_options
     if ARGV.empty?
       nodata = ARGF.read_nonblock(1) rescue true
     else
@@ -49,27 +57,34 @@ module Nwcopy
     end
 
     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
+      help
     elsif ARGV.include?('-p')
       StringIO.new `pbpaste`
     else
       ARGF
     end
   end
+
+  def self.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
+    puts '  nwpaste <hash>'
+    puts '    Pastes the provided hash from nwcopy.net'
+    puts
+    exit
+  end
 end

data/lib/nwcopy/client.rb

@@ -44,8 +44,13 @@ module Nwcopy
     end
 
 
-    def self.paste
-      url = URI.parse("#{base_url}/paste")
+    def self.paste url_or_hash = nil
+      url = if url_or_hash
+        hash = url_or_hash.split('/').last
+        URI.parse("#{base_url}/pastes/#{hash}")
+      else
+        URI.parse("#{base_url}/paste")
+      end
 
       req = Net::HTTP::Get.new(url.path)
       res = start req, url

data/lib/nwcopy/dropbox.rb

@@ -35,7 +35,7 @@ module Nwcopy
       latest_file ? latest_file.mtime : nil
     end
 
-    def self.paste
+    def self.paste ignored = nil
       latest_file.read
     end
 

data/lib/nwcopy/gist.rb

@@ -28,7 +28,7 @@ module Nwcopy
       gist.write [{:filename => filename, :input => clipboard}], false
     end
 
-    def self.paste
+    def self.paste ignored = nil
       gist.read latest_gist["repo"]
     end
 

data/lib/nwcopy/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nwcopy
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 8
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors: 
 - Josh Kleinpeter