aufgaben 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 914a19e9a0b71bd7194cad833f85547ca6e3e0769269089595cdc5a14e28e786
-  data.tar.gz: 2e5a9e462cbf48d046b42be4972562633d56014f724c84adc569d8c3f06553cc
+  metadata.gz: 7a5183c060cb857117a2f48b0e944fec202ec940310638fa36a588ee71295f60
+  data.tar.gz: 7eb0f5f2afed4376f9e07fe4f03516c4f190f18e4f2dfbd8b84689032dda0e1c
 SHA512:
-  metadata.gz: 7d08f4f69f9581f0789e4e775a0dcdb15dda7511956acd0ed44c2f3f0b324122530b7b0f0b2899adc5597384dc51fb3be2e6d56d9dc39458ff3c0f7a43d0c532
-  data.tar.gz: 908642fe3a1d55c4343410e29ef462e58a4d3733ece3ed12a5b6e83dfdcd5dcff748bb3675b0f78fd51ca934b9eba6a5d1cc0154d90acf3dbe62b70c3b9410ba
+  metadata.gz: 6fb90efed4ac4cea0a638890880db35999f91b457ebf24e834e304156b7701e9a642e70f4e450c9a32364dc4629e421ee17e57f31700cad1e7422367e021257a
+  data.tar.gz: fde7bec5eb41b82cd32cbe7380ecccb1f54ac04240d57ccc044e904e960e3cd6a7b9bd5b159f0d4536e552a9d1aca24962eb754e2462a94864a4cd4a7e86647e

data/CHANGELOG.md

@@ -4,7 +4,13 @@ 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.8.5...HEAD)
+
+## 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/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.8.5".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aufgaben
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Masafumi Koba