cloudapp 1.0.2 → 1.1.0

data/CHANGELOG.md

@@ -0,0 +1,24 @@
+# Change Log
+
+Below is a complete listing of changes for each revision of `cloudapp`.
+
+## Unreleased
+
+ - General housecleaning in `bin/cloudapp`
+ - Fix typo ([#22][] by [Mark Mulder][bittersweet])
+ - Extract Config class
+
+[#22]: https://github.com/cloudapp/cloudapp/pull/22
+[bittersweet]: https://github.com/bittersweet
+
+## 1.0.2
+
+ - Bump leadlight and relax highline dependencies.
+
+## 1.0.1
+
+ - Tightened leadlight and highline dependencies.
+
+## 1.0.0
+
+ - Stable release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudapp (1.0.2)
+    cloudapp (1.1.0)
       addressable
       faraday (~> 0.8.0.rc2)
       gli
@@ -12,10 +12,11 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.6)
+    addressable (2.2.7)
     crack (0.3.1)
     diff-lcs (1.1.3)
     fail-fast (1.0.0)
+    fakefs (0.4.0)
     faraday (0.8.0.rc2)
       multipart-post (~> 1.1)
     fattr (2.2.1)
@@ -63,6 +64,7 @@ PLATFORMS
 
 DEPENDENCIES
   cloudapp!
+  fakefs
   rake
   ronn
   rspec

data/README.md

@@ -5,6 +5,10 @@ interface to CloudApp as an added bonus.
 
 [cloudapp api]: http://developer.getcloudapp.com
 
+## Requirements
+
+`cloudapp` requires Ruby 1.9.2 or greater.
+
 
 ## Usage
 
@@ -16,21 +20,19 @@ _Usage from Ruby is still a work in progress._
 Experience all the pleasures of sharing with CloudApp now in your terminal. The
 goal of `cloudapp` is to be simple and Unix-friendly.
 
-### Requirements
-
-`cloudapp` requires Ruby 1.9.2 or greater.
-
 ### Quick Start
 
     gem install cloudapp
     cloudapp list
     cloudapp bookmark http://douglasadams.com
-    cloduapp upload ~/Desktop/screenshot.png
+    cloudapp upload ~/Desktop/screenshot.png
 
-### Usage
+### Examples
 
  - Bookmark a link: `cloudapp bookmark http://getcloudapp.com`
+ - Bookmark several links: `cloudapp bookmark http://douglasadams.com http://zombo.com`
  - Share a file: `cloudapp upload screenshot.png`
+ - Share several files: `cloudapp upload *.png`
  - List newest drops: `cloudapp list [--count=5]`
  - Copy a new drop's link (OS X): `cloudapp bookmark http://douglasadams.com | pbcopy`
  - Output drops in CSV: `cloudapp --format=csv list`
@@ -41,22 +43,19 @@ More examples can be found on [the man page][man-page].
 
 ### Wish List
 
-Some baseic features that should be added:
-
- - Share several files: `cloudapp upload *.png`
- - Create several bookmarks: `cloudapp bookmark http://douglasadams.com http://zombo.com`
-
-A little more flare would be swell.
+`cloudapp` could be awesome with a little more flare.
 
  - Download a drop: `cloudapp download http://cl.ly/abc123`
  - Output specific columns: `cloudapp list --columns=name,views,link`
- - Handle input from STDIN: `pbpaste | cloudapp bookmark -`
+ - Handle bookmarks from STDIN: `pbpaste | cloudapp bookmark`
+ - Handle files from STDIN: `find *.png | cloudapp upload`
  - Archive and share several files: `cloudapp upload --archive *.png`
  - Encrypt and share a file: `cloudapp upload --encrypt launch_codes.txt`
- - Download and decrypt and encrypted drop: `cloudapp download http://cl.ly/abc123 def456`
+ - Download and decrypt and encrypted drop: `cloudapp download --key=def456 http://cl.ly/abc123`
 
-While we're dreaming, what could you do if it kept a local copy of all your
-drops? Bonus points for a light weight daemon that kept everything in sync.
+While we're dreaming, what could you do if `cloudapp` had a database of all your
+drops? Bonus points for a light weight daemon that kept everything in sync at
+all times.
 
  - Find all your screen shots: `cloudapp list /^screen ?shot.*\.png$/`
  - Trash all your stale drops: `cloudapp delete --last-viewed="> 1 month ago"`

data/bin/cloudapp

@@ -5,72 +5,64 @@ require 'rubygems'
 require 'gli'
 require 'highline'
 require 'pathname'
-require 'yaml'
 
 require 'cloudapp'
+require 'cloudapp/config'
 require 'cloudapp/drop_presenter'
 require 'cloudapp/drop_service'
 
 
-def service
-  CloudApp::DropService.using_token token
-end
-
-def token_for_account(email, password)
-  CloudApp::DropService.retrieve_token email, password
-end
+extend Forwardable
+def_delegator 'HighLine.new', :color
 
-def config_file
-  File.expand_path '~/.cloudapprc'
+def config
+  CloudApp::Config.new
 end
 
-def token
-  return unless File.exist?(config_file)
-  config = File.open(config_file) {|file| YAML::load(file) }
-  config[:token]
-end
-
-def save_token(token)
-  File.open(config_file, 'w', 0600) do |file|
-    YAML.dump({ token: token }, file)
-  end
-end
-
-def clear_token
-  return unless File.exist?(config_file)
-  File.delete(config_file)
-end
-
-def color(*args)
-  HighLine.new.color *args
+def service
+  CloudApp::DropService.using_token config.token
 end
 
-def check_for_credentials
-  return unless token.nil?
+def require_credentials
+  return unless config.token.nil?
 
   $stdout.puts 'Sign into your CloudApp account.'
 
-  email    = HighLine.new.ask('Email: ')
-  password = HighLine.new.ask('Password: ') {|q| q.echo = false }
-  token    = CloudApp::DropService.retrieve_token email, password
-
-  save_token token
+  email        = HighLine.new.ask('Email: ')
+  password     = HighLine.new.ask('Password: ') {|q| q.echo = false }
+  config.token = CloudApp::DropService.retrieve_token email, password
 end
 
-def format_from(global_options)
-  if global_options[:format].nil?
+def format_from_options(options)
+  if options[:format].nil?
     $stdout.tty? ? :pretty : :csv
   else
-    global_options[:format].to_sym
+    options[:format].to_sym
   end
 end
 
-def privacy_from(options)
+def privacy_from_options(options)
   if options[:private] || options[:public]
     options[:private] || !options[:public]
   end
 end
 
+def create_drop_action_on_command(c)
+  c.desc 'Use a private (long) link'
+  c.switch :private
+
+  c.desc 'Use a public (short) link'
+  c.switch :public
+
+  c.action do |global_options, options, args|
+    require_credentials
+    format  = format_from_options global_options
+    private = privacy_from_options options
+
+    yield format, private, args
+  end
+end
+
 
 include GLI
 
@@ -84,18 +76,7 @@ flag [:f, :format]
 desc 'Create a new bookmark to each url and print each link'
 arg_name 'url [url...]'
 command :bookmark do |c|
-
-  c.desc 'Use a private (long) link'
-  c.switch :private
-
-  c.desc 'Use a public (short) link'
-  c.switch :public
-
-  c.action do |global_options, options, urls|
-    check_for_credentials
-    format  = format_from global_options
-    private = privacy_from options
-
+  create_drop_action_on_command(c) do |format, private, urls|
     urls.each do |url|
       url     = URI.parse url
       waiting = "Bookmarking #{ url }... "
@@ -116,18 +97,7 @@ end
 desc 'Upload each file and print each link'
 arg_name 'file [file...]'
 command :upload do |c|
-
-  c.desc 'Use a private (long) link'
-  c.switch :private
-
-  c.desc 'Use a public (short) link'
-  c.switch :public
-
-  c.action do |global_options, options, files|
-    check_for_credentials
-    format  = format_from global_options
-    private = privacy_from options
-
+  create_drop_action_on_command(c) do |format, private, files|
     files.each do |file|
       file    = Pathname.new file
       waiting = "Uploading #{ file }... "
@@ -154,11 +124,11 @@ command [:list, :ls] do |c|
   c.flag :n, :count
 
   c.action do |global_options, options, args|
-    check_for_credentials
+    require_credentials
 
     count   = options[:count].to_i
     columns = { display_name: 'Name', url: 'Link', view_counter: 'Views' }
-    format  = format_from global_options
+    format  = format_from_options global_options
 
     CloudApp::DropPresenter.print(on:      $stdout,
                                   columns: columns,
@@ -168,10 +138,43 @@ command [:list, :ls] do |c|
   end
 end
 
+
+desc 'Download the drop at <url>'
+arg_name 'url'
+command :download do |c|
+
+  c.desc 'Download the file to <file>'
+  c.arg_name 'file'
+  c.flag :o, :output
+
+  c.action do |global_options, options, urls|
+    format  = format_from_options global_options
+    download_options = {}
+    download_options[:to] = options[:output] if options[:output]
+
+    urls.each do |url|
+      url     = URI.parse url
+      waiting = "Downloading #{ url }... "
+
+      CloudApp::DropPresenter.print(on:      $stdout,
+                                    waiting: waiting,
+                                    format:  format) do
+        content = service.download_drop url, download_options
+        { pretty: 'done', csv: content }
+      end
+    end
+  end
+end
+
+
 on_error do |e|
-  if CloudApp::DropService::UNAUTHORIZED === e
+  case e
+  when CloudApp::DropService::UNAUTHORIZED
     $stderr.puts color('Email and password given are incorrect.', :bold)
-    clear_token
+    config.token = nil
+    false
+  when CloudApp::DropService::NO_CONTENT
+    $stderr.puts 'drop was deleted or is a bookmark'
     false
   else
     true

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           = '1.0.2'
-  s.date              = '2012-02-15'
+  s.version           = '1.1.0'
+  s.date              = '2012-02-18'
   s.rubyforge_project = 'cloudapp'
 
   ## Make sure your summary is short. The description may be as long
@@ -52,6 +52,7 @@ Gem::Specification.new do |s|
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
+  s.add_development_dependency 'fakefs'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'ronn'
   s.add_development_dependency 'rspec'
@@ -63,6 +64,7 @@ Gem::Specification.new do |s|
   ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
   # = MANIFEST =
   s.files = %w[
+    CHANGELOG.md
     Gemfile
     Gemfile.lock
     MIT-LICENSE
@@ -71,18 +73,22 @@ Gem::Specification.new do |s|
     bin/cloudapp
     cloudapp.gemspec
     lib/cloudapp.rb
+    lib/cloudapp/config.rb
     lib/cloudapp/drop.rb
+    lib/cloudapp/drop_content.rb
     lib/cloudapp/drop_presenter.rb
     lib/cloudapp/drop_service.rb
     lib/cloudapp/identity.rb
     man/cloudapp.1
     man/cloudapp.1.html
     man/cloudapp.1.ronn
+    spec/cassettes/DropContent/download.yml
     spec/cassettes/DropService/create_bookmark.yml
     spec/cassettes/DropService/create_bookmark_with_bad_credentials.yml
     spec/cassettes/DropService/create_bookmark_with_name.yml
     spec/cassettes/DropService/create_private_bookmark.yml
     spec/cassettes/DropService/create_public_bookmark.yml
+    spec/cassettes/DropService/drop.yml
     spec/cassettes/DropService/list_drops.yml
     spec/cassettes/DropService/list_drops_with_bad_credentials.yml
     spec/cassettes/DropService/list_drops_with_limit.yml
@@ -92,11 +98,14 @@ Gem::Specification.new do |s|
     spec/cassettes/DropService/retrieve_token_with_bad_credentials.yml
     spec/cassettes/DropService/upload_file.yml
     spec/cassettes/DropService/upload_public_file.yml
+    spec/cloudapp/config_spec.rb
+    spec/cloudapp/drop_content_spec.rb
     spec/cloudapp/drop_presenter_spec.rb
     spec/cloudapp/drop_service_spec.rb
     spec/cloudapp/drop_spec.rb
     spec/cloudapp/identity_spec.rb
     spec/helper.rb
+    spec/support/fakefs_rspec.rb
     spec/support/files/favicon.ico
     spec/support/stub_class_or_module.rb
     spec/support/vcr.rb

data/lib/cloudapp/config.rb

@@ -0,0 +1,39 @@
+require 'pathname'
+require 'singleton'
+require 'yaml'
+
+module CloudApp
+  class Config
+    def initialize(path = File.expand_path('~/.cloudapprc'))
+      @path   = path
+      @config = read_config
+    end
+
+    def token
+      @config[:token]
+    end
+
+    def token=(token)
+      if token
+        @config[:token] = token
+      else
+        @config.delete :token
+      end
+
+      write_config
+    end
+
+  private
+
+    def read_config
+      return {} unless File.exist?(@path)
+      File.open(@path) {|file| YAML.load(file) }
+    end
+
+    def write_config
+      File.open(@path, 'w', 0600) {|file|
+        YAML.dump @config, file
+      }
+    end
+  end
+end

data/lib/cloudapp/drop.rb

@@ -1,4 +1,5 @@
 require 'ostruct'
+
 module CloudApp
   class Drop < OpenStruct
     def private?() private == true end
@@ -7,5 +8,9 @@ module CloudApp
     def display_name
       name || redirect_url || url
     end
+
+    def has_content?
+      item_type != 'bookmark'
+    end
   end
 end

data/lib/cloudapp/drop_content.rb

@@ -0,0 +1,34 @@
+require 'faraday'
+require 'logger'
+require 'typhoeus'
+
+module CloudApp
+  class DropContent
+    def initialize(drop)
+      @content_url = drop.content_url
+    end
+
+    def self.download(drop)
+      new(drop).content
+    end
+
+    def content(url = @content_url)
+      connection.get(url) do |req|
+        req.headers['Accept'] = 'application/json'
+      end.on_complete do |env|
+        location = env[:response]['location']
+        if location
+          return content(location)
+        else
+          return env[:body]
+        end
+      end
+    end
+
+    def connection
+      Faraday.new do |builder|
+        builder.adapter :typhoeus
+      end
+    end
+  end
+end

data/lib/cloudapp/drop_presenter.rb

@@ -70,6 +70,11 @@ module CloudApp
 
     def response
       @response ||= @action.call
+
+      case @response
+      when Hash then @response.fetch(@format, @response)
+      else @response
+      end
     end
   end
 end

data/lib/cloudapp/drop_service.rb

@@ -1,6 +1,9 @@
-require 'leadlight'
 require 'addressable/uri'
+require 'fileutils'
+require 'leadlight'
+require 'multi_json'
 require 'cloudapp/drop'
+require 'cloudapp/drop_content'
 
 # Leadlight service for mucking about with drops in the CloudApp API.
 #
@@ -43,6 +46,7 @@ module CloudApp
 
     # Rased when given credentials are incorrect.
     class UNAUTHORIZED < StandardError; end
+    class NO_CONTENT   < StandardError; end
 
     Leadlight.build_connection_common do |c|
       c.request :multipart
@@ -152,6 +156,36 @@ module CloudApp
       raise UNAUTHORIZED
     end
 
+    def drop(url)
+      conn = Faraday.new(url: url) do |builder|
+        builder.response :logger, logger
+        builder.adapter  :typhoeus
+      end
+
+      conn.get do |req|
+        req.headers['Accept'] = 'application/json'
+      end.on_complete do |env|
+        if env.fetch(:response).status == 200
+          drop = Drop.new(MultiJson.decode(env[:body]))
+        end
+
+        return drop
+      end
+    end
+
+    def download_drop(url, options = {})
+      drop = drop url
+      raise NO_CONTENT if drop.nil? or !drop.has_content?
+
+      filename = Addressable::URI.unencode(File.basename(drop.content_url))
+      path     = Pathname.new(options.fetch(:to, filename)).expand_path
+      FileUtils.mkdir_p path.parent
+
+      DropContent.download(drop).tap do |content|
+        File.open(path, 'w', 0600) {|file| file << content }
+      end
+    end
+
     def drops(count = 20)
       root.paginated_drops(per_page: count)['items'].map do |drop_data|
         Drop.new drop_data

data/lib/cloudapp.rb

@@ -1,3 +1,3 @@
 module CloudApp
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

data/man/cloudapp.1

@@ -18,6 +18,9 @@
 .br
 \fBcloudapp upload\fR [\fB\-\-private\fR] [\fB\-\-public\fR] \fIfile\fR [\fIfile\fR\.\.\.]
 .
+.br
+\fBcloudapp download\fR [\fB\-\-output\fR=\fIfile\fR] \fIurl\fR
+.
 .SH "DESCRIPTION"
 \fBcloudapp\fR is a simple, Unix\-friendly tool for CloudApp meant to augment the Mac and Web apps\. Sometimes it\'s more convenient to share without leaving the terminal and other times it\'s the only tool available\.
 .
@@ -30,20 +33,32 @@ Output using either \fBpretty\fR or \fBcsv\fR format\. (Default: \fBpretty\fR wh
 .SH "COMMANDS"
 .
 .TP
-\fBlist\fR [\fB\-\-count\fR=\fIcount\fR]
-List the most recent \fIcount\fR drops\. The default is to list \fB20\fR drops\.
-.
-.TP
 \fBbookmark\fR [\fB\-\-private\fR] [\fB\-\-public\fR] [\fIurl\fR\.\.\.]
 Create a new bookmark to each \fIurl\fR and print each link\.
 .
 .TP
+\fBdownload\fR [\fB\-\-output\fR=\fIfile\fR] \fIurl\fR
+Download the file at \fIurl\fR to the current directory or to \fIfile\fR if present\.
+.
+.TP
+\fBlist\fR [\fB\-\-count\fR=\fIcount\fR]
+List the most recent \fIcount\fR drops\. The default is to list \fB20\fR drops\.
+.
+.TP
 \fBupload\fR [\fB\-\-private\fR] [\fB\-\-public\fR] \fIfile\fR [\fIfile\fR\.\.\.]
 Upload each \fIfile\fR and print each link\.
 .
 .SH "COMMAND OPTIONS"
 .
 .TP
+\fB\-n\fR \fIcount\fR, \fB\-\-count\fR=\fIcount\fR
+Display \fIcount\fR drops\. (Default: \fB20\fR)
+.
+.TP
+\fB\-o\fR \fIfile\fR, \fB\-\-output\fR=\fIfile\fR
+Download file as \fIfile\fR\. (Default: current directory using the remote file\'s name)
+.
+.TP
 \fB\-\-private\fR
 Use a private (long) link when creating a new drop\.
 .
@@ -51,10 +66,6 @@ Use a private (long) link when creating a new drop\.
 \fB\-\-public\fR
 Use a public (short) link when creating a new drop\.
 .
-.TP
-\fB\-n\fR \fIcount\fR, \fB\-\-count\fR=\fIcount\fR
-Display \fIcount\fR drops\. (Default: \fB20\fR)
-.
 .SH "REQUIREMENTS"
 \fBcloudapp\fR requires Ruby 1\.9\.2 or greater\.
 .
@@ -118,7 +129,7 @@ Chapter 1\.md,http://cl\.ly/3U3d\.\.\.,7
 .IP "" 0
 .
 .P
-Share a new bookmark to "http://douglasadams\.com":
+Share a new bookmark to \fBhttp://douglasadams\.com\fR:
 .
 .IP "" 4
 .
@@ -132,7 +143,7 @@ Bookmarking http://douglasadams\.com\.\.\. http://cl\.ly/1y0j403g3D0c0X1G0R3m
 .IP "" 0
 .
 .P
-Share the file "screenshot\.png":
+Share the file \fBscreenshot\.png\fR:
 .
 .IP "" 4
 .
@@ -173,5 +184,33 @@ http://cl\.ly/1y0j403g3D0c0X1G0R3m
 .
 .IP "" 0
 .
+.P
+Download a drop to the current direcctory:
+.
+.IP "" 4
+.
+.nf
+
+$ cloudapp download http://cl\.ly/040u2o3X1w0z1z3n2T04
+Downloading screenshot\.png\.\.\. done
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Download a drop to another path:
+.
+.IP "" 4
+.
+.nf
+
+$ cloudapp download \-\-output=/Users/Larry/image\.png http://cl\.ly/040u2o3X1w0z1z3n2T04
+Downloading screenshot\.png to /Users/Larry\.\.\. done
+.
+.fi
+.
+.IP "" 0
+.
 .SH "LICENSE"
 \fBcloudapp\fR is distributed under the MIT license \fIhttps://github\.com/cloudapp/cloudapp/blob/master/MIT\-LICENSE\fR\.