trecs 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11db22d959f646d759488d0e21e070a1dd131a86
-  data.tar.gz: 14ea24c099109043abf9ee864350c21406a36d58
+  metadata.gz: e38f1fcbfcf313cbb527ee22c0c61b00b4364bfc
+  data.tar.gz: 081d03b77b6698d931cf1be2b9e2fe7807c935fd
 SHA512:
-  metadata.gz: 5f5c7a11191cb0b495ea2fbb8759cf6f4af6da622d7c397deba90bc2382662ab344b6b5ed8021c6a2ea7c0cb22932fa4f636694a1b216658cc3b563dac3449ec
-  data.tar.gz: b31502af511913ce740f5c8b05593223a5423b071b00344a443e3e0dc6fb34b9e3e61838b00cb6b84af2cf6401724900aff96cbdf01f2702eb5e77b4ec6c9172
+  metadata.gz: 655d12ca6d054f13fd1eebad2595ed3a9dc549166aabb20148a296ba293adcad9324cf19bee48729e48ca9d8c5cb53a865b7414d28471c45beffbb4d1ed6d0a7
+  data.tar.gz: 2685a98427201028eddcb024093aa5bfc7cfb61542297b93e2de770e62fd96cadda0700c39032c8ae182f9fadff5f46b3752b61b25beca61010f2712283371b3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trecs (0.1.7)
+    trecs (0.1.8)
       trollop (~> 2.0)
 
 GEM

data/bin/trecs

@@ -10,10 +10,12 @@ opts = Trollop::options do
   version TRecs::VERSION
 
   opt :step, "Time in ms between frames", short: 's', default: 100
-  opt :format, "File format", type: String, default: "yaml_store"
+  opt :format, "File format", type: String, default: "json"
   opt :ticker, "Ticker", type: String, default: ""
 
   opt :ticker_file, "File to watch", type: String, default: "/tmp/ticker"
+
+  opt :audio, "Play with audio",                         type: String
 end
 opts[:trecs_file] = ARGV[0]
 
@@ -37,6 +39,24 @@ ticker_class = Kernel.const_get([
   ].join
   )
 
+########## AUDIO ##########
+def start_sound_player(file_name='sound.ogg')
+  return unless File.exist?(file_name)
+  # at_exit { system('stty echo') }
+  STDOUT.puts "=> Starting sound player..."
+  @sox_pid = fork do
+    `play #{file_name} 2>&1`
+  end
+end
+
+def stop_sound_player
+  return unless File.exist?(file_name)
+  STDOUT.puts "=> Stopping sound player..."
+  Process.waitpid(@sox_pid)
+end
+######## END AUDIO ########
+
+
 player_options = {
   reader: reader_class.new(opts),
   ticker: ticker_class.new(opts),
@@ -44,8 +64,10 @@ player_options = {
 }
 
 player = TRecs::Player.new(player_options)
+
+opts[:audio] && start_sound_player(opts[:audio])
 player.play
 
 puts "Finished"
 puts "Replay with:"
-puts "  bin/trecs #{opts[:trecs_file]}"
+puts "trecs #{opts[:trecs_file]}"

data/bin/trecs_record

@@ -10,7 +10,7 @@ opts = Trollop::options do
   version TRecs::VERSION
 
   opt :step, "Time in ms between frames", short: 's',                default: 100
-  opt :format, "File format",                         type: String,  default: "yaml_store"
+  opt :format, "File format",                         type: String,  default: "json"
   opt :strategy, "Strategy",                          type: String,  default: "incremental"
 
   opt :message, "Message to record",                  type: String,  default: "TRecs!"
@@ -19,6 +19,8 @@ opts = Trollop::options do
   opt :input_file, "File to record",                  type: String,  default: ""
   opt :terminal, "Launch terminal",                                  default: true
 
+  opt :audio, "Record audio",                         type: String
+
 end
 opts[:trecs_file] = ARGV[0]
 
@@ -41,28 +43,52 @@ strategy_class = Kernel.const_get([
   ].join
   )
 
+########## AUDIO ##########
+def start_sound_recording(file_name='sound.ogg')
+  puts "Sound file stored in #{file_name}"
+  @sox_pid = fork do
+    Signal.trap("SIGINT") {
+      puts "=> Sound recording finished!"
+      exit
+    }
+    sleep 0.5
+    `rec -C 1 --channels 1 --rate 16k --comment 'TRecs' #{file_name} 2>&1`
+  end
+end
+
+def stop_sound_recording
+  puts "=> Stopping sound recorder"
+  sleep 2 # otherwise record will be cropped for some reason
+  Process.kill("SIGINT", @sox_pid)
+  Process.waitpid(@sox_pid)
+end
+
+######## END AUDIO ########
 
 
 puts "Recording ..."
 
+
 if strategy_class.to_s == "TRecs::TtyrecStrategy"
   opts[:height], opts[:width] = `stty size`.split(" ").map(&:to_i)
+  opts[:audio] && start_sound_recording(opts[:audio])
   system "ttyrec #{opts[:input_file]}" if opts[:terminal]
 end
 
 recorder_options = {
-  writer: writer_class.new(opts),
+  writer:   writer_class.new(opts),
   strategy: strategy_class.new(opts),
-  step:   opts[:step],
+  step:     opts[:step],
 }
 
-
+opts[:audio] && stop_sound_recording
 RECORDER = TRecs::Recorder.new(recorder_options)
 
 trap "SIGINT" do
   RECORDER.stop
 end
 
+
 RECORDER.record
 
 puts "Recording finished"

data/lib/trecs/readers/json_reader.rb

@@ -0,0 +1,36 @@
+require 'json'
+require "pathname"
+
+module TRecs
+  class JsonReader
+    attr_accessor :player
+    attr_reader :frames
+    attr_reader :file
+    attr_reader :timestamps
+
+    def initialize(options={})
+      @file = options.fetch(:trecs_file)
+      json_string = File.read(@file)
+      @frames = {}
+      parsed_json = JSON.parse(json_string)
+      parsed_json.each do |time, content|
+        @frames[Integer(time)] = content
+      end
+      
+      @timestamps = @frames.keys
+    end
+
+    def setup
+      true
+    end
+
+    def frame_at(time)
+      @frames[time]
+    end
+
+    def to_s
+      "<#{self.class}>"
+    end
+    alias :inspect :to_s
+  end
+end

data/lib/trecs/recording_strategies/shell_command_strategy.rb

@@ -4,9 +4,6 @@ module TRecs
    
     def current_content(str)
       if self.command
-        #comm_array = command.split(" ")
-        #str = IO.popen([*comm_array, "#{str}"]).read
-
         comm = command.gsub(/<frame>/, "\"#{str}\"")
         str = IO.popen(comm).read
       end

data/lib/trecs/version.rb

@@ -1,3 +1,3 @@
 module TRecs
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/trecs/writers/json_writer.rb

@@ -0,0 +1,33 @@
+require 'json'
+require "fileutils"
+
+module TRecs
+  class JsonWriter
+    attr_accessor :recorder
+    attr_reader :frames
+    attr_reader :file
+
+    def initialize(options={})
+      @file = options.fetch(:trecs_file)
+      FileUtils.rm(@file, force: true)
+    end
+
+    def setup
+      @frames = {}
+    end
+
+    def create_frame(options={})
+      time = options.fetch(:time)
+      content = options.fetch(:content)
+      frames[time] = content
+    end
+
+    def render
+      json_string = frames.to_json
+      
+      File.open(file, File::CREAT|File::TRUNC|File::RDWR, 0644) do |f|
+        f.write(json_string)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trecs
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Federico Iachetti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -85,10 +85,7 @@ email:
 - iachetti.federico@gmail.com
 executables:
 - trecs
-- trecs_message
-- trecs_raw_file
 - trecs_record
-- trecs_terminal
 extensions: []
 extra_rdoc_files: []
 files:
@@ -103,10 +100,7 @@ files:
 - README.org
 - Rakefile
 - bin/trecs
-- bin/trecs_message
-- bin/trecs_raw_file
 - bin/trecs_record
-- bin/trecs_terminal
 - doc/steps.org
 - lib/players/zip_file_player.rb
 - lib/recorders/message_recorder.rb
@@ -116,6 +110,7 @@ files:
 - lib/timestamps.rb
 - lib/trecs.rb
 - lib/trecs/player.rb
+- lib/trecs/readers/json_reader.rb
 - lib/trecs/readers/yaml_store_reader.rb
 - lib/trecs/recorder.rb
 - lib/trecs/recording_strategies/custom_strategy.rb
@@ -132,6 +127,7 @@ files:
 - lib/trecs/tickers/watch_file_ticker.rb
 - lib/trecs/version.rb
 - lib/trecs/writers/in_memory_writer.rb
+- lib/trecs/writers/json_writer.rb
 - lib/trecs/writers/yaml_store_writer.rb
 - lib/trecs/writers/zip_file_writer.rb
 - old_specs/player_spec.rb

data/bin/trecs_message

@@ -1,24 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.expand_path("../../lib", __FILE__))
-
-require "trollop"
-
-require "recorders/message_recorder"
-
-options = Trollop::options do
-  opt :file_name, "File to process",                     short: 'f', type: String
-  opt :message,   "Message to record",                   short: 'm', type: String
-  opt :step,      "Time between frames in milliseconds", short: 's', default: 100
-end
-
-if options[:file_name]
-
-  recorder = Recorder.new(
-    persistence_strategy: ZipFileRecorder.new(file_name: file_name),
-    recording_strategy: IncrementalRecordingStrategy.new(message: message)
-  recorder = TRecs::MessageRecorder.new(options)
-  recorder.record
-else
-  puts "Please give a file name"
-end

data/bin/trecs_raw_file

@@ -1,28 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.expand_path("../../lib", __FILE__))
-
-require "trollop"
-
-require "recorders/raw_file_recorder"
-
-options = Trollop::options do
-  opt :input_file,  "File to process", short: 'i', type: String
-  opt :output_file, "Output file",     short: 'o', type: String,  default: "/tmp/output.txt"
-  opt :step,        "Step",            short: 's', type: Integer, default: 100
-end
-
-unless options[:output_file]
-  puts "Please give an input and an output file file name"
-  exit(1)
-end
-
-RECORDER = TRecs::RawFileRecorder.new(options)
-
-trap "SIGINT" do
-  RECORDER.stop
-end
-
-puts "Recording ..."
-RECORDER.record
-puts "Finish Recording ..."

data/bin/trecs_terminal

@@ -1,25 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.expand_path("../../lib", __FILE__))
-
-require "trollop"
-
-require "recorders/ttyrec_recorder"
-
-options = Trollop::options do
-  # opt :input_file,  "File to process", short: 'i', type: String
-  opt :output_file, "Output file",     short: 'o', type: String
-end
-
-options[:input_file] ||= "/tmp/ttyrecord"
-
-if options[:output_file] # && options[:input_file]
-  puts "Recording ..."
-  options[:height], options[:width] = `stty size`.split(" ").map(&:to_i)
-  system "ttyrec #{options[:input_file]}"
-  recorder = TRecs::TtyrecRecorder.new(options)
-  recorder.record
-  puts "Finish Recording ..."
-else
-  puts "Please give an input and an output file file name"
-end