vedeu 0.0.39 → 0.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f1858b317f4c614c4171d5d1032e7f512f093a6
-  data.tar.gz: b33301029f63c79baeef259eac052cd109634415
+  metadata.gz: 5d50ccc8e12767562af12af4793529e7349194a4
+  data.tar.gz: 3f0eede2555296556c6be6f229f8393d9597a2f4
 SHA512:
-  metadata.gz: cd006607dbf4753ca9a488298d6054e68db1425a4807ad058cbbc4c3d779b45ae030f9e4ca7d4b1db611c12ac70abfb44cc6b81d2f523ba09a916649a64181e5
-  data.tar.gz: be1a3ab07377b3385f7d0b2611989edc59c6cb84b6ecfeecf40e2b843c2dd4a344a67e3ab153bfc9b6e9dd2a3de75dae407ecdd3b11cf52dde47240660f82e59
+  metadata.gz: db682960148fc784f0b8dd745a1afd820e1698b0d0ab71d6f29c30a77ad42f159300ebaec49c235228354a1788ab30929c981eaa4d5c6aee843d7467c20c64ff
+  data.tar.gz: c75a838470727f59dba50085130228ff295a7a1fa8f2af34caad8d0f25bfdcfc5dfd5c7939b41e3a0fa37726c4a1440c4f0bd410334d7d4e698b798aeaae49d8

data/README.md

@@ -31,12 +31,6 @@ Expect proper documentation soon!
         ...
       end
 
-      command 'thing' do
-        entity   SomeClass
-        keypress 't'
-        keyword  'thing'
-      end
-
       event :some_event do
         # ...
       end
@@ -76,7 +70,6 @@ To understand how Vedeu works, you need to familiarise yourself with some terms.
     interface 'main' do
       y      1
       x      1
-      z      1
       width  10 # see notes below
       height 10
       colour foreground: '#ffffff', background: '#000000'
@@ -87,8 +80,6 @@ Referring to the above example, interfaces have a name, and various default attr
 
 `y`          sets the starting row point. (See Geometry)
 `x`          sets the starting column point.
-`z`          an integer specifying the z-index of the interface.
-              (See Layers)
 
 `width`      sets character width of the interface
 `height`     sets character height of the interface
@@ -100,18 +91,6 @@ Referring to the above example, interfaces have a name, and various default attr
 `cursor`     a boolean specifying whether the cursor should show.
 
 
-### On Defining Commands
-
-    command 'do_something' do
-      entity    SomeClass
-      keypress  's'
-      keyword   'start'
-      arguments [:some, { :values => :here }, "etc"]
-    end
-
-As above, commands have a name, a class which performs the action
-(you define this), and they can be invoked with a keypress or a keyword. At this time, Vedeu will call the `.dispatch` method on your class, passing any arguments you originally defined in the command. In the future, both the method called and the arguments could be dynamic.
-
 ### On Defining Events
 
     event :event_name do |arg1, arg2|
@@ -149,15 +128,6 @@ Vedeu has a range of symbol styles which are compatible with most terminals whic
 Like colours, they can be defined in either interfaces, for specific lines or within streams. Styles are applied as encountered.
 
 
-### Layers
-
-Vedeu allows the overlaying of interfaces. To render these correctly,
-Vedeu uses two rules.
-
-  1) The :z value. 1 would be default, or bottom. 2 would be placed on top of 1. 3 on top of 2, and so on.
-  2) If two interfaces occupy the same 'space', the interface which was defined last, wins.
-
-
 ## Contributing
 
 1. Fork it ( http://github.com/gavinlaking/vedeu/fork )

data/Rakefile

@@ -1,11 +1,10 @@
-require 'bundler/gem_tasks'
-require 'rake/testtask'
+require "bundler/gem_tasks"
+require "rake/testtask"
 
-Rake::TestTask.new(:minitest) do |t|
-  t.libs << 'lib/vedeu'
-  t.test_files = FileList['test/lib/vedeu/*_test.rb',
-                          'test/lib/vedeu/**/*_test.rb']
-  # t.options = '-v' # verbose mode
-end
+task :default => :test
 
-task default: :minitest
+Rake::TestTask.new do |t|
+  t.libs.push "lib"
+  t.libs.push "test"
+  t.pattern = "test/**/*_test.rb"
+end

data/bin/log

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
+
+-> { its -> { a } }
+trap('INT') { exit! }
+
+require 'vedeu'
+
+loop do
+  Vedeu.log('-B<-------------------------------------------------------------------')
+
+  sleep 10
+end

data/deps.md

@@ -4,11 +4,13 @@ By class
 
 Application
   Input
-  Output
   Process
   Terminal
 
 Builder
+  Geometry
+  Interface
+  Persistence
 
 ClearInterface
 
@@ -17,16 +19,6 @@ Collection
 Colour
   Esc
 
-Command
-
-CommandBuilder
-  Builder
-  CommandRepository
-
-CommandRepository
-  Command
-  Repository
-
 Composition
   InterfaceCollection
 
@@ -44,8 +36,6 @@ Esc
 
 Events
 
-Exit
-
 HashParser
   TextAdaptor
 
@@ -63,17 +53,8 @@ Interface
   Style
   Terminal
 
-InterfaceBuilder
-  Builder
-  Geometry
-  InterfaceRepository
-
 InterfaceCollection
-  InterfaceRepository
-
-InterfaceRepository
-  Interface
-  Repository
+  Persistence
 
 JSONParser
 
@@ -92,20 +73,18 @@ LineCollection
 
 Menu
 
-Output
-  InterfaceRepository
-  Terminal
-
 Parser
   Compositor
   HashParser
   JSONParser
 
+Persistence
+  Interface
+
 Presentation
   Colour
 
 Process
-  CommandRepository
   Parser
   Queue
 
@@ -114,11 +93,6 @@ Queue
 RenderInterface
   ClearInterface
 
-Repository
-  Storage
-
-Storage
-
 Stream
   Presentation
   Style
@@ -150,19 +124,15 @@ Orphans
 Template - orphaned
 Wordwrap - orphaned
 Menu     - orphaned
-Exit     - orphaned
 
 ----------------------------------------------------------------------
 Grouped
 ----------------------------------------------------------------------
 
-CommandBuilder
-  Builder
-
-InterfaceBuilder
-  Builder
+Builder
+  Interface
   Geometry
-  InterfaceRepository
+  Persistence
 
 Launcher
   Application
@@ -171,64 +141,12 @@ Launcher
       Terminal
         Esc
           Translator
-    Output
-      InterfaceRepository
-        Interface
-          ClearInterface
-          Geometry
-            Esc
-              Translator
-            Terminal
-              Esc
-                Translator
-          LineCollection
-            Collection
-            Line
-              Presentation
-                Colour
-                  Esc
-                    Translator
-              StreamCollection
-                Collection
-                Stream
-                  Presentation
-                    Colour
-                      Esc
-                        Translator
-                  Style
-                    Esc
-                      Translator
-              Style
-                Esc
-                  Translator
-          Presentation
-            Colour
-              Esc
-                Translator
-          Queue
-          RenderInterface
-            ClearInterface
-          Style
-            Esc
-              Translator
-          Terminal
-            Esc
-              Translator
-        Repository
-          Storage
-      Terminal
-        Esc
-          Translator
     Process
-      CommandRepository
-        Command
-        Repository
-          Storage
       Parser
         Compositor
           Composition
             InterfaceCollection
-              InterfaceRepository
+              Persistence
                 Interface
                   ClearInterface
                   Geometry
@@ -270,8 +188,6 @@ Launcher
                   Terminal
                     Esc
                       Translator
-                Repository
-                  Storage
         HashParser
           TextAdaptor
         JSONParser

data/lib/vedeu.rb

@@ -1,23 +1,17 @@
-require 'date'
-require 'logger'
-
-require_relative 'vedeu/models/builders/command_builder'
-require_relative 'vedeu/models/builders/interface_builder'
-require_relative 'vedeu/support/events'
-require_relative 'vedeu/support/geometry'
-require_relative 'vedeu/support/menu'
-require_relative 'vedeu/support/exit'
-require_relative 'vedeu/launcher'
+require 'vedeu/instrumentation'
+require 'vedeu/support/builder'
+require 'vedeu/support/events'
+require 'vedeu/support/geometry'
+require 'vedeu/support/menu'
+require 'vedeu/launcher'
 
 module Vedeu
+  # Vedeu::Instrumentation::Trace.call
+
   # :nocov:
   module ClassMethods
-    def command(name, &block)
-      CommandBuilder.build(name, &block)
-    end
-
     def interface(name, &block)
-      InterfaceBuilder.build(name, &block)
+      Builder.build(name, &block)
     end
 
     def event(name, &block)
@@ -34,49 +28,23 @@ module Vedeu
   def self.events
     @events ||= Events.new do
       on(:_exit_)        { fail StopIteration }
-      on(:_log_)         { |message| Vedeu.logger.debug(message) }
+      on(:_log_)         { |message| Vedeu.log(message) }
       on(:_mode_switch_) { fail ModeSwitch    }
 
       on(:_keypress_) do |key|
         trigger(:key, key)
-        trigger(:_log_, "key: #{key}")
+        trigger(:_log_, (' ' * 42) + "key: #{key}")
         trigger(:_mode_switch_) if key == :escape
       end
     end
   end
 
-  def self.logger
-    @logger ||= Logger.new(root_path + '/logs/vedeu.log').tap do |log|
-      log.formatter = proc do |_, time, _, msg|
-        "\n#{time.iso8601}: #{msg}\n"
-      end
-    end
-  end
-
-  def self.error(exception)
-    logger.debug "\e[38;5;196mError:\e[38;2;39m\e[48;2;49m " +
-                 "#{exception.message}\n\n" +
-                 exception.backtrace.join("\n")
-  end
-
-  def self.debug(filename = 'profile.html', &block)
-    require 'ruby-prof'
-
-    RubyProf.start
-
-    yield
-
-    result = RubyProf.stop
-    result.eliminate_methods!([/^Array/, /^Hash/])
-
-    File.open(Vedeu.root_path + '/tmp/' + filename, 'w') do |file|
-      RubyProf::CallStackPrinter.new(result).print(file)
-      # RubyProf::GraphPrinter.new(result).print(file)
-    end
+  def self.log(message)
+    Vedeu::Instrumentation::Log.logger.debug(message)
   end
 
   def self.included(receiver)
-    receiver.send :include, ClassMethods
+    receiver.send(:include, ClassMethods)
     receiver.extend(ClassMethods)
   end
 

data/lib/vedeu/application.rb

@@ -1,7 +1,5 @@
-require_relative 'input/input'
-require_relative 'output/output'
-require_relative 'process/process'
-require_relative 'support/terminal'
+require 'vedeu/support/input'
+require 'vedeu/support/terminal'
 
 module Vedeu
   ModeSwitch = Class.new(StandardError)
@@ -20,7 +18,7 @@ module Vedeu
       Terminal.open(mode) do
         Terminal.set_cursor_mode
 
-        Output.render
+        Vedeu.events.trigger(:refresh)
 
         runner { main_sequence }
       end
@@ -43,9 +41,7 @@ module Vedeu
     def main_sequence
       Input.capture
 
-      Process.evaluate
-
-      Output.render
+      Vedeu.events.trigger(:refresh)
     end
 
     def interactive?

data/lib/vedeu/instrumentation.rb

@@ -0,0 +1,111 @@
+require 'date'
+require 'logger'
+require 'ruby-prof'
+
+require 'vedeu'
+
+module Vedeu
+  module Instrumentation
+    # :nocov:
+    class Log
+      def self.logger
+        @logger ||= Logger.new(filename).tap do |log|
+          log.formatter = proc do |_, time, _, message|
+            time.utc.iso8601 + ": " + message + "\n"
+          end
+        end
+      end
+
+      def self.error(exception)
+        logger.debug(exception.message + "\n" +
+                     exception.backtrace.join("\n"))
+      end
+
+      private
+
+      def self.filename
+        Vedeu.root_path + '/logs/vedeu.log'
+      end
+    end
+
+    class Profile
+      def self.call(filename = 'profile.html', &block)
+        new(filename).profile(&block)
+      end
+
+      def initialize(filename)
+        @filename = filename
+      end
+
+      def profile(&block)
+        RubyProf.start
+
+        yield
+
+        result = RubyProf.stop.eliminate_methods!([/^Array/, /^Hash/])
+
+        File.open(filename, 'w') do |file|
+          RubyProf::CallStackPrinter.new(result).print(file)
+          RubyProf::GraphPrinter.new(result).print(file)
+        end
+      end
+
+      private
+
+      def filename
+        Vedeu.root_path + '/tmp/' + @filename
+      end
+    end
+
+    class Trace
+      def self.call(options = {})
+        new(options).trace
+      end
+
+      def initialize(options = {})
+        @options = options
+      end
+
+      def trace
+        set_trace_func proc { |event, file, line, id, binding, classname|
+          if event == watched && classname.to_s.match(klass)
+            Vedeu.log(sprintf(" %s %-35s #%s", event, classname, id))
+            # binding.eval('local_variables').each do |var|
+            #   print("#{var.to_s} = #{binding.local_variable_get(var).inspect}\n")
+            # end
+          end
+        }
+      end
+
+      private
+
+      def pretty!(&block)
+        ["\e[38;5;#{rand(22..231)}m", yield, "\e[38;2;39m"].join
+
+      end
+
+      def watched
+        options[:event]
+      end
+
+      def klass
+        options[:klass]
+      end
+
+      def options
+        defaults.merge!(@options)
+      end
+
+      def defaults
+        {
+          event: 'call',
+          klass: /^Vedeu::(?!.*Instrumentation|Line|Stream|Style|Colour|Geometry|Terminal|Esc|Translator).*/
+        }
+      end
+
+      # everything except Interface, Geometry and Terminal
+      # klass: /^Vedeu::(?!.*Interface|Geometry|Terminal).*/
+    end
+    # :nocov:
+  end
+end