aufgaben 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ffd158f88ddb4ddeb8f37c3ec2035aecdc060b49b3ff071503bdbc88e9758c1
-  data.tar.gz: '019fee060bb762bb4bc11398da74475070128ffd287fca8a980c69713f9c0c57'
+  metadata.gz: b4b6e4ec3c6598239fb54928583b75f4a8cdea94891a7356ef4852261ae064cb
+  data.tar.gz: e9e42da4265df2fb295f4d0d1f1035f68faabbf131fe5ea5c3d0cc1a3f46d036
 SHA512:
-  metadata.gz: 4d2903b58e2d9be8e530710bb8eee38afe9f449dda92af75268626b4537fd7303028b7f3db8bae2d2da8e252cd40ce52ccd6d303f996a83275bcdaad2a3ec41e
-  data.tar.gz: 8e7c9784d66ba273f887b84c7ca6f3b09cad80b106e9db9380e802e3ed694d5622d95ed01f74587290eae50e356536575e6df1296f45dc42d5b23984cea470fc
+  metadata.gz: 95ab0e6a21c756e66ad5e39d673c086286b2fd1f4ebb387d4ca893d3d965e7dcae6030b70b23574ff81b5994f5c14a1213f891d61039d46cbb892ee0e62811ea
+  data.tar.gz: eb7d1ceda59ab6114e57fbbd61bbbf43247e709b0eb733247c6ad003c8340e4e705d20a1f862d2d8a2aa2110a1d1a7922070308f8091c04dbd7f4f4c4cf2b29e

data/CHANGELOG.md

@@ -4,7 +4,31 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
-[Full diff](https://github.com/ybiquitous/aufgaben/compare/0.8.2...HEAD)
+[Full diff](https://github.com/ybiquitous/aufgaben/compare/0.9.0...HEAD)
+
+## 0.9.0
+
+[Full diff](https://github.com/ybiquitous/aufgaben/compare/0.8.5...0.9.0)
+
+- Support Ruby 3.0.3/2.7.5/2.6.9 for `bump:ruby` [#50](https://github.com/ybiquitous/aufgaben/pull/50)
+
+## 0.8.5
+
+[Full diff](https://github.com/ybiquitous/aufgaben/compare/0.8.4...0.8.5)
+
+- Check committed files on `release` task [#49](https://github.com/ybiquitous/aufgaben/pull/49)
+
+## 0.8.4
+
+[Full diff](https://github.com/ybiquitous/aufgaben/compare/0.8.3...0.8.4)
+
+- Check if specified files are updated on `release` task [#46](https://github.com/ybiquitous/aufgaben/pull/46)
+
+## 0.8.3
+
+[Full diff](https://github.com/ybiquitous/aufgaben/compare/0.8.2...0.8.3)
+
+- Run `git show` on `release` task [#45](https://github.com/ybiquitous/aufgaben/pull/45)
 
 ## 0.8.2
 

data/README.md

@@ -1,3 +1,5 @@
+[![Gem Version](https://badge.fury.io/rb/aufgaben.svg)](https://badge.fury.io/rb/aufgaben)
+
 # Aufgaben
 
 The collection of useful Rake tasks.
@@ -7,8 +9,7 @@ The collection of useful Rake tasks.
 Add this line to your `Gemfile`:
 
 ```ruby
-gem "aufgaben", git: "https://github.com/ybiquitous/aufgaben.git", tag: "<<tag_you_want>>", require: false
-
+gem "aufgaben", require: false
 ```
 
 ## Usage
@@ -112,9 +113,21 @@ $ rake bump:nodejs'[12.16.1]' [DRY_RUN=1]
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+To set up:
+
+```console
+bin/setup
+```
+
+To run an interactive prompt:
+
+```console
+bin/console
+```
+
+To release:
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+Run manually on the [Release workflow](https://github.com/ybiquitous/aufgaben/actions/workflows/release.yml).
 
 ## Contributing
 

data/lib/aufgaben/base.rb

@@ -17,5 +17,9 @@ module Aufgaben
     def dry_run?
       ENV["DRY_RUN"] || dry_run
     end
+
+    def git(*cmd, &block)
+      sh("git", *cmd, &block)
+    end
   end
 end

data/lib/aufgaben/bump/base.rb

@@ -83,8 +83,8 @@ MSG
           elsif !dry_run?
             puts "Committing changed files ..."
             puts ""
-            sh "git", "add", *changed_files
-            sh "git", "commit", "-m", commit_message
+            git "add", *changed_files
+            git "commit", "-m", commit_message
           end
         end
       end

data/lib/aufgaben/bump/ruby.rb

@@ -9,14 +9,17 @@ module Aufgaben
 
     DEFAULT_RELEASE_NOTE_URL = "https://www.ruby-lang.org/en/news".freeze
     RELEASE_NOTE_URLS = {
+      "3.0.3": "https://www.ruby-lang.org/en/news/2021/11/24/ruby-3-0-3-released/",
       "3.0.2": "https://www.ruby-lang.org/en/news/2021/07/07/ruby-3-0-2-released/",
       "3.0.1": "https://www.ruby-lang.org/en/news/2021/04/05/ruby-3-0-1-released/",
       "3.0.0": "https://www.ruby-lang.org/en/news/2020/12/25/ruby-3-0-0-released/",
+      "2.7.5": "https://www.ruby-lang.org/en/news/2021/11/24/ruby-2-7-5-released/",
       "2.7.4": "https://www.ruby-lang.org/en/news/2021/07/07/ruby-2-7-4-released/",
       "2.7.3": "https://www.ruby-lang.org/en/news/2021/04/05/ruby-2-7-3-released/",
       "2.7.2": "https://www.ruby-lang.org/en/news/2020/10/02/ruby-2-7-2-released/",
       "2.7.1": "https://www.ruby-lang.org/en/news/2020/03/31/ruby-2-7-1-released/",
       "2.7.0": "https://www.ruby-lang.org/en/news/2019/12/25/ruby-2-7-0-released/",
+      "2.6.9": "https://www.ruby-lang.org/en/news/2021/11/24/ruby-2-6-9-released/",
       "2.6.8": "https://www.ruby-lang.org/en/news/2021/07/07/ruby-2-6-8-released/",
       "2.6.7": "https://www.ruby-lang.org/en/news/2021/04/05/ruby-2-6-7-released/",
       "2.6.6": "https://www.ruby-lang.org/en/news/2020/03/31/ruby-2-6-6-released/",

data/lib/aufgaben/release.rb

@@ -34,8 +34,8 @@ module Aufgaben
 
         msg "If you want to do this on dry-run mode, set 'DRY_RUN=1'." unless dry_run?
 
-        sh "git", "checkout", default_branch, "--quiet"
-        sh "git", "pull", "origin", default_branch, "--quiet"
+        git "checkout", default_branch, "--quiet"
+        git "pull", "origin", default_branch, "--quiet"
         sh "bundle", "install", "--quiet"
 
         if current_version.empty?
@@ -47,7 +47,7 @@ module Aufgaben
           end
         end
 
-        sh "git", "diff", "--exit-code", "--quiet" do |ok|
+        git "diff", "--exit-code", "--quiet" do |ok|
           abort "Uncommitted changes found!" unless ok
         end
 
@@ -57,7 +57,11 @@ module Aufgaben
           msg "Releasing a new version: #{current_version} -> #{colored_new_version}"
         end
 
-        sh "git", "--no-pager", "log", "--format=%C(auto)%h %Creset%s", "#{current_version}..HEAD"
+        git "--no-pager", "log", "--format=%C(auto)%h %Creset%s", "#{current_version}..HEAD"
+
+        each_file do |file|
+          update_version_in file, write: false
+        end
 
         if dry_run?
           msg "This is a dry-run mode. No actual changes. Next, run this without `DRY_RUN=1`."
@@ -71,16 +75,21 @@ module Aufgaben
           else
             add_changelog with: new_version
           end
-          sh "git", "add", changelog
+          git "add", changelog
 
-          Dir.glob(files, File::FNM_EXTGLOB).each do |file|
+          each_file do |file|
             update_version_in file
-            sh "git", "add", file
+            git "add", file
           end
 
-          sh "git", "commit", "--quiet", "--message", "Version #{new_version}"
-          sh "git", "tag", "--annotate", "--message", "Version #{new_version}", new_version
-          msg "The tag '#{new_version}' is added. Run 'git push --follow-tags'."
+          git "commit", "--quiet", "--message", "Version #{new_version}"
+          git "tag", "--annotate", "--message", "Version #{new_version}", new_version
+          git "show", "--pretty"
+
+          check_committed_files
+
+          git_push = Color.new("git push --follow-tags").green
+          msg "The tag '#{colored_new_version}' is added. Run '#{git_push}'."
         end
       end
     end
@@ -151,12 +160,44 @@ module Aufgaben
       msg "'#{changelog}' is added."
     end
 
-    def update_version_in(file)
+    def check_committed_files
+      expected = [*expanded_files, changelog].sort
+      actual = `git diff --name-only HEAD^...HEAD`.lines(chomp: true).sort
+
+      if expected != actual
+        abort <<~MSG
+          The committed files are not what was expected.
+          Expected: #{expected}
+          Actual:   #{actual}
+        MSG
+      end
+    end
+
+    def expanded_files
+      @expanded_files ||= Dir.glob(files, File::FNM_EXTGLOB)
+    end
+
+    def each_file(&block)
+      expanded_files.each(&block)
+    end
+
+    def update_version_in(file, write: true)
       content = File.read(file)
-      content = content.gsub(Regexp.new('\b' + Regexp.escape(current_version) + '\b'), new_version)
-      File.write(file, content)
 
-      msg "'#{file}' is updated."
+      current_version_pattern = Regexp.new('\b' + Regexp.escape(current_version) + '\b')
+      unless current_version_pattern.match?(content)
+        abort "The current version '#{current_version}' is not found in '#{file}'!"
+      end
+
+      new_content = content.gsub(current_version_pattern, new_version)
+      if content == new_content
+        abort "No changes in '#{file}'"
+      end
+
+      if write
+        File.write(file, new_content)
+        msg "'#{file}' is updated."
+      end
     end
 
     def msg(text)

data/lib/aufgaben/version.rb

@@ -1,3 +1,3 @@
 module Aufgaben
-  VERSION = "0.8.2".freeze
+  VERSION = "0.9.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aufgaben
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Masafumi Koba
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-09 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: The collection of useful Rake tasks.