vedeu 0.5.10 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1096fd3f0f65d843b0f6f92e4b70a721570f15da
-  data.tar.gz: 808dc9b634727f33c20aa32712e2d6066c759b4d
+  metadata.gz: edd33e8e10532a87dc3e6ea6c7aa2142227e70f7
+  data.tar.gz: 29b39513afa32eac1564900988eb5d28d386a17a
 SHA512:
-  metadata.gz: 8cd549653f68705952718d30bd75d653cb17215dd2c30cd7fdbc407e933bb1a831f19f74da3e567c8fa4d610a93f2f93cf9a1ebf4c377a0b468816b8159d0fc9
-  data.tar.gz: 328c6e794c5387531e94a13bc3be5b30facb61697cd531fed4481214b8b56016b3c8aa7e96ec95182319a0577c63af1e96e12b23a344fd38cc4b53f205ae829f
+  metadata.gz: 6d1cd9b457457e795e9779b9d1265b6db9e8669d29f03ab62079250b08ecd65f1091c046351e9ae849f3b7843313828652984e1bc4561eef43e972ec600c0a18
+  data.tar.gz: 679201d647f7663cbe6a3789d2967206232efef7636642150ad53bfbc92ccbd18ad55cf0dcd2e0488edaa454405bec7332b8d003825c35de353edf58223483d5

data/Dockerfile

@@ -61,8 +61,9 @@ RUN gem install bundler
 
 ADD . /home/vedeu/gem/
 WORKDIR /home/vedeu/gem
+RUN chown -R vedeu:vedeu .
 USER vedeu
-RUN bundle
+RUN bundle install --deployment
 WORKDIR /home/vedeu
 
 # To build this file:

data/bin/vedeu

@@ -1,21 +1,17 @@
 #!/usr/bin/env ruby
 
 require 'rake'
-
 bundler_message = 'Bundler is required. Please install bundler with ' \
                   "'gem install bundler'"
 begin
   require 'bundler'
-
 rescue LoadError
   puts bundler_message
-
 end
 
 fail bundler_message unless defined?(Bundler)
 
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-# load Gem.bin_path('bundler', 'bundle')
 
 Bundler.setup
 
@@ -23,5 +19,6 @@ gem_dir = File.expand_path('..', File.dirname(__FILE__))
 $LOAD_PATH.unshift(gem_dir) unless $LOAD_PATH.include?(gem_dir)
 
 require 'vedeu'
+require 'vedeu_cli'
 
 Vedeu::CLI::Main.start(ARGV.dup)

data/lib/vedeu/all.rb

@@ -58,11 +58,17 @@ require 'vedeu/colours/colour'
 
 require 'vedeu/buffers/buffer'
 require 'vedeu/buffers/buffers'
+require 'vedeu/buffers/virtual_buffer'
+require 'vedeu/buffers/virtual_buffers'
+
+require 'vedeu/refresh/refresh'
+require 'vedeu/refresh/refresh_cursor'
+require 'vedeu/refresh/refresh_buffer'
+require 'vedeu/refresh/refresh_group'
 
 require 'vedeu/cursor/cursor'
 require 'vedeu/cursor/cursors'
 require 'vedeu/cursor/move'
-require 'vedeu/cursor/refresh_cursor'
 require 'vedeu/cursor/reposition'
 
 require 'vedeu/esc/actions'
@@ -109,13 +115,6 @@ require 'vedeu/application/application_controller'
 require 'vedeu/application/application_helper'
 require 'vedeu/application/application_view'
 
-require 'vedeu/cli/generator/helpers'
-require 'vedeu/cli/generator/application'
-require 'vedeu/cli/generator/view'
-require 'vedeu/cli/generator/all'
-
-require 'vedeu/cli/main'
-
 require 'vedeu/distributed/uri'
 require 'vedeu/distributed/server'
 require 'vedeu/distributed/client'
@@ -154,13 +153,10 @@ require 'vedeu/output/presentation'
 require 'vedeu/output/compressor'
 require 'vedeu/output/style'
 require 'vedeu/output/text'
-require 'vedeu/output/virtual_buffer'
 require 'vedeu/output/html_char'
-require 'vedeu/output/refresh_group'
-require 'vedeu/output/refresh'
+
 require 'vedeu/output/output'
 require 'vedeu/output/viewport'
-require 'vedeu/output/virtual_terminal'
 require 'vedeu/output/wordwrap'
 
 require 'vedeu/api'

data/lib/vedeu/bindings/drb.rb

@@ -51,7 +51,7 @@ module Vedeu
       #
       # @return [TrueClass]
       def drb_retrieve_output!
-        Vedeu.bind(:_drb_retrieve_output_) { Vedeu::VirtualBuffer.retrieve }
+        Vedeu.bind(:_drb_retrieve_output_) { Vedeu::VirtualBuffers.retrieve }
       end
 
       # Triggering this event with 'data' will push data into the running
@@ -63,7 +63,7 @@ module Vedeu
       # @return [TrueClass]
       def drb_store_output!
         Vedeu.bind(:_drb_store_output_) do |data|
-          Vedeu::VirtualBuffer.store(Vedeu::Terminal.virtual.output(data))
+          Vedeu::VirtualBuffers.store(Vedeu::VirtualBuffer.output(data))
         end
       end
 

data/lib/vedeu/bindings/system.rb

@@ -196,11 +196,13 @@ module Vedeu
         Vedeu.bind(:_mode_switch_) { fail Vedeu::ModeSwitch }
       end
 
-      # Will cause the named interface to refresh, or when a name is not given,
-      # will refresh all interfaces.
+      # Refreshes all registered interfaces or the named interface.
       #
-      # @note: Hidden interfaces will be still refreshed in memory but not
-      #   shown.
+      # @note
+      #   The interfaces will be refreshed in z-index order, meaning that
+      #   interfaces with a lower z-index will be drawn first. This means
+      #   overlapping interfaces will be drawn as specified.
+      #   Hidden interfaces will be still refreshed in memory but not shown.
       #
       # @example
       #   Vedeu.trigger(:_refresh_)
@@ -209,7 +211,7 @@ module Vedeu
       # @return [TrueClass]
       def refresh!
         Vedeu.bind(:_refresh_) do |name|
-          name ? Vedeu::Refresh.by_name(name) : Vedeu::Refresh.all
+          name ? Vedeu::RefreshBuffer.by_name(name) : Vedeu::Refresh.all
         end
       end
 
@@ -222,7 +224,7 @@ module Vedeu
       # @return [TrueClass]
       def refresh_cursor!
         Vedeu.bind(:_refresh_cursor_) do |name|
-          Vedeu::RefreshCursor.render(name)
+          Vedeu::RefreshCursor.by_name(name)
         end
       end
 
@@ -233,7 +235,9 @@ module Vedeu
       #
       # @return [TrueClass]
       def refresh_group!
-        Vedeu.bind(:_refresh_group_) { |name| Vedeu::Refresh.by_group(name) }
+        Vedeu.bind(:_refresh_group_) do |name|
+          Vedeu::RefreshGroup.by_name(name)
+        end
       end
 
       # When triggered will cause Vedeu to trigger the `:_clear_` and

data/lib/vedeu/{output/virtual_terminal.rb → buffers/virtual_buffer.rb}

@@ -2,7 +2,7 @@ module Vedeu
 
   # Represents a {Vedeu::Terminal} view as a grid of {Vedeu::Cell} objects.
   #
-  class VirtualTerminal
+  class VirtualBuffer
 
     # @!attribute [rw] renderer
     # @return [void]
@@ -16,13 +16,20 @@ module Vedeu
     # @return [Fixnum]
     attr_reader :width
 
-    # Returns a new instance of Vedeu::VirtualTerminal.
+    # @param data [Array<Array<Vedeu::Views::Char>>]
+    # @return [Array<Array<Vedeu::Views::Char>>]
+    # @see Vedeu::VirtualBuffer#output
+    def self.output(data)
+      new(Vedeu.height, Vedeu.width, Vedeu::Renderers::HTML.new).output(data)
+    end
+
+    # Returns a new instance of Vedeu::VirtualBuffer.
     #
     # @param height [Fixnum]
     # @param width [Fixnum]
     # @param renderer [Object|Vedeu::Renderers::HTML] An object responding to
     #   .render.
-    # @return [Vedeu::VirtualTerminal]
+    # @return [Vedeu::VirtualBuffer]
     def initialize(height, width, renderer = Vedeu::Renderers::HTML.new)
       @height   = height
       @width    = width
@@ -34,7 +41,7 @@ module Vedeu
     #
     # @return [Array<Array<Vedeu::Views::Char>>]
     def cells
-      @cells ||= new_virtual_terminal
+      @cells ||= new_virtual_buffer
     end
 
     # Read a single cell from the virtual terminal.
@@ -79,7 +86,7 @@ module Vedeu
     #
     # @return [Array<Array<Vedeu::Views::Char>>]
     def reset
-      @cells = new_virtual_terminal
+      @cells = new_virtual_buffer
     end
     alias_method :clear, :reset
 
@@ -113,11 +120,11 @@ module Vedeu
     end
 
     # @return [Array<Array<Vedeu::Cell>>]
-    # @see {Vedeu::VirtualTerminal#cells}
-    def new_virtual_terminal
+    # @see {Vedeu::VirtualBuffer#cells}
+    def new_virtual_buffer
       Array.new(height) { Array.new(width) { Vedeu::Cell.new } }
     end
 
-  end # VirtualTerminal
+  end # VirtualBuffer
 
 end # Vedeu

data/lib/vedeu/{output/virtual_buffer.rb → buffers/virtual_buffers.rb}

@@ -1,8 +1,8 @@
 module Vedeu
 
-  # Store and retrieve {Vedeu::VirtualTerminal} objects.
+  # Store and retrieve {Vedeu::VirtualBuffer} objects.
   #
-  # Each {Vedeu::VirtualTerminal} object is a copy of the current terminal
+  # Each {Vedeu::VirtualBuffer} object is a copy of the current terminal
   # including content but not as String objects but {Vedeu::Views::Char}
   # objects. Using {Vedeu::Views::Char} objects means that we can store the data
   # used to make up the displayed character, complete with its colour, position
@@ -13,7 +13,7 @@ module Vedeu
   # we can display the {Vedeu::Views::Char} in multiple ways (e.g. HTML) or in
   # multiple formats (e.g. JSON), and render/use that in an appropriate way.
   #
-  module VirtualBuffer
+  module VirtualBuffers
 
     extend self
 
@@ -66,6 +66,6 @@ module Vedeu
       []
     end
 
-  end # VirtualBuffer
+  end # VirtualBuffers
 
 end # Vedeu

data/lib/vedeu/cursor/cursor.rb

@@ -164,13 +164,9 @@ module Vedeu
     #
     # @return [String]
     def visibility
-      if visible?
-        Vedeu::Escape.new(position: position, value: Vedeu::Esc.show_cursor)
+      value = visible? ? Vedeu::Esc.show_cursor : Vedeu::Esc.hide_cursor
 
-      else
-        Vedeu::Escape.new(position: position, value: Vedeu::Esc.hide_cursor)
-
-      end
+      Vedeu::Escape.new(position: position, value: value)
     end
 
   end # Cursor

data/lib/vedeu/cursor/reposition.rb

@@ -26,17 +26,13 @@ module Vedeu
 
     # @return [Vedeu::Cursor]
     def to
-      result = entity.new(name: name,
-                          y:    coordinate.y_position,
-                          x:    coordinate.x_position,
-                          oy:   y,
-                          ox:   x).store
+      build_entity!
 
       Vedeu.trigger(:_clear_, name)
       Vedeu.trigger(:_refresh_, name)
       Vedeu.trigger(:_refresh_cursor_, name)
 
-      result
+      new_entity
     end
 
     protected
@@ -59,6 +55,15 @@ module Vedeu
 
     private
 
+    def build_entity!
+      @_entity ||= entity.new(name: name,
+                              y:    coordinate.y_position,
+                              x:    coordinate.x_position,
+                              oy:   y,
+                              ox:   x).store
+    end
+    alias_method :new_entity, :build_entity!
+
     # @return [Vedeu::Coordinate]
     def coordinate
       @coordinate ||= Vedeu::Coordinate.new(name, y, x)

data/lib/vedeu/esc/esc.rb

@@ -1,3 +1,7 @@
+require 'vedeu/esc/actions'
+require 'vedeu/esc/borders'
+require 'vedeu/esc/colours'
+
 module Vedeu
 
   # Provides escape sequence strings for setting the cursor position and various

data/lib/vedeu/models/views/view.rb

@@ -91,7 +91,7 @@ module Vedeu
       def store_immediate
         store_deferred
 
-        Vedeu::Refresh.by_name(name)
+        Vedeu.trigger(:_refresh_, name)
 
         self
       end

data/lib/vedeu/output/output.rb

@@ -27,7 +27,7 @@ module Vedeu
       if Vedeu::Configuration.drb?
         Vedeu.trigger(:_drb_store_output_, output)
 
-        # Vedeu::Renderers::HTML.to_file(Vedeu::VirtualBuffer.retrieve)
+        # Vedeu::Renderers::HTML.to_file(Vedeu::VirtualBuffers.retrieve)
       end
 
       Vedeu.renderers.render(output) if Vedeu.ready?

data/lib/vedeu/plugins.rb

@@ -24,7 +24,11 @@ module Vedeu
     # @param plugin [Vedeu::Plugin]
     # @return [Array<void>]
     def register(name, plugin = false)
-      plugins << plugin if plugin && not_loaded?(name)
+      if plugin && not_loaded?(name)
+        Vedeu.log(type: :debug, message: "Registering plugin: #{name}")
+
+        plugins << plugin
+      end
     end
 
     # Find all installed plugins and store them.
@@ -36,7 +40,7 @@ module Vedeu
       Gem::Specification.each do |gem|
         next unless gem.name =~ /^#{prefix}/
 
-        plugin_name = gem.name[/^#{prefix}_(.*)/, 1]
+        plugin_name = gem.name[/^#{prefix}(.*)/, 1]
 
         register(plugin_name, Vedeu::Plugin.new(plugin_name, gem))
       end
@@ -73,7 +77,7 @@ module Vedeu
 
     # @return [String]
     def prefix
-      'vedeu'
+      'vedeu_'
     end
 
   end # Plugins

data/lib/vedeu/plugins/plugin.rb

@@ -40,11 +40,11 @@ module Vedeu
       begin
         require gem_name unless enabled?
       rescue LoadError => error
-        raise Vedeu::VedeuError,
-              "Unable to load plugin #{gem_name} due to #{error}."
+        fail Vedeu::VedeuError,
+             "Unable to load plugin #{gem_name} due to #{error}."
       rescue => error
-        raise Vedeu::VedeuError,
-              "require '#{gem_name}' failed with #{error}."
+        fail Vedeu::VedeuError,
+             "require '#{gem_name}' failed with #{error}."
       end
 
       @enabled = true

data/lib/vedeu/refresh/refresh.rb

@@ -0,0 +1,31 @@
+module Vedeu
+
+  # @see Vedeu::Bindings::System#refresh!
+  class Refresh
+
+    # Refresh all registered interfaces.
+    #
+    # @return [Array<Vedeu::Interface>]
+    def self.all
+      new.all
+    end
+
+    # Return a new instance of Vedeu::Refresh.
+    #
+    # @return [Vedeu::Refresh]
+    def initialize; end
+
+    # Refresh all registered interfaces.
+    #
+    # @return [Array<Vedeu::Interface>]
+    def all
+      Vedeu.timer('Refreshing all') do
+        Vedeu.interfaces.zindexed.each do |interface|
+          Vedeu.trigger(:_refresh_, interface.name)
+        end
+      end
+    end
+
+  end # Refresh
+
+end # Vedeu

data/lib/vedeu/refresh/refresh_buffer.rb

@@ -0,0 +1,53 @@
+module Vedeu
+
+  # Refreshes the given named interface.
+  #
+  # @example
+  #   Vedeu.trigger(:_refresh_, name)
+  #
+  class RefreshBuffer
+
+    include Vedeu::Common
+
+    # @param name [String] The name of the interface to be refreshed using the
+    #   named buffer.
+    # @return [Array|Vedeu::ModelNotFound]
+    def self.by_name(name)
+      new(name).by_name
+    end
+
+    # Return a new instance of Vedeu::RefreshBuffer.
+    #
+    # @param name [String]
+    # @return [Vedeu::RefreshBuffer]
+    def initialize(name)
+      @name = name
+    end
+
+    # @return [void]
+    def by_name
+      Vedeu.timer("Refresh Buffer: '#{buffer_name}'") do
+        Vedeu.buffers.by_name(buffer_name).render
+      end
+    end
+
+    protected
+
+    # # @!attribute [r] name
+    # @return [String]
+    attr_reader :name
+
+    private
+
+    # @raise [Vedeu::MissingRequired] When the name is empty or nil.
+    # @return [String]
+    def buffer_name
+      return name if present?(name)
+
+      fail Vedeu::MissingRequired,
+           'Cannot refresh interface with an empty interface name.'
+    end
+
+  end # RefreshBuffer
+
+end # Vedeu