From 01ec3cf491215724ca1ff666fd590c261045636c Mon Sep 17 00:00:00 2001 From: Andrew Svidersky Date: Thu, 18 Feb 2021 10:40:15 +0400 Subject: [PATCH] Expands the ruby version set --- .gitignore | 2 + .rubocop.yml | 3 + .ruby-gemset | 1 + .ruby-version | 1 + .travis.yml | 29 ++++++- Gemfile | 26 +++--- Gemfile.lock | 178 -------------------------------------- esendex.gemspec | 29 +++---- gemfiles/rails_51.gemfile | 20 +++++ gemfiles/rails_52.gemfile | 20 +++++ gemfiles/rails_60.gemfile | 20 +++++ gemfiles/rails_61.gemfile | 20 +++++ 12 files changed, 140 insertions(+), 209 deletions(-) create mode 100644 .rubocop.yml create mode 100644 .ruby-gemset create mode 100644 .ruby-version delete mode 100644 Gemfile.lock create mode 100644 gemfiles/rails_51.gemfile create mode 100644 gemfiles/rails_52.gemfile create mode 100644 gemfiles/rails_60.gemfile create mode 100644 gemfiles/rails_61.gemfile diff --git a/.gitignore b/.gitignore index 09ed60c..efc3ce1 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ spec/reports test/tmp test/version_tmp tmp +Gemfile.lock +gemfiles/*.lock diff --git a/.rubocop.yml b/.rubocop.yml new file mode 100644 index 0000000..f18e63a --- /dev/null +++ b/.rubocop.yml @@ -0,0 +1,3 @@ +AllCops: + TargetRubyVersion: 2.7 + SuggestExtensions: false diff --git a/.ruby-gemset b/.ruby-gemset new file mode 100644 index 0000000..bf3744f --- /dev/null +++ b/.ruby-gemset @@ -0,0 +1 @@ +esendex-sdk diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..37c2961 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.7.2 diff --git a/.travis.yml b/.travis.yml index 3e31d23..bda3a75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,29 @@ language: ruby rvm: - - "2.2" - - "2.3" - - "2.4" + - 2.6 + - 2.7.2 + - 3.0 +os: linux +sudo: true + script: bundle exec rspec + +cache: + bundler: false + +gemfile: + - gemfiles/rails_52.gemfile + - gemfiles/rails_60.gemfile + - gemfiles/rails_61.gemfile + +jobs: + include: + - rvm: 2.2 + gemfile: gemfiles/rails_51.gemfile + - rvm: 2.3 + gemfile: gemfiles/rails_52.gemfile + - rvm: 2.4 + gemfile: gemfiles/rails_52.gemfile + exclude: + - rvm: 3.0 + gemfile: gemfiles/rails_52.gemfile diff --git a/Gemfile b/Gemfile index a9b3d48..2c1ce38 100644 --- a/Gemfile +++ b/Gemfile @@ -1,20 +1,20 @@ -source "http://rubygems.org" +source 'http://rubygems.org' gemspec group :development, :test do - gem 'rails', "~> 4.1.16" - gem 'rake', '~> 12.2.1' - gem 'rspec' - gem 'rspec-rails' - gem 'rspec-collection_matchers' - gem 'rb-inotify', :require => false - gem 'rb-fsevent', :require => false + gem 'activeresource' + gem 'growl' gem 'guard' gem 'guard-rspec' - gem 'growl' - gem 'wdm', "<= 0.0.3", :platforms => [:mswin, :mingw], :require => false - gem 'activeresource' - gem 'rails-observers', '0.1.2' - gem 'listen', '~> 3.0.0' + gem 'listen' + gem 'rails', '~> 6.0' + gem 'rails-observers' + gem 'rb-fsevent', require: false + gem 'rb-inotify', require: false + gem 'rspec' + gem 'rspec-collection_matchers' + gem 'rspec-rails' + gem 'rubocop' + gem 'wdm', platforms: %i[mswin mingw], require: false end diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index e8d0be8..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,178 +0,0 @@ -PATH - remote: . - specs: - esendex (0.6.0) - nestful (~> 0.0.8) - nokogiri (~> 1.6.8.1) - -GEM - remote: http://rubygems.org/ - specs: - actionmailer (4.1.16) - actionpack (= 4.1.16) - actionview (= 4.1.16) - mail (~> 2.5, >= 2.5.4) - actionpack (4.1.16) - actionview (= 4.1.16) - activesupport (= 4.1.16) - rack (~> 1.5.2) - rack-test (~> 0.6.2) - actionview (4.1.16) - activesupport (= 4.1.16) - builder (~> 3.1) - erubis (~> 2.7.0) - activemodel (4.1.16) - activesupport (= 4.1.16) - builder (~> 3.1) - activerecord (4.1.16) - activemodel (= 4.1.16) - activesupport (= 4.1.16) - arel (~> 5.0.0) - activeresource (4.1.0) - activemodel (~> 4.0) - activesupport (~> 4.0) - rails-observers (~> 0.1.2) - activesupport (4.1.16) - i18n (~> 0.6, >= 0.6.9) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.1) - tzinfo (~> 1.1) - arel (5.0.1.20140414130214) - builder (3.2.3) - coderay (1.1.2) - concurrent-ruby (1.0.5) - diff-lcs (1.3) - erubis (2.7.0) - ffi (1.9.21) - ffi (1.9.21-x64-mingw32) - ffi (1.9.21-x86-mingw32) - formatador (0.2.5) - growl (1.0.3) - guard (2.14.2) - formatador (>= 0.2.4) - listen (>= 2.7, < 4.0) - lumberjack (>= 1.0.12, < 2.0) - nenv (~> 0.1) - notiffany (~> 0.0) - pry (>= 0.9.12) - shellany (~> 0.0) - thor (>= 0.18.1) - guard-compat (1.2.1) - guard-rspec (4.7.3) - guard (~> 2.1) - guard-compat (~> 1.1) - rspec (>= 2.99.0, < 4.0) - i18n (0.9.5) - concurrent-ruby (~> 1.0) - json (1.8.6) - listen (3.0.8) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - lumberjack (1.0.12) - mail (2.7.0) - mini_mime (>= 0.1.1) - method_source (0.9.0) - mini_mime (1.0.0) - mini_portile2 (2.1.0) - minitest (5.11.3) - nenv (0.3.0) - nestful (0.0.8) - activesupport (>= 3.0.0.beta) - nokogiri (1.6.8.1) - mini_portile2 (~> 2.1.0) - nokogiri (1.6.8.1-x64-mingw32) - mini_portile2 (~> 2.1.0) - nokogiri (1.6.8.1-x86-mingw32) - mini_portile2 (~> 2.1.0) - notiffany (0.1.1) - nenv (~> 0.1) - shellany (~> 0.0) - pry (0.11.3) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - rack (1.5.5) - rack-test (0.6.3) - rack (>= 1.0) - rails (4.1.16) - actionmailer (= 4.1.16) - actionpack (= 4.1.16) - actionview (= 4.1.16) - activemodel (= 4.1.16) - activerecord (= 4.1.16) - activesupport (= 4.1.16) - bundler (>= 1.3.0, < 2.0) - railties (= 4.1.16) - sprockets-rails (~> 2.0) - rails-observers (0.1.2) - activemodel (~> 4.0) - railties (4.1.16) - actionpack (= 4.1.16) - activesupport (= 4.1.16) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rake (12.2.1) - rb-fsevent (0.10.2) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - rspec (3.7.0) - rspec-core (~> 3.7.0) - rspec-expectations (~> 3.7.0) - rspec-mocks (~> 3.7.0) - rspec-collection_matchers (1.1.3) - rspec-expectations (>= 2.99.0.beta1) - rspec-core (3.7.1) - rspec-support (~> 3.7.0) - rspec-expectations (3.7.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-mocks (3.7.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-rails (3.7.2) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.7.0) - rspec-expectations (~> 3.7.0) - rspec-mocks (~> 3.7.0) - rspec-support (~> 3.7.0) - rspec-support (3.7.1) - shellany (0.0.1) - sprockets (3.7.1) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (2.3.3) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) - thor (0.20.0) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) - wdm (0.0.3) - -PLATFORMS - ruby - x64-mingw32 - x86-mingw32 - -DEPENDENCIES - activeresource - esendex! - growl - guard - guard-rspec - listen (~> 3.0.0) - rails (~> 4.1.16) - rails-observers (= 0.1.2) - rake (~> 12.2.1) - rb-fsevent - rb-inotify - rspec - rspec-collection_matchers - rspec-rails - wdm (<= 0.0.3) - -BUNDLED WITH - 1.16.1 diff --git a/esendex.gemspec b/esendex.gemspec index 3845176..785ba6b 100644 --- a/esendex.gemspec +++ b/esendex.gemspec @@ -1,20 +1,19 @@ -# -*- encoding: utf-8 -*- -require File.expand_path('../lib/esendex/version', __FILE__) +require File.expand_path('lib/esendex/version', __dir__) Gem::Specification.new do |gem| - gem.authors = ["Adam Bird"] - gem.email = ["support@esendex.com"] - gem.description = "Send SMS from your application using the Esendex API" - gem.summary = "Gem for interacting with the Esendex API" - gem.homepage = "http://developers.esendex.com" + gem.authors = ['Adam Bird'] + gem.email = ['support@esendex.com'] + gem.description = 'Send SMS from your application using the Esendex API' + gem.summary = 'Gem for interacting with the Esendex API' + gem.homepage = 'http://developers.esendex.com' - gem.files = Dir["{app,config,lib}/**/*"] - gem.test_files = Dir["spec/**/*"] - gem.extra_rdoc_files = ["licence.txt", "readme.md"] - gem.name = "esendex" - gem.require_paths = ["lib"] + gem.files = Dir['{app,config,lib}/**/*'] + gem.test_files = Dir['spec/**/*'] + gem.extra_rdoc_files = ['licence.txt', 'readme.md'] + gem.name = 'esendex' + gem.require_paths = ['lib'] gem.version = Esendex::VERSION - gem.required_ruby_version = "~> 2.2" - gem.add_runtime_dependency "nestful", ["~> 0.0.8"] - gem.add_runtime_dependency "nokogiri", ["~> 1.6.8.1"] + gem.required_ruby_version = '>= 2.2' + gem.add_runtime_dependency 'nestful', ['~> 0.0.8'] + gem.add_runtime_dependency 'nokogiri' end diff --git a/gemfiles/rails_51.gemfile b/gemfiles/rails_51.gemfile new file mode 100644 index 0000000..356d030 --- /dev/null +++ b/gemfiles/rails_51.gemfile @@ -0,0 +1,20 @@ +source 'http://rubygems.org' + +gemspec path: '../' + +group :development, :test do + gem 'activeresource' + gem 'growl' + gem 'guard' + gem 'guard-rspec' + gem 'listen' + gem 'rails', '>= 5.1', '< 5.2' + gem 'rails-observers' + gem 'rb-fsevent', require: false + gem 'rb-inotify', require: false + gem 'rspec' + gem 'rspec-collection_matchers' + gem 'rspec-rails' + gem 'rubocop' + gem 'wdm', platforms: %i[mswin mingw], require: false +end diff --git a/gemfiles/rails_52.gemfile b/gemfiles/rails_52.gemfile new file mode 100644 index 0000000..8214f61 --- /dev/null +++ b/gemfiles/rails_52.gemfile @@ -0,0 +1,20 @@ +source 'http://rubygems.org' + +gemspec path: '../' + +group :development, :test do + gem 'activeresource' + gem 'growl' + gem 'guard' + gem 'guard-rspec' + gem 'listen' + gem 'rails', '>= 5.2', '< 6.0' + gem 'rails-observers' + gem 'rb-fsevent', require: false + gem 'rb-inotify', require: false + gem 'rspec' + gem 'rspec-collection_matchers' + gem 'rspec-rails' + gem 'rubocop' + gem 'wdm', platforms: %i[mswin mingw], require: false +end diff --git a/gemfiles/rails_60.gemfile b/gemfiles/rails_60.gemfile new file mode 100644 index 0000000..a2bd391 --- /dev/null +++ b/gemfiles/rails_60.gemfile @@ -0,0 +1,20 @@ +source 'http://rubygems.org' + +gemspec path: '../' + +group :development, :test do + gem 'activeresource' + gem 'growl' + gem 'guard' + gem 'guard-rspec' + gem 'listen' + gem 'rails', '>= 6.0', '< 6.1' + gem 'rails-observers' + gem 'rb-fsevent', require: false + gem 'rb-inotify', require: false + gem 'rspec' + gem 'rspec-collection_matchers' + gem 'rspec-rails' + gem 'rubocop' + gem 'wdm', platforms: %i[mswin mingw], require: false +end diff --git a/gemfiles/rails_61.gemfile b/gemfiles/rails_61.gemfile new file mode 100644 index 0000000..4eb421f --- /dev/null +++ b/gemfiles/rails_61.gemfile @@ -0,0 +1,20 @@ +source 'http://rubygems.org' + +gemspec path: '../' + +group :development, :test do + gem 'activeresource' + gem 'growl' + gem 'guard' + gem 'guard-rspec' + gem 'listen' + gem 'rails', '>= 6.1', '< 6.2' + gem 'rails-observers' + gem 'rb-fsevent', require: false + gem 'rb-inotify', require: false + gem 'rspec' + gem 'rspec-collection_matchers' + gem 'rspec-rails' + gem 'rubocop' + gem 'wdm', platforms: %i[mswin mingw], require: false +end