singer 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61d9abf1b94fa1a0b85d2770ab2f4ec38b81f9a99855054d4eeab41f69ce8e49
-  data.tar.gz: f4a433fdbfa9bc1b64847936f9033387cdc36d5490a03b497f25b49fa8c5347e
+  metadata.gz: 1496a866af8bd84f5f37b7fd231ebca183cb1af9527c80fcf82d7d12e559ae60
+  data.tar.gz: d162ae6671bde936f13594d4a9ce989179d207f96a92eb3a24496f5db5116fe6
 SHA512:
-  metadata.gz: ce7559042aaa658bfd03921901218444ea33dbf0406b04654f0b79371c8812fd3bcd6b879176b8670cf7f74db17cc9ee2f84316c94bcd1e06ab6a86f390275e9
-  data.tar.gz: c5d81b77aabe190a6e6d214857c551753270afda439367b0312df7cf9f3ec11f05030edd468b8327100369b517f3e56fb19760dd22460131f3b5f79be7c71adb
+  metadata.gz: 475541c7ea0a9c63f64eb9ee72c8267b0e4eb9f3aa9e240587e37010077123a8dc3e7ab2005c0bea4a7bd0849ec088879d4acb6967ebad766ab829e1b093d26c
+  data.tar.gz: c2cb1b56b6b65d644a844c7305ebf1fa2158d221bce249d1f9cd8970273709f0578df79c2307d89037fa45a57912ccc0a4b6341395ff6e16c651ede61823c57d

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.2.0'.freeze
 end

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

@@ -1,6 +1,6 @@
 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

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,6 +1,6 @@
 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

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

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.2.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: []