trecs 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5978e79a6f87a6ce821d9eec6b9d57c499a1fa30
-  data.tar.gz: 6c62a5294342f194d6e9dfc9e638a896b01952ef
+  metadata.gz: e99047b216ec42e9c6b739b7b1563954a71d0a25
+  data.tar.gz: 21164adc5f38c05126e72f7296f27ed98fd48a83
 SHA512:
-  metadata.gz: d5b0cc0b8ba641d853e0db21f6397de0ee2b8d2e61aa3a68cdf806fd82a42e01486d66026797699a97dbd6b36b84721562d6277f55e6317834a6c7f787ef1976
-  data.tar.gz: 3a2e735c65145832aae7601ddcd9e3ca3a66ebb643811851a7ed47506629edc589649c9c3d1d316766d0f2c149e35fbdaba6ac1a98a4afba6c089d80f57a8071
+  metadata.gz: 3de81b0147f53c3d85092c99e709f52e5d1be3f3b69fcb8892456714ed6b9cce1e606252d60a27219a5ae9a57ebdb94cb9a7ead785e82ebf09031d14723d6530
+  data.tar.gz: 384093b957ef8bb64469f2e90768d1101bc0d37d9ab0c3d656a912f970f0b1f6acbac25f120e682e3b8e1613817d33d256dcd7c11c8623aa04d3e77d5bf7ae07

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trecs (0.0.8)
+    trecs (0.0.9)
       rubyzip (~> 1.1.4)
       trollop (~> 2.0)
 
@@ -30,14 +30,13 @@ GEM
     rspec-given (3.5.4)
       given_core (= 3.5.4)
       rspec (>= 2.12)
-    rspec-mocks (2.99.0)
+    rspec-mocks (2.99.1)
     rubyzip (1.1.4)
     slop (3.5.0)
     sorcerer (1.0.2)
     trollop (2.0)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES

data/bin/trecs

@@ -1,33 +1,47 @@
 #!/usr/bin/env ruby
 
 $:.unshift(File.expand_path("../../lib", __FILE__))
-
+require "trecs"
+require "player"
 require "trollop"
 
-require "timestamps"
-require "players/zip_file_player"
-
-options = Trollop::options do
-  opt :file_name,    "File to process",                   short: 'f', type: String
-  opt :time,         "Frame at time",                     short: 't', type: String
-  opt :current_time, "Returns the current playback time", short: 'c'
-  opt :step,         "Time im ms between frames",         short: 's', default: 100
 
-  opt :timestamps,   "Returns the list of existing frame timestamps"
+opts = Trollop::options do
+  opt :step, "Time in ms between frames", short: 's', default: 100
+  opt :format, "File format", type: String, default: "yaml_store"
+  opt :ticker, "Ticker", type: String, default: ""
 
-  opt :testing,      "Ticks without waiting. Use this option only for testing purpuses"
+  opt :ticker_file, "File to watch", type: String, default: "/tmp/ticker"
 end
+opts[:trecs_file] = ARGV[0]
 
-file_name = options[:file_name]
-if file_name
-  if File.exist?(file_name)
-    player = TRecs::ZipFilePlayer.new(options)
-    if options[:timestamps]
-      p player.timestamps
-    else
-      player.play
-    end
-  else
-    puts "File #{file_name} does not exist."
-  end
-end
+reader_file = "readers/#{opts[:format]}_reader"
+require reader_file
+reader_class = Kernel.const_get([
+    "TRecs::",
+    opts[:format].split(/[-_\s]/).map(&:capitalize),
+    "Reader"
+  ].join
+  )
+
+
+ticker_separator = '_' unless opts[:ticker] == ''
+ticker_file = "tickers/#{opts[:ticker]}#{ticker_separator}ticker"
+require ticker_file
+ticker_class = Kernel.const_get([
+    "TRecs::",
+    opts[:ticker].split(/[-_\s]/).map(&:capitalize),
+    "Ticker"
+  ].join
+  )
+
+player_options = {
+  reader: reader_class.new(opts),
+  ticker: ticker_class.new(opts),
+  step:   opts[:step],
+}
+
+#p opts
+#p player_options
+player = TRecs::Player.new(player_options)
+player.play

data/lib/trecs/player.rb

@@ -30,12 +30,13 @@ module TRecs
     end
 
     def tick(time=current_time)
-      content = reader.frame_at(time)
+      content = reader.frame_at(time_to_play(time))
       if content != prev_content
         screen.clear
         screen.puts(content)
         self.prev_content = content
       end
+      content
     end
 
     def timestamps
@@ -44,12 +45,7 @@ module TRecs
 
     def time_to_play(time)
       time = time.to_i
-      return time if timestamps.include? time
-      result = timestamps.each_cons(2).select do |min, max|
-        time > min && time < max
-      end
-      result = result.first
-      result ? result.first : timestamps.last
+      timestamps.reverse.detect { |t| t <= time  }
     end
 
     private

data/lib/trecs/readers/yaml_store_reader.rb

@@ -8,7 +8,8 @@ module TRecs
     attr_reader :timestamps
 
     def initialize(options={})
-      @file = options.fetch(:file)
+      # trecs_file -> output file by convention
+      @file = options.fetch(:trecs_file)
       File.open(@file)
 
       store = YAML::Store.new "/tmp/hola.trecs"

data/lib/trecs/recording_strategies/incremental_strategy.rb

@@ -9,6 +9,7 @@ module TRecs
     end
 
     def perform
+      recorder.current_frame(time: 0, content: "")
       message.each_char.each_with_object("") do |current_char, current_msg|
         current_msg << current_char
 
@@ -20,7 +21,7 @@ module TRecs
     private
 
     def timestamp_for(message)
-      (message.size - 1) * recorder.step
+      message.size * recorder.step
     end
   end
 end

data/lib/trecs/tickers/terminal_input_ticker.rb

@@ -1,12 +1,18 @@
 module TRecs
   class TerminalInputTicker
     attr_accessor :player
-
+    def initialize(*)
+    end
+    
     def start
       while (input = gets) =~ /\A[0-9]+\Z/
         time = input.to_i
         player.tick(time)
       end
     end
+    def to_s
+      "<#{self.class}>"
+    end
+    alias :inspect :to_s
   end
 end

data/lib/trecs/tickers/ticker.rb

@@ -1,6 +1,8 @@
 module TRecs
   class Ticker
     attr_accessor :player
+    def initialize(*)
+    end
 
     def start
       prev_time = 0
@@ -11,5 +13,9 @@ module TRecs
       end
       true
     end
+    def to_s
+      "<#{self.class}>"
+    end
+    alias :inspect :to_s
   end
 end

data/lib/trecs/tickers/watch_file_ticker.rb

@@ -0,0 +1,30 @@
+require "fileutils"
+module TRecs
+  class WatchFileTicker
+    attr_accessor :player
+    def initialize(opts={})
+      @watch_file = opts.fetch(:ticker_file)
+      FileUtils.touch(@watch_file)
+      File.open(@watch_file, "w") do |f|
+        f.write("0")
+      end
+      @step = opts.fetch(:step)
+    end
+
+    def start
+      while input =~ /\A[0-9]+\Z/
+        time = input.to_i
+        player.tick(time)
+        sleep(@step/1000.0)
+      end
+    end
+    def to_s
+      "<#{self.class}>"
+    end
+    alias :inspect :to_s
+    private
+    def input
+      File.read(@watch_file).chomp
+    end
+  end
+end

data/lib/trecs/version.rb

@@ -1,3 +1,3 @@
 module TRecs
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/trecs/writers/yaml_store_writer.rb

@@ -8,7 +8,7 @@ module TRecs
 
 
     def initialize(options={})
-      @file = options.fetch(:file)
+      @file = options.fetch(:trecs_file)
       FileUtils.rm(@file, force: true)
     end
 

data/lib/trecs.rb

@@ -1,3 +1 @@
 $:.unshift(File.expand_path("../trecs/", __FILE__))
-
-require "pry"

data/spec/trecs/player_spec.rb

@@ -74,7 +74,7 @@ module TRecs
     end
 
     context "content at time" do
-      Given(:screen) { OpenStruct.new }
+      Given(:screen) { double.as_null_object }
       Given(:ticker) { OpenStruct.new }
       Given(:reader) { CustomReader.new(0 => "a", 100 => "b", 200 => "c") }
 
@@ -82,16 +82,29 @@ module TRecs
         Player.new(reader: reader, ticker: ticker, screen: screen)
       }
 
-      #When { player.play }
-
       Then { player.timestamps == [0, 100, 200] }
-      Then { player.time_to_play(nil)   == 0 }
-      Then { player.time_to_play(0)   == 0 }
-      Then { player.time_to_play(100) == 100 }
-      Then { player.time_to_play(50)  == 0 }
-      Then { player.time_to_play(101) == 100 }
-      Then { player.time_to_play(199) == 100 }
+
+      Then { player.time_to_play(nil)  == 0 }
+      Then { player.tick(nil)          == "a" }
+
+      Then { player.time_to_play(0)    == 0 }
+      Then { player.tick(0)            == "a" }
+
+      Then { player.time_to_play(100)  == 100 }
+      Then { player.tick(100)          == "b" }
+
+      Then { player.time_to_play(50)   == 0 }
+      Then { player.tick(50)           == "a" }
+
+      Then { player.time_to_play(101)  == 100 }
+      Then { player.tick(101)          == "b" }
+
+      Then { player.time_to_play(199)  == 100 }
+      Then { player.tick(199)          == "b" }
+
       Then { player.time_to_play(1000) == 200 }
+      Then { player.tick(1000)         == "c" }
+
     end
   end
 end

data/spec/trecs/recording_strategies/incremental_strategy_spec.rb

@@ -27,17 +27,18 @@ module TRecs
       When { strategy.recorder = recorder }
       When { strategy.perform }
 
-      Then { recorder.calls[1]  == [:current_frame, [ {time: 0,    content: "H"}           ] ] }
-      Then { recorder.calls[2]  == [:current_frame, [ {time: 100,  content: "He"}          ] ] }
-      Then { recorder.calls[3]  == [:current_frame, [ {time: 200,  content: "Hel"}         ] ] }
-      Then { recorder.calls[4]  == [:current_frame, [ {time: 300,  content: "Hell"}        ] ] }
-      Then { recorder.calls[5]  == [:current_frame, [ {time: 400,  content: "Hello"}       ] ] }
-      Then { recorder.calls[6]  == [:current_frame, [ {time: 500,  content: "Hello "}      ] ] }
-      Then { recorder.calls[7]  == [:current_frame, [ {time: 600,  content: "Hello W"}     ] ] }
-      Then { recorder.calls[8]  == [:current_frame, [ {time: 700,  content: "Hello Wo"}    ] ] }
-      Then { recorder.calls[9]  == [:current_frame, [ {time: 800,  content: "Hello Wor"}   ] ] }
-      Then { recorder.calls[10] == [:current_frame, [ {time: 900,  content: "Hello Worl"}  ] ] }
-      Then { recorder.calls[11] == [:current_frame, [ {time: 1000, content: "Hello World"} ] ] }
+      Then { recorder.calls[1]  == [:current_frame, [ {time: 0,    content: ""}           ] ] }
+      Then { recorder.calls[2]  == [:current_frame, [ {time: 100,  content: "H"}           ] ] }
+      Then { recorder.calls[3]  == [:current_frame, [ {time: 200,  content: "He"}          ] ] }
+      Then { recorder.calls[4]  == [:current_frame, [ {time: 300,  content: "Hel"}         ] ] }
+      Then { recorder.calls[5]  == [:current_frame, [ {time: 400,  content: "Hell"}        ] ] }
+      Then { recorder.calls[6]  == [:current_frame, [ {time: 500,  content: "Hello"}       ] ] }
+      Then { recorder.calls[7]  == [:current_frame, [ {time: 600,  content: "Hello "}      ] ] }
+      Then { recorder.calls[8]  == [:current_frame, [ {time: 700,  content: "Hello W"}     ] ] }
+      Then { recorder.calls[9]  == [:current_frame, [ {time: 800,  content: "Hello Wo"}    ] ] }
+      Then { recorder.calls[10] == [:current_frame, [ {time: 900,  content: "Hello Wor"}   ] ] }
+      Then { recorder.calls[11] == [:current_frame, [ {time: 1000, content: "Hello Worl"}  ] ] }
+      Then { recorder.calls[12] == [:current_frame, [ {time: 1100, content: "Hello World"} ] ] }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trecs
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Federico Iachetti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -166,6 +166,7 @@ files:
 - lib/trecs/screens/terminal_screen.rb
 - lib/trecs/tickers/terminal_input_ticker.rb
 - lib/trecs/tickers/ticker.rb
+- lib/trecs/tickers/watch_file_ticker.rb
 - lib/trecs/version.rb
 - lib/trecs/writers/in_memory_writer.rb
 - lib/trecs/writers/yaml_store_writer.rb
@@ -184,6 +185,7 @@ files:
 - pkg/trecs-0.0.5.gem
 - pkg/trecs-0.0.6.gem
 - pkg/trecs-0.0.7.gem
+- pkg/trecs-0.0.8.gem
 - sandbox/create_recording.rb
 - sandbox/lipsum_end
 - sandbox/lipsum_start