cloudapp 2.0.0.beta.10 → 2.0.0.beta.11

data/Gemfile.lock

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

data/bin/cloudapp

@@ -28,6 +28,11 @@ def print_error message
   $stderr.puts
 end
 
+def print_link link
+  $stdout.puts link
+  $stderr.puts link unless $stdout.tty?
+end
+
 def error message
   print_error message
   exit 1
@@ -41,22 +46,6 @@ def valid_token?
   !token.nil? and service.root.authorized?
 end
 
-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 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
-
 def print_version
   $stdout.puts CloudApp::VERSION
   exit
@@ -66,6 +55,14 @@ def copy content
   Clipboard.copy content
 end
 
+def validate_url url
+  error "#{url} doesn't look like a valid URL" unless url =~ URI.regexp
+end
+
+def validate_file path
+  error "#{path.inspect} doesn't exist" unless File.exists? path
+end
+
 
 print_version if ARGV.delete('--version') || ARGV.delete('-v')
 
@@ -75,32 +72,39 @@ while not valid_token?
   Credentials.save_token token
 end
 
-link = ARGV.delete('--direct') || ARGV.delete('-d') ? :embed : :canonical
-copy = ARGV.delete('--no-copy').nil?
+link_type = ARGV.delete('--direct') || ARGV.delete('-d') ? :embed : :canonical
+copy      = ARGV.delete('--no-copy').nil?
 
 case ARGV.shift
 when 'bookmark'
-  link = :canonical  # No such thing as an embed link for a bookmark.
+  error 'Missing URL' if ARGV.empty?
+
+  link_type = :canonical  # No such thing as an embed link for a bookmark.
   while url = ARGV.shift
-    break unless valid_url? url
+    $stderr.print "Bookmarking #{url}... "
+    validate_url url
     bookmark = service.bookmark(url)
     exit 1 unless bookmark
 
-    url = bookmark.link(link)
-    copy url if copy
-    $stdout.puts url
+    link = bookmark.link(link_type)
+    copy link if copy
+    print_link link
   end
+
 when 'upload'
-  while file = next_file
-    break unless valid_file? file
-    upload = service.upload(file)
+  error 'Missing file' if ARGV.empty?
+
+  while path = ARGV.shift
+    $stderr.print "Uploading #{File.basename(path)}... "
+    validate_file path
+    upload = service.upload(path)
     exit 1 unless upload
 
-    url = upload.link(link)
-    copy url if copy
-    $stdout.puts url
-    ARGF.skip
+    link = upload.link(link_type)
+    copy link if copy
+    print_link link
   end
+
 else
   $stderr.puts <<EOS
 Usage:

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           = '2.0.0.beta.10'
+  s.version           = '2.0.0.beta.11'
   s.date              = '2012-12-29'
   s.rubyforge_project = 'cloudapp'
 

data/lib/cloudapp/cli/prompt.rb

@@ -3,6 +3,7 @@
 module CloudApp
   module CLI
     class Prompt
+
       def ask_for_credentials
         $stderr.puts "Sign into CloudApp."
         $stderr.print "Email: "
@@ -21,8 +22,13 @@ module CloudApp
         return password
       end
 
-      def echo_on()  with_tty { system "stty echo" }  end
-      def echo_off() with_tty { system "stty -echo" } end
+      # This part gratuitously copied from hub.
+      #   https://github.com/defunkt/hub/blob/master/lib/hub/github_api.rb#L399-L400
+      NULL = defined?(File::NULL) ? File::NULL :
+               File.exist?('/dev/null') ? '/dev/null' : 'NUL'
+
+      def echo_on()  with_tty { system "stty echo 2>#{NULL}"  } end
+      def echo_off() with_tty { system "stty -echo 2>#{NULL}" } end
       def with_tty(&block)
         return unless $stdin.isatty
         yield

data/lib/cloudapp.rb

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

data/man/cloudapp.1

@@ -25,7 +25,7 @@ Upload a file or share a bookmark with CloudApp\. The drop\'s share link will be
 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\.
 .
 .TP
-\fB\-c\fR, \fB\-\-no\-copy\fR
+\fB\-\-no\-copy\fR
 Don\'t copy the new drop\'s link to the system clipboard\.
 .
 .SH "EXAMPLE"
@@ -59,41 +59,42 @@ http://cl\.ly/ghi789
 .IP "" 0
 .
 .P
-Copy the drop\'s share link to the clipboard on OS X:
+Bookmark a URL:
 .
 .IP "" 4
 .
 .nf
 
-$ cloudapp upload screenshot\.png | pbcopy
+$ cloudapp bookmark http://getcloudapp\.com
+http://cl\.ly/abc123
 .
 .fi
 .
 .IP "" 0
 .
 .P
-Bookmark a URL:
+Copy the drop\'s direct link:
 .
 .IP "" 4
 .
 .nf
 
-$ cloudapp bookmark http://getcloudapp\.com
-http://cl\.ly/abc123
+$ cloudapp upload \-\-direct screenshot\.png
+http://cl\.ly/abc123/screenshot\.png
 .
 .fi
 .
 .IP "" 0
 .
 .P
-Print the drop\'s direct link:
+Print but don\'t copy the drop\'s link:
 .
 .IP "" 4
 .
 .nf
 
-$ cloudapp upload \-\-direct screenshot\.png
-http://cl\.ly/abc123/screenshot\.png
+$ cloudapp upload \-\-no\-copy screenshot\.png
+http://cl\.ly/abc123
 .
 .fi
 .

data/man/cloudapp.1.html

@@ -95,7 +95,7 @@ credentials are stored in <code>~/.netrc</code> as defined by <code>ftp</code>(1
 <dl>
 <dt><code>-d</code>, <code>--direct</code></dt><dd><p>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.</p></dd>
-<dt><code>-c</code>, <code>--no-copy</code></dt><dd><p>Don't copy the new drop's link to the system clipboard.</p></dd>
+<dt><code>--no-copy</code></dt><dd><p>Don't copy the new drop's link to the system clipboard.</p></dd>
 </dl>
 
 
@@ -115,23 +115,24 @@ http://cl.ly/def456
 http://cl.ly/ghi789
 </code></pre>
 
-<p>Copy the drop's share link to the clipboard on OS X:</p>
-
-<pre><code>$ cloudapp upload screenshot.png | pbcopy
-</code></pre>
-
 <p>Bookmark a URL:</p>
 
 <pre><code>$ cloudapp bookmark http://getcloudapp.com
 http://cl.ly/abc123
 </code></pre>
 
-<p>Print the drop's direct link:</p>
+<p>Copy the drop's direct link:</p>
 
 <pre><code>$ cloudapp upload --direct screenshot.png
 http://cl.ly/abc123/screenshot.png
 </code></pre>
 
+<p>Print but don't copy the drop's link:</p>
+
+<pre><code>$ cloudapp upload --no-copy screenshot.png
+http://cl.ly/abc123
+</code></pre>
+
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>

data/man/cloudapp.1.ronn

@@ -37,16 +37,17 @@ Upload several files:
     http://cl.ly/def456
     http://cl.ly/ghi789
 
-Copy the drop's share link to the clipboard on OS X:
-
-    $ cloudapp upload screenshot.png | pbcopy
-
 Bookmark a URL:
 
     $ cloudapp bookmark http://getcloudapp.com
     http://cl.ly/abc123
 
-Print the drop's direct link:
+Copy the drop's direct link:
 
     $ cloudapp upload --direct screenshot.png
     http://cl.ly/abc123/screenshot.png
+
+Print but don't copy the drop's link:
+
+    $ cloudapp upload --no-copy screenshot.png
+    http://cl.ly/abc123

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudapp
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.10
+  version: 2.0.0.beta.11
   prerelease: 6
 platform: ruby
 authors:
@@ -187,6 +187,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -179383608361943794
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: