cloudapp 0.0.11 → 0.0.12

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    cloudapp (0.0.11)
+    cloudapp (0.0.12)
       addressable
       faraday (~> 0.8.0.rc2)
-      formatador
       gli
+      highline
       leadlight
       typhoeus
 
@@ -19,8 +19,8 @@ GEM
     faraday (0.8.0.rc2)
       multipart-post (~> 1.1)
     fattr (2.2.1)
-    formatador (0.2.1)
     gli (1.5.1)
+    highline (1.6.11)
     hookr (1.1.1)
       fail-fast (= 1.0.0)
     hpricot (0.8.6)

data/README.md

@@ -19,9 +19,9 @@ goal of `cloudapp` is to be simple and Unix-friendly.
 ### Quick Start
 
     gem install cloudapp
-    cloudapp --email=EMAIL --password=PASSWORD initconfig
     cloudapp list
     cloudapp bookmark http://douglasadams.com
+    cloduapp upload ~/Desktop/screenshot.png
 
 ### Usage
 
@@ -63,15 +63,11 @@ the picture.
 
 ### Security Considerations
 
-As of right now, `cloudapp` makes use of
-[`gli`'s built-in configuration handling][gli-config] to store your CloudApp
-credentials **in plain text** at `~/.cloudapp.rc`. You'll be prompted to run the
-following command if the global `--email` and `--password` options aren't
-provided:
+Your credentials are stored **in plain text** at `~/.cloudapprc`. If this
+worries you, keep an eye on [issue #10][issue-10]. Some sort of non-plaintext
+authentication is planned before 1.0 is released.
 
-    cloudapp --email=EMAIL --password=PASSWORD initconfig
-
-[gli-config]: https://github.com/davetron5000/gli/wiki/Config
+[issue-10]: https://github.com/cloudapp/cloudapp/issues/10
 
 ### Harness the Power
 

data/bin/cloudapp

@@ -3,8 +3,9 @@ $: << File.expand_path(File.dirname(File.realpath(__FILE__)) + '/../lib')
 
 require 'rubygems'
 require 'gli'
-require 'formatador'
+require 'highline'
 require 'pathname'
+require 'yaml'
 
 require 'cloudapp'
 require 'cloudapp/drop_presenter'
@@ -12,30 +13,58 @@ require 'cloudapp/drop_service'
 require 'cloudapp/identity'
 
 
-def service(global_options)
-  identity = CloudApp::Identity.from_config global_options
+def service
   CloudApp::DropService.as_identity(identity).tap do |service|
     service.logger.level = Logger::WARN
   end
 end
 
-def check_for_credentials(global_options)
-  return unless global_options[:email].nil? and global_options[:password].nil?
+def config_file
+  File.expand_path '~/.cloudapprc'
+end
 
-  exit_now! [
-    'CloudApp credentials missing. Save them to ~/.cloudapp.rc using:',
-    '  cloudapp --email=<email> --password=<password> initconfig' ].join("\n"),
-    1
+def identity
+  return unless File.exist?(config_file)
+  config = File.open(config_file) {|file| YAML::load(file) }
+  CloudApp::Identity.from_config config
 end
 
-def format_from(global_options)
-  set_default_format global_options
-  global_options[:format].to_sym
+def save_identity(email, password)
+  File.open(config_file, 'w', 0600) do |file|
+    YAML.dump({ email: email, password: password }, file)
+  end
+end
+
+def color(*args)
+  HighLine.new.color *args
 end
 
-def set_default_format(global_options)
-  return unless global_options[:format].nil?
-  global_options[:format] = $stdout.tty? ? :pretty : :csv
+def plain_text_credentials_warning
+  """
+#{ color('WARNING', :bold) }
+Your credentials are stored #{ color('in plain text', :bold) } at ~/.cloudapprc. If this worries you,
+keep an eye on issue #10 (https://github.com/cloudapp/cloudapp/issues/10). Some
+sort of non-plaintext authentication is planned before 1.0 is released.
+  """
+end
+
+def check_for_credentials
+  return unless identity.nil?
+
+  $stdout.puts [ plain_text_credentials_warning,
+                 'Sign into your CloudApp account.' ]
+
+  email    = HighLine.new.ask('Email: ')
+  password = HighLine.new.ask('Password: ') {|q| q.echo = false }
+  save_identity email, password
+end
+
+def format_from(global_options)
+  if global_options[:format].nil?
+    $stdout.tty? ? :pretty : :csv
+  else
+    global_options[:format].to_sym
+  end
 end
 
 def privacy_from(options)
@@ -49,15 +78,6 @@ include GLI
 
 program_desc 'All the pleasures of CloudApp now at your terminal'
 version CloudApp::VERSION
-config_file '.cloudapp.rc'
-
-desc 'CloudApp account email'
-arg_name 'email'
-flag :email
-
-desc 'CloudApp account password'
-arg_name 'password'
-flag :password
 
 desc 'Output format (default: pretty for tty, csv otherwise)'
 arg_name 'csv|pretty'
@@ -74,7 +94,7 @@ command [:bookmark, :shorten] do |c|
   c.switch :public
 
   c.action do |global_options, options, urls|
-    check_for_credentials global_options
+    check_for_credentials
     format  = format_from global_options
     private = privacy_from options
 
@@ -88,7 +108,7 @@ command [:bookmark, :shorten] do |c|
         new_options = { url: url }
         new_options[:private] = private unless private.nil?
 
-        new_drop = service(global_options).create new_options
+        new_drop = service.create new_options
         new_drop.url
       end
     end
@@ -106,7 +126,7 @@ command :upload do |c|
   c.switch :public
 
   c.action do |global_options, options, files|
-    check_for_credentials global_options
+    check_for_credentials
     format  = format_from global_options
     private = privacy_from options
 
@@ -120,7 +140,7 @@ command :upload do |c|
         new_options = { path: file }
         new_options[:private] = private unless private.nil?
 
-        new_drop = service(global_options).create new_options
+        new_drop = service.create new_options
         new_drop.url
       end
     end
@@ -136,7 +156,7 @@ command [:list, :ls] do |c|
   c.flag :n, :count
 
   c.action do |global_options, options, args|
-    check_for_credentials global_options
+    check_for_credentials
 
     count   = options[:count].to_i
     columns = { name: 'Name', url: 'Link', view_counter: 'Views' }
@@ -145,7 +165,7 @@ command [:list, :ls] do |c|
     CloudApp::DropPresenter.print(on:      $stdout,
                                   columns: columns,
                                   format:  format) do
-      service(global_options).drops count
+      service.drops count
     end
   end
 end

data/cloudapp.gemspec

@@ -13,7 +13,7 @@ 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           = '0.0.11'
+  s.version           = '0.0.12'
   s.date              = '2012-02-10'
   s.rubyforge_project = 'cloudapp'
 
@@ -45,8 +45,8 @@ Gem::Specification.new do |s|
   ## that are needed for an end user to actually USE your code.
   s.add_dependency 'addressable'
   s.add_dependency 'faraday', '~> 0.8.0.rc2'
-  s.add_dependency 'formatador'
   s.add_dependency 'gli'
+  s.add_dependency 'highline'
   s.add_dependency 'leadlight'
   s.add_dependency 'typhoeus'
 

data/lib/cloudapp/drop_presenter.rb

@@ -1,6 +1,5 @@
 require 'csv'
 require 'delegate'
-require 'formatador'
 
 module CloudApp
   class DropPresenter

data/lib/cloudapp.rb

@@ -1,3 +1,3 @@
 module CloudApp
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

data/man/cloudapp.1

@@ -7,7 +7,7 @@
 \fBcloudapp\fR \- All the pleasures of CloudApp now at your terminal
 .
 .SH "SYNOPSIS"
-\fBcloudapp\fR [\fB\-\-email\fR=\fIemail\fR] [\fB\-\-password\fR=\fIpassword\fR] \fIcommand\fR [\fIargs\fR]
+\fBcloudapp\fR [\fB\-\-format\fR=\fIformat\fR] \fIcommand\fR [\fIargs\fR]
 .
 .br
 \fBcloudapp list\fR [\fB\-\-count\fR=\fIcount\fR]
@@ -24,14 +24,6 @@
 .SH "GLOBAL OPTIONS"
 .
 .TP
-\fB\-\-email\fR=\fIemail\fR
-Use \fIemail\fR for CloudApp account credentials\.
-.
-.TP
-\fB\-\-password\fR=\fIpassword\fR
-Use \fIpassword\fR for CloudApp account credentials\.
-.
-.TP
 \fB\-f\fR \fIformat\fR, \fB\-\-format\fR=\fIformat\fR
 Output using either \fBpretty\fR or \fBcsv\fR format\. (Default: \fBpretty\fR when output to a terminal and \fBcsv\fR when output is piped to another program\.)
 .
@@ -179,7 +171,7 @@ http://cl\.ly/1y0j403g3D0c0X1G0R3m
 .IP "" 0
 .
 .SH "SECURITY CONSIDERATIONS"
-As of right now, \fBcloudapp\fR makes use of \fBgli\fR\'s built\-in configuration handling \fIhttps://github\.com/davetron5000/gli/wiki/Config\fR to store your CloudApp credentials \fBin plain text\fR at \fB~/\.cloudapp\.rc\fR\.
+Your credentials are stored \fBin plain text\fR at \fB~/\.cloudapprc\fR\. If this worries you, keep an eye on issue #10 \fIhttps://github\.com/cloudapp/cloudapp/issues/10\fR\. Some sort of non\-plaintext authentication is planned before 1\.0 is released\.
 .
 .SH "LICENSE"
 \fBcloudapp\fR is distributed under the MIT license \fIhttps://github\.com/cloudapp/cloudapp/blob/master/MIT\-LICENSE\fR\.

data/man/cloudapp.1.html

@@ -83,7 +83,7 @@
 
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
-<p><code>cloudapp</code> [<code>--email</code>=<var>email</var>] [<code>--password</code>=<var>password</var>] <var>command</var> [<var>args</var>]<br />
+<p><code>cloudapp</code> [<code>--format</code>=<var>format</var>] <var>command</var> [<var>args</var>]<br />
 <code>cloudapp list</code> [<code>--count</code>=<var>count</var>]<br />
 <code>cloudapp bookmark</code> [<code>--private</code>] [<code>--public</code>] <var>url</var> [<var>url</var>...]<br />
 <code>cloudapp upload</code> [<code>--private</code>] [<code>--public</code>] <var>file</var> [<var>file</var>...]</p>
@@ -97,10 +97,8 @@ terminal and other times it's the only tool available.</p>
 <h2 id="GLOBAL-OPTIONS">GLOBAL OPTIONS</h2>
 
 <dl>
-<dt><code>--email</code>=<var>email</var></dt><dd><p>Use <var>email</var> for CloudApp account credentials.</p></dd>
-<dt><code>--password</code>=<var>password</var></dt><dd><p>Use <var>password</var> for CloudApp account credentials.</p></dd>
-<dt><code>-f</code> <var>format</var>, <code>--format</code>=<var>format</var></dt><dd><p>Output using either <strong>pretty</strong> or <strong>csv</strong> format. (Default: <strong>pretty</strong>  when
-output to a terminal and <strong>csv</strong> when output is piped to another program.)</p></dd>
+<dt><code>-f</code> <var>format</var>, <code>--format</code>=<var>format</var></dt><dd>Output using either <strong>pretty</strong> or <strong>csv</strong> format. (Default: <strong>pretty</strong>  when
+output to a terminal and <strong>csv</strong> when output is piped to another program.)</dd>
 </dl>
 
 
@@ -185,9 +183,9 @@ http://cl.ly/1y0j403g3D0c0X1G0R3m
 
 <h2 id="SECURITY-CONSIDERATIONS">SECURITY CONSIDERATIONS</h2>
 
-<p>As of right now, <code>cloudapp</code> makes use of
-<a href="https://github.com/davetron5000/gli/wiki/Config"><code>gli</code>'s built-in configuration handling</a> to store your CloudApp
-credentials <strong>in plain text</strong> at <code>~/.cloudapp.rc</code>.</p>
+<p>Your credentials are stored <strong>in plain text</strong> at <code>~/.cloudapprc</code>. If this
+worries you, keep an eye on <a href="https://github.com/cloudapp/cloudapp/issues/10">issue #10</a>. Some sort of non-plaintext
+authentication is planned before 1.0 is released.</p>
 
 <h2 id="LICENSE">LICENSE</h2>
 

data/man/cloudapp.1.ronn

@@ -3,7 +3,7 @@ cloudapp(1) -- All the pleasures of CloudApp now at your terminal
 
 ## SYNOPSIS
 
-`cloudapp` [`--email`=<email>] [`--password`=<password>] <command> [<args>]<br>
+`cloudapp` [`--format`=<format>] <command> [<args>]<br>
 `cloudapp list` [`--count`=<count>]<br>
 `cloudapp bookmark` [`--private`] [`--public`] <url> [<url>...]<br>
 `cloudapp upload` [`--private`] [`--public`] <file> [<file>...]
@@ -16,12 +16,6 @@ terminal and other times it's the only tool available.
 
 ## GLOBAL OPTIONS
 
-  * `--email`=<email>:
-    Use <email> for CloudApp account credentials.
-
-  * `--password`=<password>:
-    Use <password> for CloudApp account credentials.
-
   * `-f` <format>, `--format`=<format>:
     Output using either **pretty** or **csv** format. (Default: **pretty**  when
     output to a terminal and **csv** when output is piped to another program.)
@@ -105,12 +99,11 @@ Share a new bookmark and output only the URL:
 
 ## SECURITY CONSIDERATIONS
 
-As of right now, `cloudapp` makes use of
-[`gli`'s built-in configuration handling][gli-config] to store your CloudApp
-credentials **in plain text** at `~/.cloudapp.rc`.
-
-[gli-config]: https://github.com/davetron5000/gli/wiki/Config
+Your credentials are stored **in plain text** at `~/.cloudapprc`. If this
+worries you, keep an eye on [issue #10][issue-10]. Some sort of non-plaintext
+authentication is planned before 1.0 is released.
 
+[issue-10]: https://github.com/cloudapp/cloudapp/issues/10
 
 ## LICENSE
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudapp
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70186632051880 !ruby/object:Gem::Requirement
+  requirement: &70172752917860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70186632051880
+  version_requirements: *70172752917860
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70186632051180 !ruby/object:Gem::Requirement
+  requirement: &70172752917320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.0.rc2
   type: :runtime
   prerelease: false
-  version_requirements: *70186632051180
+  version_requirements: *70172752917320
 - !ruby/object:Gem::Dependency
-  name: formatador
-  requirement: &70186632050560 !ruby/object:Gem::Requirement
+  name: gli
+  requirement: &70172752916840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70186632050560
+  version_requirements: *70172752916840
 - !ruby/object:Gem::Dependency
-  name: gli
-  requirement: &70186632049100 !ruby/object:Gem::Requirement
+  name: highline
+  requirement: &70172752916360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70186632049100
+  version_requirements: *70172752916360
 - !ruby/object:Gem::Dependency
   name: leadlight
-  requirement: &70186632048540 !ruby/object:Gem::Requirement
+  requirement: &70172752915680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70186632048540
+  version_requirements: *70172752915680
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &70186632047680 !ruby/object:Gem::Requirement
+  requirement: &70172752915080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70186632047680
+  version_requirements: *70172752915080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70186632046640 !ruby/object:Gem::Requirement
+  requirement: &70172752914500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70186632046640
+  version_requirements: *70172752914500
 - !ruby/object:Gem::Dependency
   name: ronn
-  requirement: &70186632046180 !ruby/object:Gem::Requirement
+  requirement: &70172752914080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70186632046180
+  version_requirements: *70172752914080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70186632045720 !ruby/object:Gem::Requirement
+  requirement: &70172752913640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70186632045720
+  version_requirements: *70172752913640
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70186632045180 !ruby/object:Gem::Requirement
+  requirement: &70172752912680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 2.0.0.rc1
   type: :development
   prerelease: false
-  version_requirements: *70186632045180
+  version_requirements: *70172752912680
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70186632044720 !ruby/object:Gem::Requirement
+  requirement: &70172752911760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70186632044720
+  version_requirements: *70172752911760
 description: Experience all the pleasures of sharing with CloudApp now in your terminal.
 email: larry@marburger.cc
 executables: