cloudapp 2.0.0.beta.4 → 2.0.0.beta.5

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    cloudapp (2.0.0.beta.2)
+    cloudapp (2.0.0.beta.5)
       leadlight (~> 0.0.7)
+      netrc (~> 0.7.7)
       typhoeus (~> 0.3.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.8)
-    crack (0.3.1)
-    diff-lcs (1.1.3)
     fail-fast (1.0.0)
     faraday (0.8.1)
       multipart-post (~> 1.1)
     fattr (2.2.1)
     hookr (1.1.1)
       fail-fast (= 1.0.0)
+    hpricot (0.8.6)
     leadlight (0.0.7)
       addressable (~> 2.2.0)
       faraday (= 0.8.1)
@@ -29,21 +29,16 @@ GEM
     mime-types (1.19)
     multi_json (1.0.4)
     multipart-post (1.1.5)
-    rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
+    mustache (0.99.4)
+    netrc (0.7.7)
+    rake (10.0.3)
+    rdiscount (1.6.8)
+    ronn (0.7.3)
+      hpricot (>= 0.8.2)
+      mustache (>= 0.7.0)
+      rdiscount (>= 1.5.8)
     typhoeus (0.3.3)
       mime-types
-    vcr (2.0.1)
-    webmock (1.8.9)
-      addressable (>= 2.2.7)
-      crack (>= 0.1.7)
 
 PLATFORMS
   ruby
@@ -51,6 +46,4 @@ PLATFORMS
 DEPENDENCIES
   cloudapp!
   rake
-  rspec
-  vcr (~> 2.0.0)
-  webmock
+  ronn

data/README.md

@@ -1,14 +1,68 @@
-# CloudApp Ruby Client [![Build Status](https://secure.travis-ci.org/cloudapp/cloudapp.png)](http://travis-ci.org/cloudapp/cloudapp)
+# CloudApp CLI
 
-Interact with the [CloudApp API][] from Ruby.
+Experience all the pleasures of sharing with [CloudApp][] from your terminal.
+
+[cloudapp]: http://getcloudapp.com
 
-[cloudapp api]: http://developer.getcloudapp.com
 
 ## Requirements
 
-`cloudapp` requires Ruby 1.9.2 or greater.
+`cloudapp` requires Ruby 1.9.2 or greater. Windows is not yet supported. If
+you're willing to lend a hand, we'd love to officially support it.
+
+
+## Getting Started
+
+``` bash
+$ gem install cloudapp --pre
+$ cloudapp upload screenshot.png
+$ cloudapp bookmark http://getcloudapp.com
+```
+
+## Commands
+
+### cloudapp upload
+
+``` bash
+$ cloudapp upload screenshot.png
+http://cl.ly/abc123
+```
+
+### cloudapp bookmark
+
+``` bash
+$ cloudapp bookmark http://getcloudapp.com
+http://cl.ly/abc123
+```
+
+## Wish List
+
+A few simple commands to allow scripting and input from other Unix programs
+would be ideal.
+
+### Phase: Next
+
+ - Share several files: `cloudapp upload *.png`
+ - Bookmark several links: `cloudapp bookmark http://douglasadams.com http://zombo.com`
+ - Handle bookmarks from STDIN: `pbpaste | cloudapp bookmark`
+ - Handle files from STDIN: `find *.png | cloudapp upload`
+ - Download a drop: `cloudapp download http://cl.ly/abc123`
+
+### Phase: Unstoppable
+
+ - 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 --key=def456 http://cl.ly/abc123`
+
+### Phase: World Domination
 
+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.
 
-## Usage
+ - Find all your screen shots: `cloudapp list /^screen ?shot.*\.png$/`
+ - Trash all your stale drops: `cloudapp delete --last-viewed="> 1 month ago"`
+ - See your drop views in real time: `cloudapp --tail`
 
-_Usage from Ruby is still a work in progress._
+There's bound to be a better way to express some of these commands, but you get
+the picture.

data/Rakefile

@@ -37,24 +37,6 @@ def replace_header(head, header_name)
   head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
 end
 
-#############################################################################
-#
-# Standard tasks
-#
-#############################################################################
-
-require 'rspec'
-require 'rspec/core/rake_task'
-
-desc "Run all specs"
-task RSpec::Core::RakeTask.new('spec')
-task :default => "spec"
-
-desc 'Run non-integration specs'
-RSpec::Core::RakeTask.new('spec:unit') do |t|
-  t.rspec_opts = "--tag ~integration"
-end
-
 #############################################################################
 #
 # Custom tasks (add your own tasks here)
@@ -79,7 +61,7 @@ task :release => :build do
   sh "git tag v#{version}"
   sh "git push origin master"
   sh "git push origin v#{version}"
-  sh "gem push pkg/#{name}-#{version}.gem"
+  sh "gem push pkg/#{gem_file}"
 end
 
 desc "Build #{gem_file} into the pkg directory"

data/bin/cloudapp

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+
+require 'cloudapp/credentials'
+require 'cloudapp/service'
+
+def service
+  CloudApp::Service.using_token Credentials.token
+end
+
+def error error
+  puts "ERROR: #{error}"
+  exit 1
+end
+
+def validate_url url
+  error 'URL missing' if url.nil?
+  error "#{ url } doesn't look like a valid URL" unless url =~ URI.regexp
+end
+
+def validate_file file
+  error "File doesn't exist" if file.is_a? Errno::ENOENT
+  error 'File missing'       if file.nil? or file == STDIN
+end
+
+
+while service.root.unauthorized?
+  Credentials.new.ask_for_and_save_credentials
+end
+
+link = ARGV.delete('--direct') || ARGV.delete('-d') ? :embed : :canonical
+
+case ARGV.shift
+when 'bookmark'
+  link = :canonical  # No such thing as an embed link for a bookmark.
+  url  = ARGV.shift
+  validate_url url
+  puts service.bookmark(url).link(link)
+when 'upload'
+  file = ARGF.file rescue $!
+  validate_file file
+  puts service.upload(file).link(link)
+else
+  puts <<EOS
+Usage:
+    cloudapp bookmark http://getcloudapp.com
+    cloudapp upload screenshot.png
+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.4'
-  s.date              = '2012-08-25'
+  s.version           = '2.0.0.beta.5'
+  s.date              = '2012-12-17'
   s.rubyforge_project = 'cloudapp'
 
   ## Make sure your summary is short. The description may be as long
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.require_paths = %w[lib]
 
   ## If your gem includes any executables, list them here.
-  # s.executables = ["cloudapp"]
+  s.executables = ["cloudapp"]
 
   ## Specify any RDoc options here. You'll want to add your README and
   ## LICENSE files to the extra_rdoc_files list.
@@ -43,66 +43,35 @@ 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 'typhoeus',  '~> 0.3.3'
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'vcr', '~> 2.0.0'
-  s.add_development_dependency 'webmock'
+  s.add_development_dependency 'ronn'
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE
   ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
   # = MANIFEST =
   s.files = %w[
-    CHANGELOG.md
     Gemfile
     Gemfile.lock
     MIT-LICENSE
     README.md
     Rakefile
+    bin/cloudapp
     cloudapp.gemspec
     lib/cloudapp.rb
-    lib/cloudapp/authorized_representation.rb
+    lib/cloudapp/authorized.rb
     lib/cloudapp/collection_json.rb
-    lib/cloudapp/collection_json/item.rb
-    lib/cloudapp/collection_json/representation.rb
-    lib/cloudapp/collection_json/template.rb
-    lib/cloudapp/collection_json/tint.rb
-    lib/cloudapp/drop.rb
-    lib/cloudapp/drop_collection.rb
+    lib/cloudapp/credentials.rb
     lib/cloudapp/service.rb
-    spec/cassettes/account_token.yml
-    spec/cassettes/create_bookmark.yml
-    spec/cassettes/create_bookmark_with_name.yml
-    spec/cassettes/create_bookmark_with_privacy.yml
-    spec/cassettes/list_drops.yml
-    spec/cassettes/list_drops_with_bad_token.yml
-    spec/cassettes/list_drops_with_filter.yml
-    spec/cassettes/list_drops_with_limit.yml
-    spec/cassettes/purge_drops.yml
-    spec/cassettes/setup_drops.yml
-    spec/cassettes/token_for_account.yml
-    spec/cassettes/token_for_account_with_bad_credentials.yml
-    spec/cassettes/upload_file.yml
-    spec/cassettes/upload_file_with_name.yml
-    spec/cassettes/upload_file_with_privacy.yml
-    spec/cassettes/view_drop.yml
-    spec/cloudapp/authorized_representation_spec.rb
-    spec/cloudapp/collection_json/item_spec.rb
-    spec/cloudapp/collection_json/representation_spec.rb
-    spec/cloudapp/collection_json/template_spec.rb
-    spec/cloudapp/drop_collection_spec.rb
-    spec/cloudapp/drop_spec.rb
-    spec/cloudapp/service_spec.rb
-    spec/helper.rb
-    spec/integration_spec.rb
-    spec/support/files/favicon.ico
-    spec/support/stub_class_or_module.rb
-    spec/support/vcr.rb
+    man/cloudapp.1
+    man/cloudapp.1.html
+    man/cloudapp.1.ronn
   ]
   # = MANIFEST =
 

data/lib/cloudapp/authorized.rb

@@ -0,0 +1,14 @@
+require 'leadlight'
+
+module CloudApp
+  module Authorized
+    Tint = Leadlight::Tint.new 'authorized', status: [ :success, 401 ] do
+      extend CloudApp::Authorized::Representation
+    end
+
+    module Representation
+      def unauthorized?() __response__.status == 401 end
+      def authorized?()   not unauthorized? end
+    end
+  end
+end

data/lib/cloudapp/collection_json.rb

@@ -1,3 +1,86 @@
-require 'cloudapp/collection_json/item'
-require 'cloudapp/collection_json/representation'
-require 'cloudapp/collection_json/template'
+module CloudApp
+  module CollectionJson
+    Tint = Leadlight::Tint.new 'collection+json', status: [ :success, 401 ] do
+      match_content_type 'application/vnd.collection+json'
+      extend CloudApp::CollectionJson::Representation
+    end
+
+    module Representation
+      extend Forwardable
+
+      def self.extended representation
+        Collection.new(representation).links.each do |link|
+          representation.add_link link.href, link.rel
+        end
+      end
+
+      def fill_template attributes
+        collection.template.fill(attributes)
+      end
+
+      def collection
+        Collection.new(self)
+      end
+
+      def_delegators :collection, :template, :item
+
+      class Item < SimpleDelegator
+        def links
+          fetch('links', []).map {|link| Item.new(link) }
+        end
+
+        def link rel
+          links.find {|link| link.rel == rel.to_s }.href
+        end
+
+        def href() fetch('href') end
+        def rel()  fetch('rel')  end
+        def data
+          data = {}
+          fetch('data').each do |datum|
+            data[datum.fetch('name')] = datum.fetch('value')
+          end
+          data
+        end
+      end
+
+      class Collection < Item
+        def initialize representation
+          super representation.fetch('collection')
+        end
+
+        def template() Template.new(fetch('template'), href) end
+        def items
+          fetch('items').map {|item| Item.new(item) }
+        end
+
+        def item
+          items.first
+        end
+      end
+
+      class Template < Item
+        attr_reader :href
+
+        def initialize item, href
+          @href = href
+          super item
+        end
+
+        def enctype() fetch('enctype') end
+
+        def fill key, value
+          return self unless data.has_key?(key)
+          new_data = fetch('data').map {|datum|
+            if datum.fetch('name') == key
+              datum = datum.merge 'value' => value
+            end
+            datum
+          }
+          new_item = self.merge('data' => new_data)
+          Template.new new_item, href
+        end
+      end
+    end
+  end
+end

data/lib/cloudapp/credentials.rb

@@ -0,0 +1,115 @@
+# Taken from the heroku gem.
+# https://github.com/heroku/heroku/blob/master/lib/heroku/auth.rb
+require 'netrc'
+
+class Credentials
+  def self.token
+    new.credentials.last
+  end
+
+  def netrc_path
+    default = Netrc.default_path
+    encrypted = default + ".gpg"
+    if File.exists?(encrypted)
+      encrypted
+    else
+      default
+    end
+  end
+
+  def netrc
+    @netrc ||= begin
+      File.exists?(netrc_path) && Netrc.read(netrc_path)
+    rescue => error
+      if error.message =~ /^Permission bits for/
+        perm = File.stat(netrc_path).mode & 0777
+        abort("Permissions #{perm} for '#{netrc_path}' are too open. You should run `chmod 0600 #{netrc_path}` so that your credentials are NOT accessible by others.")
+      else
+        raise error
+      end
+    end
+  end
+
+  def credentials=(credentials) @credentials = credentials end
+  def credentials()
+    (@credentials ||= read_credentials) || ask_for_and_save_credentials
+  end
+
+  def read_credentials
+    # TODO: convert legacy credentials to netrc
+    # if File.exists?(legacy_credentials_path)
+    #   @api, @client = nil
+    #   @credentials = File.read(legacy_credentials_path).split("\n")
+    #   write_credentials
+    #   FileUtils.rm_f(legacy_credentials_path)
+    # end
+
+    # read netrc credentials if they exist
+    self.credentials = netrc['api.getcloudapp.com'] if netrc
+  end
+
+  def write_credentials
+    FileUtils.mkdir_p(File.dirname(netrc_path))
+    FileUtils.touch(netrc_path)
+    FileUtils.chmod(0600, netrc_path)
+    netrc['api.getcloudapp.com'] = credentials
+    netrc.save
+  end
+
+  def delete_credentials
+    # TODO: delete legacy credentials
+    # if File.exists?(legacy_credentials_path)
+    #   FileUtils.rm_f(legacy_credentials_path)
+    # end
+    if netrc
+      netrc.delete('api.getcloudapp.com')
+      netrc.save
+    end
+    self.credentials = nil
+  end
+
+  def ask_for_and_save_credentials
+    self.credentials = ask_for_credentials
+    write_credentials
+    credentials
+  end
+
+  def ask_for_credentials
+    puts "Enter your CloudApp credentials."
+
+    print "Email: "
+    email = ask
+
+    print "Password (typing will be hidden): "
+    password = ask_for_password
+
+    # TODO: Remove this dependency on Service.
+    token = CloudApp::Service.token_for_account email, password
+    unless token
+      puts "Incorrect email or password."
+      puts
+      delete_credentials
+      return ask_for_credentials
+    end
+
+    [ email, token ]
+  end
+
+  def ask() $stdin.gets.to_s.strip end
+  def ask_for_password
+    echo_off
+    password = ask
+    puts
+    echo_on
+    return password
+  end
+
+  def echo_on()  with_tty { system "stty echo" }  end
+  def echo_off() with_tty { system "stty -echo" } end
+  def with_tty(&block)
+    return unless $stdin.isatty
+    yield
+  rescue
+    # fails on windows
+  end
+end