[Added] Support for Ruby 2.5.1

[Deprecated] Support for Ruby 2.1 [Deprecated] Support for Ruby 2.2 [Deprecated] Support for jruby Signed-off-by: Tony Wong <twong@pivotal.io>
pivotal · Apr 2, 2018 · 9c82a84 · 9c82a84
1 parent 71f8ae2
commit 9c82a84
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -90,7 +90,7 @@ ENV LC_ALL=en_US.UTF-8
 
 #install rvm
 RUN curl -sSL https://rvm.io/mpapis.asc | gpg --import && \
-    curl -sSL https://get.rvm.io | sudo bash -s stable --ruby=2.4.1
+    curl -sSL https://get.rvm.io | sudo bash -s stable --ruby=2.5.1
 ENV PATH=/usr/local/rvm/bin:$PATH
 
 #install mix

diff --git a/README.md b/README.md
@@ -6,7 +6,8 @@ Build status
 * Ruby 2.1.5 [![Ruby 2.1.5 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-2.1.5/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
 * Ruby 2.2.0 [![Ruby 2.2.0 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-2.2.0/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
 * Ruby 2.3.0 [![Ruby 2.3.0 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-2.3.0/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
-* Ruby 2.4.1 [![Ruby 2.4.1 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-2.4.1/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
+* Ruby 2.4.4 [![Ruby 2.4.4 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-2.4.4/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
+* Ruby 2.5.1 [![Ruby 2.5.1 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-2.5.1/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
 * JRuby 9.0.4.0 [![JRuby 9.0.4.0 build status](https://norsk.cf-app.com/api/v1/teams/main/pipelines/LicenseFinder/jobs/ruby-jruby-9.0.4.0/badge)](https://norsk.cf-app.com/teams/main/pipelines/LicenseFinder)
 
 

diff --git a/ci/pipelines/pipeline.yml.erb b/ci/pipelines/pipeline.yml.erb
@@ -1,5 +1,5 @@
 <% setup_slack = defined?(slack_url) && defined?(slack_channel) %>
-<% ruby_versions = %w(2.4.1 2.3.0 2.2.0 2.1.5 jruby-9.0.4.0) %>
+<% ruby_versions = %w(2.5.1 2.4.4 2.3.0 2.2.0 2.1.5 jruby-9.0.4.0) %>
 
 resource_types:
 - name: pull-request

diff --git a/lib/license_finder/core.rb b/lib/license_finder/core.rb
@@ -82,7 +82,7 @@ def current_packages
     end
 
     def clear_logs
-      FileUtils.rmdir config.log_directory if File.directory? config.log_directory
+      FileUtils.rmtree config.log_directory, :secure => true if File.directory? config.log_directory
     end
 
     def options

diff --git a/license_finder.gemspec b/license_finder.gemspec
@@ -5,7 +5,7 @@ require 'license_finder/platform'
 require 'license_finder/version'
 
 Gem::Specification.new do |s|
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.1.0'
   s.name        = 'license_finder'
   s.version     = LicenseFinder::VERSION
 
@@ -51,13 +51,13 @@ Gem::Specification.new do |s|
   s.add_dependency 'thor'
   s.add_dependency 'toml', '0.2.0'
   s.add_dependency 'xml-simple'
+  s.add_dependency 'with_env', '1.1.0'
 
-  # to preserve ruby 1.9.3 support
-  s.add_dependency 'with_env', (RUBY_VERSION <= '1.9.3' ? '1.0.0' : '> 1.0')
-
+  s.add_development_dependency 'addressable', '2.5.2'
   s.add_development_dependency 'capybara', '~> 2.0.0'
   s.add_development_dependency 'cocoapods', '0.34.0' if LicenseFinder::Platform.darwin?
   s.add_development_dependency 'fakefs', '~> 0.11.3'
+  s.add_development_dependency 'mime-types', '3.1'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 3'
@@ -68,10 +68,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rack', (RUBY_VERSION < '2.2.2' ? '1.6.0' : '> 1.6')
   s.add_development_dependency 'rack-test', (RUBY_VERSION < '2.2.2' ? '0.7.0' : '> 0.7')
 
-  # temporary to preserve ruby 1.9.3 support.
-  s.add_development_dependency 'addressable', '< 2.5.0'
-  s.add_development_dependency 'mime-types', '< 3.0'
-
   s.files         = `git ls-files`.split("\n").reject { |f| f.start_with?('spec', 'features') }
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
 end