text-to-noise 0.2.0 → 0.2.1

data/bin/text_to_noise

@@ -23,6 +23,9 @@ arg_parser = OptionParser.new do |opts|
     "Read input to sound mapping configuration from MAPPING_CONFIG" ) { |c| options[:config] = c }
   opts.on( "-m", "--mute",
     "Don't play any sounds, just print what matched" ) { options[:mute] = true }
+  opts.on( "-t", "--throttle DELAY",
+    "Wait DELAY milliseconds before reading the next line of input." ) { |ms| options[:throttle] = ms.to_i }
+  opts.on( "--debug", "Turn on debug logging" ) { options[:debug] = true }
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     exit

data/lib/text_to_noise.rb

@@ -10,20 +10,34 @@ Dir["#{LIB_DIR}/text_to_noise/*.rb"].each { |lib|
 }
 
 module TextToNoise
-  def self.player
+  include Logging
+  
+  def player
     @player ||= Player.new
   end
 
-  def self.player=( player )
+  def player=( player )
     @player = player
   end
 
-  def self.logger
+  def logger
     @logger ||= Logger.new( STDOUT ).tap { |l| l.level = Logger::INFO }
   end
 
-  def self.logger=( logger )
+  def logger=( logger )
     @logger = logger
     @logger
   end
+
+  def throttle_delay=( ms_delay )
+    @delay = ms_delay
+  end
+
+  def throttle!
+    return unless @delay
+    debug "waiting #{@delay}ms (#{@delay / 1_000.0}s)"
+    sleep @delay / 1_000.0
+  end
+
+  extend self
 end

data/lib/text_to_noise/command_line.rb

@@ -4,6 +4,8 @@ module TextToNoise
   class CommandLine
     include Logging
     attr_reader :options, :mapping
+
+    DEFAULT_FILE_DELAY = 100
     
     def initialize( options={} )
       @options = {
@@ -14,6 +16,9 @@ module TextToNoise
       
       @mapping = Mapper.parse File.read( @options[:config] )
       TextToNoise.player = self.player
+      TextToNoise.throttle_delay = @options[:throttle] if @options[:throttle]
+      TextToNoise.throttle_delay = @options[:throttle] || DEFAULT_FILE_DELAY if @options[:input] != $stdin
+      TextToNoise.logger.level = Logger::DEBUG if @options[:debug]
     rescue Errno::ENOENT => e
       raise ArgumentError, "Could not locate configuration file: '#{@options[:config]}'"
     end

data/lib/text_to_noise/log_reader.rb

@@ -8,7 +8,7 @@ module TextToNoise
     def call()
       while line = io.gets
         @mapper.dispatch line
-        sleep 0.200 # FIXME: Think of a better way to throttle playback.
+        TextToNoise.throttle!
       end
     end
   end

data/lib/text_to_noise/version.rb

@@ -1,3 +1,3 @@
 module TextToNoise
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/text_to_noise/command_line_spec.rb

@@ -44,6 +44,20 @@ module TextToNoise
           CommandLine.new :mute => true, :config => "sound_map.rb"
         end
       end
+
+      context "when given the 'throttle' option" do
+        it "sets the throttle_delay attribute on TextToNoise" do
+          TextToNoise.should_receive( :throttle_delay= ).with 100
+          CommandLine.new :config => "sound_map.rb", :throttle => 100
+        end
+      end
+
+      context "when given a 'file' option" do
+        it "sets a default throttle_delay" do
+          TextToNoise.should_receive( :throttle_delay= ).with 100
+          CommandLine.new :config => "sound_map.rb", :input => "sample.log"
+        end
+      end
     end
 
     describe "#run" do

data/spec/text_to_noise/log_reader_spec.rb

@@ -4,7 +4,7 @@ require 'stringio'
 module TextToNoise
   describe LogReader do
     let( :io ) { StringIO.new "phantasm" }
-    let( :mapper ) { double( "LineToSoundMapper" ) }
+    let( :mapper ) { double( "LineToSoundMapper", :dispatch => nil ) }
 
     subject { LogReader.new io, mapper }
     
@@ -18,6 +18,11 @@ module TextToNoise
         mapper.should_receive( :dispatch ).with "phantasm"
         subject.call
       end
+
+      it "calls TextToNoise.throttle! after each line is processed" do
+        TextToNoise.should_receive( :throttle! )
+        subject.call
+      end
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: text-to-noise
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Toby Tripp