vedeu 0.5.8 → 0.5.9

data/test/lib/vedeu/models/cell_test.rb

@@ -39,7 +39,7 @@ module Vedeu
     end
 
     describe '#eql?' do
-      let(:other) { described.new(colour: Colour.new(background: '#000000')) }
+      let(:other) { described.new(value: nil) }
 
       subject { instance.eql?(other) }
 
@@ -48,7 +48,7 @@ module Vedeu
       it { subject.must_equal(true) }
 
       context 'when different to other' do
-        let(:other) { described.new(colour: Colour.new(background: '#ff0000')) }
+        let(:other) { described.new(value: 'b') }
 
         it { subject.must_equal(false) }
       end

data/test/test_helper.rb

@@ -26,6 +26,7 @@ unless ENV['NO_SIMPLECOV']
     add_group  'cursor',        'vedeu/cursor'
     add_group  'distributed',   'vedeu/distributed'
     add_group  'dsl',           'vedeu/dsl'
+    add_group  'esc',           'vedeu/esc'
     add_group  'events',        'vedeu/events'
     add_group  'geometry',      'vedeu/geometry'
     add_group  'input',         'vedeu/input'

data/vedeu.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'guard',              '2.13.0'
   spec.add_development_dependency 'guard-minitest',     '2.4.4'
-  spec.add_development_dependency 'minitest',           '5.7.0'
+  spec.add_development_dependency 'minitest',           '5.8.0'
   spec.add_development_dependency 'minitest-reporters', '1.0.19'
   spec.add_development_dependency 'mocha',              '1.1.0'
   spec.add_development_dependency 'pry',                '0.10.1'
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov-console',  '0.2.0'
   spec.add_development_dependency 'yard',               '0.8.7.6'
 
-  spec.add_dependency 'bundler', '~> 1.8'
+  spec.add_dependency 'bundler', '~> 1.10'
   spec.add_dependency 'rake',    '~> 10.4'
   spec.add_dependency 'thor',    '0.19.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-08 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.7.0
+        version: 5.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.7.0
+        version: 5.8.0
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -307,7 +307,6 @@ files:
 - lib/vedeu/colours/colour.rb
 - lib/vedeu/colours/colour_translator.rb
 - lib/vedeu/colours/colours.rb
-- lib/vedeu/colours/escape_sequences.rb
 - lib/vedeu/colours/foreground.rb
 - lib/vedeu/colours/foregrounds.rb
 - lib/vedeu/common.rb
@@ -348,6 +347,10 @@ files:
 - lib/vedeu/dsl/text.rb
 - lib/vedeu/dsl/use.rb
 - lib/vedeu/dsl/view.rb
+- lib/vedeu/esc/actions.rb
+- lib/vedeu/esc/borders.rb
+- lib/vedeu/esc/colours.rb
+- lib/vedeu/esc/esc.rb
 - lib/vedeu/events/event.rb
 - lib/vedeu/events/event_aliases.rb
 - lib/vedeu/events/event_collection.rb
@@ -391,18 +394,17 @@ files:
 - lib/vedeu/models/views/line.rb
 - lib/vedeu/models/views/stream.rb
 - lib/vedeu/models/views/view.rb
-- lib/vedeu/null.rb
 - lib/vedeu/null/border.rb
 - lib/vedeu/null/buffer.rb
 - lib/vedeu/null/generic.rb
 - lib/vedeu/null/geometry.rb
 - lib/vedeu/null/interface.rb
 - lib/vedeu/null/menu.rb
+- lib/vedeu/null/null.rb
 - lib/vedeu/null/view.rb
 - lib/vedeu/output/clear/named_group.rb
 - lib/vedeu/output/clear/named_interface.rb
 - lib/vedeu/output/compressor.rb
-- lib/vedeu/output/esc.rb
 - lib/vedeu/output/html_char.rb
 - lib/vedeu/output/output.rb
 - lib/vedeu/output/presentation.rb
@@ -478,7 +480,6 @@ files:
 - test/lib/vedeu/colours/colour_test.rb
 - test/lib/vedeu/colours/colour_translator_test.rb
 - test/lib/vedeu/colours/colours_test.rb
-- test/lib/vedeu/colours/escape_sequences_test.rb
 - test/lib/vedeu/colours/foreground_test.rb
 - test/lib/vedeu/colours/foregrounds_test.rb
 - test/lib/vedeu/common_test.rb
@@ -508,6 +509,9 @@ files:
 - test/lib/vedeu/dsl/text_test.rb
 - test/lib/vedeu/dsl/use_test.rb
 - test/lib/vedeu/dsl/view_test.rb
+- test/lib/vedeu/esc/actions_test.rb
+- test/lib/vedeu/esc/borders_test.rb
+- test/lib/vedeu/esc/colours_test.rb
 - test/lib/vedeu/events/event_aliases_test.rb
 - test/lib/vedeu/events/event_collection_test.rb
 - test/lib/vedeu/events/event_test.rb
@@ -665,7 +669,6 @@ test_files:
 - test/lib/vedeu/colours/colour_test.rb
 - test/lib/vedeu/colours/colour_translator_test.rb
 - test/lib/vedeu/colours/colours_test.rb
-- test/lib/vedeu/colours/escape_sequences_test.rb
 - test/lib/vedeu/colours/foreground_test.rb
 - test/lib/vedeu/colours/foregrounds_test.rb
 - test/lib/vedeu/common_test.rb
@@ -695,6 +698,9 @@ test_files:
 - test/lib/vedeu/dsl/text_test.rb
 - test/lib/vedeu/dsl/use_test.rb
 - test/lib/vedeu/dsl/view_test.rb
+- test/lib/vedeu/esc/actions_test.rb
+- test/lib/vedeu/esc/borders_test.rb
+- test/lib/vedeu/esc/colours_test.rb
 - test/lib/vedeu/events/event_aliases_test.rb
 - test/lib/vedeu/events/event_collection_test.rb
 - test/lib/vedeu/events/event_test.rb

data/lib/vedeu/colours/escape_sequences.rb

@@ -1,125 +0,0 @@
-module Vedeu
-
-  # Provides escape sequence strings for terminal colours and some actions.
-  #
-  module EscapeSequences
-
-    extend self
-
-    # @return [Hash<Symbol => String>]
-    def actions
-      {
-        hide_cursor:     "\e[?25l",
-        show_cursor:     "\e[?25h",
-        cursor_position: "\e[6n",
-        bg_reset:        "\e[49m",
-        blink:           "\e[5m",
-        blink_off:       "\e[25m",
-        bold:            "\e[1m",
-        bold_off:        "\e[22m",
-        border_on:       "\e(0",
-        border_off:      "\e(B",
-        dim:             "\e[2m",
-        fg_reset:        "\e[39m",
-        negative:        "\e[7m",
-        positive:        "\e[27m",
-        reset:           "\e[0m",
-        underline:       "\e[4m",
-        underline_off:   "\e[24m",
-      }
-    end
-
-    # Produces the background named colour escape sequence hash from the
-    # foreground escape sequence hash.
-    #
-    # @return [Hash<Symbol => Fixnum>]
-    def background_codes
-      hash = {}
-      Vedeu::EscapeSequences.foreground_codes.inject(hash) do |h, (k, v)|
-        h.merge!(k => v + 10)
-      end
-    end
-
-    # Produces the foreground named colour escape sequence hash. The background
-    # escape sequences are also generated from this by adding 10 to the values.
-    # This hash gives rise to methods you can call directly on `Esc` to produce
-    # the desired colours:
-    #
-    # @example
-    #   Esc.red                     # => "\e[31m"
-    #
-    #   Esc.red { 'some text' }     # => "\e[31msome text\e[39m"
-    #
-    #   Esc.on_blue                 # => "\e[44m"
-    #
-    #   Esc.on_blue { 'some text' } # => "\e[44msome text\e[49m"
-    #
-    #   # Valid names:
-    #   :black, :red, :green, :yellow, :blue, :magenta, :cyan, :light_grey,
-    #   :default, :dark_grey, :light_red, :light_green, :light_yellow,
-    #   :light_blue, :light_magenta, :light_cyan, :white
-    #
-    # @return [Hash<Symbol => Fixnum>]
-    def foreground_codes
-      {
-        black:         30,
-        red:           31,
-        green:         32,
-        yellow:        33,
-        blue:          34,
-        magenta:       35,
-        cyan:          36,
-        light_grey:    37,
-        default:       39,
-        dark_grey:     90,
-        light_red:     91,
-        light_green:   92,
-        light_yellow:  93,
-        light_blue:    94,
-        light_magenta: 95,
-        light_cyan:    96,
-        white:         97,
-      }
-    end
-    alias_method :codes, :foreground_codes
-
-    # @return [void]
-    def setup!
-      define_actions!
-      define_backgrounds!
-      define_foregrounds!
-    end
-
-    private
-
-    # @return [void]
-    def define_actions!
-      actions.each { |key, code| define_method(key) { code } }
-    end
-
-    # @return [void]
-    def define_backgrounds!
-      background_codes.each do |key, code|
-        define_method('on_' + key.to_s) do |&blk|
-          "\e[#{code}m" + (blk ? blk.call + "\e[49m" : '')
-        end
-      end
-    end
-
-    # Dynamically creates methods for each terminal named colour. When a block
-    # is given, then the colour is reset to 'default' once the block is called.
-    #
-    # @return [void]
-    def define_foregrounds!
-      foreground_codes.each do |key, code|
-        define_method(key) do |&blk|
-          "\e[#{code}m" + (blk ? blk.call + "\e[39m" : '')
-        end
-      end
-    end
-
-  end # EscapeSequences
-
-end # Vedeu
-
-Vedeu::EscapeSequences.setup!

data/test/lib/vedeu/colours/escape_sequences_test.rb

@@ -1,100 +0,0 @@
-require 'test_helper'
-
-module Vedeu
-
-	describe EscapeSequences do
-
-    let(:described) { Vedeu::EscapeSequences }
-
-    before { Vedeu::Terminal.stubs(:size).returns([80, 25]) }
-
-    describe 'foreground colour methods' do
-      it { described.black.must_equal("\e[30m") }
-      it { described.red.must_equal("\e[31m") }
-      it { described.green.must_equal("\e[32m") }
-      it { described.yellow.must_equal("\e[33m") }
-      it { described.blue.must_equal("\e[34m") }
-      it { described.magenta.must_equal("\e[35m") }
-      it { described.cyan.must_equal("\e[36m") }
-      it { described.light_grey.must_equal("\e[37m") }
-      it { described.default.must_equal("\e[39m") }
-      it { described.dark_grey.must_equal("\e[90m") }
-      it { described.light_red.must_equal("\e[91m") }
-      it { described.light_green.must_equal("\e[92m") }
-      it { described.light_yellow.must_equal("\e[93m") }
-      it { described.light_blue.must_equal("\e[94m") }
-      it { described.light_magenta.must_equal("\e[95m") }
-      it { described.light_cyan.must_equal("\e[96m") }
-      it { described.white.must_equal("\e[97m") }
-
-      it 'returns an escape sequence for the foreground colour and resets ' \
-         'after calling the block' do
-        described.cyan do
-          'ununpentium'
-        end.must_equal("\e[36mununpentium\e[39m")
-      end
-    end
-
-    describe '.codes' do
-      it { described.codes.must_be_instance_of(Hash) }
-      it { described.must_respond_to(:foreground_codes) }
-    end
-
-    describe '.background_codes' do
-      it { described.background_codes.must_be_instance_of(Hash) }
-    end
-
-    describe 'background colour methods' do
-      it { described.on_black.must_equal("\e[40m") }
-      it { described.on_red.must_equal("\e[41m") }
-      it { described.on_green.must_equal("\e[42m") }
-      it { described.on_yellow.must_equal("\e[43m") }
-      it { described.on_blue.must_equal("\e[44m") }
-      it { described.on_magenta.must_equal("\e[45m") }
-      it { described.on_cyan.must_equal("\e[46m") }
-      it { described.on_light_grey.must_equal("\e[47m") }
-      it { described.on_default.must_equal("\e[49m") }
-      it { described.on_dark_grey.must_equal("\e[100m") }
-      it { described.on_light_red.must_equal("\e[101m") }
-      it { described.on_light_green.must_equal("\e[102m") }
-      it { described.on_light_yellow.must_equal("\e[103m") }
-      it { described.on_light_blue.must_equal("\e[104m") }
-      it { described.on_light_magenta.must_equal("\e[105m") }
-      it { described.on_light_cyan.must_equal("\e[106m") }
-      it { described.on_white.must_equal("\e[107m") }
-
-      it 'returns an escape sequence for the background colour and resets ' \
-         'after calling the block' do
-        described.on_red do
-          'livermorium'
-        end.must_equal("\e[41mlivermorium\e[49m")
-      end
-    end
-
-    describe 'action methods' do
-      it { described.hide_cursor.must_equal("\e[?25l") }
-      it { described.show_cursor.must_equal("\e[?25h") }
-      it { described.cursor_position.must_equal("\e[6n") }
-      it { described.bg_reset.must_equal("\e[49m") }
-      it { described.blink.must_equal("\e[5m") }
-      it { described.blink_off.must_equal("\e[25m") }
-      it { described.bold.must_equal("\e[1m") }
-      it { described.bold_off.must_equal("\e[22m") }
-      it { described.border_on.must_equal("\e(0") }
-      it { described.border_off.must_equal("\e(B") }
-      it { described.dim.must_equal("\e[2m") }
-      it { described.fg_reset.must_equal("\e[39m") }
-      it { described.negative.must_equal("\e[7m") }
-      it { described.positive.must_equal("\e[27m") }
-      it { described.reset.must_equal("\e[0m") }
-      it { described.underline.must_equal("\e[4m") }
-      it { described.underline_off.must_equal("\e[24m") }
-    end
-
-    describe '.actions' do
-      it { described.actions.must_be_instance_of(Hash) }
-    end
-
-	end # EscapeSequences
-
-end # Vedeu