capit 0.3.1 → 0.3.2

data/.rvmrc

@@ -1 +1,48 @@
-rvm use --create 1.9.2@capit
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
+# Only full ruby name is supported here, for short names use:
+#     echo "rvm use 1.9.3" > .rvmrc
+environment_id="ruby-1.9.3-p125@capit"
+
+# Uncomment the following lines if you want to verify rvm version per project
+# rvmrc_rvm_version="1.10.3" # 1.10.1 seams as a safe start
+# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
+#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
+#   return 1
+# }
+
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
+    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  rvm --create  "$environment_id" || {
+    echo "Failed to create RVM environment '${environment_id}'."
+    return 1
+  }
+fi
+
+# If you use bundler, this might be useful to you:
+if [[ -s Gemfile ]] && {
+  ! builtin command -v bundle >/dev/null ||
+  builtin command -v bundle | grep $rvm_path/bin/bundle >/dev/null
+}
+then
+  printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
+  gem install bundler
+fi
+if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
+then
+  bundle install | grep -vE '^Using|Your bundle is complete'
+fi

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+before_install:
+ - sudo apt-get install cutycapt
+before_script:
+ - "export DISPLAY=:99.0"
+ - "sh -e /etc/init.d/xvfb start"
+notifications:
+ irc:
+   - "irc.freenode.org#mdvlrb"

data/Gemfile

@@ -2,15 +2,15 @@
 
 source "http://rubygems.org"
 
-group :test do
-  gem 'rspec'
-  gem 'yard'
+gemspec
+
+group :development do
   gem 'simplecov', :require => false
+  gem 'yard', :require => false
   gem 'guard'
-  gem 'rb-fsevent', :require => false if RUBY_PLATFORM =~ /darwin/i
-  gem 'growl'
-  gem 'guard-bundler'
+  gem 'growl', :require => false
   gem 'guard-rspec'
+  gem 'rake', :require => false
 end
 
-gemspec
+

data/capit.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |s|
   s.version     = CapIt::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ezekiel Templin"]
-  s.email       = ["ezkl@me.com"]
+  s.email       = ["zeke@templ.in"]
   s.date        = %q{2012-01-13}
-  s.homepage    = "http://github.com/meadvillerb/capit"
+  s.homepage    = "http://github.com/ezkl/capit"
   s.summary     = %q{Easy screen captures with the help of CutyCapt}
   s.description = %q{CapIt provides a simple Ruby interface to Björn Höhrmann's CutyCapt.}
   
@@ -23,5 +23,5 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- spec/*`.split("\n")
   
   s.require_paths = ["lib"]
-  s.add_development_dependency('rspec')
+  s.add_development_dependency('rspec', "~> 2.9.0")
 end

data/lib/capit/capture.rb

@@ -30,7 +30,7 @@ module CapIt
     # The URL of the page to be captured
     attr_reader   :url
     
-    attr_accessor :folder, :filename, :user_agent, :max_wait, :delay, :output, :cutycapt_path
+    attr_accessor :folder, :filename, :user_agent, :max_wait, :delay, :output, :cutycapt_path, :min_width, :min_height
     
     # Initialize a new Capture
     # @param [String] url The URL we want to capture.
@@ -52,6 +52,8 @@ module CapIt
       @max_wait       = options[:max_wait] || 15000
       @delay          = options[:delay]
       @cutycapt_path  = options[:cutycapt_path] || determine_cutycapt_path
+      @min_width      = options[:min_width] || 1024
+      @min_height     = options[:min_height] || 768
             
       valid_extension?(@filename)
     end
@@ -111,15 +113,22 @@ module CapIt
       cmd += " --max-wait=#{@max_wait}"
       cmd += " --delay=#{@delay}" if @delay
       cmd += " --user-agent='#{@user_agent}'"
+      cmd += " --min-width='#{@min_width}'"
+      cmd += " --min-height='#{@min_height}'"
+
       
-      if determine_os == :linux
-        xvfb = 'xvfb-run --server-args="-screen 0, 1024x768x24" '
+      if determine_os == :linux and check_xvfb
+        xvfb = 'xvfb-run --server-args="-screen 99, 1024x768x24" '
         xvfb.concat(cmd)
       else
         cmd
       end        
     end
     
+    def check_xvfb
+      !(`which xvfb-run`.empty?)
+    end
+    
     def determine_cutycapt_path
       `which CutyCapt`.strip or `which cutycapt`.strip
     end

data/lib/capit/version.rb

@@ -5,5 +5,5 @@ module CapIt
   # 
   # The version number
   # 
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/capit/capture_spec.rb

@@ -20,6 +20,8 @@ describe CapIt do
         specify { @capit.filename.should == "capit.jpeg" }
         specify { @capit.user_agent.should == "CapIt! [http://github.com/meadvillerb/capit]" }
         specify { @capit.max_wait.should == 15000 }
+        specify { @capit.min_width.should == 1024 }
+        specify { @capit.min_height.should == 768 }
       end
     end
     
@@ -72,11 +74,19 @@ describe CapIt do
       subject { @capit }
     
       context "when platform is Linux" do
-        it "should add the xvfb prefix" do
+        it "should add the xvfb prefix if xvfb-run available" do
+          @capit.stub(:check_xvfb).and_return(:true)
           with_constants :RUBY_PLATFORM => "linux" do
             @capit.capture_command.should match /^xvfb/
           end
         end
+        
+        it 'should not add the xvfb prefix if xvfb-run not available' do
+          CapIt::Capture.stub(:check_xvfb).and_return(:false)
+          with_constants :RUBY_PLATFORM => "linux" do
+            @capit.capture_command.should_not match /^xvfb/
+          end
+        end
       end
     
       context "when platform is Mac" do

data/spec/spec_helper.rb

@@ -1,9 +1,3 @@
 # encoding: UTF-8
-require 'simplecov'
-SimpleCov.start do
-  coverage_dir 'coverage'
-  add_filter 'spec/'
-end
-
 Dir[File.expand_path('support', File.dirname(__FILE__)) + "/**/*.rb"].each { |f| require f }
 require 'capit'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capit
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,18 +13,23 @@ date: 2012-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157649580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *2157649580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.9.0
 description: CapIt provides a simple Ruby interface to Björn Höhrmann's CutyCapt.
 email:
-- ezkl@me.com
+- zeke@templ.in
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -35,6 +40,7 @@ files:
 - .gitignore
 - .rbenv-version
 - .rvmrc
+- .travis.yml
 - .yardopts
 - Gemfile
 - Guardfile
@@ -51,7 +57,7 @@ files:
 - spec/support/deferred_garbage_collection.rb
 - spec/support/temporary_folder_helper.rb
 - spec/support/with_constants.rb
-homepage: http://github.com/meadvillerb/capit
+homepage: http://github.com/ezkl/capit
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -63,15 +69,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1815721631992732020
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1815721631992732020
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Easy screen captures with the help of CutyCapt