vedeu 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c62441c6579d781c59c825d69511b5d3705f6014
-  data.tar.gz: b944ba4c7e976e70968d18b2bf758887b83b3516
+  metadata.gz: d9f471ab14ab7f5b69de2e0b0c250002f3f1775a
+  data.tar.gz: 471ca4b7ef85a507cf71c0fa64e11844e464f7b0
 SHA512:
-  metadata.gz: abb5508cfafc005658e04093bf5b0c4ba39e44cbdcc5830658d05b6b58804e259b95d57d236981a851b95db6bf3771852788e0690ab9740b29cae3254db12feb
-  data.tar.gz: 86f47fa933d1ac72ab151aa968b8a7c2ef830e007fda1d4d5631e66a128ed054a11cf989cf852674968f0b79436f76a7f2f38f83a9891f1913a7969e4f51e7c6
+  metadata.gz: 9e68cd9602da230d9b4c38efabaa2c8368d0e2659b6e3d1cbdf2a64522d81d5b5373b48c92ab9e9a86e6631b5fffedadaf1fecc7e3d8f5fc7795b98c4bd9f9db
+  data.tar.gz: d7981f0948f3d7b0521d5cac304deee8f7282601a4c5d71961cd76381e5be7e2c569499292872d5fd94c2c45013c939871584f5e017c6667c8fbed5d2409dc1b

data/Dockerfile

@@ -60,8 +60,10 @@ ENV PATH /opt/rubies/ruby-2.2.2/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/u
 RUN gem install bundler
 
 ADD . /home/vedeu/gem/
-WORKDIR /home/vedeu
+WORKDIR /home/vedeu/gem
 USER vedeu
+RUN bundle
+WORKDIR /home/vedeu
 
 # To build this file:
 #

data/docs/getting_started.md

@@ -20,8 +20,9 @@ for your desired application name.
 
     vedeu new your_app_name
 
-The generated files are a skeleton Vedeu client application. Let's take a look
-at these files individually.
+If `your_app_name` already exists, Vedeu will only write new files that do not
+exist at the file path. The generated files are a skeleton Vedeu client
+application. Let's take a look at these files individually.
 
 ```bash
 |
@@ -150,7 +151,9 @@ might want to do something special.
 ## Adding a new view to your application
 
 The following command will build a new view within your application.
-Substitute `some_view_name` for your desired application name.
+Substitute `some_view_name` for your desired application name. As with
+generating a new application, If `some_view_name` already exists, Vedeu will
+only write new files that do not exist at the file path.
 
     cd your_app_name
     vedeu view some_view_name

data/lib/vedeu/all.rb

@@ -31,7 +31,7 @@ require 'vedeu/repositories/store'
 require 'vedeu/repositories/registerable'
 require 'vedeu/repositories/repository'
 
-require 'vedeu/null'
+require 'vedeu/null/null'
 require 'vedeu/null/border'
 require 'vedeu/null/buffer'
 require 'vedeu/null/generic'
@@ -48,7 +48,6 @@ require 'vedeu/geometry/geometries'
 require 'vedeu/geometry/grid'
 require 'vedeu/geometry/position'
 
-require 'vedeu/colours/escape_sequences'
 require 'vedeu/colours/colours'
 require 'vedeu/colours/backgrounds'
 require 'vedeu/colours/foregrounds'
@@ -66,6 +65,11 @@ require 'vedeu/cursor/move'
 require 'vedeu/cursor/refresh_cursor'
 require 'vedeu/cursor/reposition'
 
+require 'vedeu/esc/actions'
+require 'vedeu/esc/borders'
+require 'vedeu/esc/colours'
+require 'vedeu/esc/esc'
+
 require 'vedeu/output/renderers/renderer_options'
 require 'vedeu/output/renderers/escape_sequence'
 require 'vedeu/output/renderers/file'
@@ -146,7 +150,6 @@ require 'vedeu/borders/borders'
 
 require 'vedeu/output/clear/named_group'
 require 'vedeu/output/clear/named_interface'
-require 'vedeu/output/esc'
 require 'vedeu/output/presentation'
 require 'vedeu/output/compressor'
 require 'vedeu/output/style'

data/lib/vedeu/borders/border.rb

@@ -173,19 +173,16 @@ module Vedeu
 
     # The default values for a new instance of this class.
     #
-    # @note
-    #   Using the '\uXXXX' variant produces gaps in the border, whilst the
-    #   '\xXX' renders 'nicely'.
-    #
     # @return [Hash]
+    # @see Vedeu::EscapeSequences::Borders
     def defaults
       {
-        bottom_left:  "\x6D", # └ # \u2514
-        bottom_right: "\x6A", # ┘ # \u2518
+        bottom_left:  Vedeu::EscapeSequences::Borders.bottom_left,
+        bottom_right: Vedeu::EscapeSequences::Borders.bottom_right,
         client:       nil,
         colour:       nil,
         enabled:      false,
-        horizontal:   "\x71", # ─ # \u2500
+        horizontal:   Vedeu::EscapeSequences::Borders.horizontal,
         name:         '',
         repository:   Vedeu.borders,
         show_bottom:  true,
@@ -194,9 +191,9 @@ module Vedeu
         show_top:     true,
         style:        nil,
         title:        '',
-        top_left:     "\x6C", # ┌ # \u250C
-        top_right:    "\x6B", # ┐ # \u2510
-        vertical:     "\x78", # │ # \u2502
+        top_left:     Vedeu::EscapeSequences::Borders.top_left,
+        top_right:    Vedeu::EscapeSequences::Borders.top_right,
+        vertical:     Vedeu::EscapeSequences::Borders.vertical,
       }
     end
 

data/lib/vedeu/cli/generator/application.rb

@@ -32,11 +32,7 @@ module Vedeu
       def generate
         make_directory_structure
 
-        copy_gemfile
-        copy_gitignore
-        copy_license
-        copy_readme
-        copy_ruby_version
+        copy_app_root_files
         copy_application_bootstrapper
         copy_application_controller
         copy_application_helper
@@ -56,61 +52,50 @@ module Vedeu
 
       # @return [void]
       def copy_application_bootstrapper
-        make_file(source + '/application.erb', "#{name}/application.rb")
+        make_file(source + '/application.erb',
+                  app_root_path + '/application.rb')
       end
 
       # @return [void]
       def copy_application_controller
         make_file(source + '/app/controllers/application_controller.erb',
-                  name + '/app/controllers/application_controller.rb')
+                  app_controllers_path + 'application_controller.rb')
       end
 
       # @return [void]
       def copy_application_executable
-        copy_file(source + '/bin/name', "#{name}/bin/#{name}")
+        copy_file(source + '/bin/name', app_bin_path + "#{name}")
       end
 
       # @return [void]
       def copy_application_helper
         make_file(source + '/app/helpers/application_helper.erb',
-                  name + '/app/helpers/application_helper.rb')
+                  app_helpers_path + 'application_helper.rb')
       end
 
       # @return [void]
       def copy_configuration
         make_file(source + '/config/configuration.erb',
-                  "#{name}/config/configuration.rb")
+                  app_config_path + 'configuration.rb')
       end
 
       # @return [void]
       def copy_app_name
         make_file(source + '/config/app_name.erb',
-                  name + '/config/app_name')
+                  app_config_path + 'app_name')
       end
 
       # @return [void]
-      def copy_gemfile
-        copy_file(source + '/Gemfile', "#{name}/Gemfile")
-      end
-
-      # @return [void]
-      def copy_gitignore
-        copy_file(source + '/.gitignore', "#{name}/.gitignore")
-      end
-
-      # @return [void]
-      def copy_license
-        copy_file(source + '/LICENSE.txt', "#{name}/LICENSE.txt")
-      end
-
-      # @return [void]
-      def copy_readme
-        copy_file(source + '/README.md', "#{name}/README.md")
-      end
-
-      # @return [void]
-      def copy_ruby_version
-        copy_file(source + '/.ruby-version', "#{name}/.ruby-version")
+      def copy_app_root_files
+        [
+          '/Gemfile',
+          '/.gitignore',
+          '/LICENSE.txt',
+          '/README.md',
+          '/.ruby-version',
+        ].each do |file|
+          copy_file((source + file), (app_root_path + file))
+        end
       end
 
       # @return [void]
@@ -121,7 +106,7 @@ module Vedeu
       # @return [void]
       def copy_global_keymap
         copy_file(source + '/app/models/keymaps/_global_.rb',
-                  "#{name}/app/models/keymaps/_global_.rb")
+                  app_keymaps_path + '_global_.rb')
       end
 
       # @return [Array<String>]

data/lib/vedeu/cli/generator/helpers.rb

@@ -15,6 +15,41 @@ module Vedeu
         @app_name ||= File.read('./config/app_name')
       end
 
+      # @return [String]
+      def app_bin_path
+        name + '/bin/'
+      end
+
+      # @return [String]
+      def app_config_path
+        name + '/config/'
+      end
+
+      # @return [String]
+      def app_controllers_path
+        name + '/app/controllers/'
+      end
+
+      # @return [String]
+      def app_helpers_path
+        name + '/app/helpers/'
+      end
+
+      # @return [String]
+      def app_models_path
+        name + '/app/models/'
+      end
+
+      # @return [String]
+      def app_keymaps_path
+        name + '/app/models/keymaps/'
+      end
+
+      # @return [String]
+      def app_views_path
+        name + '/app/views/'
+      end
+
       # @param destination [String]
       # @return [void]
       def make_directory(destination)
@@ -27,18 +62,36 @@ module Vedeu
       # @param destination [String]
       # @return [void]
       def copy_file(source, destination)
-        Vedeu.log_stdout(type: :create, message: "#{destination}")
+        if File.exist?(destination)
+          skipped_file(destination)
 
-        FileUtils.cp(source, destination)
+        else
+          Vedeu.log_stdout(type: :create, message: "#{destination}")
+
+          FileUtils.cp(source, destination)
+        end
       end
 
       # @param source [String]
       # @param destination [String]
       # @return [void]
       def make_file(source, destination)
-        Vedeu.log_stdout(type: :create, message: "#{destination}")
+        if File.exist?(destination)
+          skipped_file(destination)
 
-        File.write(destination, parse(source))
+        else
+          Vedeu.log_stdout(type: :create, message: "#{destination}")
+
+          File.write(destination, parse(source))
+        end
+      end
+
+      # @param destination [String]
+      # @return [void]
+      def skipped_file(destination)
+        Vedeu.log_stdout(type:    :create,
+                         message: "#{destination} " +
+                                  Esc.red { 'already exists, skipped.' })
       end
 
       # @param destination [String]
@@ -53,6 +106,7 @@ module Vedeu
       def name
         @_name ||= @name.downcase
       end
+      alias_method :app_root_path, :name
 
       # @return [String]
       def name_as_class

data/lib/vedeu/colours/colour_translator.rb

@@ -92,13 +92,9 @@ module Vedeu
 
     # @return [String]
     def to_html
-      if rgb?
-        colour
-
-      else
-        ''
+      return colour if rgb?
 
-      end
+      ''
     end
 
     private

data/lib/vedeu/esc/actions.rb

@@ -0,0 +1,52 @@
+module Vedeu
+
+  # Provides escape sequence strings.
+  #
+  module EscapeSequences
+
+    # Provides action related escape sequences.
+    #
+    module Actions
+
+      extend self
+
+      # @return [Hash<Symbol => String>]
+      def characters
+        {
+          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",
+          dim:             "\e[2m",
+          fg_reset:        "\e[39m",
+          negative:        "\e[7m",
+          positive:        "\e[27m",
+          reset:           "\e[0m",
+          underline:       "\e[4m",
+          underline_off:   "\e[24m",
+        }
+      end
+
+      # @return [void]
+      def setup!
+        define_actions!
+      end
+
+      private
+
+      # @return [void]
+      def define_actions!
+        characters.each { |key, code| define_method(key) { code } }
+      end
+
+    end # Actions
+
+  end # EscapeSequences
+
+  Vedeu::EscapeSequences::Actions.setup!
+
+end # Vedeu

data/lib/vedeu/esc/borders.rb

@@ -0,0 +1,70 @@
+module Vedeu
+
+  # Provides escape sequence strings.
+  #
+  module EscapeSequences
+
+    # Provides border/box related escape sequences.
+    #
+    # @note
+    #   Refer to UTF-8 U+2500 to U+257F for border characters. More details can
+    #   be found at: http://en.wikipedia.org/wiki/Box-drawing_character
+    #
+    #   Using the '\uXXXX' variant produces gaps in the border, whilst the
+    #   '\xXX' renders 'nicely'.
+    #
+    module Borders
+
+      extend self
+
+      # @return [String]
+      def border_on
+        "\e(0"
+      end
+
+      # @return [String]
+      def border_off
+        "\e(B"
+      end
+
+      # Provides all the semigraphic characters.
+      #
+      # # 0 1 2 3 4 5 6 7 8 9 A B C D E F
+      # 6                     ┘ ┐ ┌ └ ┼
+      # 7   ─     ├ ┤ ┴ ┬ │
+      #
+      # @return [Hash<Symbol => String>]
+      def characters
+        {
+          bottom_right:      "\x6A", # ┘ # \u2518
+          top_right:         "\x6B", # ┐ # \u2510
+          top_left:          "\x6C", # ┌ # \u250C
+          bottom_left:       "\x6D", # └ # \u2514
+          horizontal:        "\x71", # ─ # \u2500
+          vertical_left:     "\x74", # ├ # \u251C
+          vertical_right:    "\x75", # ┤ # \u2524
+          horizontal_bottom: "\x76", # ┴ # \u2534
+          horizontal_top:    "\x77", # ┬ # \u252C
+          vertical:          "\x78", # │ # \u2502
+        }
+      end
+
+      # @return [void]
+      def setup!
+        define_borders!
+      end
+
+      private
+
+      # @return [void]
+      def define_borders!
+        characters.each { |key, code| define_method(key) { code } }
+      end
+
+    end # Borders
+
+  end # EscapeSequences
+
+  Vedeu::EscapeSequences::Borders.setup!
+
+end # Vedeu