discharger 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3212b79aa38f448d44523f2f83b622c7dfec1cff7bff08ed6033bbe1fea79761
-  data.tar.gz: 6d9d0c008a85560a666522c58a97ee08feae68ef1ea4e8f7cda86e29b0e8bd75
+  metadata.gz: '0438319d582d725e71df1e9fdaf270f8036bc78f1f3c8c01b0bd4038d251e981'
+  data.tar.gz: 862ac9091b25ac1a179768f251db61a8aa2b9bcd9b6b1be6848aeb41e8687d66
 SHA512:
-  metadata.gz: a54728bf513a01a7f4f91507d0951f4075ab8d2fbd7a80cb01223bbd967f4f5bcc0dfba8a8842a3d3e6ab30c94995180bef978089c19a519ac07de608234f787
-  data.tar.gz: bf5d95387d7f861cfef6041871c39a946f986225a8c20aa3597b5dc3d5840e5f3ac16ebe5babc354da4b292e84820bcf8cc5a75b56d519414c12614e325a350b
+  metadata.gz: c237780b6041dd817e2d3c8e48ee0eebd98e8af7103c91c52d4725c0436c37c3312b7acdb60c70fcd86b660a18086cebd4ff24746921d6eb75a010f896e307b3
+  data.tar.gz: 89dd92c5c832f9cee93ae0866711ad0b8989c0c6eade619e14eccff38db6e9740bdad00a97779809b5695c4f5d55763e504422858f8f0f5c7bc1d0279712448d

data/CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.4.2] - 2026-09-30
+
+### Added
+
+- database.db_name in setup.yml sets the exported DB_NAME, or false leaves it to database.yml (836e811)
+
+### Fixed
+
+- The generated bin/setup stores a gh token only after the GitHub Packages source accepts it (1ef5a44)
+
 ## [0.4.1] - 2026-09-29
 
 ### Added
@@ -25,19 +35,3 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Releases finish when the Slack token is missing or the post fails (3cf9b6d)
 - bin/setup bootstraps a fresh clone: GitHub Packages credentials, bundle install, then re-exec under bundle exec (7196fe4)
 - github_packages stores bundler credentials only after the source accepts them (41fab0f)
-
-## [0.4.0] - 2026-09-24
-
-### Added
-
-- pr_label option opening the finalize and version-bump PRs via gh with that label (08e1d10)
-
-### Changed
-
-- Auto-deploy releases tag the newest commit that changed the version's changelog section instead of requiring it at HEAD, and no longer open a production PR (476fe1b)
-- Auto-deploy releases merge the release tag into the production branch (a7a1b49)
-
-### Fixed
-
-- retain_changelogs reaches Reissue, so finalize writes the archived changelog file (2a90edf)
-- release:prepare branches from origin, so a stale local branch no longer yields an empty changelog (8eb5fd3)

data/README.md

@@ -209,12 +209,12 @@ After installing Discharger, run the setup script to configure your development
 $ bin/setup
 ```
 
-This script is idempotent - you can run it multiple times safely, and it will ensure your environment is properly configured.
+You can rerun it whenever your environment drifts. Every run drops and rebuilds the development and test databases, so local data is lost.
 
 It works on a fresh clone with no gems installed. The generated script first runs a
 standard-library-only pass that stores bundler credentials for a configured
-`github_packages` source (from your GitHub CLI login, when its token has the
-`read:packages` scope), installs the bundle, and then
+`github_packages` source (from your GitHub CLI login, only once the source
+accepts that token), installs the bundle, and then
 re-execs itself under `bundle exec` so default gems such as psych never clash with
 `Gemfile.lock`. The `DISCHARGER_SETUP_BUNDLED` environment variable marks the second
 pass; the `github_packages` step later verifies the stored credentials and warns when
@@ -250,6 +250,9 @@ database:
   name: "db-your-app"
   version: "14"
   password: "postgres"
+  # Optional. DB_NAME exported before Rails boots; defaults to the container
+  # name without "db-". false leaves it to database.yml.
+  # db_name: "your-app"
   # Optional. Controls how the docker step handles a native PostgreSQL
   # already listening on the configured port:
   #   omitted/nil/false - silently skip Docker and use the native instance (legacy default)
@@ -318,7 +321,7 @@ The `steps` array specifies which built-in setup commands to run. Available comm
 - `docker` - Setup Docker containers
 - `pg_tools` - Create Docker-aware `pg_dump` and `psql` wrappers for apps that use `structure.sql` or call those tools directly
 - `env` - Configure environment variables
-- `database` - Setup and migrate database
+- `database` - Drop and recreate the development and test databases, load the schema, migrate, and seed. Every run resets local data.
 
 ### Selecting Specific Steps
 

data/lib/discharger/setup_runner/configuration.rb

@@ -39,7 +39,7 @@ module Discharger
     end
 
     class DatabaseConfig
-      attr_accessor :port, :name, :version, :password, :prefer_docker
+      attr_accessor :port, :name, :version, :password, :prefer_docker, :db_name
 
       def initialize
         @port = 5432
@@ -47,6 +47,7 @@ module Discharger
         @version = "14"
         @password = "postgres"
         @prefer_docker = nil
+        @db_name = nil
       end
 
       def from_hash(hash)
@@ -55,6 +56,7 @@ module Discharger
         @version = hash["version"] if hash["version"]
         @password = hash["password"] if hash["password"]
         @prefer_docker = hash["prefer_docker"] if hash.key?("prefer_docker")
+        @db_name = hash["db_name"] if hash.key?("db_name")
       end
     end
 

data/lib/discharger/setup_runner/prerequisites_loader.rb

@@ -86,15 +86,17 @@ module Discharger
       end
 
       def set_db_name(db_config)
-        if db_config["name"] && !ENV["DB_NAME"]
-          container_name = db_config["name"].to_s
-          db_name = container_name.sub(/^db-/, "")
+        return if db_config["db_name"] == false
+
+        container_name = db_config["name"].to_s
+        db_name = (db_config["db_name"] || container_name.sub(/^db-/, "")).to_s
+        return if db_name.empty?
+
+        if ENV["DB_NAME"]
+          warn_if_mismatch("DB_NAME", ENV["DB_NAME"], db_name)
+        else
           ENV["DB_NAME"] = db_name
           puts "  Setting DB_NAME=#{db_name} from config/setup.yml (container: #{container_name})"
-        elsif ENV["DB_NAME"]
-          container_name = db_config["name"].to_s
-          expected_db_name = container_name.sub(/^db-/, "")
-          warn_if_mismatch("DB_NAME", ENV["DB_NAME"], expected_db_name)
         end
       end
 

data/lib/discharger/version.rb

@@ -1,3 +1,3 @@
 module Discharger
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/lib/generators/discharger/install/templates/setup

@@ -22,18 +22,31 @@ unless ENV["DISCHARGER_SETUP_BUNDLED"]
       nil # reported by Discharger::Setup on the second pass
     end
     return if source.to_s.empty?
-    unless `gh auth status 2>&1`.include?("read:packages")
-      warn "Skipping #{source} credentials: the gh token lacks read:packages (gh auth refresh -s read:packages)"
-      return
-    end
 
     username = `gh api user --jq .login 2>/dev/null`.strip
     token = `gh auth token 2>/dev/null`.strip
     return if username.empty? || token.empty?
+    unless source_confirms_token?(source, username, token)
+      warn "Leaving bundler credentials for #{source} alone: it did not accept the gh token (gh auth refresh -s read:packages)"
+      return
+    end
 
     system("bundle", "config", "set", "--local", source, "#{username}:#{token}", out: File::NULL, err: File::NULL)
   end
 
+  def source_confirms_token?(source, username, token)
+    require "net/http"
+    uri = URI.join("#{source.chomp("/")}/", "versions")
+    response = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https", open_timeout: 5, read_timeout: 10) do |http|
+      request = Net::HTTP::Get.new(uri)
+      request.basic_auth(username, token)
+      http.request(request)
+    end
+    !%w[401 403].include?(response.code)
+  rescue
+    false
+  end
+
   unless system("bundle", "check", out: File::NULL, err: File::NULL)
     store_github_packages_credentials
     system("bundle", "install") || abort(<<~MSG)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discharger
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Jim Gay