releasetool 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be31ca29505431ae2078f139521c8a0de7ebe18146acee1feaa862e169475645
-  data.tar.gz: cf6a69fe17b82ea44099124cfc61b53b5541b9767d813cc4260d9908e9260446
+  metadata.gz: a6b0bf2084778fb39bcc2e7e1997069473c7fc3d72db0fbd0357e775c6226f29
+  data.tar.gz: 50c233e3f1efa69f4b027bd214eeebbc4504854706e81b8b3e222e77699ac370
 SHA512:
-  metadata.gz: e0c60d8f3d241c2bbc4035cbd71e5b8a744a99618c9f4aa72718918c6c66b926647d0bf4bd327cf5a1b87066631a94b73160be3972e0b5b62e9449a84d496485
-  data.tar.gz: 1a38cc0c5f621f84030f95baa81fe13229ac51621cee1462cdb88e9d907039595b76825eb3e47c4007f17391a7472ed8c1cd0485da0bce9fc835e578e0c322fd
+  metadata.gz: b324b29b9b5ac6f141a0853a8e8887afa788329a9a15dd5dc0030c2d3abab4751f8d67f0fccf5029a2aee56a73aa20c1882ba38fe9cae0fed6d8e0f6399a2fd7
+  data.tar.gz: 8c6465c57837b267999cd74b71155b7feec58fb6f2508dc7d65a44bd12aeee7d646d723c7d400e068c1a93abee7c9ff1613ac5ee0b871062f7033dcfce713d39

data/lib/releasetool.rb

@@ -3,5 +3,5 @@
 require "releasetool/release"
 
 module Releasetool
-  VERSION = "0.5.1"
+  VERSION = "0.5.3"
 end

data/lib/tasks/release_thor.rb

@@ -5,6 +5,7 @@ require "releasetool"
 require "releasetool/release"
 require "releasetool/util"
 require "releasetool/version"
+require "shellwords"
 
 class Release < Thor
   include Releasetool::Util
@@ -82,7 +83,7 @@ class Release < Thor
       guarded_system("git add #{Releasetool::Util.version_file}") if File.exist?(Releasetool::Util.version_file)
       guarded_system("git commit #{DIR} #{File.exist?(Releasetool::Util.version_file) ? Releasetool::Util.version_file : ''} #{options[:edit] ? '-e' : nil} -m\"#{DEFAULT_COMMIT_MESSAGE}\"")
     end
-    config.after_commit_hook(version) unless options[:after]
+    config.after_commit_hook(version) if options[:after]
   end
 
   desc "tag (NEW_VERSION)", <<-END
@@ -93,7 +94,7 @@ class Release < Thor
   def tag(version = nil)
     version ||= stored_version
     last_useful_commit = guarded_capture("git log head^^..head^  --pretty=format:%s").strip.split("\n").first.strip
-    guarded_system("git tag -a #{version} -e -m \"#{last_useful_commit}\"")
+    guarded_system("git tag -a #{version} -e -m #{last_useful_commit.shellescape}")
   end
 
   desc "push (NEW_VERSION)", <<-END

data/release_notes/v0.5.2.md

@@ -0,0 +1,10 @@
+v0.5.2 Release Notes
+
+*Changes since v0.5.1*
+
+allow release commit --after and release commit --no-after (#13)
+
+* `--after` for doing only the after commit hook (if it fails first time).
+* `--no-after` for skipping the after commit hook
+
+- actually working in v0.5.2 (with test)

data/release_notes/v0.5.3.md

@@ -0,0 +1,5 @@
+v0.5.3 Release Notes
+
+*Changes since v0.5.2*
+
+- fix tagging when last commit has quotes (#15, 16)

data/releasetool.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor', '>= 0.18'
 
   spec.add_development_dependency "bundler", "~> 2.1"
+  spec.add_development_dependency "climate_control"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rubocop", "1.56.3"

data/spec/releasetool_spec.rb

@@ -2,6 +2,7 @@
 
 require 'spec_helper'
 require 'fileutils'
+require 'climate_control'
 require File.expand_path('../lib/tasks/release_thor', __dir__)
 
 RSpec.describe Releasetool do
@@ -10,7 +11,13 @@ RSpec.describe Releasetool do
   end
 end
 
-RSpec.describe Release, quietly: false do
+RSpec.describe Release, quietly: true do
+  around do |example|
+    ClimateControl.modify(RELEASETOOL_VERSION_FILE: nil) do # in case it is defined...
+      example.run
+    end
+  end
+
   subject { Release.new }
 
   let(:tmpdir) { File.expand_path('../tmp/testing', __dir__) }
@@ -124,22 +131,29 @@ RSpec.describe Release, quietly: false do
   end
 
   describe "commit" do
-    before {
-      allow(ENV).to receive(:[]).with('RELEASETOOL_VERSION_FILE').and_return(nil) # in case it is defined...
+    let(:options) { { after: "default" } }
+    subject { Release.new([], options, {}) }
+
+    let!(:commit_expectations) {
       expect(subject).to receive(:guarded_system).with("git add release_notes")
       expect(subject).to receive(:guarded_system).with("git add config/initializers/00-version.rb")
+      expect(subject).to receive(:guarded_system).with("git commit release_notes config/initializers/00-version.rb  -m\"#{Release::DEFAULT_COMMIT_MESSAGE}\"")
     }
     context "with no args" do
       it "outputs without -e" do
-        expect(subject).to receive(:guarded_system).with("git commit release_notes config/initializers/00-version.rb  -m\"#{Release::DEFAULT_COMMIT_MESSAGE}\"")
         subject.commit('v0.0.3')
       end
     end
 
     context "with --edit" do
+      let(:options) { { after: "default", edit: true } }
       subject { Release.new([], { edit: true }, {}) }
-      it "outputs with e" do
+      let!(:commit_expectations) {
+        expect(subject).to receive(:guarded_system).with("git add release_notes")
+        expect(subject).to receive(:guarded_system).with("git add config/initializers/00-version.rb")
         expect(subject).to receive(:guarded_system).with("git commit release_notes config/initializers/00-version.rb -e -m\"#{Release::DEFAULT_COMMIT_MESSAGE}\"")
+      }
+      it "outputs with e" do
         subject.commit('v0.0.3')
       end
     end
@@ -148,7 +162,6 @@ RSpec.describe Release, quietly: false do
       it "should generate and still work" do
         subject.init
         expected = "after_commit(v0.0.3) has been called"
-        expect(subject).to receive(:guarded_system).with("git commit release_notes config/initializers/00-version.rb  -m\"#{Release::DEFAULT_COMMIT_MESSAGE}\"")
         expect { subject.commit('v0.0.3') }.not_to output(/#{Regexp.escape(expected)}/).to_stdout
       end
     end
@@ -159,10 +172,26 @@ RSpec.describe Release, quietly: false do
         FileUtils.cp(hooks_example_rb, "#{tmpdir}/config/releasetool/hooks.rb")
       end
       it "should output hook" do
-        expect(subject).to receive(:guarded_system).with("git commit release_notes config/initializers/00-version.rb  -m\"#{Release::DEFAULT_COMMIT_MESSAGE}\"")
         expected = "after_commit(v0.0.3) has been called"
         expect { subject.commit('v0.0.3') }.to output(/#{Regexp.escape(expected)}/).to_stdout
       end
+      context "with --after" do
+        let(:options) { { after: true } }
+        let!(:commit_expectations) {
+          # none!
+        }
+        it "should output hook only" do
+          expected = "after_commit(v0.0.3) has been called"
+          expect { subject.commit('v0.0.3') }.to output(/#{Regexp.escape(expected)}/).to_stdout
+        end
+      end
+      context "with --no-after" do
+        let(:options) { { after: false } }
+        it "shouldn't output hook" do
+          expected = "after_commit(v0.0.3) has been called"
+          expect { subject.commit('v0.0.3') }.not_to output(/#{Regexp.escape(expected)}/).to_stdout
+        end
+      end
     end
   end
 
@@ -194,6 +223,19 @@ RSpec.describe Release, quietly: false do
     end
   end
 
+  describe "tag" do
+    let(:last_message) { "some message" }
+    it "calls out" do
+      allow(subject).to receive(:guarded_capture).with("git log head^^..head^  --pretty=format:%s").and_return "some-message"
+      expect(subject).to receive(:guarded_system).with("git tag -a v1.2.3 -e -m some-message")
+      expect(subject.tag("v1.2.3"))
+    end
+    it "escapes" do
+      allow(subject).to receive(:guarded_capture).with("git log head^^..head^  --pretty=format:%s").and_return 'Something new in sandwiches "aha" (#123)'
+      expect(subject).to receive(:guarded_system).with('git tag -a v1.2.3 -e -m Something\ new\ in\ sandwiches\ \"aha\"\ \(\#123\)')
+      expect(subject.tag("v1.2.3"))
+    end
+  end
   # describe 'CLI' do
   #   it "should work with source and no target" do
   #     puts "CLI"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: releasetool
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Tim Diggins
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-19 00:00:00.000000000 Z
+date: 2024-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: climate_control
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +129,8 @@ files:
 - release_notes/v0.4.0.md
 - release_notes/v0.5.0.md
 - release_notes/v0.5.1.md
+- release_notes/v0.5.2.md
+- release_notes/v0.5.3.md
 - releasetool.gemspec
 - spec/fixtures/empty_file.rb
 - spec/fixtures/example_with_releases.tar
@@ -142,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.5.13
 signing_key:
 specification_version: 4
 summary: Release management tools