Skip to content

Commit

Permalink
Merge 583102f into 3e8064c
Browse files Browse the repository at this point in the history
  • Loading branch information
deivid-rodriguez committed Apr 7, 2017
2 parents 3e8064c + 583102f commit ce22206
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 46 deletions.
4 changes: 4 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,7 @@
# 2.2.1 (2016-12-28)

* fixed gem installation (2.2.0 was a broken release)

# 3.0.0 (Unreleased)

* drop 1.9.3 compatibility
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ source 'https://rubygems.org'
# Specify your gem's dependencies in rainbow.gemspec
gemspec

gem 'rake'
gem 'rake', '~> 11.0'
gem 'coveralls', require: false
gem 'mime-types', '< 2.0.0', platforms: [:ruby_18]
gem 'rspec'

group :development do
Expand Down
10 changes: 0 additions & 10 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -154,16 +154,6 @@ colorize all the strings, even the ones that go through file writing
formatters. You can easily solve that by disabling coloring for the Rainbow
instances that are used by formatters with file output.

## Windows support

For Windows support on Ruby < 2.0, you should install the following gems:

```ruby
gem install windows-pr win32console
```

If the above gems aren't installed then all strings are returned unmodified.

## Installation

Add it to your Gemfile:
Expand Down
22 changes: 0 additions & 22 deletions ext/mkrf_conf.rb

This file was deleted.

10 changes: 0 additions & 10 deletions lib/rainbow.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,4 @@ def self.new
self.enabled = false if ENV['TERM'] == 'dumb'
self.enabled = true if ENV['CLICOLOR_FORCE'] == '1'

# On Windows systems, try to load the local ANSI support library if Ruby version < 2
# Ruby 2.x on Windows includes ANSI support.
if RUBY_PLATFORM =~ /mswin|cygwin|mingw/ && RUBY_VERSION.to_i < 2
begin
require 'Win32/Console/ANSI'
rescue LoadError
self.enabled = false
end
end

end
3 changes: 1 addition & 2 deletions rainbow.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@ Gem::Specification.new do |spec|
spec.summary = %q(Colorize printed text on ANSI terminals)
spec.homepage = "https://github.com/sickill/rainbow"
spec.license = "MIT"
spec.required_ruby_version = '>= 1.9.2'
spec.required_ruby_version = '>= 2.0.0'

spec.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"]

spec.add_development_dependency "bundler", "~> 1.3"
spec.extensions = ["ext/mkrf_conf.rb"]
end

0 comments on commit ce22206

Please sign in to comment.