vedeu 0.4.36 → 0.4.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ecad92f4001170f4fa870a5738639b549bd5030
-  data.tar.gz: aebc0c775c358a62c309bdfba93d58d01077c662
+  metadata.gz: e29978c4b64039fc130cc5bad584e48e4ab08a6d
+  data.tar.gz: b88b3581a5d9db259b16536802ce766ac00fd524
 SHA512:
-  metadata.gz: 2fe008b535bc415a6a7c6829ebf256bc0913edf2fe5d2abc4808e8e8ea67d9ee7e8ca9e14286de8d5829617abd381f47dfe070117190194468f796b2f707dc25
-  data.tar.gz: d822a5e46f9c3897c49eb7edb65f4ecb2c32b61a5bc0c62ac1f2b6080febebcfc439d80e81e0e8832ca392f08b6fa9b6fc375e1ff15b08cc22e29f7154aeccc5
+  metadata.gz: c2d7cf78b2fe8c5282fd1f3c4f3d25210d258a2db632d1cb7cdf6214c743e54141b104af5868f33fab97a0de017e0e17db663511ffb4d49ef805fa48032c3d12
+  data.tar.gz: d880b25648befe1cabb5441c2e62a5b08b2391abfdf684b25c8063233784c36252a86460dfeb0c52217d2600b1e318cb5ef8a20b22f22a6c640692a58a6c8b7c

data/bin/vedeu

@@ -37,7 +37,8 @@ begin
     print "\n\e[33mVedeu v#{Vedeu::VERSION}\e[39m\n\n"
     print "\e[4m\e[36mUsage:\e[39m\e[24m\n\n"
     print "\e[32m  vedeu new [app_name]\e[39m\n"
-    print "    Creates the skeleton file and directory structure for a new Vedeu client application.\n\n"
+    print '    Creates the skeleton file and directory structure for a new '
+    print "Vedeu client application.\n\n"
     print "\e[32m  vedeu view [view_name]\e[39m\n"
     print "    Creates a new view for Vedeu.\n"
     print "\n\n"

data/lib/vedeu/api.rb

@@ -126,7 +126,11 @@ module Vedeu
 
     # @!method log
     #   @see Vedeu::Log.log
-    def_delegators Vedeu::Log, :log
+    # @!method log_stdout
+    #   @see Vedeu::Log.log_stdout
+    # @!method log_stderr
+    #   @see Vedeu::Log.log_stderr
+    def_delegators Vedeu::Log, :log, :log_stdout, :log_stderr
 
     # @!method keypress
     #   @see Vedeu::Mapper.keypress

data/lib/vedeu/bootstrap.rb

@@ -55,17 +55,19 @@ module Vedeu
     # @param path [String]
     # @return [String]
     def load(path)
+      loadables(path).each { |file| Kernel.load(file) }
+
+      path
+    end
+
+    # @param path [String]
+    # @return [Array<String>]
+    def loadables(path)
       files = send(path)
 
       Dir.glob(files).select do |file|
         File.file?(file) && File.extname(file) == '.rb'
-
-      end.each do |file|
-        Kernel.load(file)
-
       end
-
-      path
     end
 
   end # Bootstrap

data/lib/vedeu/dsl/composition.rb

@@ -91,14 +91,20 @@ module Vedeu
       # @param name [String] The name of interface for which this template's
       #   content belongs to.
       # @param filename [String] The filename (including path) to the template
-      #   to be used.
+      #   to be used. Yoy can use `File.dirname(__FILE__)` to use relative
+      #   paths.
       # @param object [Object] The object for which the values of template's
       #   variables can be obtained.
       # @param options [Hash] See {Vedeu::Wordwrap}
       # @return [Vedeu::Interfaces<Vedeu::Interface>]
       def template_for(name, filename, object = nil, options = {})
-        content = Vedeu::Template.parse(object, filename)
-        lines   = Vedeu::Wordwrap.for(content, options)
+        fail MissingRequired, 'Cannot render template without the name of ' \
+                              'the view.' unless name
+        fail MissingRequired, "Cannot render template for '#{name}', without " \
+                              'a filename.' unless filename
+
+        content   = Vedeu::Template.parse(object, filename)
+        lines     = Vedeu::Wordwrap.for(content, options)
 
         new_model = model.member.build(template_attributes(name, lines))
 

data/lib/vedeu/generator/application.rb

@@ -37,16 +37,9 @@ module Vedeu
 
       # @return [void]
       def make_directory_structure
-        FileUtils.mkdir_p(name + '/app/controllers')
-        FileUtils.mkdir_p(name + '/app/helpers')
-        FileUtils.mkdir_p(name + '/app/models/keymaps')
-        FileUtils.mkdir_p(name + '/app/views/interfaces')
-        FileUtils.mkdir_p(name + '/app/views/templates')
-        FileUtils.mkdir_p(name + '/bin')
-        FileUtils.mkdir_p(name + '/config')
-        FileUtils.mkdir_p(name + '/lib')
-        FileUtils.mkdir_p(name + '/test')
-        FileUtils.mkdir_p(name + '/vendor')
+        directories.each do |directory|
+          FileUtils.mkdir_p(name + directory)
+        end
       end
 
       # @return [void]
@@ -101,6 +94,22 @@ module Vedeu
                      "#{name}/app/models/keymaps/_system_.rb")
       end
 
+      # @return [Array<String>]
+      def directories
+        [
+          '/app/controllers',
+          '/app/helpers',
+          '/app/models/keymaps',
+          '/app/views/interfaces',
+          '/app/views/templates',
+          '/bin',
+          '/config',
+          '/lib',
+          '/test',
+          '/vendor',
+        ]
+      end
+
     end # Application
 
   end # Generator

data/lib/vedeu/generator/helpers.rb

@@ -24,6 +24,8 @@ module Vedeu
       # @param destination [String]
       # @return [void]
       def make_file(source, destination)
+        Vedeu.log_stdout(type: :create, message: "Writing: '#{destination}'")
+
         File.write(destination, parse(source))
       end
 

data/lib/vedeu/generator/view.rb

@@ -38,30 +38,30 @@ module Vedeu
       # @return [void]
       def make_controller_file
         make_file(source + '/app/controllers/name.erb',
-                  app_name + "/app/controllers/#{name}.rb")
+                  '.' + "/app/controllers/#{name}_controller.rb")
       end
 
       # @return [void]
       def make_helper_file
         make_file(source + '/app/helpers/name.erb',
-                  app_name + "/app/helpers/#{name}.rb")
+                  '.' + "/app/helpers/#{name}_helper.rb")
       end
 
       # @return [void]
       def make_interface_file
         make_file(source + '/app/views/interfaces/name.erb',
-                  app_name + "/app/views/interfaces/#{name}.rb")
+                  '.' + "/app/views/interfaces/#{name}.rb")
       end
 
       # @return [void]
       def make_template_file
-        FileUtils.touch(app_name + "/app/views/templates/#{name}.erb")
+        FileUtils.touch('.' + "/app/views/templates/#{name}.erb")
       end
 
       # @return [void]
       def make_view_class_file
         make_file(source + '/app/views/name.erb',
-                  app_name + "/app/views/#{name}.rb")
+                  '.' + "/app/views/#{name}.rb")
       end
 
     end # View

data/lib/vedeu/output/colour.rb

@@ -40,7 +40,23 @@ module Vedeu
     # @param value []
     # @return [Object]
     def self.coerce(value)
-      Vedeu::ColourCoercer.coerce(value)
+      # Vedeu::ColourCoercer.coerce(value)
+      return value if value.is_a?(self)
+      return new unless value.is_a?(Hash)
+
+      if value[:colour]
+        return value[:colour] if value[:colour].is_a?(self)
+        return new unless value[:colour].is_a?(Hash)
+        return new(value[:colour]) if value[:colour][:background] ||
+                                      value[:colour][:foreground]
+
+      elsif value[:background] || value[:foreground]
+        new(value)
+
+      else
+        new
+
+      end
     end
 
     # Returns a new instance of Vedeu::Colour.

data/lib/vedeu/support/log.rb

@@ -11,11 +11,11 @@ module Vedeu
     #   STDOUT, STDERR or an open file).
     #
     def initialize(logdev)
-      @level = DEBUG
+      @level             = DEBUG
       @default_formatter = Formatter.new
-      @formatter = nil
-      @logdev = nil
-      @logdev = LocklessLogDevice.new(logdev) if logdev
+      @formatter         = nil
+      @logdev            = nil
+      @logdev            = LocklessLogDevice.new(logdev) if logdev
     end
 
     # Ensures we can always write to the log file by creating a lock-less
@@ -28,14 +28,14 @@ module Vedeu
       # @param log []
       # @return []
       def initialize(log = nil)
-        @dev = nil
+        @dev      = nil
         @filename = nil
 
         if log.respond_to?(:write) && log.respond_to?(:close)
           @dev = log
 
         else
-          @dev = open_logfile(log)
+          @dev      = open_logfile(log)
           @dev.sync = true
           @filename = log
 
@@ -101,6 +101,16 @@ module Vedeu
                       message_body(type, message)]) if enabled? || force
       end
 
+      # @return [TrueClass]
+      def log_stdout(type: :info, message:)
+        $stdout.puts [message_type(type), message_body(type, message)].join
+      end
+
+      # @return [TrueClass]
+      def log_stderr(type: :info, message:)
+        $stderr.puts [message_type(type), message_body(type, message)].join
+      end
+
       # @return [TrueClass]
       def logger
         MonoLogger.new(log_file).tap do |log|

data/lib/vedeu/tasks/vedeu.rake

@@ -1,3 +1,5 @@
-Dir[File.expand_path('../*.rake', __FILE__)].delete_if do |task_file|
+tasks = Dir[File.expand_path('../*.rake', __FILE__)].delete_if do |task_file|
   task_file =~ /vedeu\.rake$/
-end.each { |task_file| load task_file }
+end
+
+tasks.each { |task_file| load task_file }

data/lib/vedeu/traps.rb

@@ -5,9 +5,15 @@ module Vedeu
   # @api private
   module Traps
 
-    Signal.trap('INT') { puts; exit(1) }
+    Signal.trap('INT') do
+      puts
+      exit(1)
+    end
 
-    Signal.trap('TERM') { puts; exit(1) }
+    Signal.trap('TERM') do
+      puts
+      exit(1)
+    end
 
     Signal.trap('TTIN') {}
     Signal.trap('USR1') {}

data/lib/vedeu/version.rb

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

data/test/lib/vedeu/api_test.rb

@@ -32,6 +32,8 @@ module Vedeu
     it { Vedeu.must_respond_to(:interfaces) }
     it { Vedeu.must_respond_to(:keymaps) }
     it { Vedeu.must_respond_to(:log) }
+    it { Vedeu.must_respond_to(:log_stdout) }
+    it { Vedeu.must_respond_to(:log_stderr) }
     it { Vedeu.must_respond_to(:keypress) }
     it { Vedeu.must_respond_to(:menu) }
     it { Vedeu.must_respond_to(:menus) }

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

@@ -46,14 +46,31 @@ module Vedeu
           ]
         }
 
-        before do
-          Vedeu::Template.expects(:parse).
-            with(object, filename).returns(content)
+        subject { instance.template_for(_name, filename, object) }
+
+        context 'when the name of the view is not given' do
+          let(:filename) { 'my_interface.erb' }
+
+          it { proc { subject }.must_raise(MissingRequired) }
         end
 
-        subject { instance.template_for(_name, filename, object) }
+        context 'when the filename of the template is not given' do
+          let(:_name) { 'my_interface' }
 
-        it { subject.must_be_instance_of(Vedeu::Interfaces) }
+          it { proc { subject }.must_raise(MissingRequired) }
+        end
+
+        context 'when the name and filename are given' do
+          let(:_name) { 'my_interface' }
+          let(:filename) { 'my_interface.erb' }
+
+          before do
+            Vedeu::Template.expects(:parse).
+              with(object, filename).returns(content)
+          end
+
+          it { subject.must_be_instance_of(Vedeu::Interfaces) }
+        end
       end
 
     end # Composition

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

@@ -27,6 +27,32 @@ module Vedeu
       end
     end
 
+    describe '.log_stdout' do
+      let(:type)     { :create }
+      let(:_message) { 'Logging to stdout...' }
+
+      subject { described.log_stdout(type: type, message: _message) }
+
+      it {
+        capture_io { subject }.must_equal(
+          ["\e[92m[create] \e[39m\e[32mLogging to stdout...\e[39m\n", ""]
+        )
+      }
+    end
+
+    describe '.log_stdout' do
+      let(:type)     { :debug }
+      let(:_message) { 'Logging to stderr...' }
+
+      subject { described.log_stderr(type: type, message: _message) }
+
+      it {
+        capture_io { subject }.must_equal(
+          ["", "\e[91m[debug]  \e[39m\e[31mLogging to stderr...\e[39m\n"]
+        )
+      }
+    end
+
     describe '.logger' do
       subject { described.logger }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.4.36
+  version: 0.4.37
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba