releasetool 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b46e141b87c5f056ab3af71cdf6a5157e6b559e51743a07383bc225676c9866
-  data.tar.gz: e9d0a785e91132404eee8aef1a96705834569d5933210dbae5e3a6cbe89f2360
+  metadata.gz: '08c8874c8636651b902d877b3b7f72e92a67ae92879cc1565b9d1c8586b893fe'
+  data.tar.gz: 295de6fe21e43b6bf21f0fc38a7f0000632dbb81b66e633b5359d5841e9be53d
 SHA512:
-  metadata.gz: f0e80727a056d71917c33fb270685e16f7ec50e50a9aad75d0ae15c09380b993aec681fa340e45ecc126bda12a4a0778e807443dabba0e9f269b586f22cdc046
-  data.tar.gz: ad2a984cb079825de22f0efa986f6f4695e3df5f711c4eb8da5075ad726a2356eea050dff44d24efb48a78bf2d6069077a1126c4854a353b2ce2efa6d8cb4326
+  metadata.gz: 07d8ee0782a15c187a2e2c0193501b3ec0049c62fc27ee13533afb86e0141f75ce1fef338ef4295ea61ecfe9c162730734602b00c4b7b52b1fe310c0e1a54c94
+  data.tar.gz: 0f6f07235221842a7eddc75c1a30bba7bc2e2985de161dd86eda7adbf59c6e70c13902a70ef7adc0b7df5942d7e379066d46915bb1489ad2a62f18ed0dd69da8

data/lib/releasetool.rb

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

data/lib/tasks/release_thor.rb

@@ -73,14 +73,16 @@ class Release < Thor
       If no version given, it will use the version stored by release start
   END
 
-  # should take release commit --edit which allows you to edit, or --no-edit (default) which allows you to just skip
-  method_option :edit, type: :boolean, desc: "edit", aliases: 'e', default: false
+  method_option :edit, type: :boolean, desc: "release commit --edit allows you to edit, or --no-edit (default) which allows you to just skip", aliases: 'e', default: false
+  method_option :after, type: :boolean, desc: " --after (only do after -- needed for when after fails first time);  --no-after (only do the standard); default is do both", default: "default", check_default_type: false
   def commit(version = nil)
     version ||= stored_version
-    guarded_system("git add #{DIR}")
-    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}\"")
-    config.after_commit_hook(version)
+    if options[:after] == "default" || !options[:after]
+      guarded_system("git add #{DIR}")
+      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) if options[:after]
   end
 
   desc "tag (NEW_VERSION)", <<-END

data/release_notes/v0.5.1.md

@@ -0,0 +1,8 @@
+v0.5.1 Release Notes
+
+*Changes since v0.5.0*
+
+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

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/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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: releasetool
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Tim Diggins
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-17 00:00:00.000000000 Z
+date: 2023-12-19 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
@@ -114,6 +128,8 @@ files:
 - release_notes/v0.3.0.md
 - release_notes/v0.4.0.md
 - release_notes/v0.5.0.md
+- release_notes/v0.5.1.md
+- release_notes/v0.5.2.md
 - releasetool.gemspec
 - spec/fixtures/empty_file.rb
 - spec/fixtures/example_with_releases.tar