vedeu 0.0.30 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fad9751a79b86fc406d103fe1882055758c9ca52
-  data.tar.gz: 92d0385d33aee322dd606720acf85e2e892058e2
+  metadata.gz: 29a2d43ab7e7d773c5ad3fcd3d223462808fe191
+  data.tar.gz: 428e31c1b5fb377a92741f3cf7ccaeafd081fe24
 SHA512:
-  metadata.gz: 1aa0f28cd2622a96f9bd39b0dfda454efc73e5fc330d6b7387cb74f041bc4b6725ccdd717166311dd4b9c8071b70de6cb50cc40bf6f429bd62a1d797496b9368
-  data.tar.gz: 08607e602dfb5d7a89688069dee68e3a34acf8b3a2f8b725f6c3ecbbaddf8fd65004d1c44dae8a088531c08f108973c95c1288cd22d622a3fca5ba57c84b9991
+  metadata.gz: b19757abb7a24b5e3c27db48950075536bd3b85b1d6b448f0041fa206c91af01405e76618f3d5b7644da86d08b0c7cd7a30de2d3438354d755c4d436f11342de
+  data.tar.gz: 0feb617271ee83bf0f3caa26c7adfb294ac6651ddbd3aa014bf14ac2f660f746ae172e568e4cf0407320f63e9ac97c5a6b1eb890bc8cb3ea5d6dfc00ac08fc59

data/Rakefile

@@ -1,10 +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.test_files = FileList['test/lib/vedeu/*_test.rb',
+                          'test/lib/vedeu/**/*_test.rb']
   # t.options = '-v' # verbose mode
 end
 

data/lib/vedeu/configuration.rb

@@ -7,7 +7,7 @@ module Vedeu
     end
 
     def initialize(args = [])
-      @args    = args || []
+      @args    = args
       @options = {}
     end
 
@@ -15,7 +15,7 @@ module Vedeu
       parser = OptionParser.new do |opts|
         opts.banner = "Usage: #{$PROGRAM_NAME} [options]"
 
-        opts.on("-1", "--run-once", "Run application once.") do
+        opts.on('-1', '--run-once', 'Run application once.') do
           @options[:interactive] = false
         end
       end

data/lib/vedeu/launcher.rb

@@ -22,17 +22,17 @@ module Vedeu
       Application.start(configuration)
 
       @exit_code = 0
+    rescue StandardError => uncaught_exception
+      Vedeu.error(uncaught_exception)
     ensure
       $stdin, $stdout, $stderr = STDIN, STDOUT, STDERR
       @kernel.exit(@exit_code)
     end
-    # :nocov:
 
     private
 
     attr_reader :argv
 
-    # :nocov:
     def configuration
       Configuration.configure(argv)
     end

data/lib/vedeu/models/command.rb

@@ -10,7 +10,7 @@ module Vedeu
     attribute :keypress,  String, default: ''
     attribute :arguments, Array,  default: []
 
-    def execute(args = [])
+    def execute(*args)
       executable.call(*args)
     end
 

data/lib/vedeu/models/interface.rb

@@ -23,6 +23,10 @@ module Vedeu
     attribute :current, String,  default: ''
     attribute :cursor,  Boolean, default: true
 
+    def geometry
+      @geometry ||= Geometry.new(self)
+    end
+
     def refresh
       if enqueued?
         self.current = dequeue

data/lib/vedeu/output/interface_renderer.rb

@@ -48,7 +48,7 @@ module Vedeu
     end
 
     def origin(index)
-      Geometry.origin(interface, index)
+      interface.geometry.origin(index)
     end
 
     def height

data/lib/vedeu/output/template.rb

@@ -0,0 +1,23 @@
+module Vedeu
+  class Template
+    def self.parse(object, path)
+      new(object, path).parse
+    end
+
+    def initialize(object, path)
+      @object, @path = object, path
+    end
+
+    def parse
+      ERB.new(load, nil, '-').result(binding)
+    end
+
+    private
+
+    attr_reader :object, :path
+
+    def load
+      File.read(File.dirname(__FILE__) + path)
+    end
+  end
+end

data/lib/vedeu/output/text_adaptor.rb

@@ -13,7 +13,7 @@ module Vedeu
     def adapt
       return [] if no_content?
 
-      lines.map { |line| Line.new({ streams: { text: line } }) }
+      lines.map { |line| { streams: { text: line } } }
     end
 
     private

data/lib/vedeu/process/process.rb

@@ -11,7 +11,7 @@ module Vedeu
     def initialize; end
 
     def evaluate
-      return false if input.nil? || input.empty?
+      return false if no_input?
 
       fail StopIteration if stop_requested?
 
@@ -28,6 +28,10 @@ module Vedeu
       result.nil? || result.empty?
     end
 
+    def no_input?
+      input.nil? || input.empty?
+    end
+
     def result
       @result ||= command.execute(*args) if command
     end

data/lib/vedeu/repository/command_repository.rb

@@ -7,13 +7,11 @@ module Vedeu
     extend self
 
     def by_input(input)
-      return nil unless input
-
       by_keypress(input) || by_keyword(input)
     end
 
     def create(attributes)
-      super(Command.new(attributes))
+      super(entity.new(attributes))
     end
 
     def entity
@@ -23,11 +21,11 @@ module Vedeu
     private
 
     def by_keypress(input)
-      query(entity, :keypress, input)
+      query(entity, :keypress, input) || false
     end
 
     def by_keyword(input)
-      query(entity, :keyword, input)
+      query(entity, :keyword, input) || false
     end
   end
 end

data/lib/vedeu/repository/event_repository.rb

@@ -0,0 +1,27 @@
+module Vedeu
+  module EventRepository
+    extend self
+
+    def handlers
+      @handlers ||= Hash.new { |h, k| h[k] = [] }.merge(defaults)
+    end
+
+    def register(event, &block)
+      handlers[event] << block
+    end
+
+    def trigger(event, *args)
+      handlers[event].each do |handler|
+        handler.call(*args)
+      end
+    end
+
+    private
+
+    def defaults
+      {
+        :_exit_ => [ proc { :exit } ],
+      }
+    end
+  end
+end

data/lib/vedeu/repository/interface_repository.rb

@@ -9,12 +9,12 @@ module Vedeu
     extend self
 
     def create(attributes = {})
-      super(Interface.new(attributes))
+      super(entity.new(attributes))
     end
 
     def find(name)
       result = super
-      raise UndefinedInterface unless result
+      fail UndefinedInterface, "#{name.to_s} could not be found." unless result
       result
     end
 
@@ -30,12 +30,14 @@ module Vedeu
       by_layer.map { |interface| interface.refresh }.compact
     end
 
-    def by_layer
-      all.sort_by { |interface| interface.z }
-    end
-
     def entity
       Interface
     end
+
+    private
+
+    def by_layer
+      all.sort_by { |interface| interface.z }
+    end
   end
 end

data/lib/vedeu/repository/storage.rb

@@ -25,6 +25,8 @@ module Vedeu
     end
 
     def query(entity, attribute, value)
+      return false if value.nil? || value.empty?
+
       map_for_class(entity).select do |_, result|
         return result if result.send(attribute) == value
       end

data/lib/vedeu/support/esc.rb

@@ -28,13 +28,14 @@ module Vedeu
       ["\e[", row, ';', column, 'H'].join
     end
 
-    def string(value = 'normal')
+    def string(value = '')
       case value
       when 'blink'         then "\e[5m"
       when 'blink_off'     then "\e[25m"
       when 'bold'          then "\e[1m"
       when 'bold_off'      then "\e[21m"
       when 'clear'         then "\e[2J"
+      when 'colour_reset'  then "\e[38;2;39m\e[48;2;49m"
       when 'hide_cursor'   then "\e[?25l"
       when 'negative'      then "\e[7m"
       when 'positive'      then "\e[27m"

data/lib/vedeu/support/geometry.rb

@@ -3,18 +3,18 @@ require_relative 'terminal'
 
 module Vedeu
   class Geometry
-    def self.origin(interface, index = 0)
-      new(interface, index).origin
+    def initialize(interface)
+      @interface = interface
     end
 
-    def initialize(interface, index = 0)
-      @interface, @index = interface, index
-    end
-
-    def origin
+    def origin(index = 0)
       Esc.set_position(virtual_y(index), virtual_x)
     end
 
+    private
+
+    attr_reader :interface
+
     def virtual_x(index = 0)
       ((x..max_x).to_a)[index]
     end
@@ -24,8 +24,8 @@ module Vedeu
     end
 
     def max_y
-      if ((y + height) > screen_height)
-        screen_height
+      if (y + height) > Terminal.height
+        Terminal.height
 
       else
         (y + height)
@@ -34,8 +34,8 @@ module Vedeu
     end
 
     def max_x
-      if ((x + width) > screen_width)
-        screen_width
+      if (x + width) > Terminal.width
+        Terminal.width
 
       else
         (x + width)
@@ -43,10 +43,6 @@ module Vedeu
       end
     end
 
-    private
-
-    attr_reader :interface, :index
-
     def height
       interface.height
     end
@@ -62,13 +58,5 @@ module Vedeu
     def y
       interface.y
     end
-
-    def screen_height
-      @height ||= Terminal.height
-    end
-
-    def screen_width
-      @width ||= Terminal.width
-    end
   end
 end

data/lib/vedeu/support/parser.rb

@@ -6,7 +6,7 @@ module Vedeu
   class ParseError < StandardError; end
 
   class Parser
-    def self.parse(output)
+    def self.parse(output = {})
       new(output).parse
     end
 

data/lib/vedeu/support/queue.rb

@@ -8,6 +8,8 @@ module Vedeu
 
     def enqueue(result)
       store.unshift(result)
+
+      self
     end
 
     def enqueued?
@@ -18,7 +20,7 @@ module Vedeu
       store.size
     end
 
-    def clear
+    def reset
       store.clear
     end
 

data/lib/vedeu.rb

@@ -3,9 +3,9 @@ require 'logger'
 
 require_relative 'vedeu/repository/command_repository'
 require_relative 'vedeu/repository/interface_repository'
+require_relative 'vedeu/repository/event_repository'
 require_relative 'vedeu/support/exit'
 require_relative 'vedeu/launcher'
-require_relative 'vedeu/version'
 
 module Vedeu
   # :nocov:
@@ -20,6 +20,14 @@ module Vedeu
                          .merge!(options))
     end
 
+    def event(name, &block)
+      EventRepository.register(name, &block)
+    end
+
+    def run(name, *args)
+      EventRepository.trigger(name, *args)
+    end
+
     private
 
     def stringify_symbols(value)
@@ -35,7 +43,15 @@ module Vedeu
     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
@@ -45,6 +61,7 @@ module Vedeu
 
     File.open(Vedeu.root_path + '/tmp/' + filename, 'w') do |file|
       RubyProf::CallStackPrinter.new(result).print(file)
+      # RubyProf::GraphPrinter.new(result).print(file)
     end
   end
 

data/test/example_app/bin/app

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
+
+-> { its -> { a } }
+trap('INT') { exit! }
+
+require_relative '../lib/app'
+
+Example::App.start

data/test/example_app/lib/app.rb

@@ -0,0 +1,63 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'vedeu'
+
+module Example
+  extend self
+
+  class ExampleCommand
+    def self.dispatch
+      %Q|{
+          "interfaces": {
+              "name": "example",
+              "lines": {
+                  "streams": [
+                      {
+                        "text": "Some text..."
+                      },
+                      {
+                        "text": " "
+                      },
+                      {
+                        "colour": {
+                          "foreground": "#00ff00",
+                          "background": "#0000ff"
+                        },
+                        "text": "The time is: #{Time.now}."
+                      }
+                  ]
+              }
+          }
+      }|
+    end
+  end
+
+  class App
+    include Vedeu
+
+    interface 'example',  {
+                            y: 1,  x: 1,  width: 80, height: 5,
+                            colour: { background: '#ff0000', foreground: '#000000' },
+                            cursor: false
+                          }
+    interface 'command',  {
+                            y: 6, x: 1, width: 80, height: 1,
+                            colour: { background: '#4040cc', foreground: '#aadd00' },
+                            cursor: true
+                          }
+    command 'time', {
+                      entity:   ExampleCommand,
+                      keyword: 'time',
+                      keypress: 't'
+                    }
+    command 'exit', {
+                      entity:   Vedeu::Exit,
+                      keyword: 'exit',
+                      keypress: 'q'
+                    }
+
+    def self.start
+      Vedeu::Launcher.new([]).execute!
+    end
+  end
+end

data/test/lib/vedeu/application_test.rb

@@ -3,45 +3,15 @@ require_relative '../../../lib/vedeu/application'
 
 module Vedeu
   describe Application do
-    let(:described_class)    { Application }
-    let(:described_instance) { described_class.new(options) }
-    let(:options)            { {} }
-
-    describe '#initialize' do
-      let(:subject) { described_class.new(options) }
-
-      it 'returns an Application instance' do
-        subject.must_be_instance_of(Application)
-      end
-    end
-
     describe '.start' do
-      let(:subject) { described_class.start(options) }
-
-      before do
-        Terminal.stubs(:open).yields(self)
-        Output.stubs(:render)
-        Input.stubs(:capture)
-        Process.stubs(:evaluate)
-        Terminal.stubs(:close)
+      it 'returns a NilClass when the application should run interactively' do
+        skip
+        # Application.start({ interactive: true }).must_be_instance_of(NilClass)
       end
 
-      context 'when the application should run interactively' do
-        let(:options) { { interactive: true } }
-
-        before { Process.stubs(:evaluate).raises(StopIteration) }
-
-        it 'returns a NilClass' do
-          subject.must_be_instance_of(NilClass)
-        end
-      end
-
-      context 'when the application should run once' do
-        let(:options) { { interactive: false } }
-
-        it 'returns a NilClass' do
-          subject.must_be_instance_of(NilClass)
-        end
+      it 'returns a NilClass when the application should run once' do
+        skip
+        # Application.start({ interactive: false }).must_be_instance_of(NilClass)
       end
     end
   end

data/test/lib/vedeu/configuration_test.rb

@@ -3,40 +3,14 @@ require_relative '../../../lib/vedeu/configuration'
 
 module Vedeu
   describe Configuration do
-    let(:described_class)    { Configuration }
-    let(:described_instance) { described_class.new(args) }
-    let(:args)               { [] }
-    let(:subject)            { described_instance }
-
-    describe '#initialize' do
-      let(:subject) { described_instance }
-
-      it 'returns a Configuration instance' do
-        subject.must_be_instance_of(Configuration)
-      end
-
-      it 'sets an instance variable' do
-        subject.instance_variable_get('@args').must_equal([])
-      end
-
-      it 'sets an instance variable' do
-        subject.instance_variable_get('@options').must_equal({})
-      end
-    end
-
     describe '#configure' do
-      let(:subject) { described_class.configure(args) }
-
-      it 'returns a Hash' do
-        subject.must_be_instance_of(Hash)
+      it 'returns an empty collection when no options are set' do
+        Configuration.configure([]).must_equal({})
       end
 
-      context 'when the option is --run-once' do
-        let(:args) { ['--run-once'] }
-
-        it 'returns the options which instructs Vedeu to run once' do
-          subject.must_equal({ interactive: false })
-        end
+      it 'returns the options which instructs Vedeu to run once' do
+        Configuration.configure(['--run-once'])
+          .must_equal({ interactive: false })
       end
     end
   end

data/test/lib/vedeu/input/input_test.rb

@@ -3,23 +3,11 @@ require_relative '../../../../lib/vedeu/input/input'
 
 module Vedeu
   describe Input do
-    let(:described_module) { Input }
-    let(:input)            { 'input' }
-
-    before do
-      Terminal.stubs(:input).returns(input)
-      Queue.stubs(:enqueue).returns([input])
-    end
-
     describe '.capture' do
-      let(:subject) { described_module.capture }
-
-      it 'returns an Array' do
-        subject.must_be_instance_of(Array)
-      end
-
-      it 'returns the enqueued input' do
-        subject.must_equal([input])
+      it 'enqueues the captured input from the terminal' do
+        Terminal.stub :input, 'input' do
+          Input.capture.must_equal(Vedeu::Queue)
+        end
       end
     end
   end

data/test/lib/vedeu/launcher_test.rb

@@ -3,22 +3,13 @@ require_relative '../../../lib/vedeu/launcher'
 
 module Vedeu
   describe Launcher do
-    let(:described_class)    { Launcher }
-    let(:described_instance) { described_class.new(argv) }
-    let(:argv)               { [] }
-
-    before { Application.stubs(:start) }
-
-    describe '#initialize' do
-      let(:subject) { described_class.new(argv) }
-
-      it 'returns a Launcher instance' do
-        subject.must_be_instance_of(Launcher)
-      end
-    end
-
     describe '#execute!' do
-      let(:subject) { described_instance.execute! }
+      it 'needs a spec, please write one.' do
+        skip
+        Application.stub :start, nil do
+          Launcher.new([]).execute!
+        end
+      end
     end
   end
 end