trecs 0.1.21 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 808c1efc9acc70084baea5d936c95e2a3a078650
-  data.tar.gz: ed3f006bdbfc55253124b44ac1db10b2124ee58e
+  metadata.gz: 9b6cb65a9817834ddc64593c4ba0904acb887f32
+  data.tar.gz: 07272efaeb6bde645cb54150deff7e9fff423143
 SHA512:
-  metadata.gz: ab7a530adc8efb82038297fa43adfd5060c74020f6e2abd1129ca59fbe1482ae7cfef6d39877874d1042f43fb7a8fa6150254175156b92270eba6c769fb08249
-  data.tar.gz: ea03a2b7c38aa1cc271c2348cdb4ca39445c6bfcfdef56615f9de553eb0e4601d7ef82a2eb8e4841db8c94b28e995c0582c92343069d7904cb150f6321dcec47
+  metadata.gz: 149f1455fc76a1db2447414a975093dee98f2bd5849255b5b82530be9b8f50d015d3d47defd3d201b7b7e1d3b68cd5344e6b8bdf37dbac42bd2501085f5c31f8
+  data.tar.gz: 69059d77a1a0f0c1e09e79e6bc98e4458593f00822777ec9cf6f49f06a3510f8b5eafbc1bb650f631e86d54e90570b625f20f5a6fb035d4d8c18451057221983

data/Gemfile.lock

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

data/bin/trecs

@@ -80,7 +80,11 @@ player_options = {
 }
 
 
-
+audio_file = Array(source.audio_files).first
+if audio_file
+  `notify-send #{audio_file}`
+  start_sound_player(audio_file)
+end
 player = TRecs::Player.new(player_options)
 
 if opts[:duration]
@@ -99,3 +103,4 @@ end
 player.play
 
 finish(opts)
+Pathname(source.tmpdir).rmtree

data/bin/trecs_record

@@ -19,7 +19,7 @@ opts = Trollop::options do
   opt :terminal,   "Launch terminal",                                      default: true
   opt :color,      "Record colors",                                        default: true
 
-  opt :audio,      "Record audio",                          type: String
+  opt :audio,      "Record audio"
 end
 opts[:trecs_backend] = ARGV[0]
 
@@ -66,12 +66,12 @@ puts "Recording ..."
 
 if strategy_class.to_s == "TRecs::TtyrecStrategy" || strategy_class.to_s == "TRecs::TmuxSessionStrategy"
   opts[:height], opts[:width] = `stty size`.split(" ").map(&:to_i)
-  opts[:audio] && start_sound_recording(opts[:audio])
+  opts[:audio] && start_sound_recording("/tmp/recording.ogg")
 
   system "ttyrec #{opts[:input_file]}" if opts[:terminal]
 end
 
-opts[:audio_files] = [opts[:audio]] if opts[:audio]
+opts[:audio_files] = ["/tmp/recording.ogg"] if opts[:audio]
 
 recorder_options = {
   writer:   writer_class.new(opts),

data/lib/trecs/readers/json_reader.rb

@@ -19,7 +19,7 @@ module TRecs
     def get_frames
       frames = {}
       source.read do
-        json_string = source.read_file("frames.json")
+        json_string = source.read_entry("frames.json") || "{}"
         parsed_json = JSON.parse(json_string)
         parsed_json.each do |time, content|
           frames[Integer(time)] = content

data/lib/trecs/sources/tgz_source.rb

@@ -7,88 +7,11 @@ 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_backend
-    attr_reader :audio_files
 
     def initialize(options={})
       @trecs_backend = options.fetch(:trecs_backend)
@@ -121,7 +44,7 @@ module TRecs
       reader = nil
       options[:source] = self
       read do |source|
-        @manifest = YAML.load(source.read_file("manifest.yaml"))
+        @manifest = YAML.load(source.read_entry("manifest.yaml"))
 
         format = manifest["format"]
         reader_file = "readers/#{format}_reader"
@@ -139,14 +62,45 @@ module TRecs
 
     # Investigar como hacer para descomprimir en memoria
     def in_tmp_dir
-      Dir.mktmpdir("trecs_record") do |dir|
-        Dir.chdir(dir) do
-          yield
-        end
+      unless tmpdir_exists?
+        p tmpdir
+        Pathname(tmpdir).mkdir
+      end
+      Dir.chdir(tmpdir) do
+        yield
       end
     end
 
-    def read_file(file_name)
+    def tmpdir_exists?
+      tmpdir && Pathname(tmpdir).exist?
+    end
+
+    def finalize
+      Pathname(tmpdir).delete if tmpdir_exists?
+    end
+
+    def tmpdir
+      @tmpdir ||= generate_tmpdir_name
+    end
+
+    def generate_tmpdir_name
+      "#{Dir.tmpdir}/#{timestamp}-#{file_name}"
+    end
+
+    def timestamp
+      Time.now.strftime("%Y%M%d%H%m%s")
+    end
+
+    def file_name
+      filename = Pathname(trecs_backend)
+      filename.basename.to_s.delete(filename.extname)
+      name = filename.basename.to_s
+      ext = filename.extname
+      name[ext] = ""
+      name
+    end
+
+    def read_entry(file_name)
       File.read(file_name)
     end
 
@@ -175,6 +129,16 @@ module TRecs
       manifest[key.to_s] = value
     end
 
+    def audio_files
+      return @audio_files if @audio_files
+
+      in_tmp_dir do
+        (Dir.open(tmpdir + "/audio").entries - %w[. ..]).map { |file|
+          Pathname("./audio/" + file).expand_path
+        }
+
+      end
+    end
     private
 
     # TODO: Este es el punto de intersección entre read y create_recording

data/lib/trecs/version.rb

@@ -1,3 +1,3 @@
 module TRecs
-  VERSION = "0.1.21"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trecs
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.2.0
 platform: ruby
 authors:
 - Federico Iachetti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop