vedeu 0.4.31 → 0.4.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 540b0cefffc391e166bd83bc2f8dfe07a787ddc4
-  data.tar.gz: 97224b316694a699ad7b4c1d042267ec90e35179
+  metadata.gz: 2db54587f464686863ae7a86653c4e690522f778
+  data.tar.gz: 8d0f17548d624a09022312fd9704632090a73b4a
 SHA512:
-  metadata.gz: 2e7b07247d6957c4e032e9c9a4c9b4b760b5008fe4e2d81c86ec18ed7d7ca435fb0bb167d9d95135789e18c5b721267f84aa617d8f220ea4ffbb2efe9eb2a790
-  data.tar.gz: 46b0f86a2e7d8f2194c102c50ffb83e81d0c0a467476c2b0231461cb1f77c0fb947908566c199687629e0f348b3d7f2636bfdc54720c99e4b98a1ac1faf5d541
+  metadata.gz: 5a817ae692b688d3a6f67b70c3f88a2fc2775c2b754fa227e5e7b0610705c4c52a266a631fe4efc169b9c26867141cbf48a1ca2e73acbe3d1a047b451dfa75f2
+  data.tar.gz: 5a2423e352bc179911a180df68addaf8b194786dff67ebece988897e4756d5386c71fb8dc97281b47c92665058daeee8d5476ee7445a8e59ed28fa5d1108d23f

data/examples/borders_app.rb

@@ -13,7 +13,7 @@ class VedeuBordersApp
   # Be aware that running an application with debugging enabled will affect
   # performance.
   configure do
-    debug!
+    # debug!
     log '/tmp/vedeu_borders_app.log'
   end
 

data/examples/colours_app.rb

@@ -13,7 +13,7 @@ class VedeuColoursApp
   # Be aware that running an application with debugging enabled will affect
   # performance.
   configure do
-    debug!
+    # debug!
     log '/tmp/vedeu_colours_app.log'
   end
 

data/examples/configuration_app.rb

@@ -20,7 +20,7 @@ class VedeuConfigurationApp
   include Vedeu
 
   configure do
-    debug!
+    # debug!
     log '/tmp/vedeu_configuration_app.log'
   end
 

data/examples/drb_app.rb

@@ -12,7 +12,7 @@ class VedeuTestApplication
   # performance.
   Vedeu.configure do
     log         '/tmp/vedeu_test_helper.log'
-    debug!
+    # debug!
     drb!
     drb_host    'localhost'
     drb_port    21_420

data/examples/focus_app.rb

@@ -18,7 +18,7 @@ class VedeuFocusApp
   # Be aware that running an application with debugging enabled will affect
   # performance.
   Vedeu.configure do
-    debug!
+    # debug!
     log '/tmp/vedeu_focus_app.log'
   end
 

data/examples/geometry_app.rb

@@ -13,7 +13,7 @@ class VedeuGeometryApp
   # Be aware that running an application with debugging enabled will affect
   # performance.
   configure do
-    debug!
+    # debug!
     log '/tmp/vedeu_geometry_app.log'
   end
 

data/examples/hello_world.rb

@@ -14,7 +14,7 @@ class HelloWorldApp
   include Vedeu
 
   configure do
-    debug!
+    # debug!
     log '/tmp/vedeu_hello_world.log'
   end
 

data/examples/material_colours_app.rb

@@ -14,7 +14,7 @@ class VedeuMaterialColoursApp
   # Be aware that running an application with debugging enabled will affect
   # performance.
   configure do
-    debug!
+    # debug!
     log '/tmp/vedeu_material_colours_app.log'
     # renderers Vedeu::Renderers::File
   end

data/examples/panel_app.rb

@@ -14,7 +14,7 @@ class VedeuPanelApp
   # Be aware that running an application with debugging enabled will affect
   # performance.
   configure do
-    debug!
+    # debug!
     log '/tmp/vedeu_panel_app.log'
     # renderers Vedeu::Renderers::File
   end

data/lib/vedeu/application.rb

@@ -58,8 +58,6 @@ module Vedeu
         runner { main_sequence }
       end
 
-      Vedeu.trigger(:_drb_stop_)
-
       output
     end
 

data/lib/vedeu/bindings.rb

@@ -74,9 +74,6 @@ module Vedeu
     # events. Please see those events for their behaviour.
     Vedeu.bind(:_resize_, delay: 0.15) { Vedeu.resize }
 
-    Vedeu.bind(:tick) { |t| Vedeu.log(type: :debug, message: "Tick: #{t}") }
-    Vedeu.bind(:tock) { |t| Vedeu.log(type: :debug, message: "Tock: #{t}") }
-
     # Hide the cursor of the named interface or interface currently in focus.
     Vedeu.bind(:_cursor_hide_) do |name|
       Vedeu::Visibility.for_cursor(name).hide

data/lib/vedeu/configuration/configuration.rb

@@ -257,7 +257,7 @@ module Vedeu
         drb_height:    25,
         drb_width:     80,
         interactive:   true,
-        log:           '/tmp/vedeu.log',
+        log:           nil,
         once:          false,
         renderers:     [Vedeu::Renderers::Terminal],
         stdin:         nil,

data/lib/vedeu/dsl/presentation.rb

@@ -72,9 +72,6 @@ module Vedeu
       #
       # @return [Vedeu::Colour]
       def colour(attributes = {})
-        attributes.delete_if do |k, v|
-          [:background, :foreground].include?(k) == false || v.nil? || v.empty?
-        end
         model.colour = Vedeu::Colour.coerce(attributes)
       end
 

data/lib/vedeu/geometry/area.rb

@@ -35,20 +35,16 @@ module Vedeu
     # @return [Vedeu::Area]
     def self.from_attributes(y:, yn:, y_yn:, y_default:,
                              x:, xn:, x_xn:, x_default:, options:)
-      y_yn = Vedeu::Dimension.pair({
-        d:       y,
-        dn:      yn,
-        d_dn:    y_yn,
-        default: y_default,
-        options: options,
-      })
-      x_xn = Vedeu::Dimension.pair({
-        d:       x,
-        dn:      xn,
-        d_dn:    x_xn,
-        default: x_default,
-        options: options,
-      })
+      y_yn = Vedeu::Dimension.pair(d:       y,
+                                   dn:      yn,
+                                   d_dn:    y_yn,
+                                   default: y_default,
+                                   options: options)
+      x_xn = Vedeu::Dimension.pair(d:       x,
+                                   dn:      xn,
+                                   d_dn:    x_xn,
+                                   default: x_default,
+                                   options: options)
 
       from_dimensions(y_yn: y_yn, x_xn: x_xn)
     end

data/lib/vedeu/geometry/coordinate.rb

@@ -81,6 +81,7 @@ module Vedeu
                 y_range[index]
 
               end
+
       validate_y(value)
     end
 
@@ -106,6 +107,7 @@ module Vedeu
                 x_range[index]
 
               end
+
       validate_x(value)
     end
 

data/lib/vedeu/main_loop.rb

@@ -2,53 +2,51 @@ module Vedeu
 
   # Provides the main loop for a Vedeu application.
   #
-  # Each time Vedeu starts one cycle in the application loop, it triggers the
-  # `:tick` event. A completion of that cycle will trigger `:tock`. This can be
-  # used by the client application for timing amongst other things.
   class MainLoop
 
     trap('SIGTERM') { stop! }
     trap('TERM')    { stop! }
     trap('INT')     { stop! }
 
-    # :nocov:
-    # Start the main loop.
-    #
-    # @return [void]
-    # @yieldreturn [void] The client application.
-    def self.start!
-      @started = true
-      @loop    = true
+    class << self
 
-      while @loop
-        yield
+      # :nocov:
+      # Start the main loop.
+      #
+      # @return [void]
+      # @yieldreturn [void] The client application.
+      def start!
+        @started = true
+        @loop    = true
 
-        safe_exit_point!
-      end
-    rescue VedeuInterrupt
-      Vedeu.log(type: :debug, message: 'Vedeu execution interrupted, exiting.')
-    end
-    # :nocov:
+        while @loop
+          yield
 
-    # Signal that we wish to terminate the running application.
-    #
-    # @return [void]
-    def self.stop!
-      @loop = false
-    end
+          safe_exit_point!
+        end
+      rescue VedeuInterrupt
+        Vedeu.log(type:    :debug,
+                  message: 'Vedeu execution interrupted, exiting.')
 
-    # Check the application has started and we wish to continue running.
-    #
-    # @raise [VedeuInterrupt] When we wish to terminate the running application.
-    # @return [void]
-    def self.safe_exit_point!
-      if @started && !@loop
-        fail VedeuInterrupt
+      end
+      # :nocov:
 
-      else
-        Vedeu.trigger(:tock, Time.now.to_f)
+      # Signal that we wish to terminate the running application.
+      #
+      # @return [void]
+      def stop!
+        @loop = false
+      end
 
+      # Check the application has started and we wish to continue running.
+      #
+      # @raise [VedeuInterrupt] When we wish to terminate the running
+      #   application.
+      # @return [void]
+      def safe_exit_point!
+        fail VedeuInterrupt if @started && !@loop
       end
+
     end
 
   end # MainLoop

data/lib/vedeu/support/log.rb

@@ -101,8 +101,8 @@ module Vedeu
       # @return [TrueClass]
       def logger
         MonoLogger.new(log_file).tap do |log|
-          log.formatter = proc do |_, time, _, message|
-            formatted_message(message, time)
+          log.formatter = proc do |_, _, _, message|
+            formatted_message(message)
           end
         end
       end
@@ -110,21 +110,16 @@ module Vedeu
       private
 
       # @param message [String]
-      # @param time [Time]
       # @return [String]
-      def formatted_message(message, time = Time.now)
-        [timestamp(time.utc.iso8601), message, "\n"].join
-      end
-
-      # @return [Boolean]
-      def enabled?
-        Vedeu::Configuration.debug?
+      def formatted_message(message)
+        [timestamp, message, "\n"].join
       end
 
       # @return [String]
       def log_file
         Vedeu::Configuration.log
       end
+      alias_method :enabled?, :log_file
 
       # @param type [Symbol] The type of log message.
       # @param body [String] The log message itself.
@@ -161,17 +156,21 @@ module Vedeu
         }
       end
 
-      # Returns a formatted (red, underlined) UTC timestamp,
-      # eg. 2014-10-24T12:34:56Z
+      # Returns a formatted timestamp.
+      # eg. [137.7824]
       #
-      # @param utc_time [String]
       # @return [String]
-      def timestamp(utc_time)
-        return '' if @last_seen == utc_time
-
-        @last_seen = utc_time
+      def timestamp
+        @now  = Time.now.to_f
+        @time = 0.0  unless @time
+        @last = @now unless @last
+
+        unless @last == @time
+          @time += (@now - @last).round(4)
+          @last = @now
+        end
 
-        "\n\e[4m\e[31m" + utc_time + "\e[39m\e[24m\n"
+        "[#{'%7.4f' % @time.to_s}] ".rjust(7)
       end
 
     end # Log eigenclass

data/lib/vedeu/support/terminal.rb

@@ -18,14 +18,10 @@ module Vedeu
       fail InvalidSyntax, 'block not given' unless block_given?
 
       if raw_mode?
-        Vedeu.log(type: :info, message: "Terminal entering 'raw' mode")
-
-        console.raw    { initialize_screen { yield } }
+        console.raw    { initialize_screen(mode) { yield } }
 
       else
-        Vedeu.log(type: :info, message: "Terminal entering 'cooked' mode")
-
-        console.cooked { initialize_screen { yield } }
+        console.cooked { initialize_screen(mode) { yield } }
 
       end
     ensure
@@ -53,8 +49,6 @@ module Vedeu
 
                     end
 
-      Vedeu.trigger(:tick, Time.now.to_f)
-
       keys_or_cmd
     end
     alias_method :read, :input
@@ -90,8 +84,11 @@ module Vedeu
       true
     end
 
+    # @param mode [Symbol]
     # @return [void]
-    def initialize_screen
+    def initialize_screen(mode)
+      Vedeu.log(type: :info, message: "Terminal entering '#{mode}' mode")
+
       output(Esc.string('screen_init'))
 
       yield if block_given?
@@ -136,8 +133,6 @@ module Vedeu
     #
     # @return [Symbol]
     def cooked_mode!
-      Vedeu.log(type: :info, message: "Terminal switching to 'cooked' mode")
-
       @mode = :cooked
     end
 
@@ -153,8 +148,6 @@ module Vedeu
     #
     # @return [Symbol]
     def raw_mode!
-      Vedeu.log(type: :info, message: "Terminal switching to 'raw' mode")
-
       @mode = :raw
     end
 

data/lib/vedeu/support/timer.rb

@@ -23,10 +23,10 @@ module Vedeu
 
     # @param block [Proc]
     # @return [void]
-    def measure(&block)
+    def measure
       work = yield
 
-      elapsed = ((Time.now.to_f - started) * 1000).to_i
+      elapsed = ((Time.now.to_f - started) * 1000).round(3)
 
       Vedeu.log(type: :timer, message: "#{message} took #{elapsed}ms.")
 

data/lib/vedeu/version.rb

@@ -1,3 +1,5 @@
 module Vedeu
-  VERSION = '0.4.31'
+
+  VERSION = '0.4.32'
+
 end

data/test/lib/vedeu/bindings_test.rb

@@ -20,8 +20,6 @@ module Vedeu
       it { Vedeu.events.registered?(:_refresh_group_).must_equal(true) }
       it { Vedeu.events.registered?(:_resize_).must_equal(true) }
       it { Vedeu.events.registered?(:_show_group_).must_equal(true) }
-      it { Vedeu.events.registered?(:tick).must_equal(true) }
-      it { Vedeu.events.registered?(:tock).must_equal(true) }
     end
 
     context 'the cursor specific events are defined' do

data/test/lib/vedeu/dsl/presentation_test.rb

@@ -50,16 +50,6 @@ module Vedeu
 
         it { subject.must_be_instance_of(Vedeu::Colour) }
 
-        context 'with an invalid attribute' do
-          let(:attributes) { { invalid: background, foreground: foreground } }
-
-          it 'sets only the valid attributes' do
-            subject.attributes.must_equal(
-              background: '', foreground: '#ff00ff'
-            )
-          end
-        end
-
         context 'with an empty value' do
           let(:attributes) { { background: background, foreground: '' } }
 

data/test/lib/vedeu/main_loop_test.rb

@@ -26,10 +26,6 @@ module Vedeu
         context 'when the loop is not running' do
         end
       end
-
-      context 'when the application has not started' do
-        it { Vedeu.expects(:trigger); subject }
-      end
     end
 
   end # MainLoop

data/test/lib/vedeu/support/timer_test.rb

@@ -30,7 +30,7 @@ module Vedeu
 
       it {
         Vedeu.expects(:log).with(type:    :timer,
-                                 message: "Testing took 0ms.")
+                                 message: "Testing took 0.0ms.")
         subject
       }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.4.31
+  version: 0.4.32
 platform: ruby
 authors:
 - Gavin Laking