cloudapp 2.0.0.beta.8 → 2.0.0.beta.9

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    cloudapp (2.0.0.beta.8)
-      leadlight (~> 0.0.7)
+    cloudapp (2.0.0.beta.9)
+      leadlight (~> 0.1.0)
       mime-types (~> 1.19)
       netrc (~> 0.7.7)
       typhoeus (~> 0.3.3)
@@ -19,7 +19,7 @@ GEM
     hookr (1.1.1)
       fail-fast (= 1.0.0)
     hpricot (0.8.6)
-    leadlight (0.0.7)
+    leadlight (0.1.0)
       addressable (~> 2.2.0)
       faraday (= 0.8.1)
       fattr
@@ -46,7 +46,7 @@ GEM
     rspec-core (2.12.2)
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
+    rspec-mocks (2.12.1)
     typhoeus (0.3.3)
       mime-types
 

data/README.md

@@ -7,7 +7,7 @@ Experience all the pleasures of sharing with [CloudApp][] from your terminal.
 
 ## Requirements
 
-`cloudapp` requires Ruby 1.9.2 or greater. Windows is not yet supported. If
+`cloudapp` requires Ruby 1.9.3 or greater. Windows is not yet supported. If
 you're willing to lend a hand, we'd love to officially support it.
 
 
@@ -42,6 +42,11 @@ link to a file like an HTML IMG tag.
 ``` bash
 $ cloudapp upload screenshot.png
 http://cl.ly/abc123
+
+$ cloudapp upload *.png
+http://cl.ly/abc123
+http://cl.ly/def456
+http://cl.ly/ghi789
 ```
 
 ### cloudapp bookmark `<url>`
@@ -51,6 +56,11 @@ Bookmark `<url>` and print its link to standard out.
 ``` bash
 $ cloudapp bookmark http://getcloudapp.com
 http://cl.ly/abc123
+
+$ cloudapp bookmark http://getcloudapp.com http://google.com http://bing.com
+http://cl.ly/abc123
+http://cl.ly/def456
+http://cl.ly/ghi789
 ```
 
 ## Wish List
@@ -58,8 +68,6 @@ http://cl.ly/abc123
 A few simple commands to allow scripting and input from other Unix programs
 would be ideal.
 
- - Share several files: `cloudapp upload *.png`
- - Bookmark several links: `cloudapp bookmark http://douglasadams.com http://zombo.com`
  - Handle bookmarks from STDIN: `pbpaste | cloudapp bookmark`
  - Download a drop: `cloudapp download http://cl.ly/abc123`
  - Encrypt and share a file: `cloudapp upload --encrypt launch_codes.txt`

data/bin/cloudapp

@@ -6,7 +6,21 @@ require 'cloudapp/cli/prompt'
 require 'cloudapp/service'
 
 def service
-  CloudApp::Service.using_token token
+  CloudApp::Service.using_token(token)
+    .on_error(&method(:service_error_handler))
+end
+
+def token_for_account credentials
+  CloudApp::Service
+    .token_for_account(*credentials, &method(:service_error_handler))
+end
+
+def service_error_handler representation
+  if representation.collection.error
+    puts
+    puts "! #{representation.collection.error.message}"
+    puts
+  end
 end
 
 def token
@@ -44,14 +58,14 @@ def print_version
 end
 
 
+print_version if ARGV.delete('--version') || ARGV.delete('-v')
+
 while not valid_token?
   credentials = CloudApp::CLI::Prompt.new.ask_for_credentials
-  token = CloudApp::Service.token_for_account *credentials
+  token = token_for_account credentials
   Credentials.save_token token
 end
 
-print_version if ARGV.delete('--version') || ARGV.delete('-v')
-
 link = ARGV.delete('--direct') || ARGV.delete('-d') ? :embed : :canonical
 
 case ARGV.shift
@@ -59,12 +73,14 @@ when 'bookmark'
   link = :canonical  # No such thing as an embed link for a bookmark.
   while url = ARGV.shift
     break unless valid_url? url
-    puts service.bookmark(url).link(link)
+    bookmark = service.bookmark(url)
+    puts bookmark.link(link)
   end
 when 'upload'
   while file = next_file
     break unless valid_file? file
-    puts service.upload(file).link(link)
+    upload = service.upload(file)
+    puts upload.link(link) if upload
     ARGF.skip
   end
 else

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.8'
-  s.date              = '2012-12-23'
+  s.version           = '2.0.0.beta.9'
+  s.date              = '2012-12-28'
   s.rubyforge_project = 'cloudapp'
 
   ## Make sure your summary is short. The description may be as long
@@ -44,7 +44,7 @@ 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 'leadlight',  '~> 0.0.7'
+  s.add_dependency 'leadlight',  '~> 0.1.0'
   s.add_dependency 'mime-types', '~> 1.19'
   s.add_dependency 'typhoeus',   '~> 0.3.3'
 
@@ -78,11 +78,13 @@ Gem::Specification.new do |s|
     man/cloudapp.1
     man/cloudapp.1.html
     man/cloudapp.1.ronn
+    script/docs
     spec/cloudapp/authorized_spec.rb
     spec/cloudapp/collection_json/collection_spec.rb
     spec/cloudapp/collection_json/item_spec.rb
     spec/cloudapp/collection_json/template_spec.rb
     spec/cloudapp/credentials_spec.rb
+    spec/helper.rb
   ]
   # = MANIFEST =
 

data/lib/cloudapp/collection_json/collection.rb

@@ -16,6 +16,11 @@ module CloudApp
       def template
         Template.new(fetch('template'), href)
       end
+
+      def error
+        return unless has_key? 'error'
+        Item.new(fetch('error'))
+      end
     end
   end
 end

data/lib/cloudapp/collection_json/item.rb

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

data/lib/cloudapp/collection_json.rb

@@ -4,7 +4,7 @@ require 'cloudapp/collection_json/template'
 
 module CloudApp
   module CollectionJson
-    Tint = Leadlight::Tint.new 'collection+json', status: [ :success, 401 ] do
+    Tint = Leadlight::Tint.new 'collection+json', status: :any do
       match_content_type 'application/vnd.collection+json'
       extend CloudApp::CollectionJson::Representation
     end

data/lib/cloudapp/service.rb

@@ -34,8 +34,10 @@ module CloudApp
       connection.token_auth token
     end
 
-    def self.token_for_account email, password
-      new.token_for_account(email, password)
+    def self.token_for_account email, password, &error_handler
+      service = new
+      service.on_error &error_handler if error_handler
+      service.token_for_account(email, password)
     end
 
     def token_for_account email, password
@@ -52,6 +54,7 @@ module CloudApp
       template = drops_template.template.
                    fill('bookmark_url', url)
       post template.href, template.data do |representation|
+        # TODO: Test unauthorized
         return representation.item
       end
     end
@@ -60,12 +63,16 @@ module CloudApp
       template = drops_template.template.
                    fill('file_size', FileTest.size(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
     end
 
     def drops_template
       root.link('drops-template').get do |representation|
+        # TODO: Test unauthorized
         return representation
       end
     end

data/lib/cloudapp.rb

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

data/man/cloudapp.1

@@ -7,14 +7,17 @@
 \fBcloudapp\fR \- all the pleasures of cloudapp in a cli
 .
 .SH "SYNOPSIS"
-\fBcloudapp bookmark\fR [\fB\-\-direct\fR] \fIurl\fR
+\fBcloudapp bookmark\fR [\fB\-\-direct\fR] \fIurl\fR [\fIurl\fR\.\.\.]
 .
 .br
-\fBcloudapp upload\fR [\fB\-\-direct\fR] \fIfile\fR
+\fBcloudapp upload\fR [\fB\-\-direct\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\.
 .
+.P
+\fBcloudapp\fR requires ruby 1\.9\.3 or greater\.
+.
 .SH "OPTIONS"
 .
 .TP
@@ -56,6 +59,22 @@ http://cl\.ly/abc123
 .IP "" 0
 .
 .P
+Upload several files:
+.
+.IP "" 4
+.
+.nf
+
+$ cloudapp upload *\.png
+http://cl\.ly/abc123
+http://cl\.ly/def456
+http://cl\.ly/ghi789
+.
+.fi
+.
+.IP "" 0
+.
+.P
 Copy the drop\'s share link to the clipboard on OS X:
 .
 .IP "" 4

data/man/cloudapp.1.html

@@ -82,14 +82,16 @@
 
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
-<p><code>cloudapp bookmark</code> [<code>--direct</code>] <var>url</var><br />
-<code>cloudapp upload</code>   [<code>--direct</code>] <var>file</var></p>
+<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>
 
 <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>
 
+<p><strong>cloudapp</strong> requires ruby 1.9.3 or greater.</p>
+
 <h2 id="OPTIONS">OPTIONS</h2>
 
 <dl>
@@ -124,6 +126,14 @@ use in places that expect a link to a file like an HTML IMG tag.</dd>
 http://cl.ly/abc123
 </code></pre>
 
+<p>Upload several files:</p>
+
+<pre><code>$ cloudapp upload *.png
+http://cl.ly/abc123
+http://cl.ly/def456
+http://cl.ly/ghi789
+</code></pre>
+
 <p>Copy the drop's share link to the clipboard on OS X:</p>
 
 <pre><code>$ cloudapp upload screenshot.png | pbcopy

data/man/cloudapp.1.ronn

@@ -3,14 +3,16 @@ cloudapp(1) -- all the pleasures of cloudapp in a cli
 
 ## SYNOPSIS
 
-`cloudapp bookmark` [`--direct`] <url><br>
-`cloudapp upload`   [`--direct`] <file>
+`cloudapp bookmark` [`--direct`] <url> [<url>...]<br>
+`cloudapp upload`   [`--direct`] <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`.
 
+**cloudapp** requires ruby 1.9.3 or greater.
+
 ## OPTIONS
 
   - `-d`, `--direct`:
@@ -37,6 +39,13 @@ Upload a file:
     $ cloudapp upload screenshot.png
     http://cl.ly/abc123
 
+Upload several files:
+
+    $ cloudapp upload *.png
+    http://cl.ly/abc123
+    http://cl.ly/def456
+    http://cl.ly/ghi789
+
 Copy the drop's share link to the clipboard on OS X:
 
     $ cloudapp upload screenshot.png | pbcopy

data/script/docs

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+git co gh-pages &&
+  git show master:man/cloudapp.1.html > index.html &&
+  git commit -am "Update docs" &&
+  git co master

data/spec/cloudapp/authorized_spec.rb

@@ -1,3 +1,4 @@
+require 'helper'
 require 'cloudapp/authorized'
 
 describe CloudApp::Authorized::Representation do

data/spec/cloudapp/collection_json/collection_spec.rb

@@ -1,3 +1,4 @@
+require 'helper'
 require 'cloudapp/collection_json/collection'
 
 describe CloudApp::CollectionJson::Collection do
@@ -66,4 +67,19 @@ describe CloudApp::CollectionJson::Collection do
     its(:href) { should eq 'http://href.com' }
     its(:data) { should eq 'first_name' => '', 'last_name' => '' }
   end
+
+  describe '#error' do
+    let(:data) {{
+      'collection' => {
+        'error' => { 'message' => 'error!' }}}}
+    subject { collection.error }
+
+    it { should be_an CloudApp::CollectionJson::Item }
+    its(:message) { should eq 'error!' }
+
+    context 'with no error' do
+      let(:data) {{ 'collection' => {} }}
+      it { should be_nil }
+    end
+  end
 end

data/spec/cloudapp/collection_json/item_spec.rb

@@ -1,3 +1,4 @@
+require 'helper'
 require 'cloudapp/collection_json/item'
 
 describe CloudApp::CollectionJson::Item do
@@ -13,6 +14,11 @@ describe CloudApp::CollectionJson::Item do
     its(:rel)  { should eq 'relation' }
   end
 
+  describe '#message' do
+    let(:data)    {{ 'message' => 'error!' }}
+    its(:message) { should eq 'error!' }
+  end
+
   describe '#links' do
     subject { described_class.new(data).links }
     let(:data)  {{ 'links' => [

data/spec/cloudapp/collection_json/template_spec.rb

@@ -1,3 +1,4 @@
+require 'helper'
 require 'cloudapp/collection_json/template'
 
 describe CloudApp::CollectionJson::Template do

data/spec/cloudapp/credentials_spec.rb

@@ -1,3 +1,4 @@
+require 'helper'
 require 'cloudapp/credentials'
 
 describe Credentials do

data/spec/helper.rb

@@ -0,0 +1,8 @@
+begin
+  # use `bundle install --standalone' to get this...
+  require_relative '../bundle/bundler/setup'
+rescue LoadError
+  # fall back to regular bundler if the developer hasn't bundled standalone
+  require 'bundler'
+  Bundler.setup
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudapp
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.8
+  version: 2.0.0.beta.9
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-23 00:00:00.000000000 Z
+date: 2012-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netrc
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -151,11 +151,13 @@ files:
 - man/cloudapp.1
 - man/cloudapp.1.html
 - man/cloudapp.1.ronn
+- script/docs
 - spec/cloudapp/authorized_spec.rb
 - spec/cloudapp/collection_json/collection_spec.rb
 - spec/cloudapp/collection_json/item_spec.rb
 - spec/cloudapp/collection_json/template_spec.rb
 - spec/cloudapp/credentials_spec.rb
+- spec/helper.rb
 homepage: https://github.com/cloudapp/cloudapp
 licenses: []
 post_install_message: 
@@ -169,6 +171,9 @@ 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: