trecs 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb9d709aca3170e4c4e191e84be0f1091f64c915
-  data.tar.gz: 2402dce30087c9d8293ae24bccaf557f366dce0b
+  metadata.gz: a4483b0fafe0266d5424f01b291a8ef6dc044ddd
+  data.tar.gz: 465ed8d44cd35a7a6b46a81be537a381d21715e3
 SHA512:
-  metadata.gz: 2a9e7265de1f024fbd7a640f7af5d44dd600b8b1a9806283ce8f3203cdca3b939b5b3101a2c09562b567af899d01d3d2d9e061ead1d52b274109f0957d329b39
-  data.tar.gz: b2af6007916bc95f1cbd963d3524446ddb67257655b3ce58d92b1f87cbf0dced7780ca94394c6f87c5470dcfd8dcf37259f233e6cfd8e8242e1b1bfe2519a01a
+  metadata.gz: bb3c8768eba4935b9615b43a048c0e8c93cb369c5c4639f204a19b78aa0321a7a2d38494ffceaf7737b1125e4eeb808128a52fc3fd0ad8d17934c9428c1afff7
+  data.tar.gz: 45404627642b17cce299a350c513907dcec4dd81c32054e919d195e9666c46a38da7490bdf6887eb726bca3c57aa2bdf9f8e72a29ddcb29ebda175c9c6f1cb82

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trecs (0.1.13)
+    trecs (0.1.14)
       minitar (~> 0.5.4)
       trollop (~> 2.0)
 

data/bin/trecs

@@ -16,32 +16,60 @@ end
 opts = Trollop::options do
   version TRecs::VERSION
 
-  opt :step,        "Time in ms between frames", short: 's',               default: 100
-  opt :ticker,      "Ticker",                                type: String, default: "clock"
+  opt :step,        "Time in ms between frames", short: 's',                default: 100
+  opt :ticker,      "Ticker",                                 type: String, default: "clock"
 
-  opt :from,        "Play from",                             type: Integer, default: 0
-  opt :to,          "Play to",                               type: Integer, default: 0
-  opt :speed,       "Playing speed",                         type: Float,   default: 1.0
+  opt :from,        "Play from",                              type: Integer, default: 0
+  opt :to,          "Play to",                                type: Integer, default: 0
+  opt :speed,       "Playing speed",                          type: Float,   default: 1.0
 
-  opt :ticker_file, "File to watch",                         type: String, default: "/tmp/ticker"
+  opt :ticker_file, "File to watch",                          type: String, default: "/tmp/ticker"
+
+  opt :audio,       "If there's an audio file, reproduce it",               default: true
+
+  opt :duration,    "Length of the recording",                              default: false
 end
 opts[:trecs_file] = ARGV[0]
 
 trap "SIGINT" do
   finish(opts)
+  if @sox_pid
+    Process.kill("SIGINT", @sox_pid)
+    Process.waitpid(@sox_pid)
+  end
   exit rescue nil
 end
 
+
+########## 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 ########
+
+
+
 source = TRecs::TgzSource.new(trecs_file: opts.fetch(:trecs_file))
-reader = source.reader(opts)
+reader = source.build_reader(opts)
 
 ticker_file = "tickers/#{opts[:ticker]}_ticker"
 require ticker_file
 ticker_class_name = [
-    "TRecs::",
-    opts[:ticker].split(/[-_\s]/).map(&:capitalize),
-    "Ticker"
-  ].join
+  "TRecs::",
+  opts[:ticker].split(/[-_\s]/).map(&:capitalize),
+  "Ticker"
+].join
 ticker_class = ticker_class_name.split("::").reduce(Object) { |a, e| a.const_get e }
 ticker = ticker_class.new(opts)
 
@@ -51,7 +79,23 @@ player_options = {
   step:   opts[:step],
 }
 
+
+
 player = TRecs::Player.new(player_options)
+
+if opts[:duration]
+  last_timestamp = player.timestamps.last
+  hr = last_timestamp / (1000*60*60)
+  last_timestamp = last_timestamp % (1000*60*60)
+  min = last_timestamp / (1000*60)
+  last_timestamp = last_timestamp % (1000*60)
+  seg = last_timestamp / 1000
+  duration = "%d:%02d:%02d" % [hr, min, seg]
+
+  puts duration
+  exit 0
+end
+
 player.play
 
 finish(opts)

data/bin/trecs_record

@@ -21,7 +21,7 @@ opts = Trollop::options do
 
   opt :audio,      "Record audio",                          type: String
 end
-opts[:trecs_file] = ARGV[0]
+opts[:trecs_backend] = ARGV[0]
 
 require "writers/json_writer"
 writer_class = TRecs::JsonWriter
@@ -36,7 +36,7 @@ strategy_class_name = [
 strategy_class = strategy_class_name.split("::").reduce(Object) { |a, e| a.const_get e }
 
 ########## AUDIO ##########
-def start_sound_recording(file_name='sound.ogg')
+def start_sound_recording(file_name='/tmp/sound.ogg')
   puts "Sound file stored in #{file_name}"
   @sox_pid = fork do
     Signal.trap("SIGINT") {

data/lib/trecs/readers/json_reader.rb

@@ -8,7 +8,7 @@ module TRecs
     attr_reader :source
 
     def initialize(options={})
-      trecs_file = options.fetch(:trecs_file)
+      trecs_backend = options.fetch(:trecs_backend)
       @source  = options.fetch(:source)
       @frames = get_frames
       @timestamps = @frames.keys

data/lib/trecs/recording_strategies/config_strategy.rb

@@ -13,12 +13,16 @@ module TRecs
       @strategies = options.fetch(:strategies) { [] }
     end
 
-    def <<(strategies)
-      Array(strategies).each do |strategy|
-        @strategies << strategy
-      end
+    def <<(strategy)
+      @strategies << strategy
     end
 
+    def append(*strategies)
+      strategies.each do |strategy|
+        self << strategy
+      end
+    end
+    
     def perform
       strategies.each do |strategy|
         strategy.recorder = recorder

data/lib/trecs/recording_strategies/hash_strategy.rb

@@ -10,9 +10,11 @@ module TRecs
 
     def perform
       @frames.each do |time, content|
-        current_time(time)
-        current_content(content)
-        save_frame
+        if time.is_a?(Numeric) || /\A\d+\Z/ === time
+          current_time(time.to_i)
+          current_content(content)
+          save_frame
+        end
       end
     end
 

data/lib/trecs/recording_strategies/tmux_session_strategy.rb

@@ -22,7 +22,6 @@ module TRecs
       end
     end
 
-
     def command
       @command ||=
         set_command

data/lib/trecs/sources/in_memory_source.rb

@@ -0,0 +1,80 @@
+require 'json'
+require "yaml"
+require "stringio"
+
+module TRecs
+  class Source
+    attr_reader :manifest
+
+    def initialize(options={})
+      @trecs_backend = options.fetch(:trecs_backend)
+    end
+
+    def []=(key, value)
+      manifest[key] = value
+    end
+
+    def [](key)
+      manifest[key]
+    end
+
+    def manifest
+      @manifest ||= {}
+    end
+
+  end
+
+  class InMemorySource < Source
+    def create_recording
+      clear
+      trecs_backend[:manifest] = manifest
+    end
+
+    def clear
+      @trecs_backend.clear
+    end
+
+    def add_entry(path)
+      io = StringIO.new
+      yield io
+      io.rewind
+      content = io.read.to_s
+
+      path_array = path.split("/") << content
+      result = path_array.reverse.inject do |entry, path|
+        { path => entry }
+      end
+      deep_merge(trecs_backend, result)
+    end
+
+    def read_entry(path)
+      path = path.split("/")
+
+      path.inject(trecs_backend) do |current_tree, current_entry|
+        break nil if current_tree.nil?
+        current_tree[current_entry]
+      end
+    end
+
+    private
+    attr_reader :trecs_backend
+
+    def deep_merge(hash1, hash2, &block)
+      hash2.each_pair do |current_key, other_value|
+        this_value = hash1[current_key]
+
+        hash1[current_key] = if this_value.is_a?(Hash) && other_value.is_a?(Hash)
+                               deep_merge(this_value, other_value, &block)
+                             else
+                               if block_given? && key?(current_key)
+                                 block.call(current_key, this_value, other_value)
+                               else
+                                 other_value
+                               end
+                             end
+      end
+      hash1
+    end
+
+  end
+end

data/lib/trecs/sources/tgz_source.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'json'
 require "fileutils"
 require "zlib"
@@ -6,19 +7,96 @@ require "tmpdir"
 require "pathname"
 require "yaml"
 
+#module TRecs
+#  class TgzSource
+#    include Archive::Tar
+#
+#    def initialize(options={})
+#      @trecs_backend = options.fetch(:trecs_backend)
+#    end
+#
+#    def create_recording
+#      in_tmp_dir do
+#        @tgz = Zlib::GzipWriter.new(trecs_backend)
+#
+#        yield self if block_given?
+#
+#        create_entry('manifest.yaml') do |f|
+#          f.write manifest.to_yaml
+#        end
+#
+#        Minitar.pack(@files_to_add.flatten, @tgz)
+#      end
+#    end
+#
+#    # TODO: Este es el punto de intersección entre read y create_recording
+#    def manifest
+#      @manifest ||= {}
+#    end
+#
+#    def []=(key, value)
+#      manifest[key] = value
+#    end
+#
+#    def [](key)
+#      manifest[key]
+#    end
+#
+#    def read_file(file_name)
+#      File.read(file_name)
+#    end
+#
+#    def create_entry(file_name)
+#      File.open(file_name, File::CREAT|File::TRUNC|File::RDWR, 0644) do |f|
+#        yield f
+#      end
+#      add_file(file_name)
+#    end
+#
+#    def add_file(file_name)
+#      @files_to_add ||= []
+#      @files_to_add << file_name
+#    end
+#
+#    def add_audio_file(file_name)
+#      Dir.mkdir("audio") unless File.exist? "audio"
+#
+#      orig_file = file_name
+#      file_name = "./audio/" + Pathname(file_name).basename.to_s
+#      FileUtils.symlink(orig_file, file_name)
+#      add_file(file_name)
+#    end
+#
+#    private
+#
+#    attr_reader :trecs_backend
+#
+#    #Investigar como hacer para descomprimir en memoria
+#    def in_tmp_dir
+#      Dir.mktmpdir("trecs_record") do |dir|
+#        Dir.chdir(dir) do
+#          yield
+#        end
+#      end
+#    end
+#  end
+#end
+#
+
 module TRecs
   class TgzSource
     include Archive::Tar
 
-    attr_reader :trecs_file
+    attr_reader :trecs_backend
+    attr_reader :audio_files
 
     def initialize(options={})
-      @trecs_file = options.fetch(:trecs_file)
+      @trecs_backend = options.fetch(:trecs_backend)
     end
 
     def create_recording
       in_tmp_dir do
-        @tgz = Zlib::GzipWriter.new(File.open(trecs_file, 'wb'))
+        @tgz = Zlib::GzipWriter.new(File.open(trecs_backend, 'wb'))
 
         yield self
 
@@ -30,7 +108,16 @@ module TRecs
       end
     end
 
-    def reader(options={})
+    def read
+      in_tmp_dir do
+        tgz = Zlib::GzipReader.new(File.open(trecs_backend, 'rb'))
+        Minitar.unpack(tgz, "./")
+
+        yield self
+      end
+    end
+
+    def build_reader(options={})
       reader = nil
       options[:source] = self
       read do |source|
@@ -50,15 +137,7 @@ module TRecs
       reader
     end
 
-    def read
-      in_tmp_dir do
-        tgz = Zlib::GzipReader.new(File.open(trecs_file, 'rb'))
-        Minitar.unpack(tgz, "./")
-
-        yield self
-      end
-    end
-
+    # Investigar como hacer para descomprimir en memoria
     def in_tmp_dir
       Dir.mktmpdir("trecs_record") do |dir|
         Dir.chdir(dir) do
@@ -98,6 +177,7 @@ module TRecs
 
     private
 
+    # TODO: Este es el punto de intersección entre read y create_recording
     def manifest
       @manifest ||= {}
     end

data/lib/trecs/version.rb

@@ -1,3 +1,3 @@
 module TRecs
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 end

data/lib/trecs/writers/json_writer.rb

@@ -9,8 +9,8 @@ module TRecs
     attr_reader :source
 
     def initialize(options={})
-      trecs_file = options.fetch(:trecs_file)
-      @source = TgzSource.new(trecs_file: trecs_file)
+      trecs_backend = options.fetch(:trecs_backend)
+      @source = TgzSource.new(trecs_backend: trecs_backend)
 
       @audio_files = options.fetch(:audio_files) { [] }
       @audio_files = Array(@audio_files)
@@ -40,7 +40,7 @@ module TRecs
           source.add_audio_file(file)
         end
         if audio_files.any?
-          source[:defailt_audio] = audio_files.first
+          source[:default_audio] = audio_files.first
         end
       end
     end

data/spec/trecs/readers/json_reader_spec.rb

@@ -3,6 +3,6 @@ require "readers/json_reader"
 
 module TRecs
   describe JsonReader do
-    skip("Test JsonReader")
+    skip("JsonReader")
   end
 end

data/spec/trecs/recording_strategies/config_strategy_spec.rb

@@ -59,7 +59,7 @@ module TRecs
           end
 
           context "in bulk" do
-            When { strategy << [second_strategy, third_strategy] }
+            When { strategy.append(second_strategy, third_strategy) }
 
             Then { strategy.strategies == [
                 first_strategy,

data/spec/trecs/recording_strategies/hash_strategy_spec.rb

@@ -23,9 +23,11 @@ module TRecs
       Given(:recorder) { Spy.new("recorder") }
       Given(:strategy) { HashStrategy.new(
           {
-            0  => "A",
-            10 => "B",
-            15 => "C",
+            0         => "A",
+            10.0      => "B",
+            "15"      => "C",
+            "1a2b3C4" => "h",
+            20        => "D",
           }
           ) }
 
@@ -35,6 +37,7 @@ module TRecs
       Then { recorder.calls[1]  == [:current_frame, [ {time: 0,  content: "A"} ] ] }
       Then { recorder.calls[2]  == [:current_frame, [ {time: 10, content: "B"} ] ] }
       Then { recorder.calls[3]  == [:current_frame, [ {time: 15, content: "C"} ] ] }
+      Then { recorder.calls[4]  == [:current_frame, [ {time: 20, content: "D"} ] ] }
     end
   end
 end

data/spec/trecs/sources/in_memory_source_spec.rb

@@ -0,0 +1,90 @@
+require "spec_helper"
+require "sources/in_memory_source"
+
+module TRecs
+  describe InMemorySource do
+    Given(:source) { InMemorySource.new(trecs_backend: trecs_backend) }
+    context "creating from scratch" do
+      Given(:trecs_backend) { Hash.new }
+
+      When { source.create_recording }
+
+      context "creation" do
+        Then { trecs_backend.keys.any? }
+      end
+
+      context "creating a manifest" do
+        When { source[:format] = "FORMAT" }
+
+        Then { source[:format] == "FORMAT" }
+        Then { trecs_backend[:manifest][:format] == "FORMAT" }
+      end
+
+      context "adding entries" do
+        context "root level" do
+          When {
+            source.add_entry("an_entry") do |e|
+              e.write "THE CONTENT"
+            end
+          }
+
+          Then { trecs_backend["an_entry"] == "THE CONTENT" }
+        end
+
+        context "one level deep" do
+          When {
+            source.add_entry("a_section/an_entry") do |e|
+              e.write "THE CONTENT"
+            end
+          }
+
+          Then { trecs_backend["a_section"]["an_entry"] == "THE CONTENT" }
+        end
+
+        context "two entries one level deep" do
+          When {
+            source.add_entry("a_section/an_entry") do |e|
+              e.write "THE CONTENT"
+            end
+
+            source.add_entry("a_section/another_entry") do |e|
+              e.write "THE OTHER CONTENT"
+            end
+          }
+
+          Then { trecs_backend["a_section"]["an_entry"]      == "THE CONTENT" }
+          Then { trecs_backend["a_section"]["another_entry"] == "THE OTHER CONTENT" }
+        end
+      end
+
+    end
+
+    context "reading a recording" do
+      Given(:trecs_backend) {
+        { "a" => { "b" => { "c.txt" => "ABC" } } }
+      }
+      Then { source.read_entry("a/b/c.txt")     == "ABC" }
+
+      Then { source.read_entry("a/b/c.t")       == nil   }
+      Then { source.read_entry("a/d/f/g/i.txt") == nil   }
+      
+      Then { source.read_entry("a/d/f/g/i.txt") == nil   }
+    end
+
+    context "handling non-empty recordings" do
+      context "#clear" do
+        Given(:trecs_backend) {
+          { "a" => { "b" => { "c.txt" => "ABC" } } }
+        }
+
+        When {
+          source.create_recording
+          source.clear
+        }
+
+        Then { trecs_backend == {} }
+      end
+
+    end
+  end
+end

data/spec/trecs/sources/tgz_source_spec.rb

@@ -1,8 +1,119 @@
-require "spec_helper"
-require "sources/tgz_source"
-
-module TRecs
-  describe TgzSource do
-    skip("TgzSource")
-  end
-end
+# require "spec_helper"
+# require "sources/tgz_source"
+# require "stringio"
+# require 'archive/tar/minitar'
+# 
+# require "spec_helper"
+# require "sources/in_memory_source"
+# 
+# module TRecs
+#   describe TgzSource do
+#     Given(:source) { TgzSource.new(trecs_backend: trecs_backend) }
+#     context "creating from scratch" do
+#       Given(:trecs_backend) { StringIO.new }
+# 
+#       When { source.create_recording }
+# 
+#       context "creation" do
+#         When { trecs_backend.rewind }
+#         Then { !trecs_backend.string.empty? }
+#       end
+# 
+#       context "creating a manifest" do
+#         When { source[:format] = "FORMAT" }
+# 
+#         Then { source[:format] == "FORMAT" }
+#       end
+# 
+#       context "adding entries" do
+#         context "root level" do
+#           When {
+#             source.add_entry("an_entry") do |e|
+#               e.write "THE CONTENT"
+#             end
+#           }
+# 
+#           Then { trecs_backend["an_entry"] == "THE CONTENT" }
+#         end
+#         #
+#         #        context "one level deep" do
+#         #          When {
+#         #            source.add_entry("a_section/an_entry") do |e|
+#         #              e.write "THE CONTENT"
+#         #            end
+#         #          }
+#         #
+#         #          Then { trecs_backend["a_section"]["an_entry"] == "THE CONTENT" }
+#         #        end
+#         #
+#         #        context "two entries one level deep" do
+#         #          When {
+#         #            source.add_entry("a_section/an_entry") do |e|
+#         #              e.write "THE CONTENT"
+#         #            end
+#         #
+#         #            source.add_entry("a_section/another_entry") do |e|
+#         #              e.write "THE OTHER CONTENT"
+#         #            end
+#         #          }
+#         #
+#         #          Then { trecs_backend["a_section"]["an_entry"]      == "THE CONTENT" }
+#         #          Then { trecs_backend["a_section"]["another_entry"] == "THE OTHER CONTENT" }
+#         #        end
+#       end
+#     end
+#     #
+#     #    context "reading a recording" do
+#     #      Given(:trecs_backend) { StringIO.new }
+#     #
+#     #      When {
+#     #        source.add_entry("a/b/c.txt") do |e|
+#     #          e.write "ABC"
+#     #        end
+#     #      }
+#     #
+#     #      Then { source.read_entry("a/b/c.txt")     == "ABC" }
+#     #
+#     #      Then { source.read_entry("a/b/c.t")       == nil   }
+#     #      Then { source.read_entry("a/d/f/g/i.txt") == nil   }
+#     #    end
+#     #
+#     #    context "handling non-empty recordings" do
+#     #      context "#clear" do
+#     #        Given(:trecs_backend) {
+#     #          { "a" => { "b" => { "c.txt" => "ABC" } } }
+#     #        }
+#     #
+#     #        When {
+#     #          source.create_recording
+#     #          source.clear
+#     #        }
+#     #
+#     #        Then { trecs_backend == {} }
+#     #      end
+#     #
+#     #    end
+#   end
+# end
+# 
+# 
+# # module TRecs
+# #   describe TgzSource do
+# #     Given(:trecs_backend) { StringIO.new }
+# #     Given(:source) { TgzSource.new(trecs_backend: trecs_backend) }
+# 
+# 
+# #     context "creation" do
+# #       When { source.create_recording }
+# #       Then { !trecs_backend.to_s.empty? }
+# #     end
+# 
+# #     context "manifest" do
+# #       When { source.create_recording }
+# #       When { source["format"] = "THE FORMAT" }
+# 
+# #       Then { trecs_backend.read == "" }
+# #       Then { source.manifest == { "format" => "THE FORMAT"} }
+# #     end
+# #   end
+# # end

data/spec/trecs/writers/json_writer_spec.rb

@@ -3,6 +3,6 @@ require "writers/json_writer"
 
 module TRecs
   describe JsonWriter do
-    skip("Test JsonWriter")
+    skip("JsonWriter")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trecs
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Federico Iachetti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -134,6 +134,7 @@ files:
 - lib/trecs/recording_strategies/tmux_session_strategy.rb
 - lib/trecs/recording_strategies/ttyrec_strategy.rb
 - lib/trecs/screens/terminal_screen.rb
+- lib/trecs/sources/in_memory_source.rb
 - lib/trecs/sources/tgz_source.rb
 - lib/trecs/tickers/clock_ticker.rb
 - lib/trecs/tickers/terminal_input_ticker.rb
@@ -162,6 +163,7 @@ files:
 - spec/trecs/recording_strategies/incremental_strategy_spec.rb
 - spec/trecs/recording_strategies/raw_file_strategy_spec.rb
 - spec/trecs/recording_strategies/shell_command_strategy_spec.rb
+- spec/trecs/sources/in_memory_source_spec.rb
 - spec/trecs/sources/tgz_source_spec.rb
 - spec/trecs/tickers/clock_ticker_spec.rb
 - spec/trecs/writers/in_memory_writer_spec.rb
@@ -208,6 +210,7 @@ test_files:
 - spec/trecs/recording_strategies/incremental_strategy_spec.rb
 - spec/trecs/recording_strategies/raw_file_strategy_spec.rb
 - spec/trecs/recording_strategies/shell_command_strategy_spec.rb
+- spec/trecs/sources/in_memory_source_spec.rb
 - spec/trecs/sources/tgz_source_spec.rb
 - spec/trecs/tickers/clock_ticker_spec.rb
 - spec/trecs/writers/in_memory_writer_spec.rb