tty 0.1.0 → 0.1.1

data/lib/tty/logger.rb

@@ -3,7 +3,7 @@
 module TTY
   # A class providing logging system
   class Logger
-    include TTY::Equatable
+    include Equatable
 
     ALL       = 0
     INFO      = 1

data/lib/tty/shell/question.rb

@@ -64,6 +64,7 @@ module TTY
         @validation    = Validation.new options.fetch(:validation) { nil }
         @default_value = nil
         @error         = false
+        @range_converter = TTY::Conversion::RangeConverter.new
       end
 
       # Set a new prompt
@@ -248,7 +249,7 @@ module TTY
       # @api public
       def in(value = nil)
         return @in if value.nil?
-        @in = TTY::Coercer::Range.coerce value
+        @in = @range_converter.convert(value)
         self
       end
 

data/lib/tty/shell/response.rb

@@ -30,6 +30,11 @@ module TTY
       #
       # @api public
       def initialize(question, shell = Shell.new)
+        @bool_converter = Conversion::BooleanConverter.new
+        @float_converter = Conversion::FloatConverter.new
+        @range_converter = Conversion::RangeConverter.new
+        @int_converter = Conversion::IntegerConverter.new
+
         @question = question
         @shell    = shell
         @reader   = Reader.new(shell)
@@ -103,14 +108,14 @@ module TTY
       #
       # @api public
       def read_int(error = nil)
-        question.evaluate_response TTY::Coercer::Integer.coerce(read_input)
+        question.evaluate_response(@int_converter.convert(read_input))
       end
 
       # Read float value
       #
       # @api public
       def read_float(error = nil)
-        question.evaluate_response TTY::Coercer::Float.coerce(read_input)
+        question.evaluate_response(@float_converter.convert(read_input))
       end
 
       # Read regular expression
@@ -124,7 +129,7 @@ module TTY
       #
       # @api public
       def read_range
-        question.evaluate_response TTY::Coercer::Range.coerce(read_input)
+        question.evaluate_response(@range_converter.convert(read_input))
       end
 
       # Read date
@@ -145,7 +150,7 @@ module TTY
       #
       # @api public
       def read_bool(error = nil)
-        question.evaluate_response TTY::Coercer::Boolean.coerce read_input
+        question.evaluate_response(@bool_converter.convert(read_input))
       end
 
       # Read file contents

data/lib/tty/shell/statement.rb

@@ -34,8 +34,9 @@ module TTY
       # @api public
       def initialize(shell = Shell.new, options = {})
         @shell   = shell
+        @pastel  = Pastel.new
         @newline = options.fetch(:newline, true)
-        @color   = options.fetch(:color, nil)
+        @color   = options.fetch(:color, false)
       end
 
       # Output the message to the shell
@@ -45,7 +46,7 @@ module TTY
       #
       # @api public
       def declare(message)
-        message = TTY.terminal.color.set message, *color if color
+        message = @pastel.decorate message, *color if color
 
         if newline && /( |\t)(\e\[\d+(;\d+)*m)?\Z/ !~ message
           shell.output.puts message

data/lib/tty/table.rb

@@ -12,8 +12,7 @@ module TTY
   # Once the data is stored in a TTY::Table various operations can be performed
   # before the information is dumped into a stdout.
   class Table
-    include Comparable, Enumerable, Conversion
-    include Validatable, Equatable
+    include Comparable, Enumerable, Validatable, Equatable
     extend Forwardable
 
     # The table header
@@ -111,6 +110,7 @@ module TTY
     # @api private
     def initialize(options = {}, &block)
       validate_options! options
+      @array_converter = Conversion::ArrayConverter.new
       @header        = (value = options[:header]) ? Header.new(value) : nil
       @rows          = coerce(options.fetch(:rows) { Row.new([]) })
       @rotated       = false
@@ -457,7 +457,7 @@ module TTY
     #
     # @api public
     def coerce(rows)
-      rows = convert_to_array(rows)
+      rows = @array_converter.convert(rows)
       rows.map { |row| to_row(row, header) }
     end
 

data/lib/tty/table/border.rb

@@ -5,7 +5,7 @@ module TTY
     # Abstract base class that is responsible for building the table border.
     class Border
       include Unicode
-      include TTY::Equatable
+      include Equatable
 
       EMPTY_CHAR = ''.freeze
 
@@ -23,6 +23,8 @@ module TTY
       # The table custom border characters
       attr_reader :border
 
+      # The table
+
       class << self
         # Store characters for border
         #
@@ -46,6 +48,7 @@ module TTY
         else
           @widths = column_widths
           @border = TTY::Table::BorderOptions.from options
+          @color  = Pastel.new
         end
       end
 
@@ -96,8 +99,8 @@ module TTY
       # @return [Array[String]]
       #
       # @api public
-      def self.set_color(color, *strings)
-        strings.map { |string| TTY.terminal.color.set(string, color) }
+      def set_color(color, *strings)
+        strings.map { |string| @color.decorate(string, color) }
       end
 
       # A line spanning all columns marking top of a table.
@@ -137,7 +140,7 @@ module TTY
       # @api public
       def row_line(row)
         line = RowLine.new(self['left'], self['center'], self['right'])
-        line.colorize(border.style) if color?
+        line.colorize(self, border.style) if color?
 
         result = row_heights(row, line)
         result.empty? ? EMPTY_CHAR : result
@@ -197,7 +200,7 @@ module TTY
                            self["#{type}_mid"])
 
         if color? && !line.empty?
-          line = Border.set_color(border.style, line)
+          line = set_color(border.style, line)
         end
         line
       end

data/lib/tty/table/border/row_line.rb

@@ -8,8 +8,8 @@ module TTY
         # Colorize characters with a given style
         #
         # @api public
-        def colorize(style)
-          colorized_chars = Border.set_color(style, right, center, left)
+        def colorize(border, style)
+          colorized_chars = border.set_color(style, right, center, left)
           self.right, self.center, self.left = colorized_chars
         end
       end # RowLine

data/lib/tty/table/operation/alignment_set.rb

@@ -12,7 +12,8 @@ module TTY
         #
         # @api private
         def initialize(aligns, widths = nil)
-          @elements = convert_to_array(aligns)
+          @array_converter = Conversion::ArrayConverter.new
+          @elements = @array_converter.convert(aligns)
           @widths   = widths
         end
 

data/lib/tty/table/padder.rb

@@ -8,7 +8,7 @@ module TTY
     #
     # @api private
     class Padder
-      include TTY::Equatable
+      include Equatable
 
       # Padding for the table cells
       #

data/lib/tty/table/renderer/basic.rb

@@ -112,7 +112,7 @@ module TTY
           @column_widths = options.fetch(:column_widths, nil)
           @column_aligns = Array(options.delete(:column_aligns)).map(&:to_sym)
           @filter        = options.fetch(:filter) { proc { |val, _| val } }
-          @width         = options.fetch(:width) { TTY.terminal.width }
+          @width         = options.fetch(:width) { TTY::Screen.width }
           @border_class  = options.fetch(:border_class) { Border::Null }
           @indent        = options.fetch(:indent) { 0 }
           @resize        = options.fetch(:resize) { false }

data/lib/tty/terminal.rb

@@ -2,26 +2,6 @@
 
 module TTY
   class Terminal
-    # Return default width of terminal
-    #
-    # @example
-    #   default_width = TTY::Terminal.default_width
-    #
-    # @return [Integer]
-    #
-    # @api public
-    attr_reader :default_width
-
-    # Return default height of terminal
-    #
-    # @example
-    #   default_height = TTY::Terminal.default_height
-    #
-    # @return [Integer]
-    #
-    # @api public
-    attr_reader :default_height
-
     # Return access to color terminal
     #
     # @return [TTY::Terminal::Color]
@@ -40,107 +20,10 @@ module TTY
     #
     # @api public
     def initialize(options = {})
-      @color = TTY::Terminal::Color.new(self.color?)
+      @color = Pastel.new
       @echo  = TTY::Terminal::Echo.new
       @pager = TTY::Terminal::Pager
       @home  = Home.new
-      @default_width  = options.fetch(:default_width) { 80 }
-      @default_height = options.fetch(:default_height) { 24 }
-    end
-
-    # Determine current width
-    #
-    # @return [Integer] width
-    #
-    # @api width
-    def width
-      env_tty_columns = ENV['TTY_COLUMNS']
-      if env_tty_columns =~ /^\d+$/
-        env_tty_columns.to_i
-      else
-        TTY::System.unix? ? dynamic_width : default_width
-      end
-    rescue
-      default_width
-    end
-
-    # Determine current height
-    #
-    # @return [Integer] height
-    #
-    # @api public
-    def height
-      env_tty_lines = ENV['TTY_LINES']
-      if env_tty_lines =~ /^\d+$/
-        env_tty_lines.to_i
-      else
-        TTY::System.unix? ? dynamic_height : default_height
-      end
-    rescue
-      default_height
-    end
-
-    # Calculate dynamic width of the terminal
-    #
-    # @return [Integer] width
-    #
-    # @api public
-    def dynamic_width
-      @dynamic_width ||= (dynamic_width_stty.nonzero? || dynamic_width_tput)
-    end
-
-    # Calculate dynamic height of the terminal
-    #
-    # @return [Integer] height
-    #
-    # @api public
-    def dynamic_height
-      @dynamic_height ||= (dynamic_height_stty.nonzero? || dynamic_height_tput)
-    end
-
-    # Detect terminal width with stty utility
-    #
-    # @return [Integer] width
-    #
-    # @api public
-    def dynamic_width_stty
-      %x(tty size 2>/dev/null).split[1].to_i
-    end
-
-    # Detect terminal height with stty utility
-    #
-    # @return [Integer] height
-    #
-    # @api public
-    def dynamic_height_stty
-      %x(tty size 2>/dev/null).split[0].to_i
-    end
-
-    # Detect terminal width with tput utility
-    #
-    # @return [Integer] width
-    #
-    # @api public
-    def dynamic_width_tput
-      %x(tput cols 2>/dev/null).to_i
-    end
-
-    # Detect terminal height with tput utility
-    #
-    # @return [Integer] height
-    #
-    # @api public
-    def dynamic_height_tput
-      %x(tput lines 2>/dev/null).to_i
-    end
-
-    # Check if terminal supports color
-    #
-    # @return [Boolean]
-    #
-    # @api public
-    def color?
-      %x(tput colors 2>/dev/null).to_i > 2
     end
 
     # Switch echo on

data/lib/tty/text/truncation.rb

@@ -20,6 +20,8 @@ module TTY
 
       attr_reader :escape
 
+      attr_reader :color
+
       # Initialize a Truncation
       #
       # @param [String] text
@@ -42,6 +44,7 @@ module TTY
       # @api private
       def initialize(text, *args)
         options    = Utils.extract_options!(args)
+        @color     = Pastel.new
         @text      = text
         @length    = options.fetch(:length) { DEFAULT_TRUNCATION_LENGTH }
         @length    = args[0] unless args.empty?
@@ -77,7 +80,7 @@ module TTY
       #
       # @api private
       def escape_text
-        TTY.terminal.color.remove text.dup
+        color.strip text.dup
       end
 
       # Leave space for the trailing characters

data/lib/tty/text/wrapping.rb

@@ -14,6 +14,8 @@ module TTY
 
       attr_reader :padding
 
+      attr_reader :color
+
       # Initialize a Wrapping
       #
       # @param [String] text
@@ -38,6 +40,7 @@ module TTY
         @indent  = options.fetch(:indent) { 0 }
         @padding = options.fetch(:padding) { [] }
         @length  = args[0] unless args.empty?
+        @color   = Pastel.new
       end
 
       # Wrap a text into lines no longer than length
@@ -63,7 +66,7 @@ module TTY
       #
       # @api private
       def actual_length(string)
-        length + (string.length - TTY.terminal.color.remove(string).length)
+        length + (string.length - color.strip(string).length)
       end
 
       # Wrap line at given length

data/lib/tty/vector.rb

@@ -3,7 +3,7 @@
 module TTY
   # This class represents a mathematical vector.
   class Vector
-    include Enumerable, Equatable, Conversion
+    include Enumerable, Equatable
 
     attr_reader :elements
     protected :elements
@@ -16,7 +16,7 @@ module TTY
     #
     # @api public
     def self.[](*array)
-      new convert_to_array(array)
+      new(array)
     end
 
     # Instantiate a Vector
@@ -27,7 +27,8 @@ module TTY
     #
     # @api public
     def initialize(array = [])
-      @elements = convert_to_array(array)
+      @array_converter = Conversion::ArrayConverter.new
+      @elements = @array_converter.convert(array)
     end
 
     # Return element at index.

data/lib/tty/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module TTY
-  VERSION = "0.1.0"
-end
+  VERSION = "0.1.1"
+end # TTY

data/spec/tty/{support/conversion_spec.rb → conversion/converter/array/convert_spec.rb}

@@ -2,12 +2,11 @@
 
 require 'spec_helper'
 
-describe TTY::Conversion do
-  let(:new_class) { Class.new { include TTY::Conversion } }
-  let(:object)    { new_class.new }
+describe TTY::Conversion::ArrayConverter do
+  let(:object)    { described_class.new }
   let(:enumerable) { [] }
 
-  subject { object.convert_to_array(enumerable) }
+  subject { object.convert(enumerable) }
 
   context 'Array type' do
     it { is_expected.to eq(enumerable) }
@@ -23,7 +22,7 @@ describe TTY::Conversion do
 
   context 'responds to #to_ary' do
     let(:converted)  { [] }
-    let(:enumerable) { double('Enumerable', :to_ary => converted) }
+    let(:enumerable) { double('Enumerable', to_ary: converted) }
 
     it { is_expected.to eq(converted) }
   end