vedeu 0.6.7 → 0.6.8

data/lib/vedeu/runtime/flags.rb

@@ -1,57 +1,61 @@
 module Vedeu
 
-  # Home of various runtime flags which Vedeu uses.
-  #
-  class Flags
+  module Runtime
 
-    include Singleton
+    # Home of various runtime flags which Vedeu uses.
+    #
+    class Flags
 
-    class << self
+      include Singleton
 
-      # @return [Boolean]
-      def ready!
-        instance.options[:ready] = true
-      end
+      class << self
 
-      # @return [Boolean]
-      def ready?
-        instance.options[:ready]
-      end
+        # @return [Boolean]
+        def ready!
+          instance.options[:ready] = true
+        end
+
+        # @return [Boolean]
+        def ready?
+          instance.options[:ready]
+        end
+
+        # Reset the flags to the default values.
+        #
+        # @return [Hash]
+        def reset!
+          instance.reset!
+        end
+
+      end # Eigenclass
+
+      # @!attribute [rw]
+      # @return [Hash]
+      attr_accessor :options
 
-      # Reset the flags to the default values.
+      # Create a new singleton instance of Vedeu::Runtime::Flags.
       #
+      # @return [Vedeu::Runtime::Flags]
+      def initialize
+        self.options = defaults
+      end
+
       # @return [Hash]
       def reset!
-        instance.reset!
+        self.options = defaults
       end
 
-    end # Eigenclass
+      private
 
-    # @!attribute [rw]
-    # @return [Hash]
-    attr_accessor :options
+      # @return [Hash]
+      def defaults
+        {
+          ready: false,
+        }
+      end
 
-    # Create a new singleton instance of Vedeu::Flags.
-    #
-    # @return [Vedeu::Flags]
-    def initialize
-      self.options = defaults
-    end
-
-    # @return [Hash]
-    def reset!
-      self.options = defaults
-    end
-
-    private
-
-    # @return [Hash]
-    def defaults
-      {
-        ready: false,
-      }
-    end
-
-  end # Flags
+    end # Flags
+
+  end # Runtime
 
 end # Vedeu

data/lib/vedeu/runtime/launcher.rb

@@ -73,7 +73,7 @@ module Vedeu
       $stdout = @stdout
       $stderr = @stderr
 
-      Vedeu::Application.start(configuration)
+      Vedeu::Runtime::Application.start(configuration)
 
       @exit_code = 0
 

data/lib/vedeu/runtime/main_loop.rb

@@ -1,55 +1,60 @@
 module Vedeu
 
-  # Provides the main loop for a Vedeu application.
-  #
-  class MainLoop
+  module Runtime
+
+    # Provides the main loop for a Vedeu application.
+    #
+    class MainLoop
+
+      trap('SIGTERM') { stop! }
+      trap('TERM')    { stop! }
+      trap('INT')     { stop! }
+
+      class << self
+
+        # :nocov:
+        # Start the main loop.
+        #
+        # @return [void]
+        # @yieldreturn [void] The client application.
+        def start!
+          @started = true
+          @loop    = true
+
+          while @loop
+            yield
+
+            safe_exit_point!
+          end
+        rescue Vedeu::Error::Interrupt
+          Vedeu.log(type:    :info,
+                    message: 'Vedeu execution interrupted, exiting.')
+        end
+        # :nocov:
 
-    trap('SIGTERM') { stop! }
-    trap('TERM')    { stop! }
-    trap('INT')     { stop! }
+        # Signal that we wish to terminate the running application.
+        #
+        # @return [void]
+        def stop!
+          @loop = false
+        end
 
-    class << self
+        # :nocov:
+        # Check the application has started and we wish to continue
+        # running.
+        #
+        # @raise [Vedeu::Error::Interrupt] When we wish to terminate
+        #   the running application.
+        # @return [void]
+        def safe_exit_point!
+          fail Vedeu::Error::Interrupt if @started && !@loop
+        end
+        # :nocov:
 
-      # :nocov:
-      # Start the main loop.
-      #
-      # @return [void]
-      # @yieldreturn [void] The client application.
-      def start!
-        @started = true
-        @loop    = true
+      end # Eigenclass
 
-        while @loop
-          yield
+    end # MainLoop
 
-          safe_exit_point!
-        end
-      rescue Vedeu::Error::Interrupt
-        Vedeu.log(type:    :info,
-                  message: 'Vedeu execution interrupted, exiting.')
-      end
-      # :nocov:
-
-      # Signal that we wish to terminate the running application.
-      #
-      # @return [void]
-      def stop!
-        @loop = false
-      end
-
-      # :nocov:
-      # Check the application has started and we wish to continue running.
-      #
-      # @raise [Vedeu::Error::Interrupt] When we wish to terminate the running
-      #   application.
-      # @return [void]
-      def safe_exit_point!
-        fail Vedeu::Error::Interrupt if @started && !@loop
-      end
-      # :nocov:
-
-    end # Eigenclass
-
-  end # MainLoop
+  end # Runtime
 
 end # Vedeu

data/lib/vedeu/runtime/traps.rb

@@ -1,25 +1,29 @@
 module Vedeu
 
-  # Vedeu can respond to various signals which are handled here.
-  #
-  module Traps
+  module Runtime
 
-    # :nocov:
-    Signal.trap('INT') do
-      exit(1)
-    end
+    # Vedeu can respond to various signals which are handled here.
+    #
+    module Traps
 
-    Signal.trap('TERM') do
-      exit(1)
-    end
+      # :nocov:
+      Signal.trap('INT') do
+        exit(1)
+      end
 
-    Signal.trap('TTIN') {}
-    Signal.trap('USR1') {}
-    Signal.trap('USR2') {}
+      Signal.trap('TERM') do
+        exit(1)
+      end
 
-    Signal.trap('SIGWINCH') { Vedeu.trigger(:_resize_) }
-    # :nocov:
+      Signal.trap('TTIN') {}
+      Signal.trap('USR1') {}
+      Signal.trap('USR2') {}
 
-  end # Traps
+      Signal.trap('SIGWINCH') { Vedeu.trigger(:_resize_) }
+      # :nocov:
+
+    end # Traps
+
+  end # Runtime
 
 end # Vedeu

data/lib/vedeu/version.rb

@@ -1,6 +1,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.6.7'
+  VERSION = '0.6.8'
 
 end

data/lib/vedeu.rb

@@ -21,7 +21,7 @@ require 'zlib'
 
 require 'thor'
 
-require 'vedeu/log/log'
+require 'vedeu/logging/log'
 
 # Vedeu is a GUI framework for terminal/console applications written in Ruby.
 #
@@ -30,7 +30,7 @@ module Vedeu
   extend Forwardable
   extend self
 
-  def_delegators Vedeu::Log, :log
+  def_delegators Vedeu::Logging::Log, :log
 
   # Return the name of currently focussed interface.
   #

data/test/lib/vedeu/buffers/virtual_buffer_test.rb

@@ -78,7 +78,7 @@ module Vedeu
         let(:y) { 0 }
         let(:x) { 2 }
 
-        it { subject.must_be_instance_of(Vedeu::Cell) }
+        it { subject.must_be_instance_of(Vedeu::Models::Cell) }
       end
     end
 

data/test/lib/vedeu/cursors/cursor_test.rb

@@ -52,7 +52,9 @@ module Vedeu
         it { subject.instance_variable_get('@name').must_equal('silver') }
         it { subject.instance_variable_get('@ox').must_equal(ox) }
         it { subject.instance_variable_get('@oy').must_equal(oy) }
-        it { subject.instance_variable_get('@repository').must_equal(repository) }
+        it {
+          subject.instance_variable_get('@repository').must_equal(repository)
+        }
         it { subject.instance_variable_get('@visible').must_equal(true) }
         it { subject.instance_variable_get('@x').must_equal(x) }
         it { subject.instance_variable_get('@y').must_equal(y) }
@@ -72,7 +74,9 @@ module Vedeu
 
       describe '#hide' do
         let(:visible)     { true }
-        let(:hide_cursor) { Vedeu::Escape.new(value: Vedeu::Esc.hide_cursor) }
+        let(:hide_cursor) {
+          Vedeu::Models::Escape.new(value: Vedeu::Esc.hide_cursor)
+        }
 
         before do
           Vedeu::Output.stubs(:render).
@@ -81,7 +85,7 @@ module Vedeu
 
         subject { instance.hide }
 
-        it { subject.must_be_instance_of(Vedeu::Escape) }
+        it { subject.must_be_instance_of(Vedeu::Models::Escape) }
       end
 
       describe '#move_down' do
@@ -196,7 +200,9 @@ module Vedeu
 
       describe '#show' do
         let(:visible) { false }
-        let(:show_cursor) { Vedeu::Escape.new(value: Vedeu::Esc.show_cursor) }
+        let(:show_cursor) {
+          Vedeu::Models::Escape.new(value: Vedeu::Esc.show_cursor)
+        }
 
         before do
           Vedeu::Output.stubs(:render).
@@ -205,7 +211,7 @@ module Vedeu
 
         subject { instance.show }
 
-        it { subject.must_be_instance_of(Vedeu::Escape) }
+        it { subject.must_be_instance_of(Vedeu::Models::Escape) }
       end
 
       describe '#reposition' do

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

@@ -249,7 +249,7 @@ module Vedeu
           end
         }
 
-        it { subject.must_be_instance_of(Vedeu::Keymap) }
+        it { subject.must_be_instance_of(Vedeu::Input::Keymap) }
         it { instance.must_respond_to(:keys) }
       end
 

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

@@ -8,7 +8,7 @@ module Vedeu
 
       let(:described) { Vedeu::DSL::Keymap }
       let(:instance)  { described.new(model) }
-      let(:model)     { Vedeu::Keymap.new(name: '_test_') }
+      let(:model)     { Vedeu::Input::Keymap.new(name: '_test_') }
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
@@ -47,7 +47,7 @@ module Vedeu
         end
 
         context 'when the key is valid (not already defined)' do
-          before { model.stubs(:add).returns(Vedeu::Keymap) }
+          before { model.stubs(:add).returns(Vedeu::Input::Keymap) }
 
           it { subject.must_equal(['j', :down]) }
         end

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

@@ -2,87 +2,91 @@ require 'test_helper'
 
 module Vedeu
 
-  describe Input do
-
-    let(:reader)    { Vedeu::Terminal }
-    let(:keypress)  { 'a' }
-    let(:described) { Vedeu::Input }
-    let(:instance)  { described.new(reader) }
-    let(:raw_mode)  { true }
-
-    describe '#initialize' do
-      it { instance.must_be_instance_of(described) }
-      it { instance.instance_variable_get('@reader').must_equal(reader) }
-    end
-
-    describe '.capture' do
-      before do
-        reader.stubs(:raw_mode?).returns(raw_mode)
-        reader.stubs(:fake_mode?).returns(fake_mode)
-        Vedeu.stubs(:trigger).returns([false])
-      end
+  module Input
 
-      subject { described.capture(reader) }
+    describe Input do
 
-      context 'when in cooked mode' do
-        let(:raw_mode)  { false }
-        let(:fake_mode) { false }
-        let(:command)   { 'help' }
+      let(:reader)    { Vedeu::Terminal }
+      let(:keypress)  { 'a' }
+      let(:described) { Vedeu::Input::Input }
+      let(:instance)  { described.new(reader) }
+      let(:raw_mode)  { true }
 
-        before { reader.stubs(:read).returns(command) }
+      describe '#initialize' do
+        it { instance.must_be_instance_of(described) }
+        it { instance.instance_variable_get('@reader').must_equal(reader) }
+      end
 
-        it 'triggers an event with the command' do
-          Vedeu.expects(:trigger).with(:_command_, command)
-          subject
+      describe '.capture' do
+        before do
+          reader.stubs(:raw_mode?).returns(raw_mode)
+          reader.stubs(:fake_mode?).returns(fake_mode)
+          Vedeu.stubs(:trigger).returns([false])
         end
-      end
 
-      context 'when in fake mode' do
-        let(:raw_mode)  { false }
-        let(:fake_mode) { true }
-        let(:keypress)  { 'b' }
+        subject { described.capture(reader) }
 
-        before { reader.stubs(:read).returns(keypress) }
+        context 'when in cooked mode' do
+          let(:raw_mode)  { false }
+          let(:fake_mode) { false }
+          let(:command)   { 'help' }
 
-        it 'triggers an event with the keypress' do
-          Vedeu.expects(:trigger).with(:_editor_, keypress)
-          subject
+          before { reader.stubs(:read).returns(command) }
+
+          it 'triggers an event with the command' do
+            Vedeu.expects(:trigger).with(:_command_, command)
+            subject
+          end
         end
-      end
 
-      context 'when in raw mode' do
-        let(:raw_mode)  { true }
-        let(:fake_mode) { false }
-        let(:keypress)  { 'a' }
+        context 'when in fake mode' do
+          let(:raw_mode)  { false }
+          let(:fake_mode) { true }
+          let(:keypress)  { 'b' }
 
-        before { reader.stubs(:read).returns(keypress) }
+          before { reader.stubs(:read).returns(keypress) }
 
-        context 'when the key is not special' do
           it 'triggers an event with the keypress' do
-            Vedeu.expects(:trigger).with(:_keypress_, keypress)
+            Vedeu.expects(:trigger).with(:_editor_, keypress)
             subject
           end
         end
 
-        context 'when the key is special' do
-          let(:keypress) { "\e[A" }
+        context 'when in raw mode' do
+          let(:raw_mode)  { true }
+          let(:fake_mode) { false }
+          let(:keypress)  { 'a' }
 
-          it 'triggers an event with the keypress' do
-            Vedeu.expects(:trigger).with(:_keypress_, :up)
-            subject
+          before { reader.stubs(:read).returns(keypress) }
+
+          context 'when the key is not special' do
+            it 'triggers an event with the keypress' do
+              Vedeu.expects(:trigger).with(:_keypress_, keypress)
+              subject
+            end
           end
 
-          context 'when the key is an F key' do
-            let(:keypress) { "\e[17~" }
+          context 'when the key is special' do
+            let(:keypress) { "\e[A" }
 
             it 'triggers an event with the keypress' do
-              Vedeu.expects(:trigger).with(:_keypress_, :f6)
+              Vedeu.expects(:trigger).with(:_keypress_, :up)
               subject
             end
+
+            context 'when the key is an F key' do
+              let(:keypress) { "\e[17~" }
+
+              it 'triggers an event with the keypress' do
+                Vedeu.expects(:trigger).with(:_keypress_, :f6)
+                subject
+              end
+            end
           end
         end
       end
-    end
+
+    end # Input
 
   end # Input
 

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

@@ -2,44 +2,48 @@ require 'test_helper'
 
 module Vedeu
 
-  describe Key do
+  module Input
 
-    let(:described) { Vedeu::Key }
-    let(:instance)  { described.new(input) { :output } }
-    let(:input)     { 'a' }
+    describe Key do
 
-    describe '#initialize' do
-      it { instance.must_be_instance_of(described) }
-      it { instance.instance_variable_get('@input').must_equal(input) }
+      let(:described) { Vedeu::Input::Key }
+      let(:instance)  { described.new(input) { :output } }
+      let(:input)     { 'a' }
 
-      context 'when the required block is not given' do
-        subject { described.new(input) }
+      describe '#initialize' do
+        it { instance.must_be_instance_of(described) }
+        it { instance.instance_variable_get('@input').must_equal(input) }
 
-        it { proc { subject }.must_raise(Vedeu::Error::InvalidSyntax) }
+        context 'when the required block is not given' do
+          subject { described.new(input) }
+
+          it { proc { subject }.must_raise(Vedeu::Error::InvalidSyntax) }
+        end
       end
-    end
 
-    describe '#input' do
-      subject { instance.input }
+      describe '#input' do
+        subject { instance.input }
+
+        it 'returns the key defined' do
+          subject.must_equal('a')
+        end
 
-      it 'returns the key defined' do
-        subject.must_equal('a')
+        it { instance.must_respond_to(:key) }
       end
 
-      it { instance.must_respond_to(:key) }
-    end
+      describe '#output' do
+        subject { instance.output }
 
-    describe '#output' do
-      subject { instance.output }
+        it 'returns the result of calling the proc' do
+          subject.must_equal(:output)
+        end
 
-      it 'returns the result of calling the proc' do
-        subject.must_equal(:output)
+        it { instance.must_respond_to(:action) }
+        it { instance.must_respond_to(:press) }
       end
 
-      it { instance.must_respond_to(:action) }
-      it { instance.must_respond_to(:press) }
-    end
+    end # Key
 
-  end # Key
+  end # Input
 
 end # Vedeu