shelr 0.15.2 → 0.16.0

data/bin/shelr

@@ -15,6 +15,7 @@ HELP     = <<-HELP
     Recording:
 
       record              - record new shellcast
+      record --sound      - record new shellcast with sound
 
     Publishing:
 
@@ -48,7 +49,7 @@ case ARGV[0]
 when '-h', '--help'
   puts HELP
 when 'record'
-  Shelr::Recorder.record!
+  Shelr::Recorder.record!(sound: ARGV[1] == '--sound')
 when 'list'
   Shelr::Player.list
 when 'play'
@@ -58,7 +59,7 @@ when 'play'
     elsif ARGV[1] =~ /.*\.json$/ # local file
       Shelr::Player.play_dump(ARGV[1])
     else
-      Shelr::Player.play(ARGV[1])
+      Shelr::Player.play(:record_id => ARGV[1])
     end
   else
     puts "Missing id for shellcast"

data/lib/shelr/player.rb

@@ -8,8 +8,8 @@ require 'pathname'
 module Shelr
   class Player
 
-    def self.play(id)
-      new(id).play
+    def self.play(options)
+      new.play(options)
     end
 
     def self.play_remote(url)
@@ -28,9 +28,9 @@ module Shelr
     end
 
     def self.list
-      Dir[File.join(Shelr::DATA_DIR, "**", 'meta')].each do |path|
-        metadata = JSON.parse(IO.read(path))
-        puts "#{metadata["recorded_at"]}: #{metadata["title"]}"
+      (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"]}"
       end
     end
 
@@ -40,26 +40,32 @@ module Shelr
         %w(typescript timing).each do |type|
           File.open(File.join(dir, type), 'w') { |f| f.puts(parts[type]) }
         end
-        Shelr.terminal.puts_line
-        puts "=> Title: #{parts['title']}"
-        puts "=> Description: #{parts['description']}t"
-        Shelr.terminal.puts_line
-        scriptreplay File.join(dir, 'typescript'), File.join(dir, 'timing')
-        Shelr.terminal.puts_line
-        puts "=> Title: #{parts['title']}"
-        puts "=> Description: #{parts['description']}t"
-        Shelr.terminal.puts_line
+        play(:record_dir => dir)
       end
     end
 
-    def initialize(id)
-      @record_id = id
-    end
-
-    def play
+    def play(options = {})
+      @options = options
+      start_sound_player
       Shelr.terminal.puts_line
       self.class.scriptreplay record_file('typescript'), record_file('timing')
       Shelr.terminal.puts_line
+      stop_sound_player
+    end
+
+    def start_sound_player
+      return unless File.exist?(record_file('sound.ogg'))
+      at_exit { system('stty echo') }
+      STDOUT.puts "=> Starting sound player..."
+      @sox_pid = fork do
+        `play #{record_file('sound.ogg')} 2>&1`
+      end
+    end
+
+    def stop_sound_player
+      return unless File.exist?(record_file('sound.ogg'))
+      STDOUT.puts "=> Stopping sound player..."
+      Process.kill("HUP", @sox_pid)
     end
 
     def self.scriptreplay(typescript_file, timing_file)
@@ -78,7 +84,11 @@ module Shelr
     private
 
     def record_file(name)
-      File.join(Shelr.data_dir(@record_id), name)
+      File.join(record_dir, name)
+    end
+
+    def record_dir
+      @options[:record_id] ? Shelr.data_dir(@options[:record_id]) : @options[:record_dir]
     end
   end
 end

data/lib/shelr/recorder.rb

@@ -4,15 +4,15 @@ module Shelr
 
     attr_accessor :meta, :user_rows, :user_columns
 
-    def self.record!
-      new.record!
+    def self.record!(options = {})
+      new.record!(options)
     end
 
     def initialize
       @meta = {}
     end
 
-    def record!
+    def record!(options = {})
       ensure_terminal_has_good_size
       check_record_dir
       with_lock_file do
@@ -23,7 +23,9 @@ module Shelr
         STDOUT.puts "=> Please, do not resize your terminal while recording"
         STDOUT.puts "=> Press Ctrl+D or 'exit' to finish recording"
         Shelr.terminal.puts_line
+        start_sound_recording if options[:sound]
         system(recorder_cmd)
+        stop_sound_recording if options[:sound]
         save_as_typescript if Shelr.backend == 'ttyrec'
         Shelr.terminal.puts_line
         STDOUT.puts "=> Session finished"
@@ -107,6 +109,22 @@ module Shelr
       File.join(Shelr.data_dir(record_id), name)
     end
 
+    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
+      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`
+    end
+
     def recorder_cmd
       case Shelr.backend
       when 'script'

data/lib/shelr/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelr
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.16.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000 Z
+date: 2012-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -88,7 +88,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1693508584259767020
+      hash: -611569918164860445
 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: -1693508584259767020
+      hash: -611569918164860445
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21