From 2f479617bef47a26154986f1c010b2d7b631c41e Mon Sep 17 00:00:00 2001
From: Oleg <oleg@khabarov.ca>
Date: Mon, 8 Jan 2018 14:38:08 -0800
Subject: [PATCH] removing appraisal, tweaking gemspec and gemfiles

---
 .travis.yml               | 32 +++++++-------------------------
 Appraisals                | 28 ----------------------------
 Gemfile                   | 21 +++++++++------------
 Rakefile                  | 20 +++++---------------
 bootstrap_form.gemspec    | 24 ++++++++----------------
 gemfiles/4.0.gemfile      |  9 ---------
 gemfiles/4.1.gemfile      |  9 ---------
 gemfiles/4.2.gemfile      |  9 ---------
 gemfiles/5.0.gemfile      | 10 ----------
 gemfiles/5.1.gemfile      |  9 ---------
 test/gemfiles/5.0.gemfile | 16 ++++++++++++++++
 test/gemfiles/5.1.gemfile | 16 ++++++++++++++++
 test/gemfiles/5.2.gemfile | 16 ++++++++++++++++
 13 files changed, 77 insertions(+), 142 deletions(-)
 delete mode 100644 Appraisals
 delete mode 100644 gemfiles/4.0.gemfile
 delete mode 100644 gemfiles/4.1.gemfile
 delete mode 100644 gemfiles/4.2.gemfile
 delete mode 100644 gemfiles/5.0.gemfile
 delete mode 100644 gemfiles/5.1.gemfile
 create mode 100644 test/gemfiles/5.0.gemfile
 create mode 100644 test/gemfiles/5.1.gemfile
 create mode 100644 test/gemfiles/5.2.gemfile

diff --git a/.travis.yml b/.travis.yml
index 42528216c..1c72f00eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +1,10 @@
-sudo: false
 language: ruby
 rvm:
-  - 1.9
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3.1
+  - 2.2.7
+  - 2.3.5
+  - 2.4.2
+  - 2.5.0
 gemfile:
-  - gemfiles/4.0.gemfile
-  - gemfiles/4.1.gemfile
-  - gemfiles/4.2.gemfile
-matrix:
-  include:
-    - rvm: 2.2.2
-      gemfile: gemfiles/5.0.gemfile
-    - rvm: 2.3.1
-      gemfile: gemfiles/5.0.gemfile
-      # Run Danger only once
-      script: bundle exec danger
-    - rvm: 2.2.2
-      gemfile: gemfiles/5.1.gemfile
-    - rvm: 2.3.1
-      gemfile: gemfiles/5.1.gemfile
-before_install:
-  - gem install bundler --conservative --version '~> 1.10'
-before_script:
-  - bundle exec rake -f test/dummy/Rakefile db:create db:migrate RAILS_ENV=test
+  - test/gemfiles/5.0.gemfile
+  - test/gemfiles/5.1.gemfile
+  - test/gemfiles/5.2.gemfile
diff --git a/Appraisals b/Appraisals
deleted file mode 100644
index 0af3c431b..000000000
--- a/Appraisals
+++ /dev/null
@@ -1,28 +0,0 @@
-appraise "4.0" do
-  gem "rails", "~> 4.0.0"
-  # nokogiri 1.7+ is not compatible with Ruby < 2.1, so pin at older version.
-  gem "nokogiri", "~> 1.6.8", platforms: [:ruby_19, :ruby_20]
-end
-
-appraise "4.1" do
-  gem "rails", "~> 4.1.0"
-  # nokogiri 1.7+ is not compatible with Ruby < 2.1, so pin at older version.
-  gem "nokogiri", "~> 1.6.8", platforms: [:ruby_19, :ruby_20]
-end
-
-appraise "4.2" do
-  gem "rails", "~> 4.2.0"
-  # nokogiri 1.7+ is not compatible with Ruby < 2.1, so pin at older version.
-  gem "nokogiri", "~> 1.6.8", platforms: [:ruby_19, :ruby_20]
-end
-
-appraise "5.0" do
-  gem "rails", "~> 5.0.0"
-  gem "minitest", "< 5.10.2"
-  gem "danger"
-end
-
-appraise "5.1" do
-  gem "rails", "~> 5.1.0"
-  gem "minitest", "< 5.10.2"
-end
diff --git a/Gemfile b/Gemfile
index a65ccd187..ec295692f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,17 +1,14 @@
 source "http://rubygems.org"
 
-# Declare your gem's dependencies in bootstrap_form.gemspec.
-# Bundler will treat runtime dependencies like base dependencies, and
-# development dependencies will be added by default to the :development group.
 gemspec
 
-# jquery-rails is used by the dummy application
-gem "jquery-rails"
+group :test do
+  gem "diffy"
+  gem "equivalent-xml"
+  gem "mime-types", "~> 2.6.2"
+  gem "mocha"
+  gem "nokogiri"
 
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.
-
-# To use debugger
-# gem 'ruby-debug19', :require => 'ruby-debug'
+  gem "sqlite3"
+  gem "timecop", "~> 0.7.1"
+end
diff --git a/Rakefile b/Rakefile
index 8a5484318..708c7b858 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,37 +1,27 @@
-#!/usr/bin/env rake
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
+
+require 'rdoc/task'
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'BootstrapForm'
   rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-
-
-Bundler::GemHelper.install_tasks
+require 'bundler/gem_tasks'
 
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = false
 end
 
-
-task :default => :test
+task default: :test
diff --git a/bootstrap_form.gemspec b/bootstrap_form.gemspec
index 02eefe81e..7e8cc25a4 100644
--- a/bootstrap_form.gemspec
+++ b/bootstrap_form.gemspec
@@ -1,8 +1,7 @@
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+
 require "bootstrap_form/version"
 
-# Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = "bootstrap_form"
   s.version     = BootstrapForm::VERSION
@@ -15,18 +14,11 @@ Gem::Specification.new do |s|
                   "easy to create beautiful-looking forms using Bootstrap 4"
   s.license     = "MIT"
 
-  s.files = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  s.bindir = "exe"
+  s.files         = `git ls-files`.split("\n")
+  s.platform      = Gem::Platform::RUBY
+  s.require_paths = ["lib"]
+
+  s.required_ruby_version = ">= 2.2.2"
 
-  s.add_development_dependency "appraisal"
-  s.add_development_dependency "diffy"
-  s.add_development_dependency "equivalent-xml"
-  s.add_development_dependency "mime-types", "~> 2.6.2"
-  s.add_development_dependency "mocha"
-  s.add_development_dependency "nokogiri"
-  s.add_development_dependency "rails", ">= 4.0"
-  s.add_development_dependency "sqlite3"
-  s.add_development_dependency "timecop", "~> 0.7.1"
+  s.add_dependency "rails", ">= 5.0"
 end
diff --git a/gemfiles/4.0.gemfile b/gemfiles/4.0.gemfile
deleted file mode 100644
index 976d756ea..000000000
--- a/gemfiles/4.0.gemfile
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "jquery-rails"
-gem "rails", "~> 4.0.0"
-gem "nokogiri", "~> 1.6.8", platforms: [:ruby_19, :ruby_20]
-
-gemspec path: "../"
diff --git a/gemfiles/4.1.gemfile b/gemfiles/4.1.gemfile
deleted file mode 100644
index 5d937d0f7..000000000
--- a/gemfiles/4.1.gemfile
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "jquery-rails"
-gem "rails", "~> 4.1.0"
-gem "nokogiri", "~> 1.6.8", platforms: [:ruby_19, :ruby_20]
-
-gemspec path: "../"
diff --git a/gemfiles/4.2.gemfile b/gemfiles/4.2.gemfile
deleted file mode 100644
index a5995131c..000000000
--- a/gemfiles/4.2.gemfile
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "jquery-rails"
-gem "rails", "~> 4.2.0"
-gem "nokogiri", "~> 1.6.8", platforms: [:ruby_19, :ruby_20]
-
-gemspec path: "../"
diff --git a/gemfiles/5.0.gemfile b/gemfiles/5.0.gemfile
deleted file mode 100644
index b57e347dd..000000000
--- a/gemfiles/5.0.gemfile
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "jquery-rails"
-gem "rails", "~> 5.0.0"
-gem "minitest", "< 5.10.2"
-gem "danger"
-
-gemspec path: "../"
diff --git a/gemfiles/5.1.gemfile b/gemfiles/5.1.gemfile
deleted file mode 100644
index 0d55c51c1..000000000
--- a/gemfiles/5.1.gemfile
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "jquery-rails"
-gem "rails", "~> 5.1.0"
-gem "minitest", "< 5.10.2"
-
-gemspec path: "../"
diff --git a/test/gemfiles/5.0.gemfile b/test/gemfiles/5.0.gemfile
new file mode 100644
index 000000000..7bbf2d906
--- /dev/null
+++ b/test/gemfiles/5.0.gemfile
@@ -0,0 +1,16 @@
+source "http://rubygems.org"
+
+gemspec path: "../"
+
+gem "rails", "~> 5.0.0"
+
+group :test do
+  gem "diffy"
+  gem "equivalent-xml"
+  gem "mime-types", "~> 2.6.2"
+  gem "mocha"
+  gem "nokogiri"
+
+  gem "sqlite3"
+  gem "timecop", "~> 0.7.1"
+end
diff --git a/test/gemfiles/5.1.gemfile b/test/gemfiles/5.1.gemfile
new file mode 100644
index 000000000..530f2ace2
--- /dev/null
+++ b/test/gemfiles/5.1.gemfile
@@ -0,0 +1,16 @@
+source "http://rubygems.org"
+
+gemspec path: "../"
+
+gem "rails", "~> 5.1.0"
+
+group :test do
+  gem "diffy"
+  gem "equivalent-xml"
+  gem "mime-types", "~> 2.6.2"
+  gem "mocha"
+  gem "nokogiri"
+
+  gem "sqlite3"
+  gem "timecop", "~> 0.7.1"
+end
diff --git a/test/gemfiles/5.2.gemfile b/test/gemfiles/5.2.gemfile
new file mode 100644
index 000000000..9e581b399
--- /dev/null
+++ b/test/gemfiles/5.2.gemfile
@@ -0,0 +1,16 @@
+source "http://rubygems.org"
+
+gemspec path: "../"
+
+gem "rails", "~> 5.2.0"
+
+group :test do
+  gem "diffy"
+  gem "equivalent-xml"
+  gem "mime-types", "~> 2.6.2"
+  gem "mocha"
+  gem "nokogiri"
+
+  gem "sqlite3"
+  gem "timecop", "~> 0.7.1"
+end