cloudapp 2.0.0.beta.9 → 2.0.0.beta.10

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    cloudapp (2.0.0.beta.9)
+    cloudapp (2.0.0.beta.10)
+      clipboard (~> 1.0.1)
       leadlight (~> 0.1.0)
       mime-types (~> 1.19)
       netrc (~> 0.7.7)
@@ -11,6 +12,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.8)
+    clipboard (1.0.1)
     diff-lcs (1.1.3)
     fail-fast (1.0.0)
     faraday (0.8.1)

data/bin/cloudapp

@@ -4,6 +4,7 @@ require 'cloudapp'
 require 'cloudapp/credentials'
 require 'cloudapp/cli/prompt'
 require 'cloudapp/service'
+require 'clipboard'
 
 def service
   CloudApp::Service.using_token(token)
@@ -17,12 +18,21 @@ end
 
 def service_error_handler representation
   if representation.collection.error
-    puts
-    puts "! #{representation.collection.error.message}"
-    puts
+    print_error representation.collection.error.message
   end
 end
 
+def print_error message
+  $stderr.puts
+  $stderr.puts "! #{message}"
+  $stderr.puts
+end
+
+def error message
+  print_error message
+  exit 1
+end
+
 def token
   Credentials.token
 end
@@ -31,11 +41,6 @@ def valid_token?
   !token.nil? and service.root.authorized?
 end
 
-def error error
-  puts "ERROR: #{error}"
-  exit 9
-end
-
 def valid_url? url
   error 'URL missing' if url.nil?
   error "#{ url } doesn't look like a valid URL" unless url =~ URI.regexp
@@ -53,10 +58,14 @@ def next_file
 end
 
 def print_version
-  puts CloudApp::VERSION
+  $stdout.puts CloudApp::VERSION
   exit
 end
 
+def copy content
+  Clipboard.copy content
+end
+
 
 print_version if ARGV.delete('--version') || ARGV.delete('-v')
 
@@ -67,6 +76,7 @@ while not valid_token?
 end
 
 link = ARGV.delete('--direct') || ARGV.delete('-d') ? :embed : :canonical
+copy = ARGV.delete('--no-copy').nil?
 
 case ARGV.shift
 when 'bookmark'
@@ -74,17 +84,25 @@ when 'bookmark'
   while url = ARGV.shift
     break unless valid_url? url
     bookmark = service.bookmark(url)
-    puts bookmark.link(link)
+    exit 1 unless bookmark
+
+    url = bookmark.link(link)
+    copy url if copy
+    $stdout.puts url
   end
 when 'upload'
   while file = next_file
     break unless valid_file? file
     upload = service.upload(file)
-    puts upload.link(link) if upload
+    exit 1 unless upload
+
+    url = upload.link(link)
+    copy url if copy
+    $stdout.puts url
     ARGF.skip
   end
 else
-  puts <<EOS
+  $stderr.puts <<EOS
 Usage:
     cloudapp bookmark http://getcloudapp.com
     cloudapp upload screenshot.png

data/cloudapp.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'cloudapp'
-  s.version           = '2.0.0.beta.9'
-  s.date              = '2012-12-28'
+  s.version           = '2.0.0.beta.10'
+  s.date              = '2012-12-29'
   s.rubyforge_project = 'cloudapp'
 
   ## Make sure your summary is short. The description may be as long
@@ -43,9 +43,10 @@ Gem::Specification.new do |s|
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
-  s.add_dependency 'netrc',      '~> 0.7.7'
+  s.add_dependency 'clipboard',  '~> 1.0.1'
   s.add_dependency 'leadlight',  '~> 0.1.0'
   s.add_dependency 'mime-types', '~> 1.19'
+  s.add_dependency 'netrc',      '~> 0.7.7'
   s.add_dependency 'typhoeus',   '~> 0.3.3'
 
   ## List your development dependencies here. Development dependencies are

data/lib/cloudapp/cli/prompt.rb

@@ -4,10 +4,10 @@ module CloudApp
   module CLI
     class Prompt
       def ask_for_credentials
-        puts "Sign into CloudApp."
-        print "Email: "
+        $stderr.puts "Sign into CloudApp."
+        $stderr.print "Email: "
         email = ask
-        print "Password (typing will be hidden): "
+        $stderr.print "Password (typing will be hidden): "
         password = ask_for_password
         [ email, password ]
       end
@@ -16,7 +16,7 @@ module CloudApp
       def ask_for_password
         echo_off
         password = ask
-        puts
+        $stderr.puts
         echo_on
         return password
       end

data/lib/cloudapp.rb

@@ -1,3 +1,3 @@
 module CloudApp
-  VERSION = '2.0.0.beta.9'
+  VERSION = '2.0.0.beta.10'
 end

data/man/cloudapp.1

@@ -7,13 +7,13 @@
 \fBcloudapp\fR \- all the pleasures of cloudapp in a cli
 .
 .SH "SYNOPSIS"
-\fBcloudapp bookmark\fR [\fB\-\-direct\fR] \fIurl\fR [\fIurl\fR\.\.\.]
+\fBcloudapp bookmark\fR [\fB\-\-direct\fR] [\fB\-\-no\-copy\fR] \fIurl\fR [\fIurl\fR\.\.\.]
 .
 .br
-\fBcloudapp upload\fR [\fB\-\-direct\fR] \fIfile\fR [\fIfile\fR\.\.\.]
+\fBcloudapp upload\fR [\fB\-\-direct\fR] [\fB\-\-no\-copy\fR] \fIfile\fR [\fIfile\fR\.\.\.]
 .
 .SH "DESCRIPTION"
-Upload a file or share a bookmark with CloudApp\. The drop\'s share link will be printed to standard output\. Account credentials are stored in \fB~/\.netrc\fR\.
+Upload a file or share a bookmark with CloudApp\. The drop\'s share link will be printed to standard output and copied to the system clipboard\. Account credentials are stored in \fB~/\.netrc\fR as defined by \fBftp\fR(1)\.
 .
 .P
 \fBcloudapp\fR requires ruby 1\.9\.3 or greater\.
@@ -24,25 +24,9 @@ Upload a file or share a bookmark with CloudApp\. The drop\'s share link will be
 \fB\-d\fR, \fB\-\-direct\fR
 Print the drop\'s direct link after creation\. The direct link is suitable for use in places that expect a link to a file like an HTML IMG tag\.
 .
-.SH "EXIT STATUS"
-cloudapp may return one of several error codes if it encouters problems\.
-.
-.IP "\(bu" 4
-\fB0\fR Success
-.
-.IP "\(bu" 4
-\fB1\fR File exceeds the limits of the account\'s plan
-.
-.IP "\(bu" 4
-\fB9\fR Some horrible, unexpected thing has happened
-.
-.IP "" 0
-.
-.SH "FILES"
-.
 .TP
-\fB$HOME/\.netrc\fR
-Store account authentication token
+\fB\-c\fR, \fB\-\-no\-copy\fR
+Don\'t copy the new drop\'s link to the system clipboard\.
 .
 .SH "EXAMPLE"
 Upload a file:
@@ -114,6 +98,4 @@ http://cl\.ly/abc123/screenshot\.png
 .fi
 .
 .IP "" 0
-.
-.SH "SEE ALSO"
-\fBftp\fR(1)
+

data/man/cloudapp.1.html

@@ -63,10 +63,7 @@
     <a href="#SYNOPSIS">SYNOPSIS</a>
     <a href="#DESCRIPTION">DESCRIPTION</a>
     <a href="#OPTIONS">OPTIONS</a>
-    <a href="#EXIT-STATUS">EXIT STATUS</a>
-    <a href="#FILES">FILES</a>
     <a href="#EXAMPLE">EXAMPLE</a>
-    <a href="#SEE-ALSO">SEE ALSO</a>
   </div>
 
   <ol class='man-decor man-head man head'>
@@ -82,39 +79,23 @@
 
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
-<p><code>cloudapp bookmark</code> [<code>--direct</code>] <var>url</var> [<var>url</var>...]<br />
-<code>cloudapp upload</code>   [<code>--direct</code>] <var>file</var> [<var>file</var>...]</p>
+<p><code>cloudapp bookmark</code> [<code>--direct</code>] [<code>--no-copy</code>] <var>url</var> [<var>url</var>...]<br />
+<code>cloudapp upload</code>   [<code>--direct</code>] [<code>--no-copy</code>] <var>file</var> [<var>file</var>...]</p>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
 <p>Upload a file or share a bookmark with CloudApp. The drop's share link will be
-printed to standard output. Account credentials are stored in <code>~/.netrc</code>.</p>
+printed to standard output and copied to the system clipboard. Account
+credentials are stored in <code>~/.netrc</code> as defined by <code>ftp</code>(1).</p>
 
 <p><strong>cloudapp</strong> requires ruby 1.9.3 or greater.</p>
 
 <h2 id="OPTIONS">OPTIONS</h2>
 
 <dl>
-<dt><code>-d</code>, <code>--direct</code></dt><dd>Print the drop's direct link after creation. The direct link is suitable for
-use in places that expect a link to a file like an HTML IMG tag.</dd>
-</dl>
-
-
-<h2 id="EXIT-STATUS">EXIT STATUS</h2>
-
-<p>cloudapp may return one of several error codes if it encouters problems.</p>
-
-<ul>
-<li><code>0</code> Success</li>
-<li><code>1</code> File exceeds the limits of the account's plan</li>
-<li><code>9</code> Some horrible, unexpected thing has happened</li>
-</ul>
-
-
-<h2 id="FILES">FILES</h2>
-
-<dl>
-<dt><code>$HOME/.netrc</code></dt><dd>Store account authentication token</dd>
+<dt><code>-d</code>, <code>--direct</code></dt><dd><p>Print the drop's direct link after creation. The direct link is suitable for
+use in places that expect a link to a file like an HTML IMG tag.</p></dd>
+<dt><code>-c</code>, <code>--no-copy</code></dt><dd><p>Don't copy the new drop's link to the system clipboard.</p></dd>
 </dl>
 
 
@@ -151,10 +132,6 @@ http://cl.ly/abc123
 http://cl.ly/abc123/screenshot.png
 </code></pre>
 
-<h2 id="SEE-ALSO">SEE ALSO</h2>
-
-<p><code>ftp</code>(1)</p>
-
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>

data/man/cloudapp.1.ronn

@@ -3,13 +3,14 @@ cloudapp(1) -- all the pleasures of cloudapp in a cli
 
 ## SYNOPSIS
 
-`cloudapp bookmark` [`--direct`] <url> [<url>...]<br>
-`cloudapp upload`   [`--direct`] <file> [<file>...]
+`cloudapp bookmark` [`--direct`] [`--no-copy`] <url> [<url>...]<br>
+`cloudapp upload`   [`--direct`] [`--no-copy`] <file> [<file>...]
 
 ## DESCRIPTION
 
 Upload a file or share a bookmark with CloudApp. The drop's share link will be
-printed to standard output. Account credentials are stored in `~/.netrc`.
+printed to standard output and copied to the system clipboard. Account
+credentials are stored in `~/.netrc` as defined by `ftp`(1).
 
 **cloudapp** requires ruby 1.9.3 or greater.
 
@@ -19,18 +20,8 @@ printed to standard output. Account credentials are stored in `~/.netrc`.
     Print the drop's direct link after creation. The direct link is suitable for
     use in places that expect a link to a file like an HTML IMG tag.
 
-## EXIT STATUS
-
-cloudapp may return one of several error codes if it encouters problems.
-
- - `0` Success
- - `1` File exceeds the limits of the account's plan
- - `9` Some horrible, unexpected thing has happened
-
-## FILES
-
-  - `$HOME/.netrc`:
-    Store account authentication token
+  - `--no-copy`:
+    Don't copy the new drop's link to the system clipboard.
 
 ## EXAMPLE
 
@@ -59,7 +50,3 @@ Print the drop's direct link:
 
     $ cloudapp upload --direct screenshot.png
     http://cl.ly/abc123/screenshot.png
-
-## SEE ALSO
-
-`ftp`(1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudapp
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.9
+  version: 2.0.0.beta.10
   prerelease: 6
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000 Z
+date: 2012-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: netrc
+  name: clipboard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: leadlight
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +59,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.19'
+- !ruby/object:Gem::Dependency
+  name: netrc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.7
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -171,9 +187,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2960018242600154187
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: