singer 2.1.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61d9abf1b94fa1a0b85d2770ab2f4ec38b81f9a99855054d4eeab41f69ce8e49
-  data.tar.gz: f4a433fdbfa9bc1b64847936f9033387cdc36d5490a03b497f25b49fa8c5347e
+  metadata.gz: 7ddb4f2b6355ce6ebce3856cc7030b20f3338a1af33fd2a01b5e94ed491b89e7
+  data.tar.gz: 1a6efcb12834b46b2dc1d8f39673a21d349e2f6d807c7d1775e7d6547e5acba3
 SHA512:
-  metadata.gz: ce7559042aaa658bfd03921901218444ea33dbf0406b04654f0b79371c8812fd3bcd6b879176b8670cf7f74db17cc9ee2f84316c94bcd1e06ab6a86f390275e9
-  data.tar.gz: c5d81b77aabe190a6e6d214857c551753270afda439367b0312df7cf9f3ec11f05030edd468b8327100369b517f3e56fb19760dd22460131f3b5f79be7c71adb
+  metadata.gz: 7b306e89c44c9d4ccecf843301178b2d14de488ba0d5949a2dcfa6436af72b67bb6291a8cc829b9cf331458d4c99f0333c9b9b4c93be0c3d727e73239f0bc519
+  data.tar.gz: e2765626a12557c2433e5c5b7e06463036b2500c08fcd9ac327f9c7631dc3316f4e79c5d3eb6f008ee72ebfcc2a15018afa2d934c39360b3ed0bb1a6416c40fb

data/lib/singer/paths.rb

@@ -18,7 +18,12 @@ module Singer
 		end
 
 		def self.output_path(...)
-			File.join(...).gsub(/__([[:alpha:]][[:word:]]+)__/) do |match|
+			substitute_variables(File.join(...))
+		end
+
+		# will substitute non-forbidden variables, 2 characters or more
+		def self.substitute_variables(path)
+			path.gsub(/__([[:alpha:]][[:word:]]*[[:alpha:]])__/) do |match|
 				potential_config = $1.downcase
 
 				if variable_name_can_be_substituted?(potential_config)

data/lib/singer/version.rb

@@ -1,3 +1,3 @@
 module Singer
-	VERSION = '2.1.0'.freeze
+	VERSION = '2.3.0'.freeze
 end

data/templates/sinatra_app/Gemfile

@@ -14,7 +14,7 @@ group :test do # for humans
 end
 
 group :test, :ci do
-	gem 'minitest', '~> 5.23.0' # fivemat double-outputs with newer than this
+	gem 'minitest'
 	gem 'mocha'
 	gem 'rack-test'
 	gem 'rake'
@@ -23,6 +23,6 @@ group :test, :ci do
 end
 
 group :ci do # for CI automation
-	gem 'minitest-junit'
+	gem 'minitest-reporters'
 	gem 'simplecov-cobertura'
 end

data/templates/sinatra_app/exe/server.rb

@@ -1,3 +1,7 @@
-require 'zeitwerk_setup'
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+
+require_relative '../lib/zeitwerk_setup'
 
 <%= Singer.configuration.project_name_camelcase %>::Server.run!

data/templates/sinatra_app/test/{test_autoloading.rb → autoloading_test.rb}

@@ -1,14 +1,15 @@
 require 'minitest_helper'
 
-class TestAutoloading < Minitest::Test
+class AutoloadingTest < Minitest::Test
 	def test_zeitwerk_has_one_loader
-		refute_empty Zeitwerk::Registry.loaders
-		assert_equal 1, Zeitwerk::Registry.loaders.size
+		loaders = Zeitwerk::Registry.loaders.instance_variable_get(:@loaders)
+		refute_empty loaders
+		assert_equal 1, loaders.size
 	end
 
 	# this test is kinda slow, but not as slow as Rack::Test
 	def test_zeitwerk_eager_autoloading_works
-		loader = Zeitwerk::Registry.loaders.first
+		loader = Zeitwerk::Registry.loaders.instance_variable_get(:@loaders).first
 		# loader.log!
 		loader.eager_load(force: true)
 	rescue Zeitwerk::NameError => exc

data/templates/sinatra_app/test/{test_hello.rb → hello_test.rb}

@@ -1,7 +1,7 @@
 require 'minitest_helper'
 
 # TODO: remove
-class TestHello < Minitest::Test
+class HelloTest < Minitest::Test
 	def test_greet_with_a_param_generates_a_greeting_string
 		assert_equal 'Hello, stranger.', <%= Singer.configuration.project_name_camelcase %>::Hello.greet(:stranger)
 	end

data/templates/sinatra_app/test/server/{test_server_error_dumping.rb → server_error_dumping_test.rb}

@@ -1,13 +1,13 @@
 require 'minitest_helper'
 
-class TestServerErrorDumping < Minitest::Test
+class ServerErrorDumpingTest < Minitest::Test
 	def test_dump_errors_backtrace_is_filtered_against_vendor
 		exc = generate_exception_with_realistic_backtrace
-		assert exc.backtrace.any?{ _1.include?('/vendor/') } # now you see me
+		assert(exc.backtrace.any?{ _1.include?('/vendor/') }) # now you see me
 
 		log = mock()
 		log.expects(:puts).with do |message|
-			refute message.lines.any?{ _1.include?('/vendor/') } # now you don't
+			refute(message.lines.any?{ _1.include?('/vendor/') }) # now you don't
 		end
 
 		app = <%= Singer.configuration.project_name_camelcase %>::Server.new! # .new! returns real instance without Sinatra::Wrapper

data/templates/sinatra_app/test/server/{test_server.rb → server_test.rb}

@@ -1,6 +1,6 @@
 require 'minitest_helper'
 
-class TestServer < Minitest::Test
+class ServerTest < Minitest::Test
 	include Rack::Test::Methods
 
 	def app
@@ -10,7 +10,7 @@ class TestServer < Minitest::Test
 	def test_top_level_redirects
 		get '/'
 
-		assert last_response.redirect?
+		assert_predicate last_response, :redirect?
 		assert_match %r{/hello/world$}, last_response.headers['location']
 	end
 

data/templates/tdd/test/{test___PROJECT_NAME_SNAKECASE__.rb → __PROJECT_NAME_SNAKECASE___test.rb}

@@ -3,7 +3,7 @@ require 'minitest/autorun' if File.expand_path($PROGRAM_NAME) == File.expand_pat
 
 require_relative '../lib/<%= Singer.configuration.project_name_snakecase %>'
 
-class Test<%= Singer.configuration.project_name_camelcase %> < Minitest::Test
+class <%= Singer.configuration.project_name_camelcase %>Test < Minitest::Test
 	# TEST_INPUT = File.read('input_mini.txt').lines(chomp: true)
 
 	def setup

data/templates/test/test/{test___PROJECT_NAME_SNAKECASE__.rb → __PROJECT_NAME_SNAKECASE___test.rb}

@@ -1,4 +1,4 @@
-class Test<%= Singer.configuration.project_name_camelcase %> < Minitest::Test
+class <%= Singer.configuration.project_name_camelcase %>Test < Minitest::Test
 	def setup
 		@<%= Singer.configuration.project_name_snakecase %> = <%= Singer.configuration.project_name_camelcase %>.new
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: singer
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Emil Chludziński
@@ -53,18 +53,18 @@ files:
 - templates/sinatra_app/lib/__PROJECT_NAME_SNAKECASE__/hello.rb
 - templates/sinatra_app/lib/__PROJECT_NAME_SNAKECASE__/server.rb
 - templates/sinatra_app/lib/zeitwerk_setup.rb
+- templates/sinatra_app/test/autoloading_test.rb
+- templates/sinatra_app/test/hello_test.rb
 - templates/sinatra_app/test/minitest_helper.rb
-- templates/sinatra_app/test/server/test_server.rb
-- templates/sinatra_app/test/server/test_server_error_dumping.rb
-- templates/sinatra_app/test/test_autoloading.rb
-- templates/sinatra_app/test/test_hello.rb
+- templates/sinatra_app/test/server/server_error_dumping_test.rb
+- templates/sinatra_app/test/server/server_test.rb
 - templates/sinatra_app/views/index.haml
 - templates/sinatra_app/views/layout.haml
 - templates/sinatra_app/views/style.sass
 - templates/tdd/Gemfile
 - templates/tdd/lib/__PROJECT_NAME_SNAKECASE__.rb
-- templates/tdd/test/test___PROJECT_NAME_SNAKECASE__.rb
-- templates/test/test/test___PROJECT_NAME_SNAKECASE__.rb
+- templates/tdd/test/__PROJECT_NAME_SNAKECASE___test.rb
+- templates/test/test/__PROJECT_NAME_SNAKECASE___test.rb
 homepage: https://gitlab.com/tanstaafl/singer/
 licenses:
 - MIT
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Singer generates code (such as Sinatra apps) from templates.
 test_files: []