cloudapp 2.0.0.beta.12 → 2.0.0.beta.13

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudapp (2.0.0.beta.12)
+    cloudapp (2.0.0.beta.13)
       clipboard (~> 1.0.1)
       leadlight (~> 0.1.0)
       mime-types (~> 1.19)

data/bin/cloudapp

@@ -7,6 +7,11 @@ require 'cloudapp/cli/prompt'
 require 'cloudapp/service'
 require 'clipboard'
 
+trap('SIGINT') do
+  puts
+  exit
+end
+
 def service
   CloudApp::Service.using_token(token)
     .on_error(&method(:service_error_handler))
@@ -19,7 +24,12 @@ end
 
 def service_error_handler representation
   if representation.collection.error
-    print_error representation.collection.error.message
+    message = representation.collection.error.message
+    if representation.collection.error.code == 'upgrade'
+      message << ' '
+      message << representation.link('upgrade').href
+    end
+    print_error message
   end
 end
 
@@ -49,7 +59,8 @@ end
 
 def print_error message
   $stderr.puts
-  $stderr.puts "! #{message}"
+  $stderr.puts
+  $stderr.puts "! #{wrap(message, 78, '  ')}"
   $stderr.puts
 end
 
@@ -58,6 +69,10 @@ def error message
   exit 1
 end
 
+def wrap message, width, padding
+  message.gsub(/(.{1,#{width}})(\s+|$)/, "\\1\n#{padding}").strip
+end
+
 def print_version
   $stdout.puts CloudApp::VERSION
   exit
@@ -65,9 +80,12 @@ end
 
 def print_help io = $stdout
   io.puts <<EOS
+cloudapp, version #{CloudApp::VERSION}
+
 Usage:
-    cloudapp bookmark http://getcloudapp.com
-    cloudapp upload screenshot.png
+    cloudapp bookmark [--direct] [--[no-]copy] <url> [<url>...]
+    cloudapp upload   [--direct] [--[no-]copy] <file> [<file>...]
+
 EOS
 end
 

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.12'
-  s.date              = '2012-12-31'
+  s.version           = '2.0.0.beta.13'
+  s.date              = '2013-01-06'
   s.rubyforge_project = 'cloudapp'
 
   ## Make sure your summary is short. The description may be as long

data/lib/cloudapp.rb

@@ -1,3 +1,3 @@
 module CloudApp
-  VERSION = '2.0.0.beta.12'
+  VERSION = '2.0.0.beta.13'
 end

data/lib/cloudapp/collection_json/item.rb

@@ -3,9 +3,10 @@ require 'delegate'
 module CloudApp
   module CollectionJson
     class Item < SimpleDelegator
-      def href()    fetch('href')    end
-      def rel()     fetch('rel')     end
-      def message() fetch('message') end
+      def href()    fetch('href')         end
+      def rel()     fetch('rel')          end
+      def code()    fetch('code', nil)    end
+      def message() fetch('message', nil) end
 
       def links
         fetch('links', []).map {|link| Item.new(link) }

data/lib/cloudapp/service.rb

@@ -60,11 +60,11 @@ module CloudApp
     end
 
     def upload path
-      template = drops_template.template.
-                   fill('file_size', FileTest.size(path))
+      template = drops_template.template
+                   .fill('file_size', FileTest.size(path))
+                   .fill('name',      File.basename(path))
       post template.href, template.data do |representation|
         # TODO: Test unauthorized
-        # TODO: Test uploading after free plan exhausted
         return unless representation.__response__.success?
         return upload_file(path, representation.template)
       end

data/man/cloudapp.1

@@ -7,10 +7,10 @@
 \fBcloudapp\fR \- all the pleasures of cloudapp in a cli
 .
 .SH "SYNOPSIS"
-\fBcloudapp bookmark\fR [\fB\-\-direct\fR] [\fB\-\-no\-copy\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] [\fB\-\-no\-copy\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 and copied to the system clipboard\. Account credentials are stored in \fB~/\.netrc\fR as defined by \fBftp\fR(1)\.
@@ -25,8 +25,16 @@ Upload a file or share a bookmark with CloudApp\. The drop\'s share link will be
 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\.
 .
 .TP
-\fB\-\-no\-copy\fR
-Don\'t copy the new drop\'s link to the system clipboard\.
+\fB\-h\fR, \fB\-\-help\fR
+Print a help message describing cloudapp\'s usage\.
+.
+.TP
+\fB\-\-[no\-]copy\fR
+Copy the new drop\'s link to the system clipboard\. The default option is copy\.
+.
+.TP
+\fB\-\-version\fR
+Display the version of cloudapp\.
 .
 .SH "EXAMPLE"
 Upload a file:
@@ -36,7 +44,7 @@ Upload a file:
 .nf
 
 $ cloudapp upload screenshot\.png
-http://cl\.ly/abc123
+Uploading screenshot\.png\.\.\. http://cl\.ly/image/3U2U2f3B1O0x
 .
 .fi
 .
@@ -50,9 +58,9 @@ Upload several files:
 .nf
 
 $ cloudapp upload *\.png
-http://cl\.ly/abc123
-http://cl\.ly/def456
-http://cl\.ly/ghi789
+Uploading screenshot\-1\.png\.\.\. http://cl\.ly/image/1E1F1k3Q3919
+Uploading screenshot\-2\.png\.\.\. http://cl\.ly/image/3P1s3p0c3545
+Uploading screenshot\-3\.png\.\.\. http://cl\.ly/image/0E3k0h353X0w
 .
 .fi
 .
@@ -66,7 +74,7 @@ Bookmark a URL:
 .nf
 
 $ cloudapp bookmark http://getcloudapp\.com
-http://cl\.ly/abc123
+Bookmarking http://getcloudapp\.com\.\.\. http://cl\.ly/352T3Z2G0G2S
 .
 .fi
 .
@@ -80,7 +88,7 @@ Copy the drop\'s direct link:
 .nf
 
 $ cloudapp upload \-\-direct screenshot\.png
-http://cl\.ly/abc123/screenshot\.png
+Uploading screenshot\.png\.\.\. http://cl\.ly/image/3U2U2f3B1O0x/screenshot\.png
 .
 .fi
 .
@@ -94,7 +102,7 @@ Print but don\'t copy the drop\'s link:
 .nf
 
 $ cloudapp upload \-\-no\-copy screenshot\.png
-http://cl\.ly/abc123
+Uploading screenshot\.png\.\.\. http://cl\.ly/image/3U2U2f3B1O0x
 .
 .fi
 .

data/man/cloudapp.1.html

@@ -79,8 +79,8 @@
 
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
-<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>
+<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>
 
@@ -95,7 +95,10 @@ credentials are stored in <code>~/.netrc</code> as defined by <code>ftp</code>(1
 <dl>
 <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>--no-copy</code></dt><dd><p>Don't copy the new drop's link to the system clipboard.</p></dd>
+<dt><code>-h</code>, <code>--help</code></dt><dd><p>Print a help message describing cloudapp's usage.</p></dd>
+<dt><code>--[no-]copy</code></dt><dd><p>Copy the new drop's link to the system clipboard. The default option is
+copy.</p></dd>
+<dt><code>--version</code></dt><dd><p>Display the version of cloudapp.</p></dd>
 </dl>
 
 
@@ -104,33 +107,33 @@ use in places that expect a link to a file like an HTML IMG tag.</p></dd>
 <p>Upload a file:</p>
 
 <pre><code>$ cloudapp upload screenshot.png
-http://cl.ly/abc123
+Uploading screenshot.png... http://cl.ly/image/3U2U2f3B1O0x
 </code></pre>
 
 <p>Upload several files:</p>
 
 <pre><code>$ cloudapp upload *.png
-http://cl.ly/abc123
-http://cl.ly/def456
-http://cl.ly/ghi789
+Uploading screenshot-1.png... http://cl.ly/image/1E1F1k3Q3919
+Uploading screenshot-2.png... http://cl.ly/image/3P1s3p0c3545
+Uploading screenshot-3.png... http://cl.ly/image/0E3k0h353X0w
 </code></pre>
 
 <p>Bookmark a URL:</p>
 
 <pre><code>$ cloudapp bookmark http://getcloudapp.com
-http://cl.ly/abc123
+Bookmarking http://getcloudapp.com... http://cl.ly/352T3Z2G0G2S
 </code></pre>
 
 <p>Copy the drop's direct link:</p>
 
 <pre><code>$ cloudapp upload --direct screenshot.png
-http://cl.ly/abc123/screenshot.png
+Uploading screenshot.png... http://cl.ly/image/3U2U2f3B1O0x/screenshot.png
 </code></pre>
 
 <p>Print but don't copy the drop's link:</p>
 
 <pre><code>$ cloudapp upload --no-copy screenshot.png
-http://cl.ly/abc123
+Uploading screenshot.png... http://cl.ly/image/3U2U2f3B1O0x
 </code></pre>
 
 

data/man/cloudapp.1.ronn

@@ -3,8 +3,8 @@ cloudapp(1) -- all the pleasures of cloudapp in a cli
 
 ## SYNOPSIS
 
-`cloudapp bookmark` [`--direct`] [`--no-copy`] <url> [<url>...]<br>
-`cloudapp upload`   [`--direct`] [`--no-copy`] <file> [<file>...]
+`cloudapp bookmark` [`--direct`] [`--[no-]copy`] <url> [<url>...]<br>
+`cloudapp upload`   [`--direct`] [`--[no-]copy`] <file> [<file>...]
 
 ## DESCRIPTION
 
@@ -20,34 +20,41 @@ credentials are stored in `~/.netrc` as defined by `ftp`(1).
     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.
 
-  - `--no-copy`:
-    Don't copy the new drop's link to the system clipboard.
+  - `-h`, `--help`:
+    Print a help message describing cloudapp's usage.
+
+  - `--[no-]copy`:
+    Copy the new drop's link to the system clipboard. The default option is
+    copy.
+
+  - `--version`:
+    Display the version of cloudapp.
 
 ## EXAMPLE
 
 Upload a file:
 
     $ cloudapp upload screenshot.png
-    http://cl.ly/abc123
+    Uploading screenshot.png... http://cl.ly/image/3U2U2f3B1O0x
 
 Upload several files:
 
     $ cloudapp upload *.png
-    http://cl.ly/abc123
-    http://cl.ly/def456
-    http://cl.ly/ghi789
+    Uploading screenshot-1.png... http://cl.ly/image/1E1F1k3Q3919
+    Uploading screenshot-2.png... http://cl.ly/image/3P1s3p0c3545
+    Uploading screenshot-3.png... http://cl.ly/image/0E3k0h353X0w
 
 Bookmark a URL:
 
     $ cloudapp bookmark http://getcloudapp.com
-    http://cl.ly/abc123
+    Bookmarking http://getcloudapp.com... http://cl.ly/352T3Z2G0G2S
 
 Copy the drop's direct link:
 
     $ cloudapp upload --direct screenshot.png
-    http://cl.ly/abc123/screenshot.png
+    Uploading screenshot.png... http://cl.ly/image/3U2U2f3B1O0x/screenshot.png
 
 Print but don't copy the drop's link:
 
     $ cloudapp upload --no-copy screenshot.png
-    http://cl.ly/abc123
+    Uploading screenshot.png... http://cl.ly/image/3U2U2f3B1O0x

data/spec/cloudapp/collection_json/item_spec.rb

@@ -14,9 +14,24 @@ describe CloudApp::CollectionJson::Item do
     its(:rel)  { should eq 'relation' }
   end
 
+  describe '#code' do
+    let(:data) {{ 'code' => 'ID10T' }}
+    its(:code) { should eq 'ID10T' }
+
+    context 'without a code' do
+      let(:data) { {} }
+      its(:code) { should be_nil }
+    end
+  end
+
   describe '#message' do
     let(:data)    {{ 'message' => 'error!' }}
     its(:message) { should eq 'error!' }
+
+    context 'without a message' do
+      let(:data)    { {} }
+      its(:message) { should be_nil }
+    end
   end
 
   describe '#links' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudapp
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.12
+  version: 2.0.0.beta.13
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -191,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3445886834563878524
+      hash: -547801259757017894
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: