tty 0.1.0 → 0.1.1

data/spec/tty/{coercer/boolean/coerce_spec.rb → conversion/converter/boolean/convert_spec.rb}

@@ -2,14 +2,15 @@
 
 require 'spec_helper'
 
-describe TTY::Coercer::Boolean, '#coerce' do
+describe TTY::Conversion::BooleanConverter, '#convert' do
+  let(:object) { described_class.new }
 
-  subject { described_class.coerce(value) }
+  subject(:converter) { object.convert(value) }
 
   context "with empty" do
     let(:value) { '' }
 
-    it { expect { subject }.to raise_error(TTY::TypeError) }
+    it { expect { subject }.to raise_error(TTY::Conversion::TypeError) }
   end
 
   context "with true" do
@@ -111,6 +112,6 @@ describe TTY::Coercer::Boolean, '#coerce' do
   context "with FOO" do
     let(:value) { 'FOO' }
 
-    it { expect { subject }.to raise_error(TTY::TypeError) }
+    it { expect { subject }.to raise_error(TTY::Conversion::TypeError) }
   end
 end

data/spec/tty/{coercer/float/coerce_spec.rb → conversion/converter/float/convert_spec.rb}

@@ -2,10 +2,11 @@
 
 require 'spec_helper'
 
-describe TTY::Coercer::Float, '#coerce' do
+describe TTY::Conversion::FloatConverter, '#convert' do
+  let(:object) { described_class.new }
   let(:strict) { true }
 
-  subject { described_class.coerce(value, strict) }
+  subject(:converter) { object.convert(value, strict) }
 
   context 'with empty' do
     let(:value) { '' }

data/spec/tty/{coercer/integer/coerce_spec.rb → conversion/converter/integer/convert_spec.rb}

@@ -2,9 +2,11 @@
 
 require 'spec_helper'
 
-describe TTY::Coercer::Integer, '#coerce' do
+describe TTY::Conversion::IntegerConverter, '#convert' do
+  let(:object) { described_class.new }
   let(:strict) { true }
-  subject { described_class.coerce(value, strict) }
+
+  subject(:converter) { object.convert(value, strict) }
 
   context 'with empty' do
     let(:value) { '' }

data/spec/tty/{coercer/range/coerce_spec.rb → conversion/converter/range/convert_spec.rb}

@@ -2,9 +2,10 @@
 
 require 'spec_helper'
 
-describe TTY::Coercer::Range, '#coerce' do
+describe TTY::Conversion::RangeConverter, '#convert' do
+  let(:object) { described_class.new }
 
-  subject { described_class.coerce(value) }
+  subject(:converter) { object.convert(value) }
 
   context 'with empty' do
     let(:value) { '' }

data/spec/tty/shell/error_spec.rb

@@ -2,12 +2,15 @@
 
 require 'spec_helper'
 
-describe TTY::Shell, '#error' do
+RSpec.describe TTY::Shell, '.error' do
   let(:input)  { StringIO.new }
   let(:output) { StringIO.new }
+  let(:color)  { Pastel.new(enabled: true) }
 
   subject(:shell) { TTY::Shell.new(input, output) }
 
+  before { allow(Pastel).to receive(:new).and_return(color) }
+
   after { output.rewind }
 
   it 'displays one message' do

data/spec/tty/shell/response/read_bool_spec.rb

@@ -11,7 +11,7 @@ describe TTY::Shell::Question, '#read_bool' do
     input << 'invalid'
     input.rewind
     q = shell.ask("Do you read books?")
-    expect { q.read_bool }.to raise_error(TTY::TypeError)
+    expect { q.read_bool }.to raise_error(TTY::Conversion::TypeError)
   end
 
   it 'reads negative boolean' do

data/spec/tty/shell/say_spec.rb

@@ -5,9 +5,12 @@ require 'spec_helper'
 describe TTY::Shell, '#say' do
   let(:input)  { StringIO.new }
   let(:output) { StringIO.new }
+  let(:color)  { Pastel.new(enabled: true) }
 
   subject(:shell) { TTY::Shell.new(input, output) }
 
+  before { allow(Pastel).to receive(:new).and_return(color) }
+
   after { output.rewind }
 
   it 'prints an empty message' do

data/spec/tty/shell/statement/initialize_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe TTY::Shell::Statement, '#new' do
+RSpec.describe TTY::Shell::Statement, '#new' do
   let(:input)  { StringIO.new }
   let(:output) { StringIO.new }
   let(:shell) { TTY::Shell.new(input, output) }
@@ -11,5 +11,5 @@ describe TTY::Shell::Statement, '#new' do
 
   it { expect(statement.newline).to eq(true) }
 
-  it { expect(statement.color).to be_nil }
+  it { expect(statement.color).to eq(false) }
 end

data/spec/tty/shell/warn_spec.rb

@@ -5,9 +5,12 @@ require 'spec_helper'
 describe TTY::Shell, '#warn' do
   let(:input)  { StringIO.new }
   let(:output) { StringIO.new }
+  let(:color)  { Pastel.new(enabled: true) }
 
   subject(:shell) { TTY::Shell.new(input, output) }
 
+  before { allow(Pastel).to receive(:new).and_return(color) }
+
   after { output.rewind }
 
   it 'displays one message' do

data/spec/tty/table/field/equality_spec.rb

@@ -31,7 +31,7 @@ describe TTY::Table::Field, '#==' do
   context 'with an equivalent object of subclass' do
     let(:other) { Class.new(described_class).new(value) }
 
-    it { is_expected.to eql(false) }
+    it { is_expected.to eq(true) }
 
     it 'is symmetric' do
       is_expected.not_to eql(other == object)

data/spec/tty/table/render_spec.rb

@@ -6,11 +6,14 @@ describe TTY::Table, '#render' do
   let(:object) { described_class }
   let(:header) { ['h1', 'h2'] }
   let(:rows)   { [['a1', 'a2'], ['b1', 'b2']] }
+  let(:color)  { Pastel.new(enabled: true) }
   let(:basic_renderer)   { TTY::Table::Renderer::Basic }
   let(:ascii_renderer)   { TTY::Table::Renderer::ASCII }
 
   subject(:table) { object.new header, rows }
 
+  before { allow(Pastel).to receive(:new).and_return(color) }
+
   it { is_expected.to respond_to(:render) }
 
   context 'with block' do

data/spec/tty/table/render_with_spec.rb

@@ -1,11 +1,14 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 
 require 'spec_helper'
 
-describe TTY::Table, '#render_with' do
+RSpec.describe TTY::Table, '#render_with' do
   let(:header) { ['h1', 'h2', 'h3'] }
   let(:rows)   { [['a1', 'a2', 'a3'], ['b1', 'b2', 'b3']] }
   let(:table)  { described_class.new header, rows }
+  let(:color)  { Pastel.new(enabled: true) }
+
+  before { allow(Pastel).to receive(:new).and_return(color) }
 
   context 'with invalid border class' do
     it "doesn't inherit from TTY::Table::Border" do
@@ -94,9 +97,9 @@ describe TTY::Table, '#render_with' do
         renderer.border.style = :red
       end
       expect(result).to eq <<-EOS.normalize
-        \e[31m|\e[0mh1\e[31m\e[0mh2\e[31m\e[0mh3\e[31m|\e[0m
-        \e[31m|\e[0ma1\e[31m\e[0ma2\e[31m\e[0ma3\e[31m|\e[0m
-        \e[31m|\e[0mb1\e[31m\e[0mb2\e[31m\e[0mb3\e[31m|\e[0m
+        \e[31m|\e[0mh1h2h3\e[31m|\e[0m
+        \e[31m|\e[0ma1a2a3\e[31m|\e[0m
+        \e[31m|\e[0mb1b2b3\e[31m|\e[0m
       EOS
     end
   end

data/spec/tty/table/renderer/basic/coloring_spec.rb

@@ -2,27 +2,28 @@
 
 require 'spec_helper'
 
-describe TTY::Table::Renderer::Basic, 'coloring' do
+RSpec.describe TTY::Table::Renderer::Basic, 'coloring' do
   let(:header)   { ['h1', 'h2'] }
   let(:rows)     { [['a1', 'a2'], ['b1', 'b2']] }
-  let(:blue)     { "\e[34m" }
   let(:clear)    { "\e[0m" }
-  let(:on_green) { "\e[42m"}
   let(:options)  { {filter: filter } }
   let(:table)    { TTY::Table.new(header, rows) }
+  let(:color)    { Pastel.new(enabled: true) }
 
   subject(:renderer) { described_class.new(table, options) }
 
+  before { allow(Pastel).to receive(:new).and_return(color) }
+
   context 'with filter on all fields' do
     let(:filter) {
-      proc { |val, row, col| TTY.terminal.color.set val, :blue, :on_green }
+      proc { |val, row, col| color.decorate val, :blue, :on_green }
     }
 
     it 'colors all elements' do
       expect(renderer.render).to eql <<-EOS.normalize
-        #{blue}#{on_green}h1#{clear} #{blue}#{on_green}h2#{clear}
-        #{blue}#{on_green}a1#{clear} #{blue}#{on_green}a2#{clear}
-        #{blue}#{on_green}b1#{clear} #{blue}#{on_green}b2#{clear}
+        \e[34;42mh1#{clear} \e[34;42mh2#{clear}
+        \e[34;42ma1#{clear} \e[34;42ma2#{clear}
+        \e[34;42mb1#{clear} \e[34;42mb2#{clear}
       EOS
     end
   end
@@ -30,13 +31,13 @@ describe TTY::Table::Renderer::Basic, 'coloring' do
   context 'with filter only on header' do
     let(:filter) {
       proc { |val, row, col|
-        row.zero? ?  TTY.terminal.color.set(val, :blue, :on_green) : val
+        row.zero? ?  color.decorate(val, :blue, :on_green) : val
       }
     }
 
     it 'colors only header' do
       expect(renderer.render).to eql <<-EOS.normalize
-        #{blue}#{on_green}h1#{clear} #{blue}#{on_green}h2#{clear}
+        \e[34;42mh1#{clear} \e[34;42mh2#{clear}
         a1 a2
         b1 b2
       EOS

data/spec/tty/table/renderer/style_spec.rb

@@ -6,9 +6,12 @@ describe TTY::Table::Renderer, 'with style' do
   let(:header) { ['h1', 'h2', 'h3'] }
   let(:rows)   { [['a1', 'a2', 'a3'], ['b1', 'b2', 'b3']] }
   let(:table)  { TTY::Table.new(header, rows) }
+  let(:color)  { Pastel.new(enabled: true) }
 
   subject(:renderer) { described_class.select(type).new(table) }
 
+  before { allow(Pastel).to receive(:new).and_return(color) }
+
   context 'when basic renderer' do
     let(:type) { :basic }
 

data/spec/tty/terminal/color_spec.rb

@@ -2,12 +2,15 @@
 
 require 'spec_helper'
 
-describe TTY::Terminal, '#color' do
+RSpec.describe TTY::Terminal, '#color' do
+  let(:color)  { Pastel.new(enabled: true) }
 
-  it { expect(subject.color).to be_a(TTY::Terminal::Color) }
+  it { expect(subject.color).to be_a(Pastel::Delegator) }
+
+  before { allow(Pastel).to receive(:new).and_return(color) }
 
   it 'delegates color handling' do
     string = 'text'
-    expect(subject.color.set(string, :red)).to eq("\e[31m#{string}\e[0m")
+    expect(subject.color.decorate(string, :red)).to eq("\e[31m#{string}\e[0m")
   end
 end

data/tasks/console.rake

@@ -4,7 +4,7 @@ desc 'Load gem inside irb console'
 task :console do
   require 'irb'
   require 'irb/completion'
-  require File.join(__FILE__, '../lib/finite_machine')
+  require File.join(__FILE__, '../../lib/tty')
   ARGV.clear
   IRB.start
 end

data/tty.gemspec

@@ -17,5 +17,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency "bundler", "~> 1.5"
+  gem.add_dependency 'equatable',       '~> 0.5.0'
+  gem.add_dependency 'pastel',          '~> 0.4.0'
+  gem.add_dependency 'tty-screen',      '~> 0.1.0'
+  gem.add_dependency 'tty-spinner',     '~> 0.1.0'
+  gem.add_dependency 'tty-progressbar', '~> 0.2.0'
+
+  gem.add_development_dependency 'bundler', '~> 1.5'
 end

metadata

@@ -1,15 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: tty
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-21 00:00:00.000000000 Z
+date: 2014-11-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: equatable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: pastel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: tty-screen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: tty-spinner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: tty-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -46,11 +116,12 @@ files:
 - benchmarks/table.rb
 - images/tty.png
 - lib/tty.rb
-- lib/tty/coercer.rb
-- lib/tty/coercer/boolean.rb
-- lib/tty/coercer/float.rb
-- lib/tty/coercer/integer.rb
-- lib/tty/coercer/range.rb
+- lib/tty/conversion.rb
+- lib/tty/conversion/converter/array.rb
+- lib/tty/conversion/converter/boolean.rb
+- lib/tty/conversion/converter/float.rb
+- lib/tty/conversion/converter/integer.rb
+- lib/tty/conversion/converter/range.rb
 - lib/tty/logger.rb
 - lib/tty/plugins.rb
 - lib/tty/plugins/plugin.rb
@@ -64,9 +135,7 @@ files:
 - lib/tty/shell/statement.rb
 - lib/tty/shell/suggestion.rb
 - lib/tty/support/coercion.rb
-- lib/tty/support/conversion.rb
 - lib/tty/support/delegatable.rb
-- lib/tty/support/equatable.rb
 - lib/tty/support/unicode.rb
 - lib/tty/support/utils.rb
 - lib/tty/system.rb
@@ -107,7 +176,6 @@ files:
 - lib/tty/table/transformation.rb
 - lib/tty/table/validatable.rb
 - lib/tty/terminal.rb
-- lib/tty/terminal/color.rb
 - lib/tty/terminal/echo.rb
 - lib/tty/terminal/home.rb
 - lib/tty/terminal/pager.rb
@@ -120,10 +188,11 @@ files:
 - lib/tty/vector.rb
 - lib/tty/version.rb
 - spec/spec_helper.rb
-- spec/tty/coercer/boolean/coerce_spec.rb
-- spec/tty/coercer/float/coerce_spec.rb
-- spec/tty/coercer/integer/coerce_spec.rb
-- spec/tty/coercer/range/coerce_spec.rb
+- spec/tty/conversion/converter/array/convert_spec.rb
+- spec/tty/conversion/converter/boolean/convert_spec.rb
+- spec/tty/conversion/converter/float/convert_spec.rb
+- spec/tty/conversion/converter/integer/convert_spec.rb
+- spec/tty/conversion/converter/range/convert_spec.rb
 - spec/tty/logger/log_spec.rb
 - spec/tty/logger/new_spec.rb
 - spec/tty/logger/valid_level_spec.rb
@@ -162,9 +231,7 @@ files:
 - spec/tty/shell/suggest_spec.rb
 - spec/tty/shell/warn_spec.rb
 - spec/tty/support/coercion_spec.rb
-- spec/tty/support/conversion_spec.rb
 - spec/tty/support/delegatable_spec.rb
-- spec/tty/support/equatable_spec.rb
 - spec/tty/support/fixtures/classes.rb
 - spec/tty/system/editor/available_spec.rb
 - spec/tty/system/editor/build_spec.rb
@@ -272,9 +339,6 @@ files:
 - spec/tty/table/transformation/extract_tuples_spec.rb
 - spec/tty/table/validatable/validate_options_spec.rb
 - spec/tty/table/validatable_spec.rb
-- spec/tty/terminal/color/code_spec.rb
-- spec/tty/terminal/color/remove_spec.rb
-- spec/tty/terminal/color/set_spec.rb
 - spec/tty/terminal/color_spec.rb
 - spec/tty/terminal/echo_spec.rb
 - spec/tty/terminal/home_spec.rb
@@ -285,7 +349,6 @@ files:
 - spec/tty/terminal/pager/executables_spec.rb
 - spec/tty/terminal/pager/page_spec.rb
 - spec/tty/terminal/pager/system/page_spec.rb
-- spec/tty/terminal/size_spec.rb
 - spec/tty/text/distance/distance_spec.rb
 - spec/tty/text/distance/initialize_spec.rb
 - spec/tty/text/distance_spec.rb
@@ -332,10 +395,11 @@ summary: A toolbox for developing beautiful command line clients. It provides a
   information back.
 test_files:
 - spec/spec_helper.rb
-- spec/tty/coercer/boolean/coerce_spec.rb
-- spec/tty/coercer/float/coerce_spec.rb
-- spec/tty/coercer/integer/coerce_spec.rb
-- spec/tty/coercer/range/coerce_spec.rb
+- spec/tty/conversion/converter/array/convert_spec.rb
+- spec/tty/conversion/converter/boolean/convert_spec.rb
+- spec/tty/conversion/converter/float/convert_spec.rb
+- spec/tty/conversion/converter/integer/convert_spec.rb
+- spec/tty/conversion/converter/range/convert_spec.rb
 - spec/tty/logger/log_spec.rb
 - spec/tty/logger/new_spec.rb
 - spec/tty/logger/valid_level_spec.rb
@@ -374,9 +438,7 @@ test_files:
 - spec/tty/shell/suggest_spec.rb
 - spec/tty/shell/warn_spec.rb
 - spec/tty/support/coercion_spec.rb
-- spec/tty/support/conversion_spec.rb
 - spec/tty/support/delegatable_spec.rb
-- spec/tty/support/equatable_spec.rb
 - spec/tty/support/fixtures/classes.rb
 - spec/tty/system/editor/available_spec.rb
 - spec/tty/system/editor/build_spec.rb
@@ -484,9 +546,6 @@ test_files:
 - spec/tty/table/transformation/extract_tuples_spec.rb
 - spec/tty/table/validatable/validate_options_spec.rb
 - spec/tty/table/validatable_spec.rb
-- spec/tty/terminal/color/code_spec.rb
-- spec/tty/terminal/color/remove_spec.rb
-- spec/tty/terminal/color/set_spec.rb
 - spec/tty/terminal/color_spec.rb
 - spec/tty/terminal/echo_spec.rb
 - spec/tty/terminal/home_spec.rb
@@ -497,7 +556,6 @@ test_files:
 - spec/tty/terminal/pager/executables_spec.rb
 - spec/tty/terminal/pager/page_spec.rb
 - spec/tty/terminal/pager/system/page_spec.rb
-- spec/tty/terminal/size_spec.rb
 - spec/tty/text/distance/distance_spec.rb
 - spec/tty/text/distance/initialize_spec.rb
 - spec/tty/text/distance_spec.rb