cloudapp 2.0.0.beta.11 → 2.0.0.beta.12

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudapp (2.0.0.beta.11)
+    cloudapp (2.0.0.beta.12)
       clipboard (~> 1.0.1)
       leadlight (~> 0.1.0)
       mime-types (~> 1.19)

data/bin/cloudapp

@@ -2,6 +2,7 @@
 
 require 'cloudapp'
 require 'cloudapp/credentials'
+require 'cloudapp/cli/options'
 require 'cloudapp/cli/prompt'
 require 'cloudapp/service'
 require 'clipboard'
@@ -22,28 +23,39 @@ def service_error_handler representation
   end
 end
 
-def print_error message
-  $stderr.puts
-  $stderr.puts "! #{message}"
-  $stderr.puts
+def token
+  Credentials.token
+end
+
+def valid_token?
+  !token.nil? and service.root.authorized?
 end
 
-def print_link link
+def authenticate
+  while not valid_token?
+    credentials = CloudApp::CLI::Prompt.new.ask_for_credentials
+    token = token_for_account credentials
+    Credentials.save_token token
+  end
+end
+
+def fetch_link drop, link_type, copy_link
+  link = drop.link(link_type)
+  copy link if copy_link
   $stdout.puts link
   $stderr.puts link unless $stdout.tty?
 end
 
-def error message
-  print_error message
-  exit 1
-end
 
-def token
-  Credentials.token
+def print_error message
+  $stderr.puts
+  $stderr.puts "! #{message}"
+  $stderr.puts
 end
 
-def valid_token?
-  !token.nil? and service.root.authorized?
+def error message
+  print_error message
+  exit 1
 end
 
 def print_version
@@ -51,64 +63,53 @@ def print_version
   exit
 end
 
-def copy content
-  Clipboard.copy content
-end
-
-def validate_url url
-  error "#{url} doesn't look like a valid URL" unless url =~ URI.regexp
+def print_help io = $stdout
+  io.puts <<EOS
+Usage:
+    cloudapp bookmark http://getcloudapp.com
+    cloudapp upload screenshot.png
+EOS
 end
 
-def validate_file path
-  error "#{path.inspect} doesn't exist" unless File.exists? path
+def copy content
+  Clipboard.copy content
 end
 
-
-print_version if ARGV.delete('--version') || ARGV.delete('-v')
-
-while not valid_token?
-  credentials = CloudApp::CLI::Prompt.new.ask_for_credentials
-  token = token_for_account credentials
-  Credentials.save_token token
+def invalid_command
+  print_help $stderr
+  exit 1
 end
 
-link_type = ARGV.delete('--direct') || ARGV.delete('-d') ? :embed : :canonical
-copy      = ARGV.delete('--no-copy').nil?
-
-case ARGV.shift
-when 'bookmark'
-  error 'Missing URL' if ARGV.empty?
-
-  link_type = :canonical  # No such thing as an embed link for a bookmark.
-  while url = ARGV.shift
-    $stderr.print "Bookmarking #{url}... "
-    validate_url url
-    bookmark = service.bookmark(url)
+def bookmark options
+  error 'Missing URL to bookmark.' if options.arguments.empty?
+  authenticate
+  options.arguments.each do |arg|
+    $stderr.print "Bookmarking #{arg}... "
+    error "#{arg} doesn't look like a valid URL" unless arg =~ URI.regexp
+    bookmark = service.bookmark(arg)
     exit 1 unless bookmark
-
-    link = bookmark.link(link_type)
-    copy link if copy
-    print_link link
+    fetch_link bookmark, options.link_type, options.copy_link?
   end
+end
 
-when 'upload'
-  error 'Missing file' if ARGV.empty?
-
-  while path = ARGV.shift
-    $stderr.print "Uploading #{File.basename(path)}... "
-    validate_file path
-    upload = service.upload(path)
+def upload options
+  error 'Missing file to upload.' if options.arguments.empty?
+  authenticate
+  options.arguments.each do |arg|
+    $stderr.print "Uploading #{File.basename(arg)}... "
+    error "#{arg.inspect} doesn't exist" unless File.exists? arg
+    upload = service.upload(arg)
     exit 1 unless upload
-
-    link = upload.link(link_type)
-    copy link if copy
-    print_link link
+    fetch_link upload, options.link_type, options.copy_link?
   end
+end
 
-else
-  $stderr.puts <<EOS
-Usage:
-    cloudapp bookmark http://getcloudapp.com
-    cloudapp upload screenshot.png
-EOS
+
+options = CloudApp::CLI::Options.parse ARGV
+case options.action
+when :help     then print_help
+when :version  then print_version
+when :bookmark then bookmark options
+when :upload   then upload options
+else                invalid_command
 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.11'
-  s.date              = '2012-12-29'
+  s.version           = '2.0.0.beta.12'
+  s.date              = '2012-12-31'
   s.rubyforge_project = 'cloudapp'
 
   ## Make sure your summary is short. The description may be as long
@@ -69,6 +69,7 @@ Gem::Specification.new do |s|
     cloudapp.gemspec
     lib/cloudapp.rb
     lib/cloudapp/authorized.rb
+    lib/cloudapp/cli/options.rb
     lib/cloudapp/cli/prompt.rb
     lib/cloudapp/collection_json.rb
     lib/cloudapp/collection_json/collection.rb
@@ -81,6 +82,7 @@ Gem::Specification.new do |s|
     man/cloudapp.1.ronn
     script/docs
     spec/cloudapp/authorized_spec.rb
+    spec/cloudapp/cli/options_spec.rb
     spec/cloudapp/collection_json/collection_spec.rb
     spec/cloudapp/collection_json/item_spec.rb
     spec/cloudapp/collection_json/template_spec.rb

data/lib/cloudapp/cli/options.rb

@@ -0,0 +1,51 @@
+module CloudApp
+  module CLI
+    class Options
+      def self.parse args
+        options = {}
+        if args.delete('--direct') || args.delete('-d')
+          options[:direct] = true
+        end
+        options[:copy_link] = true unless args.delete('--no-copy')
+        options[:help]      = args.delete('--help') || args.delete('-h')
+        options[:version]   = args.delete('--version')
+        options[:action]    = args.shift unless args.empty?
+        options[:arguments] = args unless args.empty?
+
+        Options.new options
+      end
+
+      attr_accessor :arguments
+      def initialize options
+        @copy_link = options.fetch :copy_link, false
+        @direct    = options.fetch :direct,    false
+        @help      = options.fetch :help,      false
+        @version   = options.fetch :version,   false
+        @action    = options.fetch :action,    nil
+        @arguments = options.fetch :arguments, []
+      end
+
+      def copy_link?
+        @copy_link
+      end
+
+      def link_type
+        @direct && action != :bookmark ? :embed : :canonical
+      end
+
+      def action
+        if @help or @action == 'help'
+          :help
+        elsif @version
+          :version
+        elsif @action == 'bookmark'
+          :bookmark
+        elsif @action == 'upload'
+          :upload
+        else
+          :invalid
+        end
+      end
+    end
+  end
+end

data/lib/cloudapp/cli/prompt.rb

@@ -3,7 +3,6 @@
 module CloudApp
   module CLI
     class Prompt
-
       def ask_for_credentials
         $stderr.puts "Sign into CloudApp."
         $stderr.print "Email: "

data/lib/cloudapp.rb

@@ -1,3 +1,3 @@
 module CloudApp
-  VERSION = '2.0.0.beta.11'
+  VERSION = '2.0.0.beta.12'
 end

data/spec/cloudapp/cli/options_spec.rb

@@ -0,0 +1,112 @@
+require 'helper'
+require 'cloudapp/cli/options'
+
+describe CloudApp::CLI::Options do
+  describe '#copy_link?' do
+    subject { described_class.parse(args).copy_link? }
+
+    context 'with no args' do
+      let(:args) {[ '' ]}
+      it { should eq(true) }
+    end
+
+    context 'with --no-copy' do
+      let(:args) { %w(--no-copy) }
+      it { should eq(false) }
+    end
+
+    context 'with --copy' do
+      let(:args) { %w(--copy) }
+      it { should eq(true) }
+    end
+  end
+
+  describe '#link_type' do
+    subject { described_class.parse(args).link_type }
+
+    context 'with no args' do
+      let(:args) {[ '' ]}
+      it { should eq(:canonical) }
+    end
+
+    context 'with --direct' do
+      let(:args) { %w(--direct) }
+      it { should eq(:embed) }
+    end
+
+    context 'with -d' do
+      let(:args) { %w(-d) }
+      it { should eq(:embed) }
+    end
+
+    context 'with --direct when bookmarking' do
+      let(:args) { %w(bookmark --direct) }
+      it { should eq(:canonical) }
+    end
+  end
+
+  describe '#action' do
+    subject { described_class.parse(args).action }
+
+    context 'with bookmark' do
+      let(:args) { %w(bookmark) }
+      it { should eq(:bookmark) }
+    end
+
+    context 'with upload' do
+      let(:args) { %w(upload) }
+      it { should eq(:upload) }
+    end
+
+    context 'with help' do
+      let(:args) { %w(help) }
+      it { should eq(:help) }
+    end
+
+    context 'with --help' do
+      let(:args) { %w(--help) }
+      it { should eq(:help) }
+    end
+
+    context 'with -h' do
+      let(:args) { %w(-h) }
+      it { should eq(:help) }
+    end
+
+    context 'with --version' do
+      let(:args) { %w(--version) }
+      it { should eq(:version) }
+    end
+
+    context 'with no args' do
+      let(:args) {[ '' ]}
+      it { should eq(:invalid) }
+    end
+
+    context 'with an invalid command' do
+      let(:args) {[ '' ]}
+      it { should eq(:invalid) }
+    end
+  end
+
+  describe '#arguments' do
+    subject { described_class.parse(args).arguments }
+
+    context 'with no args' do
+      let(:args) {[ '' ]}
+      it { should be_empty }
+    end
+
+    context 'with no args when bookmarking' do
+      let(:args) { %w(bookmark) }
+      it { should be_empty }
+    end
+
+    context 'with args when bookmarking' do
+      let(:args) { %w(bookmark one two) }
+      it { should eq(%w(one two)) }
+    end
+  end
+
+  # it "doesn't mutate array"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudapp
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.11
+  version: 2.0.0.beta.12
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-29 00:00:00.000000000 Z
+date: 2012-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -157,6 +157,7 @@ files:
 - cloudapp.gemspec
 - lib/cloudapp.rb
 - lib/cloudapp/authorized.rb
+- lib/cloudapp/cli/options.rb
 - lib/cloudapp/cli/prompt.rb
 - lib/cloudapp/collection_json.rb
 - lib/cloudapp/collection_json/collection.rb
@@ -169,6 +170,7 @@ files:
 - man/cloudapp.1.ronn
 - script/docs
 - spec/cloudapp/authorized_spec.rb
+- spec/cloudapp/cli/options_spec.rb
 - spec/cloudapp/collection_json/collection_spec.rb
 - spec/cloudapp/collection_json/item_spec.rb
 - spec/cloudapp/collection_json/template_spec.rb
@@ -189,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -179383608361943794
+      hash: -3445886834563878524
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: