cloudapp 2.0.0.beta.5 → 2.0.0.beta.6

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    cloudapp (2.0.0.beta.5)
+    cloudapp (2.0.0.beta.6)
       leadlight (~> 0.0.7)
+      mime-types (~> 1.19)
       netrc (~> 0.7.7)
       typhoeus (~> 0.3.3)
 
@@ -10,6 +11,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.8)
+    diff-lcs (1.1.3)
     fail-fast (1.0.0)
     faraday (0.8.1)
       multipart-post (~> 1.1)
@@ -37,6 +39,14 @@ GEM
       hpricot (>= 0.8.2)
       mustache (>= 0.7.0)
       rdiscount (>= 1.5.8)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.0)
     typhoeus (0.3.3)
       mime-types
 
@@ -47,3 +57,4 @@ DEPENDENCIES
   cloudapp!
   rake
   ronn
+  rspec

data/README.md

@@ -15,20 +15,38 @@ you're willing to lend a hand, we'd love to officially support it.
 
 ``` bash
 $ gem install cloudapp --pre
-$ cloudapp upload screenshot.png
 $ cloudapp bookmark http://getcloudapp.com
+$ cloudapp upload screenshot.png
+$ cloudapp upload --direct screenshot.png
+```
+
+For a good time, install `gem-man` and read the man page or
+[read it online][man].
+
+[man]: http://cloudapp.github.com/cloudapp
+
+
+``` bash
+$ gem install gem-man
+$ gem man cloudapp
 ```
 
 ## Commands
 
-### cloudapp upload
+### cloudapp upload `<file>`
+
+Upload `<file>` and print its link to standard out. Use the `--direct` flag to
+print the file's direct link which is suitable for use in places that expect a
+link to a file like an HTML IMG tag.
 
 ``` bash
 $ cloudapp upload screenshot.png
 http://cl.ly/abc123
 ```
 
-### cloudapp bookmark
+### cloudapp bookmark `<url>`
+
+Bookmark `<url>` and print its link to standard out.
 
 ``` bash
 $ cloudapp bookmark http://getcloudapp.com
@@ -40,29 +58,12 @@ http://cl.ly/abc123
 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.
-
- - 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`
-
-There's bound to be a better way to express some of these commands, but you get
-the picture.
+There's be a better way to express some of these commands, but you get the
+picture.

data/bin/cloudapp

@@ -1,30 +1,47 @@
 #!/usr/bin/env ruby
 
 require 'cloudapp/credentials'
+require 'cloudapp/cli/prompt'
 require 'cloudapp/service'
 
 def service
-  CloudApp::Service.using_token Credentials.token
+  CloudApp::Service.using_token token
+end
+
+def token
+  Credentials.token
+end
+
+def valid_token?
+  !token.nil? and service.root.authorized?
 end
 
 def error error
   puts "ERROR: #{error}"
-  exit 1
+  exit 9
 end
 
-def validate_url url
+def valid_url? url
   error 'URL missing' if url.nil?
   error "#{ url } doesn't look like a valid URL" unless url =~ URI.regexp
+  true
 end
 
-def validate_file file
+def valid_file? file
   error "File doesn't exist" if file.is_a? Errno::ENOENT
   error 'File missing'       if file.nil? or file == STDIN
+  not file.closed?
+end
+
+def next_file
+  ARGF.file rescue $!
 end
 
 
-while service.root.unauthorized?
-  Credentials.new.ask_for_and_save_credentials
+while not valid_token?
+  credentials = CloudApp::CLI::Prompt.new.ask_for_credentials
+  token = CloudApp::Service.token_for_account *credentials
+  Credentials.save_token token
 end
 
 link = ARGV.delete('--direct') || ARGV.delete('-d') ? :embed : :canonical
@@ -32,13 +49,16 @@ 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)
+  while url = ARGV.shift
+    break unless valid_url? url
+    puts service.bookmark(url).link(link)
+  end
 when 'upload'
-  file = ARGF.file rescue $!
-  validate_file file
-  puts service.upload(file).link(link)
+  while file = next_file
+    break unless valid_file? file
+    puts service.upload(file).link(link)
+    ARGF.skip
+  end
 else
   puts <<EOS
 Usage:

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.5'
-  s.date              = '2012-12-17'
+  s.version           = '2.0.0.beta.6'
+  s.date              = '2012-12-23'
   s.rubyforge_project = 'cloudapp'
 
   ## Make sure your summary is short. The description may be as long
@@ -43,14 +43,16 @@ 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'
+  s.add_dependency 'netrc',      '~> 0.7.7'
+  s.add_dependency 'leadlight',  '~> 0.0.7'
+  s.add_dependency 'mime-types', '~> 1.19'
+  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 'ronn'
+  s.add_development_dependency 'rspec'
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE
@@ -66,12 +68,21 @@ Gem::Specification.new do |s|
     cloudapp.gemspec
     lib/cloudapp.rb
     lib/cloudapp/authorized.rb
+    lib/cloudapp/cli/prompt.rb
     lib/cloudapp/collection_json.rb
+    lib/cloudapp/collection_json/collection.rb
+    lib/cloudapp/collection_json/item.rb
+    lib/cloudapp/collection_json/template.rb
     lib/cloudapp/credentials.rb
     lib/cloudapp/service.rb
     man/cloudapp.1
     man/cloudapp.1.html
     man/cloudapp.1.ronn
+    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
   ]
   # = MANIFEST =
 

data/lib/cloudapp/cli/prompt.rb

@@ -0,0 +1,34 @@
+# Lovingly borrowed from the heroku gem:
+#   https://github.com/heroku/heroku/blob/master/lib/heroku/auth.rb
+module CloudApp
+  module CLI
+    class Prompt
+      def ask_for_credentials
+        puts "Sign into CloudApp."
+        print "Email: "
+        email = ask
+        print "Password (typing will be hidden): "
+        password = ask_for_password
+        [ email, password ]
+      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
+  end
+end

data/lib/cloudapp/collection_json/collection.rb

@@ -0,0 +1,21 @@
+require 'cloudapp/collection_json/item'
+require 'cloudapp/collection_json/template'
+
+module CloudApp
+  module CollectionJson
+    class Collection < Item
+      def initialize representation
+        super representation.fetch('collection')
+      end
+
+      def item() items.first end
+      def items
+        fetch('items', []).map {|item| Item.new(item) }
+      end
+
+      def template
+        Template.new(fetch('template'), href)
+      end
+    end
+  end
+end

data/lib/cloudapp/collection_json/item.rb

@@ -0,0 +1,26 @@
+require 'delegate'
+
+module CloudApp
+  module CollectionJson
+    class Item < SimpleDelegator
+      def href() fetch('href') end
+      def rel()  fetch('rel')  end
+
+      def links
+        fetch('links', []).map {|link| Item.new(link) }
+      end
+
+      def link rel
+        links.find {|link| link.rel == rel.to_s }.href
+      end
+
+      def data
+        data = {}
+        fetch('data').each do |datum|
+          data[datum.fetch('name')] = datum.fetch('value')
+        end
+        data
+      end
+    end
+  end
+end

data/lib/cloudapp/collection_json/template.rb

@@ -0,0 +1,26 @@
+require 'cloudapp/collection_json/item'
+
+module CloudApp
+  module CollectionJson
+    class Template < Item
+      attr_reader :href
+
+      def initialize item, href
+        @href = href
+        super item
+      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

data/lib/cloudapp/collection_json.rb

@@ -1,3 +1,7 @@
+require 'cloudapp/collection_json/item'
+require 'cloudapp/collection_json/collection'
+require 'cloudapp/collection_json/template'
+
 module CloudApp
   module CollectionJson
     Tint = Leadlight::Tint.new 'collection+json', status: [ :success, 401 ] do
@@ -7,6 +11,7 @@ module CloudApp
 
     module Representation
       extend Forwardable
+      def_delegators :collection, :template, :item
 
       def self.extended representation
         Collection.new(representation).links.each do |link|
@@ -21,66 +26,6 @@ module CloudApp
       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

@@ -1,115 +1,33 @@
-# 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
+  attr_reader :netrc
 
-  def netrc_path
-    default = Netrc.default_path
-    encrypted = default + ".gpg"
-    if File.exists?(encrypted)
-      encrypted
-    else
-      default
-    end
+  def initialize netrc
+    @netrc = netrc
   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
+  def self.token netrc = Netrc.read
+    new(netrc).token
   end
 
-  def credentials=(credentials) @credentials = credentials end
-  def credentials()
-    (@credentials ||= read_credentials) || ask_for_and_save_credentials
+  def self.save_token token, netrc = Netrc.read
+    new(netrc).save_token token
   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
+  def token
+    credentials.last
   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
+  def save_token token
+    return if token.nil? or token =~ /^\s*$/
+    netrc['api.getcloudapp.com'] = [ 'api@getcloudapp.com', token ]
     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
+private
 
-  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
+  def credentials
+    Array netrc['api.getcloudapp.com']
   end
 end

data/lib/cloudapp/service.rb

@@ -1,12 +1,13 @@
 require 'leadlight'
 require 'cloudapp/authorized'
 require 'cloudapp/collection_json'
+require 'mime/types'
 require 'uri'
 
 module CloudApp
   class Service
     Leadlight.build_service self do
-      url 'http://api.getcloudapp.com'
+      url 'https://api.getcloudapp.com'
       tints << CloudApp::CollectionJson::Tint
       tints << CloudApp::Authorized::Tint
 
@@ -70,7 +71,7 @@ module CloudApp
 
     def upload_file(path, template)
       file     = File.open path
-      file_io  = Faraday::UploadIO.new file, 'image/png'  # TODO: Use correct mime type
+      file_io  = Faraday::UploadIO.new file, mime_type_for(path)
       template = template.fill('file', file_io)
       uri      = Addressable::URI.parse template.href
 
@@ -87,5 +88,10 @@ module CloudApp
         end
       end
     end
+
+    def mime_type_for path
+      MIME::Types.type_for(File.basename(path)).first ||
+        'application/octet-stream'
+    end
   end
 end

data/lib/cloudapp.rb

@@ -1,3 +1,3 @@
 module CloudApp
-  VERSION = '2.0.0.beta.5'
+  VERSION = '2.0.0.beta.6'
 end

data/man/cloudapp.1

@@ -19,7 +19,7 @@ Upload a file or share a bookmark with CloudApp\. The drop\'s share link will be
 .
 .TP
 \fB\-d\fR, \fB\-\-direct\fR
-Print the drop\'s direct link after creation\. The direct link is suitable for use in places that expect a link to a file content like an HTML IMG tag\.
+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\.
 .
 .SH "EXIT STATUS"
 cloudapp may return one of several error codes if it encouters problems\.
@@ -31,7 +31,7 @@ cloudapp may return one of several error codes if it encouters problems\.
 \fB1\fR File exceeds the limits of the account\'s plan
 .
 .IP "\(bu" 4
-\fB9\fR Something horrible has happened
+\fB9\fR Some horrible, unexpected thing has happened
 .
 .IP "" 0
 .

data/man/cloudapp.1.html

@@ -94,7 +94,7 @@ printed to standard output. Account credentials are stored in <code>~/.netrc</co
 
 <dl>
 <dt><code>-d</code>, <code>--direct</code></dt><dd>Print the drop's direct link after creation. The direct link is suitable for
-use in places that expect a link to a file content like an HTML IMG tag.</dd>
+use in places that expect a link to a file like an HTML IMG tag.</dd>
 </dl>
 
 
@@ -105,7 +105,7 @@ use in places that expect a link to a file content like an HTML IMG tag.</dd>
 <ul>
 <li><code>0</code> Success</li>
 <li><code>1</code> File exceeds the limits of the account's plan</li>
-<li><code>9</code> Something horrible has happened</li>
+<li><code>9</code> Some horrible, unexpected thing has happened</li>
 </ul>
 
 

data/man/cloudapp.1.ronn

@@ -15,7 +15,7 @@ printed to standard output. Account credentials are stored in `~/.netrc`.
 
   - `-d`, `--direct`:
     Print the drop's direct link after creation. The direct link is suitable for
-    use in places that expect a link to a file content like an HTML IMG tag.
+    use in places that expect a link to a file like an HTML IMG tag.
 
 ## EXIT STATUS
 
@@ -23,7 +23,7 @@ cloudapp may return one of several error codes if it encouters problems.
 
  - `0` Success
  - `1` File exceeds the limits of the account's plan
- - `9` Something horrible has happened
+ - `9` Some horrible, unexpected thing has happened
 
 ## FILES
 

data/spec/cloudapp/authorized_spec.rb

@@ -0,0 +1,19 @@
+require 'cloudapp/authorized'
+
+describe CloudApp::Authorized::Representation do
+  let(:representation) { stub :representation, __response__: response }
+  let(:response)       { stub :response, status: status }
+  subject { representation.extend described_class }
+
+  context 'an unauthorized response' do
+    let(:status) { 401 }
+    it { should     be_unauthorized }
+    it { should_not be_authorized }
+  end
+
+  context 'a success response' do
+    let(:status) { 200 }
+    it { should_not be_unauthorized }
+    it { should     be_authorized }
+  end
+end

data/spec/cloudapp/collection_json/collection_spec.rb

@@ -0,0 +1,69 @@
+require 'cloudapp/collection_json/collection'
+
+describe CloudApp::CollectionJson::Collection do
+  let(:collection) { described_class.new(data) }
+  subject { collection }
+
+  describe 'the collection item' do
+    let(:data) {{ 'collection' => { 'href' => 'http://href.com' }}}
+    its(:href) { should eq 'http://href.com' }
+  end
+
+  describe '#items' do
+    let(:data) {{
+      'collection' => {
+        'items' => [
+          { 'href' => 'http://one.com' },
+          { 'href' => 'http://two.com' } ]}
+    }}
+    subject { collection.items }
+
+    it { should be_an Array }
+    it { should have(2).items }
+
+    it 'returns an array of Items' do
+      subject.each do |item|
+        item.should be_an CloudApp::CollectionJson::Item
+      end
+
+      item = subject.first
+      item.href.should eq 'http://one.com'
+    end
+
+    context 'with no items' do
+      let(:data) {{ 'collection' => {} }}
+      it { should be_empty }
+    end
+  end
+
+  describe '#item' do
+    let(:data) {{
+      'collection' => {
+        'items' => [
+          { 'href' => 'http://one.com' },
+          { 'href' => 'http://two.com' } ]}}}
+    subject { collection.item }
+
+    it { should eq collection.items.first }
+
+    context 'with no items' do
+      let(:data) {{ 'collection' => {} }}
+      it { should be_nil }
+    end
+  end
+
+  describe '#template' do
+    let(:data) {{
+      'collection' => {
+        'href' => 'http://href.com',
+        'template' => {
+          'data' => [
+            { 'name' => 'first_name', 'value' => '' },
+            { 'name' => 'last_name', 'value' => '' } ]}}}}
+    subject { collection.template }
+
+    it { should be_an CloudApp::CollectionJson::Template }
+    its(:href) { should eq 'http://href.com' }
+    its(:data) { should eq 'first_name' => '', 'last_name' => '' }
+  end
+end

data/spec/cloudapp/collection_json/item_spec.rb

@@ -0,0 +1,55 @@
+require 'cloudapp/collection_json/item'
+
+describe CloudApp::CollectionJson::Item do
+  subject { described_class.new(data) }
+
+  describe '#href' do
+    let(:data) {{ 'href' => 'http://getcloudapp.com' }}
+    its(:href) { should eq 'http://getcloudapp.com' }
+  end
+
+  describe '#rel' do
+    let(:data) {{ 'rel' => 'relation' }}
+    its(:rel)  { should eq 'relation' }
+  end
+
+  describe '#links' do
+    subject { described_class.new(data).links }
+    let(:data)  {{ 'links' => [
+                     { 'rel' => 'self', 'href' => 'http://self.com' },
+                     { 'rel' => 'next', 'href' => 'http://next.com' }] }}
+
+    it { should be_an Array }
+    it { should have(2).items }
+
+    it 'returns an array of Items' do
+      subject.each do |item|
+        item.should be_a described_class
+      end
+
+      item = subject.first
+      item.rel.should eq 'self'
+      item.href.should eq 'http://self.com'
+    end
+
+    context 'with no links' do
+      let(:data) { {} }
+      it { should be_empty }
+    end
+  end
+
+  describe '#link' do
+    subject { described_class.new(data).link('next') }
+    let(:data)  {{ 'links' => [
+                     { 'rel' => 'self', 'href' => 'http://self.com' },
+                     { 'rel' => 'next', 'href' => 'http://next.com' }] }}
+
+    it { should eq 'http://next.com' }
+  end
+
+  describe '#data' do
+    let(:data) {{ 'data' => [{ 'name' => 'first_name', 'value' => 'Arthur' },
+                             { 'name' => 'last_name',  'value' => 'Dent' }] }}
+    its(:data) { should eq 'first_name' => 'Arthur', 'last_name' => 'Dent' }
+  end
+end

data/spec/cloudapp/collection_json/template_spec.rb

@@ -0,0 +1,35 @@
+require 'cloudapp/collection_json/template'
+
+describe CloudApp::CollectionJson::Template do
+  let(:template) { described_class.new(data, 'http://href.com') }
+  subject { template }
+
+  describe 'the template item' do
+    let(:data) {{ 'data' => [
+                    { 'name' => 'first_name', 'value' => '' },
+                    { 'name' => 'last_name', 'value' => ''  } ]}}
+
+    its(:href) { should eq 'http://href.com' }
+    its(:data) { should eq 'first_name' => '', 'last_name' => '' }
+  end
+
+  describe '#fill' do
+    let(:data) {{ 'data' => [
+                    { 'name' => 'first_name', 'value' => '' },
+                    { 'name' => 'last_name', 'value' => ''  } ]}}
+    subject { template.fill('first_name', 'Arthur') }
+
+    it { should be_a described_class }
+    it { should_not eq template }
+
+    it 'fills the datum' do
+      subject.data.fetch('first_name').should eq 'Arthur'
+    end
+
+    context 'a nonexistent key' do
+      it 'does nothing' do
+        subject.fill('bad', 'value').should eq subject
+      end
+    end
+  end
+end

data/spec/cloudapp/credentials_spec.rb

@@ -0,0 +1,61 @@
+require 'cloudapp/credentials'
+
+describe Credentials do
+  describe '.token' do
+    let(:netrc) { stub :netrc, :[] => %w( arthur@dent.com towel ) }
+    subject { Credentials.token(netrc) }
+    it { should eq 'towel' }
+  end
+
+  describe '#token' do
+    let(:netrc) { stub :netrc, :[] => %w( arthur@dent.com towel ) }
+    subject { Credentials.new(netrc).token }
+
+    it { should eq 'towel' }
+
+    it 'fetches token from netrc' do
+      netrc.should_receive(:[]).with('api.getcloudapp.com').once
+      subject
+    end
+
+    context 'without saved token' do
+      let(:netrc) { stub :netrc, :[] => nil }
+      it { should be_nil }
+    end
+  end
+
+  describe '.save_token' do
+    let(:netrc) { stub :netrc, :[]= => nil }
+
+    it 'saves the token' do
+      netrc.should_receive(:save).once.ordered
+      Credentials.save_token 'new token', netrc
+    end
+  end
+
+  describe '#save_token' do
+    let(:netrc) { stub :netrc }
+    subject { Credentials.new(netrc) }
+
+    it 'saves the token' do
+      credentials = [ 'api@getcloudapp.com', 'new token' ]
+      netrc.should_receive(:[]=).with('api.getcloudapp.com', credentials)
+        .once.ordered
+      netrc.should_receive(:save).once.ordered
+      subject.save_token 'new token'
+    end
+
+    it 'ignores a nil token' do
+      netrc.should_not_receive(:[]=)
+      netrc.should_not_receive(:save)
+      subject.save_token nil
+    end
+
+    it 'ignores an empty token' do
+      netrc.should_not_receive(:[]=)
+      netrc.should_not_receive(:save)
+      subject.save_token ''
+      subject.save_token ' '
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudapp
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.5
+  version: 2.0.0.beta.6
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2012-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netrc
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.7
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.19'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.19'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  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:
@@ -109,12 +141,21 @@ files:
 - cloudapp.gemspec
 - lib/cloudapp.rb
 - lib/cloudapp/authorized.rb
+- lib/cloudapp/cli/prompt.rb
 - lib/cloudapp/collection_json.rb
+- lib/cloudapp/collection_json/collection.rb
+- lib/cloudapp/collection_json/item.rb
+- lib/cloudapp/collection_json/template.rb
 - lib/cloudapp/credentials.rb
 - lib/cloudapp/service.rb
 - man/cloudapp.1
 - man/cloudapp.1.html
 - man/cloudapp.1.ronn
+- 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
 homepage: https://github.com/cloudapp/cloudapp
 licenses: []
 post_install_message: