Skip to content

Commit

Permalink
Revert to old colored gem
Browse files Browse the repository at this point in the history
Introduced many regressions
  • Loading branch information
KrauseFx committed Feb 3, 2017
1 parent 9d65b6a commit bab0836
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion credentials_manager/lib/credentials_manager.rb
Expand Up @@ -4,7 +4,7 @@
require 'credentials_manager/appfile_config'

# Third Party code
require 'colored2'
require 'colored'
require 'security'
require 'highline/import' # to hide the entered password

Expand Down
2 changes: 1 addition & 1 deletion fastlane.gemspec
Expand Up @@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
spec.add_dependency 'word_wrap', '~> 1.0.0' # to add line breaks for tables with long strings

spec.add_dependency 'babosa', '>= 1.0.2', "< 2.0.0"
spec.add_dependency 'colored2', '>= 3.1.1', "< 4.0.0" # coloured terminal output
spec.add_dependency 'colored' # coloured terminal output
spec.add_dependency 'commander', '>= 4.4.0', '< 5.0.0' # CLI parser
spec.add_dependency 'excon', '>= 0.45.0', '< 1.0.0' # Great HTTP Client
spec.add_dependency 'faraday-cookie_jar', '~> 0.0.6'
Expand Down
2 changes: 1 addition & 1 deletion fastlane_core/lib/fastlane_core.rb
Expand Up @@ -31,7 +31,7 @@
require 'fastlane_core/swag'

# Third Party code
require 'colored2'
require 'colored'
require 'commander'

# after commander import
Expand Down
2 changes: 1 addition & 1 deletion fastlane_core/lib/fastlane_core/helper.rb
@@ -1,5 +1,5 @@
require 'logger'
require 'colored2'
require 'colored'

module FastlaneCore
module Helper
Expand Down
8 changes: 4 additions & 4 deletions fastlane_core/lib/fastlane_core/ui/disable_colors.rb
@@ -1,15 +1,15 @@
# This code overwrites the methods from the colored gem
# via https://github.com/kigster/colored2/blob/aa274018906641ffb07aaa3015081a174d169dfe/lib/colored2.rb
# via https://github.com/defunkt/colored/blob/master/lib/colored.rb

require 'colored2'
require 'colored'

class String
Colored2::COLORS.keys.each do |color|
Colored::COLORS.keys.each do |color|
define_method(color) do
self # do nothing with the string, but return it
end
end
Colored2::EFFECTS.keys.each do |extra|
Colored::EXTRAS.keys.each do |extra|
define_method(extra) do
self # do nothing with the string, but return it
end
Expand Down
2 changes: 1 addition & 1 deletion frameit/frames_generator/Rakefile
@@ -1,4 +1,4 @@
require 'colored2'
require 'colored'
require 'mini_magick'
require 'json'

Expand Down
2 changes: 1 addition & 1 deletion pilot/spec/tester_manager_spec.rb
@@ -1,4 +1,4 @@
require 'colored2'
require 'colored'
require 'ostruct'

describe Pilot::TesterManager do
Expand Down
2 changes: 1 addition & 1 deletion rakelib/issue_stats.rake
Expand Up @@ -51,7 +51,7 @@ task :issue_stats do
require 'json'
require 'faraday'
require 'terminal-table'
require 'colored2'
require 'colored'

raise "Please set GITHUB_SCRIPT_TOKEN in your environment with a GitHub personal access token value".red if GITHUB_TOKEN.to_s.empty?

Expand Down
2 changes: 1 addition & 1 deletion rakelib/release_stats.rake
Expand Up @@ -23,7 +23,7 @@ desc 'Print stats about how much time has passed and work has happened since the
task :release_stats do
require 'date'
require 'terminal-table'
require 'colored2'
require 'colored'
require 'shellwords'

`git pull --tags`
Expand Down

0 comments on commit bab0836

Please sign in to comment.