ivar 0.4.0 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fab4b673955331785324df9526d8c6cbefc2fb2bfd5268364fabea167842deaa
-  data.tar.gz: 4a39dc2f3530e7292e613b9140cb668ee1755a55cf4da8676c6bc74da159a20d
+  metadata.gz: 3116543b0e32b5de687f2d5cdc4503add2a87334a03ffc20445ad3aaeeff65f1
+  data.tar.gz: 5944d6a180892a4bc6ce19903ec8185a847e2b464aa1fa23b7eda03c7e6d9baa
 SHA512:
-  metadata.gz: e15519f99aa5c24bec436bc1365d5640eb64f31b91c901442105cd62da045b44d55a6537b73b8c8d405318afc430ce9cfa9060e99beb72368643f25933043327
-  data.tar.gz: 7f717746c49f99ee91757429bc0dfe0c568c9e4684bcb219a11224457b06fc3aac4dc59d40e3109b600b4bd0729c58c070bee874a25787f5802afdbb13cb5cf8
+  metadata.gz: f90e50b2767f6f5932ff36c19beb464392beb82789eef3db02ddc52d057746892a6e1a52ebb2a72692e61958082715deaa490ea636fc4e1cd8d06284e25e2bbc
+  data.tar.gz: 9b53396cb198b0313d2f900162a8fb3f10821509bfc90434b9e78223ac3fc6105c5d4c3da59de7a56e90c6e0d9642d35ac1d82bff0b0f768133c4279ffdf7451

data/CHANGELOG.md

@@ -7,7 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.4.6] - 2025-05-07
+
+## [0.4.5] - 2025-05-07
+
+## [0.4.4] - 2025-05-07
+
+### Changed
+- Enhanced release script to detect and handle uncommitted changes after the release process
+- Improved release script to update Gemfile.lock before committing version changes
+
+## [0.4.2] - 2025-05-07
+
+### Added
+- Enhanced release script to automatically push changes and tags to the remote repository
+
 ### Fixed
+- Fixed release script to include Gemfile.lock changes in version bump commit
 - Fixed GitHub Actions workflow to prevent "frozen Gemfile.lock" errors during gem publishing
 
 ## [0.4.0] - 2025-05-07

data/VERSION.md

@@ -17,19 +17,21 @@ To release a new version:
 1. Make sure all changes are documented in the `CHANGELOG.md` file under the "Unreleased" section
 2. Run the release script with the appropriate version bump type:
    ```
-   script/release [major|minor|patch]
+   script/release [major|minor|patch] [options]
    ```
+
+   Available options:
+   - `--yes` or `-y`: Skip confirmation prompt
+   - `--no-push`: Skip pushing changes to remote repository
+
 3. The script will:
    - Run tests and linter to ensure everything is working
    - Update the version number in `lib/ivar/version.rb`
    - Update the `CHANGELOG.md` file with the new version and date
    - Commit these changes
    - Create a git tag for the new version
-4. Push the changes and tag to GitHub:
-   ```
-   git push origin main && git push origin v{version}
-   ```
-5. The GitHub Actions workflow will automatically:
+   - Push the changes and tag to GitHub (unless `--no-push` is specified)
+4. The GitHub Actions workflow will automatically:
    - Build the gem
    - Run tests
    - Publish the gem to RubyGems.org

data/lib/ivar/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ivar
-  VERSION = "0.4.0"
+  VERSION = "0.4.6"
 end

data/script/release

@@ -5,7 +5,8 @@
 # Usage: script/release [major|minor|patch] [options]
 #
 # Options:
-#   --yes, -y    Skip confirmation prompt
+#   --yes, -y     Skip confirmation prompt
+#   --no-push     Skip pushing changes to remote repository
 
 require "bundler/gem_tasks"
 require_relative "../lib/ivar/version"
@@ -84,16 +85,70 @@ def clean_build_artifacts
   end
 end
 
-def commit_and_tag(new_version)
+def check_for_uncommitted_changes
+  info "Checking for uncommitted changes..."
+  uncommitted_changes = `git status --porcelain`.strip
+
+  if uncommitted_changes.empty?
+    info "No uncommitted changes detected."
+    false
+  else
+    info "Uncommitted changes detected:"
+    puts uncommitted_changes
+    true
+  end
+end
+
+def commit_remaining_changes(new_version)
+  info "Committing remaining changes after release process..."
+  system("git add --all")
+  system("git commit -m \"Post-release cleanup for v#{new_version}\"")
+  info "Remaining changes committed."
+end
+
+def push_changes_and_tag(new_version)
+  # Check for any uncommitted changes before pushing
+  has_uncommitted_changes = check_for_uncommitted_changes
+
+  # If there are uncommitted changes, commit them
+  if has_uncommitted_changes
+    commit_remaining_changes(new_version)
+  end
+
+  info "Pushing changes to remote repository..."
+  system("git push origin main") || error("Failed to push changes to remote repository.")
+
+  info "Pushing tag v#{new_version} to remote repository..."
+  system("git push origin v#{new_version}") || error("Failed to push tag to remote repository.")
+
+  success "Changes and tag pushed successfully!"
+end
+
+def update_gemfile_lock
+  info "Updating Gemfile.lock with new version..."
+  system("bundle install") || error("Failed to update Gemfile.lock. Run 'bundle install' manually and try again.")
+  info "Gemfile.lock updated successfully."
+end
+
+def commit_and_tag(new_version, skip_push = false)
   info "Committing version bump..."
-  system("git add lib/ivar/version.rb CHANGELOG.md")
+
+  # Add all relevant files to staging
+  system("git add lib/ivar/version.rb CHANGELOG.md Gemfile.lock")
+
+  # Commit the changes
   system("git commit -m \"Bump version to #{new_version}\"")
 
   info "Creating tag v#{new_version}..."
   system("git tag -a v#{new_version} -m \"Version #{new_version}\"")
 
-  info "To push the new version, run:"
-  puts "  git push origin main && git push origin v#{new_version}"
+  if skip_push
+    info "Skipping push to remote repository."
+    info "To push the new version manually, run:"
+    puts "  git push origin main && git push origin v#{new_version}"
+  else
+    push_changes_and_tag(new_version)
+  end
 end
 
 # Main script
@@ -102,6 +157,7 @@ error "Please specify a version bump type: major, minor, or patch" if ARGV.empty
 # Parse arguments
 args = ARGV.dup
 skip_confirmation = args.delete("--yes") || args.delete("-y")
+skip_push = args.delete("--no-push")
 bump_type = args[0].downcase if args[0]
 
 error "Please specify a version bump type: major, minor, or patch" unless bump_type
@@ -126,9 +182,32 @@ if confirmation == "y"
   run_linter
   update_version_file(new_version)
   update_changelog(new_version)
-  commit_and_tag(new_version)
+  update_gemfile_lock
+  commit_and_tag(new_version, skip_push)
   success "Version bumped to #{new_version}!"
-  success "Run 'git push origin main && git push origin v#{new_version}' to trigger the release workflow."
+
+  if skip_push
+    success "Remember to push changes manually to trigger the release workflow."
+  else
+    success "Release workflow triggered!"
+
+    # Final check for any remaining uncommitted changes
+    if check_for_uncommitted_changes
+      info "There are still uncommitted changes after the release process."
+      puts "Would you like to commit and push these changes? (y/n)"
+      cleanup_confirmation = $stdin.gets.chomp.downcase
+
+      if cleanup_confirmation == "y"
+        commit_remaining_changes(new_version)
+        system("git push origin main") || error("Failed to push cleanup changes.")
+        success "Post-release cleanup completed and pushed successfully!"
+      else
+        info "Uncommitted changes left in working directory."
+      end
+    else
+      success "Working directory is clean. Release completed successfully!"
+    end
+  end
 else
   info "Release cancelled."
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ivar
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.6
 platform: ruby
 authors:
 - Avdi Grimm
+autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prism
@@ -78,7 +79,6 @@ files:
 - hooks/README.md
 - hooks/install.sh
 - hooks/pre-commit
-- ivar.gemspec
 - lib/ivar.rb
 - lib/ivar/check_all.rb
 - lib/ivar/check_all_manager.rb
@@ -114,6 +114,7 @@ metadata:
   homepage_uri: https://github.com/avdi/ivar
   source_code_uri: https://github.com/avdi/ivar
   changelog_uri: https://github.com/avdi/ivar/blob/main/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -128,7 +129,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Automatically check instance variables for typos.
 test_files: []

data/ivar.gemspec

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/ivar/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "ivar"
-  spec.version = Ivar::VERSION
-  spec.authors = ["Avdi Grimm"]
-  spec.email = ["avdi@avdi.codes"]
-
-  spec.summary = "Automatically check instance variables for typos."
-  spec.description = <<~DESCRIPTION
-    Ruby instance variables are so convenient - you don't even need to declare them!
-    But... they are also dangerous, because a mispelled variable name results in `nil`
-    instead of an error.
-
-    Why not have the best of both worlds? Ivar lets you use plain-old instance variables,
-    and automatically checks for typos.
-
-    Ivar waits until an instance is created to do the checking, then uses Prism to look
-    for variables that don't match what was set in initialization. So it's a little bit
-    dynamic, a little bit static. It doesn't encumber your instance variable reads and
-    writes with any extra checking. And with the `:warn_once` policy, it won't overwhelm
-    you with output.
-  DESCRIPTION
-
-  spec.homepage = "https://github.com/avdi/ivar"
-  spec.license = "MIT"
-  spec.required_ruby_version = ">= 3.3.0"
-
-  spec.metadata["allowed_push_host"] = "https://rubygems.org"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/avdi/ivar"
-  spec.metadata["changelog_uri"] = "https://github.com/avdi/ivar/blob/main/CHANGELOG.md"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (File.expand_path(f) == __FILE__) ||
-        f.start_with?(*%w[bin/ test/ spec/ features/ .git .circleci appveyor Gemfile]) ||
-        f.end_with?(".gem")
-    end
-  end
-  spec.require_paths = ["lib"]
-
-  # Dependencies
-  spec.add_dependency "prism", "~> 1.2"
-end