Minor cleanup

branson-simplethread · Aug 3, 2024 · 7f520dc · 7f520dc
1 parent 115b7d7
commit 7f520dc
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 23 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 Pull Requests are welcome!
 
-Here are a few useful information for contributors:
+Here are a few useful information for contributing:
 
 1. If you are planning for a complex PR, we suggest that you check before hand whether your
    proposed changes are going to be accepted by posting your ideas in

diff --git a/.github/ISSUE_TEMPLATE/Code.yml b/.github/ISSUE_TEMPLATE/Code.yml
@@ -11,7 +11,7 @@ body:
         
         Please, understand that code issues are reserved for real, reproducible pagy bugs.
         
-        _If you are not sure that your problem is actually a bug,
+        _If you are not sure that your problem is actually a bug, or you have problems reproducing it,
         please ask for [support](https://github.com/ddnexus/pagy/discussions/categories/q-a) instead._
 
   - type: checkboxes
@@ -38,7 +38,7 @@ body:
         
         #### 👍 VALID code files 
         
-          - Edited copy of a single-file APP from the [Pagy Playground](https://ddnexus.github.io/pagy/playground) 
+          - (Edited) copy of a single-file APP from the [Pagy Playground](https://ddnexus.github.io/pagy/playground) 
           - Link to a pagy fork containing an added test file
           - A plain ruby file that can run as a single command like `ruby my_issue.rb`
           _(without any other setup step, installation or guessing, and with no or minimal interaction required)_

diff --git a/scripts/bump.rb b/scripts/bump.rb
@@ -5,7 +5,7 @@
 require_relative 'scripty'
 
 # Abort if the working tree is dirty
-Scripty.abort('Working tree dirty!') unless `git status --porcelain`.empty?
+abort('Working tree dirty!') unless `git status --porcelain`.empty?
 
 # Prompt for the new version
 require_relative '../gem/lib/pagy'
@@ -15,14 +15,14 @@
 new_version = gets.chomp
 
 # Abort if the version is missing
-Scripty.abort('Missing new version!') if new_version.empty?
+abort('Missing new version!') if new_version.empty?
 
 # Abort if the version is invalid
 new_fragments = new_version.split('.')
-Scripty.abort('Incomplete semantic version!') if new_fragments.size < 3
+abort('Incomplete semantic version!') if new_fragments.size < 3
 
 # Abort if there is no gem change
-Scripty.abort("No gem changes since version #{old_version}!") \
+abort("No gem changes since version #{old_version}!") \
     if `git diff --name-only --relative=gem "#{old_version}"..HEAD`.empty?
 
 # Bump the version in files

diff --git a/scripts/scripty.rb b/scripts/scripty.rb
@@ -13,13 +13,6 @@ def ask_and_do(question)
   end
   module_function :ask_and_do
 
-  # Warn and exit
-  def abort(message)
-    warn message
-    exit 1
-  end
-  module_function :abort
-
   # Optional edit
   def file_edit?(name, filepath)
     filepath = ROOT.join(filepath).to_s
@@ -39,6 +32,14 @@ def file_sub(filepath, search, replace)
   end
   module_function :file_sub
 
+  # Extract a tagged string in filepth
+  def tagged_extract(filepath, tag)
+    filepath = ROOT.join(filepath).to_s
+    content  = File.read(filepath)
+    content[/<!-- #{tag}_start -->\n(.*)<!-- #{tag}_end -->/m, 1]
+  end
+  module_function :tagged_extract
+
   # Substitute a tagged string in filepth
   def tagged_file_sub(filepath, tag, new_content)
     filepath = ROOT.join(filepath).to_s
@@ -48,11 +49,4 @@ def tagged_file_sub(filepath, tag, new_content)
     File.write(filepath, content)
   end
   module_function :tagged_file_sub
-
-  def tagged_extract(filepath, tag)
-    filepath = ROOT.join(filepath).to_s
-    content  = File.read(filepath)
-    content[/<!-- #{tag}_start -->\n(.*)<!-- #{tag}_end -->/m, 1]
-  end
-  module_function :tagged_extract
 end