Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don’t worry, you can still create the pull request.
Commits on Sep 18, 2011
Mauro Botelho Waiting on a process which is already dead is causing No child proces…
…ses (Errno::ECHILD). This fixes the issue.
2f142d0
Commits on Sep 21, 2011
@masatomo masatomo fix a bug which always ruby exits with 0 (success) with Headless gem.…
… It caused "rake" command always exits 0 and CI server misunderstood the result of "rake spec"
90ba063
Commits on Dec 31, 2011
@recursive recursive rspec2 now running properly as lib/headless is being required 745ccba
@recursive recursive fixes failing video recorder spec expecting call to FileUtils.mv and …
…receiving 0 times
7fe8ae3
@recursive recursive removes Process.detach(pid) 0553b81
Commits on Mar 27, 2012
@gshakhn gshakhn Added an option to specify the codec used for video recording. 54afe23
@gshakhn gshakhn Preserve exit status when recording video. Similar to pull request 12. ( caaf578
@gshakhn gshakhn Merge remote-tracking branch 'quantiverge/fix_rspec_not_running' into…
… pick-video-codec
2a55405
@gshakhn gshakhn Merge remote-tracking branch 'quantiverge/fix_failing_video_recorder_…
…spec' into pick-video-codec
6bb871d
Commits on Mar 29, 2012
@leonid-shevtsov leonid-shevtsov Merge pull request #10 from mabotelh/patch-1
Waiting on a process which is already dead is causing No child processes
4066eab
@leonid-shevtsov leonid-shevtsov Merge pull request #12 from masatomo/fix_exit_code
fix a bug which always ruby exits with 0 (success) with Headless gem
a7d5ddf
@leonid-shevtsov leonid-shevtsov Fixing rspec specs to work correctly on Ruby 1.9.3 (referenced in issue 753f59d
@leonid-shevtsov leonid-shevtsov Merge pull request from 'quantiverge:fix_failing_video_recorder_spec'
Conflicts:
	spec/video_recorder_spec.rb
6bdebc2
@leonid-shevtsov leonid-shevtsov Merge pull request #21 from quantiverge/adds_cucumber_wkhtmltopdf_exa…
…mple

adds cucumber with wkhtmltopdf example
e4e1fd2
@leonid-shevtsov leonid-shevtsov display number autopicking, and handling non-accessible Xvfb pidfile,…
… as per #22
10249fe
@leonid-shevtsov leonid-shevtsov Merge branch 'master' of github.com:leonid-shevtsov/headless 2fc0d6e
@leonid-shevtsov leonid-shevtsov Merge pull request #24 from gshakhn/preserve-exit-status-recording
Preserve exit status when recording video.
22784a9
@leonid-shevtsov leonid-shevtsov Merge pull request #25 from gshakhn/pick-video-codec 0f57868
@leonid-shevtsov leonid-shevtsov Merge branch 'master' of github.com:leonid-shevtsov/headless 6531c60
@leonid-shevtsov leonid-shevtsov added rake as a development dependency to fix Travis 482b404
@leonid-shevtsov leonid-shevtsov adding travis.yml 6167537
@leonid-shevtsov leonid-shevtsov release 0.3.1 7cde9f7
Commits on Jun 30, 2012
@leonid-shevtsov leonid-shevtsov added information regarding parallel processes in README 86d4a8c
Commits on Jul 10, 2012
@djanowski djanowski Make sure to always destroy when using the block syntax. b23165a
Commits on Aug 20, 2012
@beezly beezly Add option for frame_rate 6b662e8
@leonid-shevtsov leonid-shevtsov Merge pull request #29 from beezly/master
Frame Rate option in video_recorder
f176796
Commits on Oct 08, 2012
@leonid-shevtsov leonid-shevtsov added OSX notice to README 7a13097
@leonid-shevtsov leonid-shevtsov Merge branch 'master' of github.com:leonid-shevtsov/headless 2e883c1
Commits on Jan 19, 2013
@leonid-shevtsov leonid-shevtsov fix for #33 - make sure Xvfb is running before returning control to t…
…he program
dc536ca
Commits on Jan 28, 2013
@leonid-shevtsov leonid-shevtsov Merge pull request #28 from djanowski/patch-1
Make sure to always destroy when using the block syntax.
737359a
@leonid-shevtsov leonid-shevtsov refactored attach_xvfb method c8e8742
@leonid-shevtsov leonid-shevtsov Merge pull request #20 from quantiverge/fix_errno_echild
removes Process.detach(pid)
aefdb65
@leonid-shevtsov leonid-shevtsov releasing version 1.0.0 243756d
@leonid-shevtsov leonid-shevtsov add rake to dev dependencies 0197a44
Commits on Feb 20, 2013
@leonid-shevtsov leonid-shevtsov Merge branch 'wait-for-xvfb-to-launch'
Conflicts:
	lib/headless.rb
367b3eb
@leonid-shevtsov leonid-shevtsov releasing version 1.0.1 cfbb106
Commits on Aug 02, 2013
@natritmeyer natritmeyer converting code blocks from 4-space-indent style to backtick style to…
… allow for github flavoured markdown
b0295c1
@natritmeyer natritmeyer removing deprecation warnings - converted calls from #stub! to #stub 0babbfc
@natritmeyer natritmeyer fixing broken tests 11c23e4
Commits on Aug 11, 2013
@leonid-shevtsov leonid-shevtsov Merge pull request #36 from natritmeyer/readme_tweaks
Adding syntax highlighting to the code blocks in the README.md file; fixed specs broken due to rspec deprecation
2c3b9cd
Commits on Sep 12, 2013
@leonid-shevtsov leonid-shevtsov Clarified reuse of headless in scripts as per issue #37 985b956
Commits on Jan 13, 2014
@bitdeli-chef bitdeli-chef Add a Bitdeli badge to README 0c50927
@leonid-shevtsov leonid-shevtsov Merge pull request #40 from bitdeli-chef/master
Add a Bitdeli Badge to README
c9c7601
Commits on Feb 24, 2014
@evandrodp evandrodp Update headless.rb 9c1f38a
Commits on Mar 24, 2014
@ShockwaveNN ShockwaveNN Add ability to set custom xvfb_launch_timeout
Usefull if pc have pretty slow performance and need some time to init xvfb correctly
e0d44e7
@ShockwaveNN ShockwaveNN remove typo call 3f5af4a
Commits on May 27, 2014
@abotalov abotalov Pass dimensions correctly to ffmpeg
ffmpeg man tells that they should be passed as "wxh".
Currently they are passed as "wxhxd" which produces a failure in FFmpeg 1.2
e5a05cb
Commits on May 30, 2014
@ynagorny ynagorny Added a video option to specify which provider supplied ffmpeg 6893ab2
@ynagorny ynagorny Added ability to supply extra options to ffmpeg 7a5b483
Commits on Jun 03, 2014
@leonid-shevtsov leonid-shevtsov Merge pull request #44 from abotalov/pass_dimensions_correctly_to_ffmpeg
Pass dimensions correctly to ffmpeg
ae52005
@leonid-shevtsov leonid-shevtsov Merge pull request #41 from evandrodp/patch-1
Update headless.rb
a0ec993
@leonid-shevtsov leonid-shevtsov releasing v1.0.2 2b40a77
Commits on Jun 15, 2014
@ynagorny ynagorny Added ability to select capturing screenshots either by using import …
…or xwd utility
e63e686
Commits on Aug 16, 2014
@leonid-shevtsov leonid-shevtsov no more testing 1.8 and REE, however - let's test Ruby 2 7633361
Commits on Oct 13, 2014
@johnhamelink johnhamelink Remove IDEA project directory from gitignore 5597d7f
@johnhamelink johnhamelink Removed @ynagorny from readme b436d78
@johnhamelink johnhamelink Renamed :import to :imagemagick
- Fixed rspec failure in travis
e7a6a63
Commits on Jan 16, 2015
@gpavlidi gpavlidi Move -g switch after the inputs fc5420a
Commits on Apr 22, 2015
@leonid-shevtsov leonid-shevtsov Merge pull request #53 from gpavlidi/fix-ffmpeg
Move -g switch after the inputs
fc37639
@leonid-shevtsov leonid-shevtsov Merge pull request #42 from ShockwaveNN/patch-2
Add ability to set custom xvfb_launch_timeout
69ee11e
@leonid-shevtsov leonid-shevtsov Rename XVFB_LAUNCH_TIMEOUT to DEFAULT_XVFB_LAUNCH_TIMEOUT for clarity bcd1e61
@leonid-shevtsov leonid-shevtsov documentation updates 6a703f3
@leonid-shevtsov leonid-shevtsov Merge branch 'master' of https://github.com/WeAreFarmGeek/headless in…
…to WeAreFarmGeek-master
f51d395
@leonid-shevtsov leonid-shevtsov some code cleanup in video recorder 2f03c5d
@leonid-shevtsov leonid-shevtsov upgrade test suite to RSpec 3 28d0b73
Commits on Apr 23, 2015
@leonid-shevtsov leonid-shevtsov * integration tests
* More informative error messages
* If video recorder provider is libav, use avconv binary instead of ffmpeg
* Rewritten Xvfb launch using Process.spawn and avoiding a shell
* Do not manually remove X11 lock file when stopping Xvfb; this isn’t conventional. Should eliminate some errors with not being able to find Xvfb
* Detect situation when Xvfb can’t listen to any sockets and raise corresponding error
* Properly working integration tests
2886098
@leonid-shevtsov leonid-shevtsov Updated README, CHANGELOG, bump version da961eb
Commits on Apr 24, 2015
Brian Lauber Path to avconv / ffmpeg can be specified via the :provider_binary key…
…word argument
3ae6b5a
Brian Lauber Added :provider_binary argument to README.md 97042fb
Brian Lauber Added specs for :provider_binary field f1ddb7c
Commits on May 06, 2015
Brian Lauber Renamed 'provider_binary' to 'provider_binary_path' 77b1b78
Commits on May 10, 2015
@leonid-shevtsov leonid-shevtsov Merge pull request #55 from briandamaged/master
Allow provider_binary_path to be specified
b68a984
@leonid-shevtsov leonid-shevtsov updating documentation and version to 2.1.0 f8ed962
Commits on Jun 19, 2015
@leonid-shevtsov leonid-shevtsov added link to the parallel Cucumber test configuration example (fixes #… c9f5077
Commits on Jun 23, 2015
@samnissen samnissen Reverse destroy vs. destroy_sync paradigm to make waiting the default. 570d36d
@samnissen samnissen Document new kill paradigm da7569e
Commits on Jun 27, 2015
@marxarelli marxarelli Allow reuse of displays started by other users
Headless provides more than just the automatic launching of an Xvfb
process, it also provides useful screenshot and vidcap features. It
would be nice to be able to use these features even when reusing an Xvfb
display that's managed by another user.

With this change, reuse of another user's display will be allowed if a
display was explicitly given and reuse is explicitly allowed.

fixes #48
7f4b921
Commits on Jul 14, 2015
@leonid-shevtsov leonid-shevtsov Merge pull request #59 from samnissen/destroy-more-sensibly-scn-june-…
…2015

Change default behavior of destroy to wait for Xvfb to finish
377ab60
Commits on Jul 15, 2015
@BlakeMesdag BlakeMesdag Add support for graphicsmagick f3a1642
Commits on Jul 17, 2015
@leonid-shevtsov leonid-shevtsov Merge pull request #62 from BlakeMesdag/add-graphicsmagick-screenshots
Add support for graphicsmagick
fe38f00
Commits on Aug 05, 2015
@leonid-shevtsov leonid-shevtsov Merge pull request #60 from marxarelli/feature/reuse-explicit-display
Allow reuse of displays started by other users
8251a73
@leonid-shevtsov leonid-shevtsov updating version and CHANGELOG for v2.2.0 0b8c257
Commits on Sep 21, 2015
@reiz reiz Add license info to the gemspec. db6018e
@leonid-shevtsov leonid-shevtsov Merge pull request #70 from reiz/patch-1
Add license info to the gemspec.
4534933
Commits on Feb 08, 2016
@leonid-shevtsov leonid-shevtsov bumping version to fix file permissions 3845b9b
@leonid-shevtsov leonid-shevtsov yet another version bump to fix file permissions c06b9c0
Something went wrong with that request. Please try again.