sendl 0.0.5 → 0.0.6

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.0.6
+
+- Allow STDIN to be shared
+- Documentation tweaks
 
 0.0.4
 

data/bin/sendcat

@@ -60,19 +60,22 @@ Sending files with Sendcat
 
 The simplest way is sending one file:
 
-$ sendcat bob@dingo.com somefile
+$ sendcat somefile
+https://sendc.at/dl/Jqd2ICj5jqkKhpUxkqSJRJLpzRNRFhJUjGqBd6az1v0NEsWKIwIDtpf
+somefile:     100% |========================|    377B   1.2KB/s ETA:  00:00:00
+Files shared successfully (>'.'<)
 
-You can also send multiple files:
+You can then grab the link and send it to someone. You can make it even easier by specifying an email address:
 
-$ sendcat bob@dingo.com somefile otherfile
+$ sendcat somefile bob@dingo.com
 
-You can use wildcards, also order of arguments doesn't matter:
+Sendcat will upload the file and send an email to bob@dingo.com with a link to download the file. You can also send multiple files and/or people at once:
 
-$ sendcat * bob@dingo.com
+$ sendcat bob@dingo.com alice@bob.com somefile otherfile
 
-You can send to multiple people at once too
+You can use wildcards, also order of arguments doesn't matter:
 
-$ sendcat file1 file2 bob@dingo.com alice@bob.com
+$ sendcat * bob@dingo.com
 
 You can add a message:
 
@@ -86,6 +89,10 @@ Sendcat will dump the URL out to stdout, so to easily copy it to your clipboard
 
 $ sendcat file1 file2 bob@dingo.com alice@bob.com -m "Sendcat is awesome" | pbcopy
 
+You don't need to specify an email address if you are going to handle the share link yourself:
+
+$ sendcat somefile
+
 You can send files to anyone, they don't need an account at sendcat.com. The recipient will receive an email with download instructions for the file.
 
 EOS
@@ -106,13 +113,6 @@ recipients = ARGV.grep(email_regex)
 # copycat getopt behavior and modify ARGV
 recipients.each{|r| ARGV.delete(r)}
 
-# anything left in ARGV should be a file
-ARGV.each do |f|
-  files << Sendl::File.new(f)
-end
-
-# debugging
-
 # should handle:
 #   sendl sudara@alonetone.com file 
 #   sendl sudara@alonetone.com will@will_j.net file
@@ -120,11 +120,25 @@ end
 #   sendl -t sudara@alonetone.com -t will@will_j.net -f file1 -f file2
 #   sendl -t sudara@alonetone.com -t will@will_j.net file1 file2
 
-# puts recipients.inspect
-# puts files.inspect
-
 if not STDIN.tty?
-  files << Sendl::File.new(STDIN)
+  # Buffer STDIN to a temp file.
+  stdin_tmpfile = Tempfile.new 'sendcat'
+  
+  at_exit do
+    stdin_tmpfile.unlink
+  end
+  
+  while data = STDIN.read(10_000)
+    stdin_tmpfile.write(data)
+  end
+  stdin_tmpfile.close
+  
+  files << Sendl::File.new(stdin_tmpfile.path, (opts[:filename] || "STDIN"))
+end
+
+# anything left in ARGV should be a file
+ARGV.each do |f|
+  files << Sendl::File.new(f)
 end
 
 if files.empty?

data/lib/sendl/file.rb

@@ -1,14 +1,11 @@
 module Sendl
   class File
-    attr_reader :filename
-    attr_reader :size
+    attr_reader :filename, :size, :desired_name
     
-    def initialize(name)
-      @filename = name
-      @size = ::File.size(name)
-    end
-    
-    def upload!(share_id)
+    def initialize(file, override_name = nil)
+      @desired_name = ::File.basename(override_name || file)
+      @filename = file
+      @size = ::File.size(file)
     end
     
     def sha512

data/lib/sendl/uploader.rb

@@ -46,7 +46,9 @@ module Sendl
 
     def upload_file(f)
       debug("Uploading #{f.filename}")
+      
       mime_type = MIME::Types.type_for(f.filename).first || 'application/octet-stream'
+      
       debug("Determined MIME Type of #{mime_type}")
       debug("Uploading by sha")
       r = Curl::Easy.new(url_for("shares/#{@share_id}/share_files.json")) do |curl|
@@ -56,12 +58,14 @@ module Sendl
       file_share_id = parse_json(r.body_str)["share_file"]["id"]
       
       if r.response_code == 201
-        STDERR.puts "#{::File.basename(f.filename)} was already uploaded, skipping"
+        STDERR.puts "#{::File.basename(f.desired_name)} was already uploaded, skipping"
       elsif r.response_code == 202
         debug("Server requests the full file contents")
-        progress = ProgressBar.new(f.filename.split('/').last, f.size)
+        
+        progress = ProgressBar.new(f.desired_name, f.size)
         progress.file_transfer_mode
         progress.bar_mark = "="
+        
         r = Curl::Easy.new(url_for("shares/#{@share_id}/share_files/#{file_share_id}.json")) do |curl|
           curl.multipart_form_post = true
           curl.on_progress do |dl_total, dl_now, ul_total, ul_now| # callback
@@ -69,7 +73,7 @@ module Sendl
             progress.set(current)
             true
           end
-          curl.http_post Curl::PostField.content("auth_token", api_key), Curl::PostField.content("_method", "PUT"), Curl::PostField.file("file_data[data]", f.filename)
+          curl.http_post Curl::PostField.content("auth_token", api_key), Curl::PostField.content("_method", "PUT"), Curl::PostField.file("file_data[data]", f.filename, f.desired_name)
         end
         STDERR.puts
       else

data/lib/sendl/version.rb

@@ -1,3 +1,3 @@
 module Sendl
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -2,7 +2,7 @@
 name: sendl
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Will Jessop
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 Z
+date: 2011-05-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: getopt