tty 0.2.1 → 0.3.0

data/lib/tty/version.rb

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

data/spec/tty/plugins/plugin/load_spec.rb

@@ -5,28 +5,20 @@ require 'spec_helper'
 describe TTY::Plugin, '#load!' do
   let(:gem)    { Gem::Specification.new('tty-console', '3.1.3')}
   let(:name)   { 'console'}
-  let(:input)  { StringIO.new }
-  let(:output) { StringIO.new }
 
   subject(:plugin) { described_class.new(name, gem) }
 
-  context 'when gem unsuccessfully loaded' do
-    before { allow(Kernel).to receive(:require) { raise LoadError } }
-
-    it 'fails to load the gem' do
-      allow(TTY.shell).to receive(:error)
-      subject.load!
-      expect(TTY.shell).to have_received(:error).with(/Unable to load plugin tty-console./)
-    end
+  it 'fails to load the gem' do
+    allow(Kernel).to receive(:require) { raise LoadError }
+    expect {
+      plugin.load!
+    }.to output(/Unable to load plugin tty-console./).to_stdout
   end
 
-  context 'when gem unsuccessfully required' do
-    before { allow(Kernel).to receive(:require) { raise StandardError } }
-
-    it 'fails to require the gem' do
-      allow(TTY.shell).to receive(:error)
-      subject.load!
-      expect(TTY.shell).to have_received(:error).with(/Unable to load plugin tty-console./)
-    end
+  it 'fails to require the gem' do
+    allow(Kernel).to receive(:require) { raise StandardError }
+    expect {
+      plugin.load!
+    }.to output(/Unable to load plugin tty-console./).to_stdout
   end
 end

data/spec/tty/system/editor/open_spec.rb

@@ -21,7 +21,7 @@ describe TTY::System::Editor, '#open' do
     before { allow(editor).to receive(:command).and_return('vim') }
 
     it 'invokes editor' do
-      invocable = double(:invocable, :invoke => nil)
+      invocable = double(:invocable, invoke: nil)
       expect(subject).to receive(:new).with(file).and_return(invocable)
       editor.open(file)
     end

data/spec/tty/terminal/home_spec.rb

@@ -2,34 +2,26 @@
 
 require 'spec_helper'
 
-describe TTY::Terminal, '#home' do
-  subject(:terminal) { described_class.new }
-
-  before { allow(ENV).to receive(:[]) }
-
-  after { terminal.instance_variable_set(:@home, nil) }
-
-  it 'expands user home path if HOME environemnt not set' do
-    allow(File).to receive(:expand_path).and_return('/home/user')
-    expect(terminal.home).to eql('/home/user')
-  end
-
-  it 'defaults to user HOME environment' do
-    allow(ENV).to receive(:[]).with('HOME').and_return('/home/user')
-    expect(terminal.home).to eq('/home/user')
-  end
-
-  context 'when failed to expand' do
-    before { allow(File).to receive(:expand_path).and_raise(RuntimeError) }
-
-    it 'returns C:/ on windows' do
-      allow(TTY::System).to receive(:windows?).and_return(true)
-      expect(terminal.home).to eql("C:/")
+RSpec.describe TTY::Terminal::Home, '#find_home' do
+  context 'on unix' do
+    it "finds home" do
+      platform = spy(:windows? => false)
+      home = described_class.new(platform)
+      allow(home).to receive(:unix_home).and_return('/users/piotr')
+      allow(File).to receive(:expand_path).and_return('/users/piotr')
+      expect(home.find_home).to eq('/users/piotr')
+      expect(home).to have_received(:unix_home)
     end
+  end
 
-    it 'returns root on unix' do
-      allow(TTY::System).to receive(:windows?).and_return(false)
-      expect(terminal.home).to eql("/")
+  context 'on windows' do
+    it "finds home" do
+      platform = spy(:windows? => true)
+      home = described_class.new(platform)
+      allow(home).to receive(:windows_home).and_return('C:\Users\Piotr')
+      allow(File).to receive(:expand_path).and_return('C:\Users\Piotr')
+      expect(home.find_home).to eq('C:\Users\Piotr')
+      expect(home).to have_received(:windows_home)
     end
   end
 end

data/spec/tty/tty_spec.rb

@@ -7,7 +7,7 @@ describe TTY do
 
   it { expect(object.terminal).to be_instance_of(TTY::Terminal) }
 
-  it { expect(object.shell).to be_instance_of(TTY::Shell) }
+  #it { expect(object.shell).to be_instance_of(TTY::Shell) }
 
   it { expect(object.system).to be(TTY::System) }
 

data/spec/tty/vector/new_spec.rb

@@ -24,7 +24,7 @@ describe TTY::Vector, '#new' do
   end
 
   context 'with an argument that is a hash' do
-    let(:argument) { {:value => 'Piotr'} }
+    let(:argument) { {value: 'Piotr'} }
 
     it 'sets elements' do
       expect(vector.to_a).to eq([[:value, 'Piotr']])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tty
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-20 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-pager
@@ -188,26 +188,13 @@ files:
 - lib/tty/logger.rb
 - lib/tty/plugins.rb
 - lib/tty/plugins/plugin.rb
-- lib/tty/shell.rb
-- lib/tty/shell/distance.rb
-- lib/tty/shell/question.rb
-- lib/tty/shell/question/modifier.rb
-- lib/tty/shell/question/validation.rb
-- lib/tty/shell/reader.rb
-- lib/tty/shell/response.rb
-- lib/tty/shell/response_delegation.rb
-- lib/tty/shell/statement.rb
-- lib/tty/shell/suggestion.rb
 - lib/tty/support/coercion.rb
 - lib/tty/support/delegatable.rb
 - lib/tty/support/unicode.rb
-- lib/tty/support/utils.rb
 - lib/tty/system.rb
 - lib/tty/system/editor.rb
 - lib/tty/terminal.rb
-- lib/tty/terminal/echo.rb
 - lib/tty/terminal/home.rb
-- lib/tty/terminal/raw.rb
 - lib/tty/vector.rb
 - lib/tty/version.rb
 - spec/spec_helper.rb
@@ -218,38 +205,6 @@ files:
 - spec/tty/plugins/load_spec.rb
 - spec/tty/plugins/plugin/load_spec.rb
 - spec/tty/plugins/plugin/new_spec.rb
-- spec/tty/shell/ask_spec.rb
-- spec/tty/shell/distance/distance_spec.rb
-- spec/tty/shell/distance/initialize_spec.rb
-- spec/tty/shell/error_spec.rb
-- spec/tty/shell/print_table_spec.rb
-- spec/tty/shell/question/argument_spec.rb
-- spec/tty/shell/question/character_spec.rb
-- spec/tty/shell/question/default_spec.rb
-- spec/tty/shell/question/in_spec.rb
-- spec/tty/shell/question/initialize_spec.rb
-- spec/tty/shell/question/modifier/apply_to_spec.rb
-- spec/tty/shell/question/modifier/letter_case_spec.rb
-- spec/tty/shell/question/modifier/whitespace_spec.rb
-- spec/tty/shell/question/modify_spec.rb
-- spec/tty/shell/question/valid_spec.rb
-- spec/tty/shell/question/validate_spec.rb
-- spec/tty/shell/question/validation/coerce_spec.rb
-- spec/tty/shell/question/validation/valid_value_spec.rb
-- spec/tty/shell/reader/getc_spec.rb
-- spec/tty/shell/response/read_bool_spec.rb
-- spec/tty/shell/response/read_char_spec.rb
-- spec/tty/shell/response/read_date_spec.rb
-- spec/tty/shell/response/read_email_spec.rb
-- spec/tty/shell/response/read_multiple_spec.rb
-- spec/tty/shell/response/read_number_spec.rb
-- spec/tty/shell/response/read_range_spec.rb
-- spec/tty/shell/response/read_spec.rb
-- spec/tty/shell/response/read_string_spec.rb
-- spec/tty/shell/say_spec.rb
-- spec/tty/shell/statement/initialize_spec.rb
-- spec/tty/shell/suggest_spec.rb
-- spec/tty/shell/warn_spec.rb
 - spec/tty/support/coercion_spec.rb
 - spec/tty/support/delegatable_spec.rb
 - spec/tty/support/fixtures/classes.rb
@@ -259,8 +214,6 @@ files:
 - spec/tty/system/editor/executables_spec.rb
 - spec/tty/system/editor/invoke_spec.rb
 - spec/tty/system/editor/open_spec.rb
-- spec/tty/terminal/color_spec.rb
-- spec/tty/terminal/echo_spec.rb
 - spec/tty/terminal/home_spec.rb
 - spec/tty/tty_spec.rb
 - spec/tty/vector/new_spec.rb
@@ -306,38 +259,6 @@ test_files:
 - spec/tty/plugins/load_spec.rb
 - spec/tty/plugins/plugin/load_spec.rb
 - spec/tty/plugins/plugin/new_spec.rb
-- spec/tty/shell/ask_spec.rb
-- spec/tty/shell/distance/distance_spec.rb
-- spec/tty/shell/distance/initialize_spec.rb
-- spec/tty/shell/error_spec.rb
-- spec/tty/shell/print_table_spec.rb
-- spec/tty/shell/question/argument_spec.rb
-- spec/tty/shell/question/character_spec.rb
-- spec/tty/shell/question/default_spec.rb
-- spec/tty/shell/question/in_spec.rb
-- spec/tty/shell/question/initialize_spec.rb
-- spec/tty/shell/question/modifier/apply_to_spec.rb
-- spec/tty/shell/question/modifier/letter_case_spec.rb
-- spec/tty/shell/question/modifier/whitespace_spec.rb
-- spec/tty/shell/question/modify_spec.rb
-- spec/tty/shell/question/valid_spec.rb
-- spec/tty/shell/question/validate_spec.rb
-- spec/tty/shell/question/validation/coerce_spec.rb
-- spec/tty/shell/question/validation/valid_value_spec.rb
-- spec/tty/shell/reader/getc_spec.rb
-- spec/tty/shell/response/read_bool_spec.rb
-- spec/tty/shell/response/read_char_spec.rb
-- spec/tty/shell/response/read_date_spec.rb
-- spec/tty/shell/response/read_email_spec.rb
-- spec/tty/shell/response/read_multiple_spec.rb
-- spec/tty/shell/response/read_number_spec.rb
-- spec/tty/shell/response/read_range_spec.rb
-- spec/tty/shell/response/read_spec.rb
-- spec/tty/shell/response/read_string_spec.rb
-- spec/tty/shell/say_spec.rb
-- spec/tty/shell/statement/initialize_spec.rb
-- spec/tty/shell/suggest_spec.rb
-- spec/tty/shell/warn_spec.rb
 - spec/tty/support/coercion_spec.rb
 - spec/tty/support/delegatable_spec.rb
 - spec/tty/support/fixtures/classes.rb
@@ -347,8 +268,6 @@ test_files:
 - spec/tty/system/editor/executables_spec.rb
 - spec/tty/system/editor/invoke_spec.rb
 - spec/tty/system/editor/open_spec.rb
-- spec/tty/terminal/color_spec.rb
-- spec/tty/terminal/echo_spec.rb
 - spec/tty/terminal/home_spec.rb
 - spec/tty/tty_spec.rb
 - spec/tty/vector/new_spec.rb

data/lib/tty/shell.rb

@@ -1,211 +0,0 @@
-# encoding: utf-8
-
-module TTY
-  # A class responsible for shell prompt interactions.
-  class Shell
-    # @api private
-    attr_reader :input
-
-    # @api private
-    attr_reader :output
-
-    # Shell prompt prefix
-    #
-    # @api private
-    attr_reader :prefix
-
-    # Initialize a Shell
-    #
-    # @api public
-    def initialize(input = stdin, output = stdout, options = {})
-      @input  = input
-      @output = output
-      @prefix = options.fetch(:prefix) { '' }
-    end
-
-    # Ask a question.
-    #
-    # @example
-    #   shell = TTY::Shell.new
-    #   shell.ask("What is your name?")
-    #
-    # @param [String] statement
-    #   string question to be asked
-    #
-    # @yieldparam [TTY::Question] question
-    #   further configure the question
-    #
-    # @yield [question]
-    #
-    # @return [TTY::Question]
-    #
-    # @api public
-    def ask(statement, *args, &block)
-      options = Utils.extract_options!(args)
-
-      question = Question.new self, options
-      question.instance_eval(&block) if block_given?
-      question.prompt(statement)
-    end
-
-    # A shortcut method to ask the user positive question and return
-    # true for 'yes' reply.
-    #
-    # @return [Boolean]
-    #
-    # @api public
-    def yes?(statement, *args, &block)
-      ask(statement, *args, &block).read_bool
-    end
-
-    # A shortcut method to ask the user negative question and return
-    # true for 'no' reply.
-    #
-    # @return [Boolean]
-    #
-    # @api public
-    def no?(statement, *args, &block)
-      !yes?(statement, *args, &block)
-    end
-
-    # Print statement out. If the supplied message ends with a space or
-    # tab character, a new line will not be appended.
-    #
-    # @example
-    #   say("Simple things.")
-    #
-    # @param [String] message
-    #
-    # @return [String]
-    #
-    # @api public
-    def say(message = '', options = {})
-      message = message.to_str
-      return unless message.length > 0
-
-      statement = Statement.new(self, options)
-      statement.declare message
-    end
-
-    # Print statement(s) out in red green.
-    #
-    # @example
-    #   shell.confirm "Are you sure?"
-    #   shell.confirm "All is fine!", "This is fine too."
-    #
-    # @param [Array] messages
-    #
-    # @return [Array] messages
-    #
-    # @api public
-    def confirm(*args)
-      options = Utils.extract_options!(args)
-      args.each { |message| say message, options.merge(color: :green) }
-    end
-
-    # Print statement(s) out in yellow color.
-    #
-    # @example
-    #   shell.warn "This action can have dire consequences"
-    #   shell.warn "Carefull young apprentice", "This is potentially dangerous"
-    #
-    # @param [Array] messages
-    #
-    # @return [Array] messages
-    #
-    # @api public
-    def warn(*args)
-      options = Utils.extract_options!(args)
-      args.each { |message| say message, options.merge(color: :yellow) }
-    end
-
-    # Print statement(s) out in red color.
-    #
-    # @example
-    #   shell.error "Shutting down all systems!"
-    #   shell.error "Nothing is fine!", "All is broken!"
-    #
-    # @param [Array] messages
-    #
-    # @return [Array] messages
-    #
-    # @api public
-    def error(*args)
-      options = Utils.extract_options!(args)
-      args.each { |message| say message, options.merge(color: :red) }
-    end
-
-    # Takes the string provided by the user and compare it with other possible
-    # matches to suggest an unambigous string
-    #
-    # @example
-    #   shell.suggest('sta', ['status', 'stage', 'commit', 'branch'])
-    #   # => "status, stage"
-    #
-    # @param [String] message
-    #
-    # @param [Array] possibilities
-    #
-    # @param [Hash] options
-    # @option options [String] :indent
-    #   The number of spaces for indentation
-    # @option options [String] :single_text
-    #   The text for a single suggestion
-    # @option options [String] :plural_text
-    #   The text for multiple suggestions
-    #
-    # @return [String]
-    #
-    # @api public
-    def suggest(message, possibilities, options = {})
-      suggestion = Suggestion.new(options)
-      say(suggestion.suggest(message, possibilities))
-    end
-
-    # Print a table to shell.
-    #
-    # @example of a table with rows rendered with ascii border
-    #   rows = [[1], [2], [3]]
-    #   TTY.shell.print_table rows, renderer: :ascii
-    #
-    # @return [undefined]
-    #
-    # @api public
-    def print_table(*args, &block)
-      options  = Utils.extract_options!(args)
-      renderer = options.fetch(:renderer) { :basic }
-      table    = TTY::Table.new(*args, &block)
-      say table.render(renderer, options)
-    end
-
-    # Check if outputing to shell
-    #
-    # @return [Boolean]
-    #
-    # @api public
-    def tty?
-      stdout.tty?
-    end
-
-    # Return standard in
-    #
-    # @api private
-    def stdin
-      $stdin
-    end
-
-    # Return standard out
-    #
-    # @api private
-    def stdout
-      $stdout
-    end
-
-    # Return standard error
-    #
-    # @api private
-    def stderr
-      $stderr
-    end
-  end # Shell
-end # TTY