captured 0.2.7 → 0.2.9

data/LICENSE

@@ -1,20 +1 @@
-Copyright (c) 2009 Christopher Sexton
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+This is software is distributed under the same license as Ruby itself. See http://www.ruby-lang.org/en/LICENSE.txt.

data/README.markdown

@@ -1,17 +1,19 @@
 captured
 ========
 
+<img src="http://github.com/csexton/captured/raw/master/resources/captured.png" align="right" />
+
 Quick screen capture and sharing application for Mac OS X.
 
-By programmers for programmers
-==============================
+Screen Capture Sharing Tool
+===========================
 
-While I would love to tinker with this to make it easy to install (it is really easy to use once it is setup), it proved to be non-trivial.
+I made captured because I wanted to customize and extend screen capture sharing programs, it is really intended for the commandline savvy.
 
 So, I am making some assumptions about the environment that captured runs in. In particular it expects:
 
  * A decent understanding of installing ruby gems
- * That [Growl](http://growl.info/) (and the [growlnotify](http://growl.info/documentation/growlnotify.php) command-line tool) are installed
+ * That [Growl](http://growl.info/) is installed
 
 With that said, once things are installed and configured it really is handy.
 
@@ -30,7 +32,7 @@ Using Captured
 
 The main use is to upload a screen shot taken using OS X's built in screen capture.
 
- 1. Press ⌘⇧4 to capture
+ 1. Press ⌘-⇧-4 to capture
  2. Paste the link
 
 Captured can also be used from the command line to easily share files.
@@ -41,30 +43,31 @@ Captured can also be used from the command line to easily share files.
 Configuration
 =============
 
-By default captured uses Imageshack as the host, but you can configure it to upload and share images by other services.
+By default captured uses Imgur as the default host, but you can configure it to upload and share images by other services.
 
 To edit the configuraiton:
 
     $ open -e ~/.captured.yml
 
-Type: Imageshack
+Type: Imgur
 ----------------
-The easiest way to do this is to use the image shack service. This service is a little slower, but is free and easy.
+The simple image sharer. The default option.
 
 <pre>
-    upload:
-      type: imageshack
+upload:
+  type: imgur
 </pre>
 
-Type: Imgur
+Type: Imageshack
 ----------------
-The simple image sharer
+This service is a little slower, but is free and easy.
 
 <pre>
-    upload:
-      type: imgur
+upload:
+  type: imageshack
 </pre>
 
+
 Type: scp
 ---------
 
@@ -77,13 +80,13 @@ If you have you own web server scp is a very handy way to host your own captures
  * path - the remote path to upload to
 
 <pre>
-	upload:
-	  type: scp
-	  user: user
-	  password: secret
-	  host: example.com
-	  path: path/to/captured/
-	  url: "http://example.com/captured/"
+upload:
+  type: scp
+  user: user
+  password: secret
+  host: example.com
+  path: path/to/captured/
+  url: "http://example.com/captured/"
 </pre>
 
 Icons
@@ -91,7 +94,9 @@ Icons
 
 Icons from the [Crystal Clear](http://www.everaldo.com/crystal/) icon set by [Everaldo Coelho](http://en.wikipedia.org/wiki/Everaldo_Coelho). – The icons are [licensed](http://www.everaldo.com/crystal/?action=license) under the [GNU Lesser General Public License (LGPL)](http://en.wikipedia.org/wiki/GNU_Lesser_General_Public_License).
 
+The Logo was made from the fantastic Vector Wood Signs by [DragonArt](http://dragonartz.wordpress.com) under the [Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States License](http://creativecommons.org/licenses/by-nc-sa/3.0/us/).
+
 Copyright
 =========
 
-Copyright (c) 2009 Christopher Sexton. See LICENSE for details.
+Copyright (c) 2010 Christopher Sexton. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.9

data/bin/captured

@@ -5,8 +5,7 @@ require "#{File.dirname(__FILE__)}/../lib/captured"
 
 options = {:config_file => "#{ENV['HOME']}/.captured.yml",
            :watch_path => "#{ENV['HOME']}/Desktop/",
-           :watch_pattern => Captured.guess_watch_path, 
-           :growl_path => "/usr/local/bin/growlnotify" }
+           :watch_pattern => Captured.guess_watch_path}
 
 OptionParser.new do |opts|
   opts.summary_width = 25

data/etc/captured.yml-example

@@ -1,18 +1,19 @@
 # Example captured configuration file
 #
-#  Upload type: Image Shack
+
+#  Upload type: Imgur
 #  =================================
+#
+#  The simple image sharer
 
 upload:
-  type: imageshack
+  type: imgur
 
-#  Standard upload type: Imgur
+#  Upload type: Image Shack
 #  =================================
-#
-#  The simple image sharer
 
 #upload:
-#  type: imgur
+#  type: imageshack
 
 #
 #  Powerful upload type: scp

data/lib/captured/file_uploader.rb

@@ -8,7 +8,7 @@ class FileUploader
   end
 
   def initialize(options)
-    @growl_path = options[:growl_path] || "/usr/local/bin/growlnotify"
+    @growl_path = options[:growl_path] || "#{File.dirname(File.expand_path(__FILE__))}/../../resources/growlnotify"
     @config = YAML.load_file(options[:config_file])
     case @config['upload']['type']
     when "eval"

data/spec/captured_spec.rb

@@ -11,7 +11,7 @@ describe "File Uploader" do
     @options = {:config_file => File.dirname(__FILE__) + '/fixtures/scp_config.yml',
       :watch_path => File.dirname(__FILE__) + '/../tmp/watch_path',
       :watch_pattern => Captured.guess_watch_path,
-      :growl_path => "/usr/local/bin/growlnotify" }
+      :growl_path => "#{File.dirname(File.expand_path(__FILE__))}/../resources/growlnotify" }
   end
 
   after(:all) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: captured
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
+  version: 0.2.9
 platform: ruby
 authors: 
 - Christopher Sexton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 -05:00
+date: 2009-12-07 00:00:00 -05:00
 default_executable: captured
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,8 +57,11 @@ files:
 - lib/captured/uploaders/scp_uploader.rb
 - resources/2uparrow.png
 - resources/action_run.png
+- resources/captured-box.png
+- resources/captured-empty-box.png
 - resources/captured.png
 - resources/green_check.png
+- resources/growlnotify
 - resources/red_star.png
 - resources/red_x.png
 - resources/ruby.png