highline 2.0.0.pre.develop.11 → 2.0.0.pre.develop.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 384e4ddade0f40dc604fd6cbb4fed1f543f54fa3
-  data.tar.gz: 80ca4c698e1418b4a3476e27e4179bde0405721c
+  metadata.gz: 20085d360090ca1af2b16c4ec579647ec88a79f2
+  data.tar.gz: 5b41382a10fef5b7ff836c69ed4eff2dbe50f65c
 SHA512:
-  metadata.gz: 40e63c09636602c0a71582f8ea4033571202fe10721655b4853d74d3a391472ce6c574404fe750f543ec4f783b2e66afac247e21ec9ed729c521e0826d54187a
-  data.tar.gz: c35ebc20d89396e0af1f8b97716067308c726c290374fecfa71c1b9a9968dcd854f0a1d020e6e7a10407ded8f9fc52273e688538c1b33b54ee05f9c0a2d8fd8d
+  metadata.gz: 9c12e2b43c53506dcb614024f726310fe0282db48c60ee0ce6bd01c15ee3c05592929310d939045b479c6ee12c8161a186b627eddef33c83477f9e0d5b06bda1
+  data.tar.gz: 81a74acd56063ae2262b4da7156938cb20434e469e19c2636bcb6943e6e93fa6c36dfddd8d7095cc03dcddea3ade28d104d30880cd858c5a64e566a2a1a5995e

data/.travis.yml

@@ -23,6 +23,7 @@ matrix:
     - rvm: rbx-3.81
     - rvm: jruby-19mode # JRuby in 1.9 mode
     - rvm: jruby-head
+  fast_finish: true
   include:
     - rvm: 1.9
       before_install:

data/Changelog.md

@@ -2,6 +2,12 @@
 
 Below is a complete listing of changes for each revision of HighLine.
 
+### Unreleased
+* PR #218 - Ease transition from 1.7.x to 2.0.x (@abinoam)
+  * Copy use_color from HighLine.default_instance
+  * Expose IOConsoleCompatible
+* PR #216 - Update .appveyor.yml - Fix Windows CI (@abinoam)
+
 ### 2.0.0-develop.11 / 2017-09-25
 * PR #215 - Apply several Rubocop stylistic suggestions (@abinoam)
   * Update gemspec/Gemfile to newer standards

data/appveyor.yml

@@ -1,19 +1,37 @@
-version: '{build}'
+version: 2.0.{build}-{branch}
 
-skip_tags: true
+cache:
+  - vendor/bundle
 
 environment:
   matrix:
-    - ruby_version: "21"
-    - ruby_version: "21-x64"
+    - RUBY_VERSION: "193"
+    - RUBY_VERSION: "200"
+    - RUBY_VERSION: "200-x64"
+    - RUBY_VERSION: "21"
+    - RUBY_VERSION: "21-x64"
+    - RUBY_VERSION: "22"
+    - RUBY_VERSION: "22-x64"
+    - RUBY_VERSION: "23"
+    - RUBY_VERSION: "23-x64"
+    - RUBY_VERSION: "24"
+    - RUBY_VERSION: "24-x64"
 
-install:
-  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - gem install bundler --no-document -v 1.10.5
-  - bundle install --retry=3 --without development
+matrix:
+  allow_failures:
+    - RUBY_VERSION: "193"
 
-test_script:
-  - bundle exec rake
+install:
+  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+  - bundle config --local path vendor/bundle
+  - bundle install --retry=3 --without code_quality
 
 build: off
 
+before_test:
+  - ruby -v
+  - gem -v
+  - bundle -v
+
+test_script:
+  - bundle exec rake

data/lib/highline.rb

@@ -115,9 +115,9 @@ class HighLine
     @header   = nil
     @prompt   = nil
     @key      = nil
-    @use_color = true
-    @track_eof = true # The setting used to disable EOF tracking.
 
+    @use_color = default_use_color
+    @track_eof = true # The setting used to disable EOF tracking.
     @terminal = HighLine::Terminal.get_terminal(input, output)
   end
 
@@ -619,6 +619,21 @@ class HighLine
   def actual_length(text)
     Wrapper.actual_length text
   end
+
+  # Check to see if there's already a HighLine.default_instance or if
+  # this is the first time the method is called (eg: at
+  # HighLine.default_instance initialization).
+  # If there's already one, copy use_color settings.
+  # This is here most to help migrate code from HighLine 1.7.x to 2.0.x
+  #
+  # @return [Boolean]
+  def default_use_color
+    if HighLine.default_instance
+      HighLine.default_instance.use_color
+    else
+      true
+    end
+  end
 end
 
 HighLine.default_instance = HighLine.new

data/lib/highline/io_console_compatible.rb

@@ -0,0 +1,37 @@
+# coding: utf-8
+
+require "stringio"
+require "tempfile"
+
+#
+# On tests, we try to simulate input output with
+# StringIO, Tempfile and File objects.
+#
+# For this to be accomplished, we have to do some
+# tweaking so that they respond adequately to the
+# called methods during tests.
+#
+
+module IOConsoleCompatible
+  def getch
+    getc
+  end
+
+  attr_accessor :echo
+
+  def winsize
+    [24, 80]
+  end
+end
+
+class Tempfile
+  include IOConsoleCompatible
+end
+
+class File
+  include IOConsoleCompatible
+end
+
+class StringIO
+  include IOConsoleCompatible
+end

data/lib/highline/version.rb

@@ -2,5 +2,5 @@
 
 class HighLine
   # The version of the installed library.
-  VERSION = "2.0.0-develop.11".freeze
+  VERSION = "2.0.0-develop.12".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: highline
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.develop.11
+  version: 2.0.0.pre.develop.12
 platform: ruby
 authors:
 - James Edward Gray II
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-25 00:00:00.000000000 Z
+date: 2017-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,6 +100,7 @@ files:
 - lib/highline/compatibility.rb
 - lib/highline/custom_errors.rb
 - lib/highline/import.rb
+- lib/highline/io_console_compatible.rb
 - lib/highline/list.rb
 - lib/highline/list_renderer.rb
 - lib/highline/menu.rb