vedeu 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78eafb32b9a942a36cbc9ed4d65bf96542e39c03
-  data.tar.gz: 6e79f409e8be1e884060585b04066ae0995e7aac
+  metadata.gz: e3051d98a552c6a3129de526b25593c3e7f0be00
+  data.tar.gz: 32c2e964c4556e84f06f02bd0278fd466281693b
 SHA512:
-  metadata.gz: 3fb0a166b340bae5d0ba423c698f6304f20777291ab316defa98b5b4dbcdf91fed7160b1c567663346052fdced575e11d32fc0aec7fc6c59cae10ce48993cccb
-  data.tar.gz: c4e0c6cdea25d795fde8bc46358f74656efc15e69609efcd390c24d8464ce9f1163dcceaf44337ecf6f9b05081e7ce2d248a692e7905ebe0899440546b190c71
+  metadata.gz: b9fd3e03a60603baf573466fcf384b8b625fa5be156ab87e321c060eb391fbe84b1113ff4f27c1dc1a0fbc307fb536802436a894c958f864b5f1b2ea24564d8b
+  data.tar.gz: a09c6e80a05b2a44bfc029b563acbb79d09d2fd16b00355b29d074176a72090d2a2dd3745e12b17a5b414f7b2c953f50a7f7278294ae682e634e029faf101ac2

data/README.md

@@ -28,24 +28,6 @@ TODO: Write detailed documentation
       |-- Interfaces
       |     |-- Dummy < Interface
       |
-      |-- Process
-      |     |-- Commands
-      |     |     |-- Command
-      |     |
-      |     |-- Compositor
-      |     |     |-- Directive
-      |     |     |     |-- Colour
-      |     |     |     |     |-- Foreground < Base
-      |     |     |     |     |-- Background < Base
-      |     |     |     |
-      |     |     |     |-- Position
-      |     |     |     |-- Style
-      |     |     |           |-- Esc
-      |     |     |
-      |     |     |-- Terminal
-      |     |
-      |     |-- Terminal
-      |
       |-- Terminal
 
     Base
@@ -53,6 +35,22 @@ TODO: Write detailed documentation
       |-- Esc
 
     Interface
+      |-- Commands
+      |     |-- Command
+      |     |-- Exit
+      |
+      |-- Compositor
+      |     |-- Directive
+      |     |     |-- Colour
+      |     |     |     |-- Foreground < Base
+      |     |     |     |-- Background < Base
+      |     |     |
+      |     |     |-- Position
+      |     |     |-- Style
+      |     |           |-- Esc
+      |     |
+      |     |-- Terminal
+      |
       |-- Terminal
 
     Terminal

data/lib/vedeu.rb

@@ -1,5 +1,4 @@
 require 'io/console'
-require 'singleton'
 
 require_relative 'vedeu/support/terminal'
 
@@ -21,7 +20,6 @@ require_relative 'vedeu/interface/dummy'
 require_relative 'vedeu/process/commands'
 require_relative 'vedeu/process/command'
 require_relative 'vedeu/process/exit'
-require_relative 'vedeu/process/process'
 
 require_relative 'vedeu/application'
 require_relative 'vedeu/version'

data/lib/vedeu/application.rb

@@ -1,18 +1,20 @@
 module Vedeu
   class Application
     class << self
-      def start(interfaces = nil, options = {})
-        new(interfaces, options).start
+      def start(options = {})
+        new(options).main_sequence
       end
     end
 
-    def initialize(interfaces = nil, options = {})
-      @interfaces, @options = interfaces, options
+    def initialize(options = {})
+      @options = options
     end
 
-    def start
+    def main_sequence
       Terminal.open(options) do
-        Process.main_sequence(interfaces)
+        initial_state
+
+        event_loop
       end
     ensure
       Terminal.close
@@ -20,7 +22,19 @@ module Vedeu
 
     private
 
-    attr_reader :interfaces, :options
+    attr_reader :options
+
+    def event_loop
+      interfaces.event_loop
+    end
+
+    def initial_state
+      interfaces.initial_state
+    end
+
+    def interfaces
+      @interfaces ||= Interfaces.defined || Interfaces.default
+    end
 
     def options
       defaults.merge!(@options)

data/lib/vedeu/interface/interfaces.rb

@@ -1,21 +1,27 @@
 module Vedeu
   class UndefinedInterface < StandardError; end
 
-  class Interfaces
-    class << self
-      def default
-        new { |io| io.add(:dummy, Dummy) }
-      end
+  module Interfaces
+    extend self
 
-      def define(&block)
-        new(&block)
-      end
+    def default
+      add(:dummy, Dummy)
     end
 
-    def initialize(&block)
-      @interfaces ||= {}
+    def defined
+      interfaces.empty? ? nil : interfaces
+    end
+
+    def define(&block)
+      if block_given?
+        yield self
+      else
+        self
+      end
+    end
 
-      yield self if block_given?
+    def list
+      interfaces.inspect
     end
 
     def add(name, klass, options = {})
@@ -25,10 +31,6 @@ module Vedeu
       end
     end
 
-    def show
-      interfaces
-    end
-
     def initial_state
       interfaces.values.map { |io| io.call.initial_state }
     end
@@ -39,11 +41,13 @@ module Vedeu
 
     private
 
-    attr_accessor :interfaces
-
     def valid?(klass)
       raise UndefinedInterface unless Object.const_defined?(klass.to_s)
       true
     end
+
+    def interfaces
+      @interfaces ||= {}
+    end
   end
 end

data/lib/vedeu/output/compositor.rb

@@ -1,15 +1,15 @@
 module Vedeu
   class Compositor
     class << self
-      def write(output = [], options = {})
+      def write(output = [])
         return if output.nil? || output.empty?
 
-        new(output, options).write
+        new(output).write
       end
     end
 
-    def initialize(output = [], options = {})
-      @output, @options = output, options
+    def initialize(output = [])
+      @output = output
     end
 
     def write
@@ -48,13 +48,5 @@ module Vedeu
     def write_line(data)
       Terminal.output(data)
     end
-
-    def options
-      defaults.merge!(@options)
-    end
-
-    def defaults
-      {}
-    end
   end
 end

data/lib/vedeu/output/translator.rb

@@ -12,7 +12,7 @@ module Vedeu
 
     def translate
       return unless valid?
-      [term_colour_base, red, green, blue].inject(:+)
+      [16, red, green, blue].inject(:+)
     end
 
     private
@@ -20,31 +20,15 @@ module Vedeu
     attr_reader :html_colour
 
     def red
-      (html_colour[1..2].to_i(16) / colour_divide) * 36
+      (html_colour[1..2].to_i(16) / 51) * 36
     end
 
     def green
-      (html_colour[3..4].to_i(16) / colour_divide) * 6
+      (html_colour[3..4].to_i(16) / 51) * 6
     end
 
     def blue
-      (html_colour[5..6].to_i(16) / colour_divide) * 1
-    end
-
-    def colour_divide
-      source_values / target_values
-    end
-
-    def source_values
-      256
-    end
-
-    def target_values
-      5
-    end
-
-    def term_colour_base
-      16
+      (html_colour[5..6].to_i(16) / 51) * 1
     end
 
     def valid?

data/lib/vedeu/process/commands.rb

@@ -1,38 +1,16 @@
 module Vedeu
-  class Commands
-    include Singleton
-
-    class << self
-      def instance(&block)
-        @instance ||= new(&block)
-      end
-      alias_method :define, :instance
-
-      # def define(name, klass, args = [], options = {}, &block)
-      #   instance.define(name, klass, args = [], options = {})
-      # end
-
-      def execute(command = "")
-        instance.execute(command)
-      end
-
-      def list
-        instance.list
+  module Commands
+    extend self
+
+    def define(&block)
+      if block_given?
+        yield self
+      else
+        self
       end
     end
 
-    def initialize(&block)
-      @commands ||= { 'exit' => Proc.new { Exit.dispatch } }
-
-      yield self if block_given?
-    end
-
-    def define(name, klass, args = [], options = {})
-      commands.merge!(Command.define(name, klass, args, options))
-    end
-    alias_method :add, :define
-
-    def execute(command)
+    def execute(command = "")
       commands.fetch(command).call if exists?(command)
     end
 
@@ -40,13 +18,18 @@ module Vedeu
       commands.inspect
     end
 
-    private
+    def add(name, klass, args = [], options = {})
+      commands.merge!(Command.define(name, klass, args, options))
+    end
 
-    attr_accessor :commands
-    attr_accessor :instance
+    private
 
     def exists?(command)
       commands.fetch(command, false)
     end
+
+    def commands
+      @commands ||= { 'exit' => Proc.new { Exit.dispatch } }
+    end
   end
 end

data/lib/vedeu/version.rb

@@ -1,3 +1,3 @@
 module Vedeu
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/lib/vedeu/application_test.rb

@@ -3,14 +3,11 @@ require_relative '../../test_helper'
 module Vedeu
   describe Application do
     let(:described_class) { Application }
-    let(:instance)        { described_class.new(interfaces, options) }
-    let(:interfaces)      {}
+    let(:instance)        { described_class.new(options) }
     let(:options)         { {} }
 
-    describe '#start' do
-      before { Esc.stubs(:clear).returns('') }
-
-      subject { instance.start }
+    describe '.start' do
+      subject { described_class.start(options) }
 
       it { skip }
     end

data/test/lib/vedeu/interface/interfaces_test.rb

@@ -1,35 +1,43 @@
 require_relative '../../../test_helper'
 
 module Vedeu
-  describe Interfaces do
-    let(:described_class)    { Interfaces }
-    let(:instance) { described_class.new }
-    let(:block)    {}
+  class DummyInterface < Interface
+    def initial_state; end
+
+    def event_loop; end
+  end
 
-    it { instance.must_be_instance_of(Interfaces) }
+  describe Interfaces do
+    let(:described_class) { Interfaces }
 
     describe '.default' do
       subject { described_class.default }
 
-      it { subject.must_be_instance_of(Interfaces) }
+      it { subject.must_be_instance_of(Hash) }
 
       it 'adds the dummy interface to the interface list' do
-        subject.show.wont_be_empty
+        described_class.list.wont_be_empty
       end
     end
 
+    describe '.defined' do
+      subject { described_class.defined }
+
+      it { subject.must_be_instance_of(Hash) }
+    end
+
     describe '.define' do
       subject { described_class.define }
 
-      it { subject.must_be_instance_of(Interfaces) }
+      it { subject.must_be_instance_of(Module) }
     end
 
-    describe '#add' do
-      let(:interface_name)  {}
-      let(:klass) { Class }
-      let(:options)         { {} }
+    describe '.add' do
+      let(:interface) {}
+      let(:klass)     { DummyInterface }
+      let(:options)   { {} }
 
-      subject { instance.add(interface_name, klass, options) }
+      subject { described_class.add(interface, klass, options) }
 
       it { subject.must_be_instance_of(Hash) }
 
@@ -42,20 +50,25 @@ module Vedeu
       end
     end
 
-    describe '#show' do
-      subject { instance.show }
+    describe '.list' do
+      subject { described_class.list }
 
-      it { subject.must_be_instance_of(Hash) }
+      it { subject.must_be_instance_of(String) }
     end
 
-    describe '#initial_state' do
-      subject { instance.initial_state }
+    describe '.initial_state' do
+      subject { described_class.initial_state }
 
       it { subject.must_be_instance_of(Array) }
     end
 
-    describe '#event_loop' do
-      subject { instance.event_loop }
+    describe '.event_loop' do
+      before do
+        Terminal.stubs(:input)
+        Commands.stubs(:execute).returns(:stop)
+      end
+
+      subject { described_class.event_loop }
 
       it { subject.must_be_instance_of(Array) }
     end

data/test/lib/vedeu/output/compositor_test.rb

@@ -2,7 +2,7 @@ require_relative '../../../test_helper'
 
 module Vedeu
   describe Compositor do
-    let(:described_class)    { Compositor }
+    let(:described_class) { Compositor }
     let(:instance) { described_class.new(rows) }
     let(:rows)     { [[]] }
 

data/test/lib/vedeu/output/style_test.rb

@@ -43,6 +43,12 @@ module Vedeu
         it { subject.must_equal("\e[0m") }
       end
 
+      context 'when the style is normal' do
+        let(:style) { :normal }
+
+        it { subject.must_equal("\e[0m") }
+      end
+
       context 'when the style is show_cursor' do
         let(:style) { :show_cursor }
 

data/test/lib/vedeu/output/translator_test.rb

@@ -2,11 +2,10 @@ require_relative '../../../test_helper'
 
 module Vedeu
   describe Translator do
-    let(:described_class)       { Translator }
-    let(:instance)    { described_class.new(html_colour) }
+    let(:described_class) { Translator }
     let(:html_colour) {}
 
-    it { instance.must_be_instance_of(Translator) }
+    it { described_class.new(html_colour).must_be_instance_of(Translator) }
 
     describe '#translate' do
       {
@@ -31,7 +30,7 @@ module Vedeu
           described_class.translate.must_equal(nil)
         end
 
-        it 'returns nil when the wrong type' do
+        it 'returns nil when the wrong type!' do
           described_class.translate(:wrong_type).must_equal(nil)
         end
 

data/test/lib/vedeu/process/commands_test.rb

@@ -1,16 +1,20 @@
 require_relative '../../../test_helper'
 
 module Vedeu
-  class DummyCommandKlass
-    def self.dispatch; end
+  class DummyCommand
+    def self.dispatch
+      :noop
+    end
   end
 
   describe Commands do
-    let(:described_class)    { Commands }
-    let(:instance) { described_class.instance }
-    let(:block)    {}
+    let(:described_class) { Commands }
+
+    describe '.define' do
+      subject { described_class.define }
 
-    it { instance.must_be_instance_of(Commands) }
+      it { skip }
+    end
 
     describe '.execute' do
       subject { described_class.execute }
@@ -24,27 +28,15 @@ module Vedeu
       it { subject.must_be_instance_of(String) }
     end
 
-    describe '#define' do
+    describe '.add' do
       let(:command_name)  { "some_name" }
-      let(:command_klass) { DummyCommandKlass }
+      let(:command_klass) { DummyCommand }
       let(:args)          { [] }
       let(:options)       { {} }
 
-      subject { instance.define(command_name, command_klass, args, options) }
+      subject { described_class.add(command_name, command_klass, args, options) }
 
       it { subject.must_be_instance_of(Hash) }
     end
-
-    describe '#execute' do
-      subject { instance.execute }
-
-      it { skip }
-    end
-
-    describe '#list' do
-      subject { instance.list }
-
-      it { subject.must_be_instance_of(String) }
-    end
   end
 end

data/test/lib/vedeu/support/terminal_test.rb

@@ -103,6 +103,12 @@ module Vedeu
       end
     end
 
+    describe '.clear_line' do
+      subject { described_class.clear_line }
+
+      it { skip }
+    end
+
     describe '.show_cursor' do
       before { console.stubs(:puts) }
 
@@ -131,6 +137,18 @@ module Vedeu
       end
     end
 
+    describe '#initialize' do
+      subject { described_class.new }
+
+      it { skip }
+    end
+
+    describe '#open' do
+      subject { described_class.new.open }
+
+      it { skip }
+    end
+
     describe '#initial_setup!' do
       subject { described_class.new.initial_setup! }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -170,7 +170,6 @@ files:
 - lib/vedeu/process/command.rb
 - lib/vedeu/process/commands.rb
 - lib/vedeu/process/exit.rb
-- lib/vedeu/process/process.rb
 - lib/vedeu/support/terminal.rb
 - lib/vedeu/version.rb
 - test/lib/vedeu/application_test.rb
@@ -190,7 +189,6 @@ files:
 - test/lib/vedeu/process/command_test.rb
 - test/lib/vedeu/process/commands_test.rb
 - test/lib/vedeu/process/exit_test.rb
-- test/lib/vedeu/process/process_test.rb
 - test/lib/vedeu/support/terminal_test.rb
 - test/lib/vedeu/version_test.rb
 - test/support/test_app/bin/testapp
@@ -238,7 +236,6 @@ test_files:
 - test/lib/vedeu/process/command_test.rb
 - test/lib/vedeu/process/commands_test.rb
 - test/lib/vedeu/process/exit_test.rb
-- test/lib/vedeu/process/process_test.rb
 - test/lib/vedeu/support/terminal_test.rb
 - test/lib/vedeu/version_test.rb
 - test/support/test_app/bin/testapp

data/lib/vedeu/process/process.rb

@@ -1,33 +0,0 @@
-module Vedeu
-  class Process
-    class << self
-      def main_sequence(interfaces = nil)
-        new(interfaces).main_sequence
-      end
-    end
-
-    def initialize(interfaces = nil)
-      @interfaces = interfaces
-    end
-
-    def main_sequence
-      initial_state
-
-      event_loop
-    end
-
-    private
-
-    def event_loop
-      interfaces.event_loop
-    end
-
-    def initial_state
-      interfaces.initial_state
-    end
-
-    def interfaces
-      @interfaces ||= Interfaces.default
-    end
-  end
-end

data/test/lib/vedeu/process/process_test.rb

@@ -1,10 +0,0 @@
-require_relative '../../../test_helper'
-
-module Vedeu
-  describe Process do
-    let(:described_class) { Process }
-    let(:instance)        { described_class.new }
-
-    it { instance.must_be_instance_of(Process) }
-  end
-end