capit 0.2.3 → 0.3.0

data/.rbenv-version

@@ -0,0 +1 @@
+1.9.3-p0

data/.rvmrc

@@ -1 +1 @@
-rvm ruby-1.9.2
+rvm use --create 1.9.2@capit

data/Gemfile

@@ -3,14 +3,14 @@
 source "http://rubygems.org"
 
 group :test do
-  gem 'rspec', '~> 2.5.0'
-  gem 'yard', '~> 0.6.5'
-  
-  gem 'simplecov', '~> 0.4.0', :require => false
-  gem 'guard', '~> 0.3.0'
-  gem 'growl', '~> 1.0.3'
-  gem 'guard-bundler', '~> 0.1.2'
-  gem 'guard-rspec', '~> 0.2.0'
+  gem 'rspec'
+  gem 'yard'
+  gem 'simplecov', :require => false
+  gem 'guard'
+  gem 'rb-fsevent', :require => false if RUBY_PLATFORM =~ /darwin/i
+  gem 'growl'
+  gem 'guard-bundler'
+  gem 'guard-rspec'
 end
 
 gemspec

data/Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec', :version => 2, :cli => '-c' do
+guard 'rspec', :version => 2, :cli => '--color --format nested' do
   watch(%r{^spec/.+_spec\.rb})
   watch(%r{^lib/(.+)\.rb})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb') { "spec" }

data/README.md

@@ -6,7 +6,17 @@ CapIt provides a simple Ruby interface to Björn Höhrmann's
 Install CutyCapt
 ----------------
 
-### Ubuntu/Debian
+### OSX (via Homebrew)
+
+    brew install cuty_capt
+
+
+### Ubuntu >= 11.04 & Debian >= 6.0
+
+    sudo apt-get install xvfb
+    sudo apt-get install cutycapt
+
+### Other Ubuntu/Debian
 (from [Setting up Headless XServer and CutyCapt on Ubuntu][2])
 
     sudo apt-get install xvfb
@@ -20,10 +30,6 @@ Install CutyCapt
 
 You'll also need to make sure the `CutyCapt` executable is in your PATH.
 
-### OSX (via Homebrew)
-
-    brew install cuty_capt
-
 Install CapIt
 -------------
     gem install capit

data/capit.gemspec

@@ -23,10 +23,6 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- spec/*`.split("\n")
   
   s.require_paths = ["lib"]
-  s.add_development_dependency('rspec', '~> 2.5.0')
-  s.add_development_dependency('simplecov', '~> 0.4.0')
-  s.add_development_dependency('guard', '~> 0.3.0')
-  s.add_development_dependency('growl', '~> 1.0.3')
-  s.add_development_dependency('guard-bundler', '~> 0.1.2')
-  s.add_development_dependency('guard-rspec', '~> 0.2.0')
+  s.add_dependency("hike")
+  s.add_development_dependency('rspec')
 end

data/lib/capit/capture.rb

@@ -25,12 +25,12 @@ module CapIt
   class Capture
     
     # All extensions CutyCapt can use to infer format of output
-    EXTENSIONS = /\A[\w\-]+\.(svg|ps|pdf|itext|html|rtree|png|jpeg|jpg|mng|tiff|gif|bmp|ppm|xvm|xpm)\z/i
+    EXTENSIONS = /\A[\w\-\.]+\.(svg|ps|pdf|itext|html|rtree|png|jpeg|jpg|mng|tiff|gif|bmp|ppm|xvm|xpm)\z/i
     
     # The URL of the page to be captured
     attr_reader   :url
     
-    attr_accessor :folder, :filename, :user_agent, :max_wait, :delay, :output
+    attr_accessor :folder, :filename, :user_agent, :max_wait, :delay, :output, :cutycapt_path
     
     # Initialize a new Capture
     # @param [String] url The URL we want to capture.
@@ -45,14 +45,14 @@ module CapIt
     # @raise InvalidExtensionError
     #
     def initialize url, options = {}
-      cutycapt_installed?
-      @url        = url              
-      @folder     = options[:folder] || Dir.pwd
-      @filename   = options[:filename] || "capit.jpeg"
-      @user_agent = options[:user_agent] || "CapIt! [http://github.com/meadvillerb/capit]"
-      @max_wait   = options[:max_wait] || 15000
-      @delay      = options[:delay]
-      
+      @url            = url              
+      @folder         = options[:folder] || Dir.pwd
+      @filename       = options[:filename] || "capit.jpeg"
+      @user_agent     = options[:user_agent] || "CapIt! [http://github.com/meadvillerb/capit]"
+      @max_wait       = options[:max_wait] || 15000
+      @delay          = options[:delay]
+      @cutycapt_path  = options[:cutycapt_path] || determine_cutycapt_path
+            
       valid_extension?(@filename)
     end
     
@@ -106,7 +106,7 @@ module CapIt
     # @return [String]
     #
     def capture_command        
-      cmd = "CutyCapt --url='#{@url}'"
+      cmd = "#{@cutycapt_path} --url='#{@url}'"
       cmd += " --out='#{@folder}/#{@filename}'"
       cmd += " --max-wait=#{@max_wait}"
       cmd += " --delay=#{@delay}" if @delay
@@ -120,6 +120,10 @@ module CapIt
       end        
     end
     
+    def determine_cutycapt_path
+      `which CutyCapt`.strip or `which cutycapt`.strip
+    end
+    
     # Uses RUBY_PLATFORM to determine the operating system.
     # Not foolproof, but good enough for the time being.
     # 
@@ -133,14 +137,5 @@ module CapIt
         else raise InvalidOSError, "CapIt currently only works on the Mac and Linux platforms"
       end
     end
-    
-    # Checks to see if CutyCapt is available in PATH.
-    # Raises CutyCaptError if not.
-    # 
-    # @return
-    # 
-    def cutycapt_installed?
-      raise CutyCaptError, "CutyCapt must be installed and available on PATH" if `which CutyCapt`.empty?
-    end
   end
-end
+end

data/lib/capit/version.rb

@@ -5,5 +5,5 @@ module CapIt
   # 
   # The version number
   # 
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/spec/capit/capture_spec.rb

@@ -4,7 +4,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe CapIt do  
   it "should have a Convenience Method" do
     @folder = setup_temporary_folder
-    @capit = CapIt::Capture("http://mdvlrb.com/", :filename => 'test-mdvlrb.png', :folder => @folder).should == @folder + "/test-mdvlrb.png"
+    @capit = CapIt::Capture("http://mdvlrb.com/", :filename => 'one.test-mdvlrb.png', :folder => @folder).should == @folder + "/one.test-mdvlrb.png"
     destroy_temporary_folder(@folder)
   end
     
@@ -13,7 +13,7 @@ describe CapIt do
     subject { @capit }
     
     describe "#initialize" do
-      it { should respond_to :url, :folder, :filename, :user_agent, :max_wait, :delay }
+      it { should respond_to :url, :folder, :filename, :user_agent, :max_wait, :delay, :cutycapt_path }
       
       context "defaults" do
         specify { @capit.folder.should == Dir.pwd }
@@ -53,6 +53,20 @@ describe CapIt do
       end
     end
     
+    describe "#cutycapt_path=" do
+      it "should allow the user to set CutyCapt's path" do
+        capit = CapIt::Capture.new("http://mdvlrb.com/")
+        capit.cutycapt_path = "/usr/local/sbin/CutyCapt"
+        capit.cutycapt_path.should == "/usr/local/sbin/CutyCapt"
+      end
+    end
+    
+    describe "#determine_cutycapt_path" do
+      it "should determine the appropriate path for the executable if possible" do
+        @capit.determine_cutycapt_path.should == "/usr/local/bin/CutyCapt"
+      end
+    end
+    
     describe "#capture_command" do
       before { @capit = CapIt::Capture.new("http://mdvlrb.com/") }
       subject { @capit }
@@ -68,7 +82,7 @@ describe CapIt do
       context "when platform is Mac" do
         it "should not add the xvfb prefix" do
           with_constants :RUBY_PLATFORM => "darwin" do 
-            @capit.capture_command.should match /^CutyCapt/
+            @capit.capture_command.should match /CutyCapt/
           end
         end
       end  
@@ -82,14 +96,6 @@ describe CapIt do
           end
         end
       end
-
-      context "when CutyCapt executable is unavailable" do
-        it "should raise an error" do
-          with_environment_variable 'PATH' => "" do
-            expect { CapIt::Capture.new("http://mdvlrb.com/") }.to raise_error(/CutyCapt/)
-          end
-        end
-      end
     end    
   end
 end

data/spec/spec_helper.rb

@@ -1,14 +1,9 @@
 # encoding: UTF-8
 require 'simplecov'
-
 SimpleCov.start do
   coverage_dir 'coverage'
   add_filter 'spec/'
 end
 
-require 'rspec'
-require 'support/with_constants'
-require 'support/deferred_garbage_collection' # http://makandra.com/notes/950-speed-up-rspec-by-deferring-garbage-collection
-require 'support/temporary_folder_helper'
-
+Dir[File.expand_path('support', File.dirname(__FILE__)) + "/**/*.rb"].each { |f| require f }
 require 'capit'

metadata

@@ -1,96 +1,50 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: capit
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  version: 0.2.3
 platform: ruby
-authors: 
+authors:
 - Ezekiel Templin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.5.0
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: simplecov
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+date: 2011-04-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: hike
+  requirement: &2152919040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.4.0
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: guard
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.3.0
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: growl
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.3
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: guard-bundler
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2152919040
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2152918600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.1.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: guard-rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.2.0
-  type: :development
-  version_requirements: *id006
-description: "CapIt provides a simple Ruby interface to Bj\xC3\xB6rn H\xC3\xB6hrmann's CutyCapt."
-email: 
+  version_requirements: *2152918600
+description: CapIt provides a simple Ruby interface to Björn Höhrmann's CutyCapt.
+email:
 - ezkl@me.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE
-files: 
+files:
 - .gemtest
 - .gitignore
+- .rbenv-version
 - .rvmrc
 - .yardopts
 - Gemfile
@@ -110,32 +64,29 @@ files:
 - spec/support/with_constants.rb
 homepage: http://github.com/meadvillerb/capit
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Easy screen captures with the help of CutyCapt
-test_files: 
+test_files:
 - spec/capit/capture_spec.rb
 - spec/capit_spec.rb
 - spec/spec_helper.rb