shelr 0.16.0 → 0.16.1

data/lib/shelr/player.rb

@@ -29,8 +29,12 @@ module Shelr
 
     def self.list
       (Dir[File.join(Shelr::DATA_DIR, "**")] - ['.', '..']).sort.each do |dir|
-        metadata = JSON.parse(IO.read(File.join(dir, 'meta')))
-        puts "#{metadata["recorded_at"]} : #{metadata["title"]}"
+        begin
+          metadata = JSON.parse(IO.read(File.join(dir, 'meta')))
+          puts "#{metadata["recorded_at"]} : #{metadata["title"]}"
+        rescue Errno::ENOENT
+          puts "Corrupted shellcast in #{dir}"
+        end
       end
     end
 
@@ -55,7 +59,7 @@ module Shelr
 
     def start_sound_player
       return unless File.exist?(record_file('sound.ogg'))
-      at_exit { system('stty echo') }
+      # at_exit { system('stty echo') }
       STDOUT.puts "=> Starting sound player..."
       @sox_pid = fork do
         `play #{record_file('sound.ogg')} 2>&1`
@@ -65,7 +69,7 @@ module Shelr
     def stop_sound_player
       return unless File.exist?(record_file('sound.ogg'))
       STDOUT.puts "=> Stopping sound player..."
-      Process.kill("HUP", @sox_pid)
+      Process.waitpid(@sox_pid)
     end
 
     def self.scriptreplay(typescript_file, timing_file)

data/lib/shelr/recorder.rb

@@ -112,17 +112,16 @@ module Shelr
     def start_sound_recording
       STDOUT.puts "Sound file stored in #{record_file('sound.ogg')}"
       @sox_pid = fork do
-        Signal.trap("HUP") { puts "Sound recording finished!"; exit }
-        run_sound_recorder
+        Signal.trap("INT") { puts "=> Sound recording finished!"; exit }
+        `rec -C 1 --channels 1 --rate 16k --comment 'Recorded for http://shelr.tv/' #{record_file('sound.ogg')} 2>&1`
       end
     end
 
     def stop_sound_recording
-      Process.kill("HUP", @sox_pid)
-    end
-
-    def run_sound_recorder
-      `rec -C 1 --channels 1 --rate 8k --comment 'Recorded for http://shelr.tv/' #{record_file('sound.ogg')} 2>&1`
+      STDOUT.puts "=> Stopping sound recorder"
+      sleep 2 # otherwise record will be cropped for some reason
+      Process.kill("INT", @sox_pid)
+      Process.waitpid(@sox_pid)
     end
 
     def recorder_cmd

data/lib/shelr/version.rb

@@ -1,3 +1,3 @@
 module Shelr
-  VERSION = '0.16.0'
+  VERSION = '0.16.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelr
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
   prerelease: 
 platform: ruby
 authors:
@@ -88,7 +88,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -611569918164860445
+      hash: 1189951139247372912
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -611569918164860445
+      hash: 1189951139247372912
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21