- Upgrade dependencies

Author: DannyBen

.gitignore

@@ -1,7 +1,7 @@
 Gemfile.lock
 
 /coverage
-/debug.rb
+/debug.runfile
 /dev
 /doc
 /gems

Gemfile

@@ -1,17 +1,21 @@
 source 'https://rubygems.org'
 
-gem 'byebug'
-gem 'filewatcher-cli'
-gem 'lp'
-gem 'pretty_trace'
-gem 'rack-test'
-gem 'rspec'
-gem 'rspec_approvals'
-gem 'rspec-html-matchers'
-gem 'runfile'
-gem 'runfile-tasks'
-gem 'sasstool'
-gem 'simplecov'
-gem 'slim'
+group :development do
+  gem 'byebug'
+  gem 'filewatcher-cli', require: false
+  gem 'lp'
+  gem 'pretty_trace'
+  gem 'runfile', '>= 1.0', require: false
+  gem 'runfile-tasks', '>= 1.0', require: false
+  gem 'sasstool', require: false
+end
+
+group :test do
+  gem 'rack-test'
+  gem 'rspec'
+  gem 'rspec-html-matchers'
+  gem 'rspec_approvals'
+  gem 'simplecov'
+end
 
 gemspec

Runfile

@@ -1,19 +1,18 @@
-require_relative 'lib/madness'
+require 'madness'
 require "sasstool"
 require "slim"
 require "pretty_trace/enable-trim"
-require "runfile-tasks"
 
 title   "Madness Runfile"
 summary "Runfile tasks for building the Madness gem"
 version Madness::VERSION
 
-RunfileTasks::RubyGems.all 'madness'
-RunfileTasks::Testing.rspec
+import_gem 'runfile-tasks/gem'
+import 'debug'
 
 help   "Generate public CSS"
 usage  'css [--watch]'
-option '-w, --watch', 'Watch for changes and regenerate'
+option '--watch, -w', 'Watch for changes and regenerate'
 action :css do |args|
   if args['--watch']
     exec "filewatcher --immediate 'app/styles/*.scss' 'bundle exec run css'"
@@ -32,7 +31,7 @@ end
 
 usage  "(server|s) [--sample]"
 help   "Run server with spec docroot or the sample docroot"
-option "-s, --sample", "Use the 'sample' folder instead of the fixture"
+option "--sample, -s", "Use the 'sample' folder instead of the fixture"
 action :server, :s do |args|
   folder = args['--sample'] ? 'sample' : 'spec/fixtures/docroot'
   exec "bundle exec bin/madness server #{folder}"
@@ -92,5 +91,3 @@ action :site do
   File.write 'docs/index.html', html
   puts 'Saved docs/index.html'
 end
-
-require_relative 'debug.rb' if File.exist? 'debug.rb'

madness.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.7'
 
   s.add_runtime_dependency 'addressable', '~> 2.7'
-  s.add_runtime_dependency 'colsole', '~> 0.8', '>= 0.8.1'
+  s.add_runtime_dependency 'colsole', '>= 0.8.1', '< 2'
   s.add_runtime_dependency 'extended_yaml', '~> 0.2'
   s.add_runtime_dependency 'mister_bin', '~> 0.7'
   s.add_runtime_dependency 'naturally', '~> 2.2'
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'requires', '~> 1.0'
   s.add_runtime_dependency 'rouge', '~> 4.0'
   s.add_runtime_dependency 'sinatra', '~> 3.0'
-  s.add_runtime_dependency 'slim', '~> 4.0'
+  s.add_runtime_dependency 'slim', '>= 4.0', '< 6'
 
   s.metadata = {
     'bug_tracker_uri'       => 'https://github.com/DannyBen/madness/issues',

spec/spec_helper.rb

@@ -5,7 +5,7 @@
 # Require the Gemfile
 require 'rubygems'
 require 'bundler'
-Bundler.require :default, :development
+Bundler.require :default, :development, :test
 
 # Sinatra testing with Rack::Test
 require 'rack/test'