cloudapp 1.1.0 → 2.0.0.beta.1

metadata

@@ -1,96 +1,67 @@
 --- !ruby/object:Gem::Specification
 name: cloudapp
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 2.0.0.beta.1
+  prerelease: 6
 platform: ruby
 authors:
 - Larry Marburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-18 00:00:00.000000000 Z
+date: 2012-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: addressable
-  requirement: &70180042556660 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70180042556660
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: &70180042552240 !ruby/object:Gem::Requirement
+  name: leadlight
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0.rc2
+        version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70180042552240
-- !ruby/object:Gem::Dependency
-  name: gli
-  requirement: &70180042550960 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70180042550960
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
-  name: highline
-  requirement: &70180042547820 !ruby/object:Gem::Requirement
+  name: typhoeus
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70180042547820
-- !ruby/object:Gem::Dependency
-  name: leadlight
-  requirement: &70180042545740 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: *70180042545740
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
-  name: typhoeus
-  requirement: &70180038459080 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *70180038459080
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: &70180038451940 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70180038451940
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70180038450620 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,43 +69,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70180038450620
-- !ruby/object:Gem::Dependency
-  name: ronn
-  requirement: &70180038449860 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70180038449860
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70180038449280 !ruby/object:Gem::Requirement
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *70180038449280
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: &70180038448640 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
-  type: :development
-  prerelease: false
-  version_requirements: *70180038448640
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70180038448060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,11 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70180038448060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Experience all the pleasures of sharing with CloudApp now in your terminal.
 email: larry@marburger.cc
-executables:
-- cloudapp
+executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -158,46 +121,61 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- bin/cloudapp
 - cloudapp.gemspec
 - lib/cloudapp.rb
-- lib/cloudapp/config.rb
+- lib/cloudapp/account.rb
+- lib/cloudapp/authorized_representation.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_content.rb
-- lib/cloudapp/drop_presenter.rb
-- lib/cloudapp/drop_service.rb
-- lib/cloudapp/identity.rb
+- lib/cloudapp/drop_collection.rb
+- lib/cloudapp/service.rb
+- lib/cloudapp/token.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
-- spec/cassettes/DropService/list_trash.yml
-- spec/cassettes/DropService/list_trash_with_bad_credentials.yml
-- spec/cassettes/DropService/retrieve_token.yml
-- 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/cassettes/create_bookmark.yml
+- spec/cassettes/create_bookmark_with_name.yml
+- spec/cassettes/create_bookmark_with_privacy.yml
+- spec/cassettes/delete_drop.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_href.yml
+- spec/cassettes/list_drops_with_href_and_filter.yml
+- spec/cassettes/list_drops_with_href_and_limit.yml
+- spec/cassettes/list_drops_with_limit.yml
+- spec/cassettes/list_drops_with_nil_href.yml
+- spec/cassettes/purge_drops.yml
+- spec/cassettes/recover_drop.yml
+- spec/cassettes/rename_drop.yml
+- spec/cassettes/setup_drops.yml
+- spec/cassettes/token_for_account.yml
+- spec/cassettes/token_for_account_with_bad_credentials.yml
+- spec/cassettes/trash_drop.yml
+- spec/cassettes/update_drop_bookmark_url.yml
+- spec/cassettes/update_file.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/account_spec.rb
+- 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/identity_spec.rb
+- spec/cloudapp/service_spec.rb
+- spec/cloudapp/token_spec.rb
 - spec/helper.rb
-- spec/support/fakefs_rspec.rb
+- spec/integration_spec.rb
 - spec/support/files/favicon.ico
 - spec/support/stub_class_or_module.rb
 - spec/support/vcr.rb
-- spec/support/vcr_rspec.rb
 homepage: https://github.com/cloudapp/cloudapp
 licenses: []
 post_install_message: 
@@ -214,12 +192,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: cloudapp
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 2
 summary: CloudApp CLI

data/bin/cloudapp

@@ -1,184 +0,0 @@
-#!/usr/bin/env ruby
-$: << File.expand_path(File.dirname(File.realpath(__FILE__)) + '/../lib')
-
-require 'rubygems'
-require 'gli'
-require 'highline'
-require 'pathname'
-
-require 'cloudapp'
-require 'cloudapp/config'
-require 'cloudapp/drop_presenter'
-require 'cloudapp/drop_service'
-
-
-extend Forwardable
-def_delegator 'HighLine.new', :color
-
-def config
-  CloudApp::Config.new
-end
-
-def service
-  CloudApp::DropService.using_token config.token
-end
-
-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 }
-  config.token = CloudApp::DropService.retrieve_token email, password
-end
-
-def format_from_options(options)
-  if options[:format].nil?
-    $stdout.tty? ? :pretty : :csv
-  else
-    options[:format].to_sym
-  end
-end
-
-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
-
-program_desc 'All the pleasures of CloudApp now at your terminal'
-version CloudApp::VERSION
-
-desc 'Output format (default: pretty for tty, csv otherwise)'
-arg_name 'csv|pretty'
-flag [:f, :format]
-
-desc 'Create a new bookmark to each url and print each link'
-arg_name 'url [url...]'
-command :bookmark do |c|
-  create_drop_action_on_command(c) do |format, private, urls|
-    urls.each do |url|
-      url     = URI.parse url
-      waiting = "Bookmarking #{ url }... "
-
-      CloudApp::DropPresenter.print(on:      $stdout,
-                                    waiting: waiting,
-                                    format:  format) do
-        new_options = { url: url }
-        new_options[:private] = private unless private.nil?
-
-        new_drop = service.create new_options
-        new_drop.url
-      end
-    end
-  end
-end
-
-desc 'Upload each file and print each link'
-arg_name 'file [file...]'
-command :upload do |c|
-  create_drop_action_on_command(c) do |format, private, files|
-    files.each do |file|
-      file    = Pathname.new file
-      waiting = "Uploading #{ file }... "
-
-      CloudApp::DropPresenter.print(on:      $stdout,
-                                    waiting: waiting,
-                                    format:  format) do
-        new_options = { path: file }
-        new_options[:private] = private unless private.nil?
-
-        new_drop = service.create new_options
-        new_drop.url
-      end
-    end
-  end
-end
-
-desc 'List the most recent drops'
-command [:list, :ls] do |c|
-
-  c.desc 'Number of drops to display'
-  c.arg_name 'count'
-  c.default_value '20'
-  c.flag :n, :count
-
-  c.action do |global_options, options, args|
-    require_credentials
-
-    count   = options[:count].to_i
-    columns = { display_name: 'Name', url: 'Link', view_counter: 'Views' }
-    format  = format_from_options global_options
-
-    CloudApp::DropPresenter.print(on:      $stdout,
-                                  columns: columns,
-                                  format:  format) do
-      service.drops count
-    end
-  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|
-  case e
-  when CloudApp::DropService::UNAUTHORIZED
-    $stderr.puts color('Email and password given are incorrect.', :bold)
-    config.token = nil
-    false
-  when CloudApp::DropService::NO_CONTENT
-    $stderr.puts 'drop was deleted or is a bookmark'
-    false
-  else
-    true
-  end
-end
-
-exit GLI.run(ARGV)

data/lib/cloudapp/config.rb

@@ -1,39 +0,0 @@
-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_content.rb

@@ -1,34 +0,0 @@
-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

@@ -1,80 +0,0 @@
-require 'csv'
-require 'delegate'
-
-module CloudApp
-  class DropPresenter
-    def initialize(io, format, waiting, columns, action)
-      @io      = io
-      @format  = format
-      @waiting = waiting
-      @columns = columns
-      @action  = action
-    end
-
-    def self.print(options, &action)
-      new(options.fetch(:on),
-          options.fetch(:format, :pretty),
-          options.fetch(:waiting, nil),
-          options.fetch(:columns, nil),
-          action).print
-    end
-
-    def pretty?() @format == :pretty end
-    def csv?()    @format == :csv    end
-
-    def print
-      @io.print @waiting if pretty?
-      @io.puts  lines
-    end
-
-    protected
-
-    def lines
-      if not @columns
-        response
-      else
-        headings = @columns.values
-        lines    = response.inject([ headings ]) do |lines, item|
-          lines << extract_values(item)
-        end
-
-        if csv?
-          csv = CSV.generate do |csv|
-            lines.each do |line|
-              csv << line
-            end
-          end
-        else
-          column_widths = lines.transpose.map do |column|
-            column.map(&:size).max
-          end
-
-          lines.map do |line|
-            line.each_with_index.map do |value, i|
-              value.ljust column_widths[i]
-            end.join '  '
-          end
-        end
-      end
-    end
-
-    def extract_values(item)
-      value_methods.map do |method|
-        item.send(method).to_s
-      end
-    end
-
-    def value_methods
-      @columns.keys
-    end
-
-    def response
-      @response ||= @action.call
-
-      case @response
-      when Hash then @response.fetch(@format, @response)
-      else @response
-      end
-    end
-  end
-end