sendl 0.0.3 → 0.0.5

data/CHANGELOG

@@ -0,0 +1,8 @@
+
+0.0.4
+
+- Dump out share URL on stdout as soon as it is created.
+
+0.0.3
+
+- Bail if no files were shared

data/bin/sendcat

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
-# require 'bundler'
-# Bundler.setup
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 require 'sendl'
+require 'sendl/version'
 require 'trollop'
 require 'yajl'
 require 'yaml'
@@ -48,6 +49,46 @@ email_regex = /^#{email_name_regex}@#{domain_head_regex}#{domain_tld_regex}$/i
 opts = Trollop::options do
   opt :message, "Message to the recipients", :allow_blank => true, :default => ""
   opt :debug, "Dump debug output"
+  version "sendcat #{Sendl::VERSION}"
+  banner <<-EOS
+
+==================== (>'.'<) ====================
+
+Sending files with Sendcat
+
+==================== (>'.'<) ====================
+
+The simplest way is sending one file:
+
+$ sendcat bob@dingo.com somefile
+
+You can also send multiple files:
+
+$ sendcat bob@dingo.com somefile otherfile
+
+You can use wildcards, also order of arguments doesn't matter:
+
+$ sendcat * bob@dingo.com
+
+You can send to multiple people at once too
+
+$ sendcat file1 file2 bob@dingo.com alice@bob.com
+
+You can add a message:
+
+$ sendcat file1 file2 bob@dingo.com alice@bob.com -m # Launches your editor
+
+or…
+
+$ sendcat file1 file2 bob@dingo.com alice@bob.com -m "Sendcat is awesome"
+
+Sendcat will dump the URL out to stdout, so to easily copy it to your clipboard use:
+
+$ sendcat file1 file2 bob@dingo.com alice@bob.com -m "Sendcat is awesome" | pbcopy
+
+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
 end
 
 if opts[:message].nil?
@@ -82,20 +123,29 @@ end
 # puts recipients.inspect
 # puts files.inspect
 
-
 if not STDIN.tty?
   files << Sendl::File.new(STDIN)
 end
 
+if files.empty?
+  STDERR.puts "Uh-oh, you didn't specify any files to share!"
+  exit(1)
+end
+
 s = Sendl::Uploader.new(:api_key => ENV['API_KEY'] || YAML::load_file("#{ENV['HOME']}/.sendcat")[:api_key], :recipients => recipients, :message => message, :debug => opts[:debug])
 
+puts s.share_url
+
+if not STDOUT.tty?
+  STDERR.puts "A link to your share was send to stdout, looks like you took care of that."
+end
+
 s.upload(files)
 
 if s.success?
-  puts
-  puts "Files shared successfully (>'.'<)"
+  STDERR.puts "Files shared successfully (>'.'<)"
 else
-  puts "There were errors uploading:"
-  puts s.errors.join("\n")
+  STDERR.puts "There were errors uploading:"
+  STDERR.puts s.errors.join("\n")
   exit 1
 end

data/lib/sendl/uploader.rb

@@ -1,7 +1,7 @@
 module Sendl
   class Uploader
     
-    attr_accessor :endpoint, :api_key, :success, :errors, :recipients, :json_parser, :message
+    attr_accessor :endpoint, :api_key, :success, :errors, :recipients, :json_parser, :message, :share_url
     
     def initialize(options)
       argument_errors = []
@@ -16,15 +16,14 @@ module Sendl
       @success = false
       @errors = []
       @share_id = nil
+      @share_id = get_share_id
     end
     
     def debug(msg)
-      @debug && puts(msg)
+      @debug && STDERR.puts(msg)
     end
     
     def upload(files, options = {})
-      @share_id = get_share_id
-                  
       files.each do |f|
         upload_file(f)
       end
@@ -57,7 +56,7 @@ module Sendl
       file_share_id = parse_json(r.body_str)["share_file"]["id"]
       
       if r.response_code == 201
-        puts "#{::File.basename(f.filename)} was already uploaded, skipping"
+        STDERR.puts "#{::File.basename(f.filename)} 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)
@@ -72,7 +71,7 @@ module Sendl
           end
           curl.http_post Curl::PostField.content("auth_token", api_key), Curl::PostField.content("_method", "PUT"), Curl::PostField.file("file_data[data]", f.filename)
         end
-        puts
+        STDERR.puts
       else
         @errors << "Could not create share_file, response was #{r.response_code}"
       end
@@ -84,11 +83,13 @@ module Sendl
       end
       
       if r.response_code != 201
-        @errors << "Could not create share, response was #{r.response_code}"
-        return false
+        STDERR.puts "Could not create share, HTTP response was #{r.response_code} (expected 201)"
+        exit 1
       end
-      
-      @share_id = parse_json(r.body_str)["share"]["id"]
+
+      share = parse_json(r.body_str)
+      @share_url = share["url"]
+      @share_id = share["share"]["id"]
     end
         
     # FIXME: de-duplicate

data/lib/sendl/version.rb

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

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: sendl
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors: 
 - Will Jessop
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-15 00:00:00 +01:00
-default_executable: 
+date: 2011-04-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: getopt
@@ -25,10 +20,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 0
         version: 1.4.0
   type: :runtime
   version_requirements: *id001
@@ -40,10 +31,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 1
         version: 0.8.1
   type: :runtime
   version_requirements: *id002
@@ -55,10 +42,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        - 15
         version: 0.7.15
   type: :runtime
   version_requirements: *id003
@@ -70,9 +53,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 16
         version: "1.16"
   type: :runtime
   version_requirements: *id004
@@ -84,10 +64,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 16
-        - 3
         version: 1.16.3
   type: :runtime
   version_requirements: *id005
@@ -99,10 +75,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 9
         version: 0.0.9
   type: :runtime
   version_requirements: *id006
@@ -114,10 +86,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 5
-        - 0
         version: 2.5.0
   type: :development
   version_requirements: *id007
@@ -129,10 +97,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 12
         version: 0.9.12
   type: :development
   version_requirements: *id008
@@ -148,6 +112,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- CHANGELOG
 - Gemfile
 - README.markdown
 - Rakefile
@@ -160,7 +125,6 @@ files:
 - sendl.gemspec
 - spec/file_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://sendcat.com/
 licenses: []
 
@@ -174,21 +138,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: sendl
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Lib for accessing the sendcat file sending service