aufgaben 0.8.4 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 914a19e9a0b71bd7194cad833f85547ca6e3e0769269089595cdc5a14e28e786
-  data.tar.gz: 2e5a9e462cbf48d046b42be4972562633d56014f724c84adc569d8c3f06553cc
+  metadata.gz: 3de5f02a75dedc2a9a499ee7551348192c9107b2b37c5500647b723ff5a2e693
+  data.tar.gz: 5b5b0f8452a05534b51fd80c4429335f0a97aa866018bf59a33cad9a900ba9f1
 SHA512:
-  metadata.gz: 7d08f4f69f9581f0789e4e775a0dcdb15dda7511956acd0ed44c2f3f0b324122530b7b0f0b2899adc5597384dc51fb3be2e6d56d9dc39458ff3c0f7a43d0c532
-  data.tar.gz: 908642fe3a1d55c4343410e29ef462e58a4d3733ece3ed12a5b6e83dfdcd5dcff748bb3675b0f78fd51ca934b9eba6a5d1cc0154d90acf3dbe62b70c3b9410ba
+  metadata.gz: a7c70d5e4e31e394450f8c5921f3337c9200283021c6c82851021246bae3247c463d4e1d44392467d673532aea4f0773ea2e962b603e88595246b99f3d7caaf0
+  data.tar.gz: 1710c26fd8f7e519077b18c3977f9201e80ef96d352c3b7f6b9cb710211edd2f1ab9a195c4a4565e1b1bb018f812b89127697b995c0c362140275e88b6d3dc4e

data/CHANGELOG.md

@@ -4,7 +4,26 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
-[Full diff](https://github.com/ybiquitous/aufgaben/compare/0.8.4...HEAD)
+[Full diff](https://github.com/ybiquitous/aufgaben/compare/0.10.0...HEAD)
+
+## 0.10.0
+
+[Full diff](https://github.com/ybiquitous/aufgaben/compare/0.9.0...0.10.0)
+
+- Add new Ruby versions for `bump:ruby` [#52](https://github.com/ybiquitous/aufgaben/pull/52)
+- Manage Ruby release URLs in JSON file [#53](https://github.com/ybiquitous/aufgaben/pull/53)
+
+## 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
 

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

@@ -1,4 +1,5 @@
 require_relative "./base"
+require "json"
 
 module Aufgaben
   class Bump::Ruby < Bump::Base
@@ -8,25 +9,7 @@ module Aufgaben
     ].freeze
 
     DEFAULT_RELEASE_NOTE_URL = "https://www.ruby-lang.org/en/news".freeze
-    RELEASE_NOTE_URLS = {
-      "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.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.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/",
-      "2.6.5": "https://www.ruby-lang.org/en/news/2019/10/01/ruby-2-6-5-released/",
-      "2.6.4": "https://www.ruby-lang.org/en/news/2019/08/28/ruby-2-6-4-released/",
-      "2.6.3": "https://www.ruby-lang.org/en/news/2019/04/17/ruby-2-6-3-released/",
-      "2.6.2": "https://www.ruby-lang.org/en/news/2019/03/13/ruby-2-6-2-released/",
-      "2.6.1": "https://www.ruby-lang.org/en/news/2019/01/30/ruby-2-6-1-released/",
-      "2.6.0": "https://www.ruby-lang.org/en/news/2018/12/25/ruby-2-6-0-released/",
-    }.freeze
+    RELEASE_NOTE_URLS = JSON.parse(File.read(File.join(__dir__, "..", "..", "ruby_release_urls.json")), symbolize_names: true).freeze
 
     def initialize(name = :ruby, ns = default_namespace, depends: [])
       self.files = DEFAULT_FILES.dup

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,7 @@ 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
@@ -75,16 +75,18 @@ module Aufgaben
           else
             add_changelog with: new_version
           end
-          sh "git", "add", changelog
+          git "add", changelog
 
           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
-          sh "git", "show", "--pretty"
+          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}'."
@@ -158,8 +160,25 @@ module Aufgaben
       msg "'#{changelog}' is added."
     end
 
+    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)
-      Dir.glob(files, File::FNM_EXTGLOB).each(&block)
+      expanded_files.each(&block)
     end
 
     def update_version_in(file, write: true)

data/lib/aufgaben/version.rb

@@ -1,3 +1,3 @@
 module Aufgaben
-  VERSION = "0.8.4".freeze
+  VERSION = "0.10.0".freeze
 end

data/lib/ruby_release_urls.json

@@ -0,0 +1,28 @@
+{
+  "3.1.2": "https://www.ruby-lang.org/en/news/2022/04/12/ruby-3-1-2-released/",
+  "3.1.1": "https://www.ruby-lang.org/en/news/2022/02/18/ruby-3-1-1-released/",
+  "3.1.0": "https://www.ruby-lang.org/en/news/2021/12/25/ruby-3-1-0-released/",
+  "3.0.4": "https://www.ruby-lang.org/en/news/2022/04/12/ruby-3-0-4-released/",
+  "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.6": "https://www.ruby-lang.org/en/news/2022/04/12/ruby-2-7-6-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.10": "https://www.ruby-lang.org/en/news/2022/04/12/ruby-2-6-10-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/",
+  "2.6.5": "https://www.ruby-lang.org/en/news/2019/10/01/ruby-2-6-5-released/",
+  "2.6.4": "https://www.ruby-lang.org/en/news/2019/08/28/ruby-2-6-4-released/",
+  "2.6.3": "https://www.ruby-lang.org/en/news/2019/04/17/ruby-2-6-3-released/",
+  "2.6.2": "https://www.ruby-lang.org/en/news/2019/03/13/ruby-2-6-2-released/",
+  "2.6.1": "https://www.ruby-lang.org/en/news/2019/01/30/ruby-2-6-1-released/",
+  "2.6.0": "https://www.ruby-lang.org/en/news/2018/12/25/ruby-2-6-0-released/"
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aufgaben
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.10.0
 platform: ruby
 authors:
 - Masafumi Koba
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-07 00:00:00.000000000 Z
+date: 2022-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,6 +71,7 @@ files:
 - lib/aufgaben/color.rb
 - lib/aufgaben/release.rb
 - lib/aufgaben/version.rb
+- lib/ruby_release_urls.json
 homepage: https://github.com/ybiquitous/aufgaben
 licenses:
 - MIT
@@ -93,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: The collection of useful Rake tasks.