headless 0.2.1 → 0.2.2

data/CHANGELOG

@@ -1,8 +1,14 @@
+## 0.2.2 (2011-09-01)
+
+* improve detection of ffmpeg process (from https://github.com/alanshields/headless)
+
 ## 0.2.1 (2011-08-26)
+
 * added ability to capture screenshots (from https://github.com/iafonov/headless)
 * added ability to capture video (from https://github.com/iafonov/headless)
 * fixed issue with stray pidfile
 
 ## 0.1.0 (2010-08-15)
+
 * introduced options
 * make it possible to change virtual screen dimensions and pixel depth

data/headless.gemspec

@@ -3,7 +3,7 @@ spec = Gem::Specification.new do |s|
   s.email = 'leonid@shevtsov.me'
 
   s.name = 'headless'
-  s.version = '0.2.1'
+  s.version = '0.2.2'
   s.summary = 'Ruby headless display interface'
 
   s.description = <<-EOF

data/lib/headless/cli_util.rb

@@ -16,7 +16,18 @@ class Headless
 
     def self.read_pid(pid_filename)
       pid = (File.read(pid_filename) rescue "").strip.to_i
-      pid == 0 ? nil : pid
+      pid = nil if pid.zero?
+
+      if pid
+        begin
+          Process.kill(0, pid)
+          pid
+        rescue Errno::ESRCH
+          nil
+        end
+      else
+        nil
+      end
     end
 
     def self.fork_process(command, pid_filename, log_filename='/dev/null')

data/lib/headless/video/video_recorder.rb

@@ -16,25 +16,28 @@ class Headless
     end
 
     def capture_running?
-      !!@capture_running
+      CliUtil.read_pid @pid_file_path
     end
 
     def start_capture
       CliUtil.fork_process("#{CliUtil.path_to('ffmpeg')} -y -r 30 -g 600 -s #{@dimensions} -f x11grab -i :#{@display} -vcodec qtrle #{@tmp_file_path}", @pid_file_path, @log_file_path)
-      @capture_running = true
       at_exit do
-        stop_and_discard if capture_running?
+        stop_and_discard
       end
     end
 
     def stop_and_save(path)
-      @capture_running = false
       CliUtil.kill_process(@pid_file_path, :wait => true)
-      FileUtils.mv(@tmp_file_path, path)
+      if File.exists? @tmp_file_path
+        begin
+          FileUtils.mv(@tmp_file_path, path)
+        rescue Errno::EINVAL
+          nil
+        end
+      end
     end
 
     def stop_and_discard
-      @capture_running = false
       CliUtil.kill_process(@pid_file_path, :wait => true)
       begin
         FileUtils.rm(@tmp_file_path)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: headless
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Leonid Shevtsov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-26 00:00:00 +03:00
+date: 2011-09-01 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency