Merge remote-tracking branch 'origin/master' into bf/update-changelog

interagent · Oct 9, 2023 · e629b76 · e629b76
2 parents ee4cc2d + 1a38e56
commit e629b76
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 13 deletions.
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         ruby-version: ['3.0', '3.1', '3.2']
-        activesupport-version: ['5', '6']
+        activesupport-version: ['6', '7']
         sinatra-version: ['2', '3']
     env:
       ACTIVESUPPORT_MAJOR: ${{ matrix.activesupport-version }}

diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
 gemspec
-gem "activesupport", "~> #{ENV["ACTIVESUPPORT_MAJOR"] || 6}.x"
+gem "activesupport", "~> #{ENV["ACTIVESUPPORT_MAJOR"] || 7}.x"
 gem "sinatra", "~> #{ENV["SINATRA_MAJOR"] || 2}.x"
diff --git a/lib/pliny/commands/creator.rb b/lib/pliny/commands/creator.rb
@@ -35,7 +35,7 @@ def parse_erb_files
       Dir.glob("#{app_dir}/{*,.*}.erb").each do |file|
         static_file = file.gsub(/\.erb$/, '')
 
-        template = ERB.new(File.read(file), 0)
+        template = ERB.new(File.read(file))
         context = OpenStruct.new(app_name: name)
         content = template.result(context.instance_eval { binding })
 

diff --git a/lib/pliny/commands/generator/base.rb b/lib/pliny/commands/generator/base.rb
@@ -41,7 +41,7 @@ def display(msg)
 
       def render_template(template_file, vars = {})
         template_path = File.dirname(__FILE__) + "/../../templates/#{template_file}"
-        template = ERB.new(File.read(template_path), 0, '>')
+        template = ERB.new(File.read(template_path), trim_mode: '>')
         context = OpenStruct.new(vars)
         template.result(context.instance_eval { binding })
       end

diff --git a/lib/template/Gemfile b/lib/template/Gemfile
@@ -6,22 +6,22 @@ gem "oj"
 gem "pg"
 gem "pliny", "~> 0.32"
 gem "pry"
-gem "puma", "~> 3"
+gem "puma", "~> 6"
 gem "rack-ssl"
-gem "rack-timeout", "~> 0.4"
+gem "rack-timeout", "~> 0.6"
 gem "rake"
 gem "rollbar"
-gem "sequel", "~> 4.34"
+gem "sequel", "~> 5.73"
 gem "sequel-paranoid"
-gem "sequel_pg", "~> 1.6", require: "sequel"
-gem "sinatra", [">= 1.4", "< 3.0"], require: "sinatra/base"
+gem "sequel_pg", "~> 1.17", require: "sequel"
+gem "sinatra", [">= 2.0", "< 3.0"], require: "sinatra/base"
 gem "sinatra-contrib", require: ["sinatra/namespace", "sinatra/reloader"]
 gem "sinatra-router"
 gem "sucker_punch"
 
 group :development, :test do
   gem "pry-byebug"
-  gem "rubocop", "~> 0.52.1", require: false
+  gem "rubocop", "~> 1.56", require: false
   gem "rubocop-rspec", require: false
 end
 

diff --git a/pliny.gemspec b/pliny.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.executables = %x{ git ls-files }.split("\n").select { |d| d =~ /^bin\// }.map { |d| d.gsub(/^bin\//, "") }
   gem.files = %x{ git ls-files }.split("\n").select { |d| d =~ %r{^(License|README|bin/|data/|ext/|lib/|spec/|test/)} }
 
-  gem.add_dependency "activesupport",  ">= 5.0.1", "< 7.0"
+  gem.add_dependency "activesupport",  ">= 6.0", "< 8.0"
   gem.add_dependency "multi_json",     "~> 1.9",  ">= 1.9.3"
   gem.add_dependency "prmd",           "~> 0.11", ">= 0.11.4"
 

diff --git a/spec/helpers/zulu_time_spec.rb b/spec/helpers/zulu_time_spec.rb
@@ -1,5 +1,4 @@
 require "spec_helper"
-require "active_support/core_ext/numeric/time"
 
 describe Pliny::Helpers::ZuluTime do
   context "zulu_time" do

diff --git a/spec/integration_spec.rb b/spec/integration_spec.rb
@@ -1,6 +1,5 @@
 require "spec_helper"
 require "open3"
-require 'active_support/core_ext/object/blank'
 
 describe "Pliny integration test" do
   describe "bin/setup" do

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -7,6 +7,7 @@
 require "bundler"
 Bundler.require
 
+require "active_support/all"
 require "fileutils"
 require "rack/test"
 require "sequel"