From e02b30a111d9ace05d2d4a770651d96c201400c7 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Fri, 4 Jan 2019 11:40:16 +0100 Subject: [PATCH] Drop support for Ruby 2.2 It reached EOL on 20th Jun 2018 and no longer receives patches. * set required Ruby version to >= 2.3 in spec file * set rubocop's TargetRubyVersion to 2.3 and fix all the offenses --- .rubocop.yml | 2 +- .travis.yml | 1 - colorls.gemspec | 2 +- exe/colorls | 1 + lib/colorls.rb | 2 ++ lib/colorls/core.rb | 2 ++ lib/colorls/fileinfo.rb | 2 ++ lib/colorls/flags.rb | 4 +++- lib/colorls/git.rb | 2 ++ lib/colorls/monkeys.rb | 2 ++ lib/colorls/version.rb | 4 +++- lib/colorls/yaml.rb | 2 ++ 12 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 4712ddd..484dbb6 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -8,7 +8,7 @@ AllCops: - 'lib/yaml/*' - 'lib/**/*.sh' DisplayCopNames: true - TargetRubyVersion: 2.2 + TargetRubyVersion: 2.3 # Preferred codebase style --------------------------------------------- diff --git a/.travis.yml b/.travis.yml index aaaf92e..64c9aaa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,6 @@ cache: bundler rvm: - - '2.2' - '2.3' - '2.4' - '2.5' diff --git a/colorls.gemspec b/colorls.gemspec index 3f93c8b..505748f 100644 --- a/colorls.gemspec +++ b/colorls.gemspec @@ -33,7 +33,7 @@ Gem::Specification.new do |spec| spec.homepage = 'https://github.com/athityakumar/colorls' spec.license = 'MIT' - spec.required_ruby_version = '>= 2.2.0' + spec.required_ruby_version = '>= 2.3.0' spec.files = `git ls-files -z`.split("\x0").reject do |f| f.match(%r{^(test|spec|features)/}) diff --git a/exe/colorls b/exe/colorls index 1f52943..e7ad5f3 100755 --- a/exe/colorls +++ b/exe/colorls @@ -1,4 +1,5 @@ #!/usr/bin/env ruby +# frozen_string_literal: true require 'colorls' diff --git a/lib/colorls.rb b/lib/colorls.rb index c1af739..eec01cc 100644 --- a/lib/colorls.rb +++ b/lib/colorls.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'yaml' require 'etc' require 'English' diff --git a/lib/colorls/core.rb b/lib/colorls/core.rb index f4a4928..1ce4459 100644 --- a/lib/colorls/core.rb +++ b/lib/colorls/core.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module ColorLS class Core def initialize(input, all: false, report: false, sort: false, show: false, diff --git a/lib/colorls/fileinfo.rb b/lib/colorls/fileinfo.rb index 8f00639..4d8045e 100644 --- a/lib/colorls/fileinfo.rb +++ b/lib/colorls/fileinfo.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'forwardable' module ColorLS diff --git a/lib/colorls/flags.rb b/lib/colorls/flags.rb index 022855a..8461703 100644 --- a/lib/colorls/flags.rb +++ b/lib/colorls/flags.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'optparse' require 'colorls/version' require 'ostruct' @@ -42,7 +44,7 @@ module ColorLS begin next STDERR.puts "\n Specified path '#{path}' doesn't exist.".colorize(:red) unless File.exist?(path) - puts '' if i > 0 + puts '' if i.positive? puts "\n#{path}:" if Dir.exist?(path) && @args.size > 1 Core.new(path, @opts).ls rescue SystemCallError => e diff --git a/lib/colorls/git.rb b/lib/colorls/git.rb index 180a99d..0e8f05a 100644 --- a/lib/colorls/git.rb +++ b/lib/colorls/git.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module ColorLS module Git def self.status(repo_path) diff --git a/lib/colorls/monkeys.rb b/lib/colorls/monkeys.rb index e5deea6..454478c 100644 --- a/lib/colorls/monkeys.rb +++ b/lib/colorls/monkeys.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class String def colorize(color) self.color(color.to_sym) diff --git a/lib/colorls/version.rb b/lib/colorls/version.rb index a61aa62..6331e75 100644 --- a/lib/colorls/version.rb +++ b/lib/colorls/version.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module ColorLS - VERSION = '1.1.1'.freeze + VERSION = '1.1.1' end diff --git a/lib/colorls/yaml.rb b/lib/colorls/yaml.rb index e5797ec..81b2457 100644 --- a/lib/colorls/yaml.rb +++ b/lib/colorls/yaml.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module ColorLS class Yaml def initialize(filename)