Skip to content

Commit e228bed

Browse files
committed
Update CHANGELOG with github_changelog_generator
1 parent f84aa3d commit e228bed

File tree

3 files changed

+45
-137
lines changed

3 files changed

+45
-137
lines changed

.github_changelog_generator

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ bug-labels=Type: Bug
55
exclude-labels=Type: Question
66
header=# ModbusMaster CHANGELOG
77
include-labels=Type: Bug,Type: Enhancement,Type: Feature Request,Type: Maintenance
8-
since-tag=0.10.0
98
future-release=Unreleased

CHANGELOG.md

Lines changed: 19 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ModbusMaster CHANGELOG
22

3-
## [Unreleased](https://github.com/4-20ma/ModbusMaster/tree/Unreleased) (2016-09-11)
4-
[Full Changelog](https://github.com/4-20ma/ModbusMaster/compare/v0.11.0...Unreleased)
3+
## [v0.12.0](https://github.com/4-20ma/ModbusMaster/tree/v0.12.0) (2016-09-11)
4+
[Full Changelog](https://github.com/4-20ma/ModbusMaster/compare/v0.11.0...v0.12.0)
55

66
**Implemented enhancements:**
77

@@ -44,6 +44,8 @@
4444
**Implemented enhancements:**
4545

4646
- Update architecture switch to match Arduino convention [\#27](https://github.com/4-20ma/ModbusMaster/issues/27)
47+
- Request timeout is impatient [\#3](https://github.com/4-20ma/ModbusMaster/issues/3)
48+
- Update architecture switch [\#28](https://github.com/4-20ma/ModbusMaster/pull/28) ([4-20ma](https://github.com/4-20ma))
4749

4850
## [v0.10.3](https://github.com/4-20ma/ModbusMaster/tree/v0.10.3) (2015-05-22)
4951
[Full Changelog](https://github.com/4-20ma/ModbusMaster/compare/v0.10.2...v0.10.3)
@@ -53,17 +55,28 @@
5355
- Inconsistent Doxygen comments [\#25](https://github.com/4-20ma/ModbusMaster/issues/25)
5456
- Replace C macros with inline functions [\#18](https://github.com/4-20ma/ModbusMaster/issues/18)
5557

58+
**Merged pull requests:**
59+
60+
- Adjust doxygen comments to be consistent [\#26](https://github.com/4-20ma/ModbusMaster/pull/26) ([4-20ma](https://github.com/4-20ma))
61+
- Replace C macros w/inline functions [\#24](https://github.com/4-20ma/ModbusMaster/pull/24) ([4-20ma](https://github.com/4-20ma))
62+
5663
## [v0.10.2](https://github.com/4-20ma/ModbusMaster/tree/v0.10.2) (2015-05-22)
5764
[Full Changelog](https://github.com/4-20ma/ModbusMaster/compare/v0.9.1...v0.10.2)
5865

66+
**Implemented enhancements:**
67+
68+
- Implement CRC16 for SAM3X8E microprocessor [\#11](https://github.com/4-20ma/ModbusMaster/pull/11) ([4-20ma](https://github.com/4-20ma))
69+
- Add rx flush, change response timeout to 2000 ms [\#10](https://github.com/4-20ma/ModbusMaster/pull/10) ([agprimatic](https://github.com/agprimatic))
70+
5971
**Fixed bugs:**
6072

61-
- Fix documentation build error [\#16](https://github.com/4-20ma/ModbusMaster/issues/16)
73+
- Fix documentation build error [\#23](https://github.com/4-20ma/ModbusMaster/pull/23) ([4-20ma](https://github.com/4-20ma))
74+
- Work around HardwareSerial for SAM3 micro [\#12](https://github.com/4-20ma/ModbusMaster/pull/12) ([4-20ma](https://github.com/4-20ma))
6275

63-
**Closed issues:**
76+
**Merged pull requests:**
6477

65-
- Rename markdown file extensions [\#20](https://github.com/4-20ma/ModbusMaster/issues/20)
66-
- Update pointers to match C++ convention [\#15](https://github.com/4-20ma/ModbusMaster/issues/15)
78+
- Update pointers to match C++ convention [\#22](https://github.com/4-20ma/ModbusMaster/pull/22) ([4-20ma](https://github.com/4-20ma))
79+
- Rename markdown file extensions [\#21](https://github.com/4-20ma/ModbusMaster/pull/21) ([4-20ma](https://github.com/4-20ma))
6780

6881
## [v0.9.1](https://github.com/4-20ma/ModbusMaster/tree/v0.9.1) (2013-01-02)
6982
[Full Changelog](https://github.com/4-20ma/ModbusMaster/compare/v0.9...v0.9.1)
@@ -93,110 +106,6 @@
93106
[Full Changelog](https://github.com/4-20ma/ModbusMaster/compare/v0.1...v0.2)
94107

95108
## [v0.1](https://github.com/4-20ma/ModbusMaster/tree/v0.1) (2010-01-25)
96-
[Full Changelog](https://github.com/4-20ma/ModbusMaster/compare/0.10.0...v0.1)
97-
98-
<!--
99-
This file is no longer maintained; refer to CHANGELOG.md, which automatically
100-
incorporates appends content from this file.
101-
-->
102-
## [v0.11.0 (2015-05-22)](https://github.com/4-20ma/ModbusMaster/tree/v0.11.0)
103-
- Fix grammar in library.properties
104-
- Fix broken links in HISTORY, Rakefile
105-
- Add RX flush, increase response timeout
106-
- Insert missing space
107-
- Add comment clarifying flush() is tx buffer only
108-
- Fix MBSerial pointer from . to ->
109-
- Update architecture switch
110-
111-
112-
## [v0.10.3 (2015-05-22)](https://github.com/4-20ma/ModbusMaster/tree/v0.10.3)
113-
- Adjust doxygen comments to be consistent
114-
- Replace C macros w/inline functions
115-
- Update library.properties to conform to others
116-
- Adjust README links to use absolute URLs
117-
118-
119-
## [v0.10.2 (2015-05-21)](https://github.com/4-20ma/ModbusMaster/tree/v0.10.2)
120-
- Update documentation after resolving doc build err
121-
- Fix documentation build error
122-
- Update library.properties
123-
- Add README badges for tag, license
124-
- Update README
125-
- Replace **Heading** with Heading followed by ------- line for cleaner Markdown syntax
126-
- Update Arduino version note to 1.6
127-
- Fix nanoline URL
128-
- Remove deprecation note from README
129-
- Update pointers to match C++ convention
130-
- Rename markdown file extensions
131-
132-
133-
## v0.10.1 (2015-05-20)
134-
- Update Rakefile to commit Doxyfile, reference
135-
- Version bump to v0.10.0
136-
137-
138-
## v0.10.0 (2015-05-20)
139-
- Update Rakefile to update library.properties
140-
- Add library.properties file to describe library
141-
- Add .ruby-* to manage versions via rvm or rbenv
142-
- Add Gemfile to manage dependencies via Bundler
143-
- Update .gitignore to exclude Gemfile.lock
144-
- Work around HardwareSerial for SAM3 micro
145-
- add #ifdefs to check for presence of AVR or ARM chipset (use HardwareSerial for AVR and UARTClass for ARM)
146-
- change MBSerial to pointer and update all references to use -> notation instead of . notation
147-
- Implement CRC16 for SAM3X8E microprocessor
148-
- renamed _crc16_update to crc16_update to minimize confusion with AVR function in util/crc16.h
149-
- added C version of crc16 and removed extraneous version of crc16 functions
150-
- Add end-of-life note to README
151-
- Add auto-generated pdf documentation for v0.9.1
152-
- Remove pdf documentation for versions 0.6, 0.7
153-
- Add pdf documentation for versions 0.6, 0.7
154-
- Remove unnecessary require 'fileutils'
155-
- Add auto-generated pdf documentation
156-
- Define PROJECT_BRIEF tag in Doxyfile
157-
- Add pdf generation to prepare:documentation
158-
- Add doc/README.txt
159-
160-
161-
## [v0.9.1 (2013-01-02)](https://github.com/4-20ma/ModbusMaster/tree/v0.9.1)
162-
- Add Rakefile to manage prepare/release process
163-
- Add .gitignore to skip doc/html, doc/latex files
164-
- Add Doxyfile to repo
165-
- Update copyright year
166-
- Update email address
167-
- Fix references to repo
168-
- Move history to separate file
169-
- Update README copyright, email
170-
171-
172-
## [v0.9 (2011-12-04)](https://github.com/4-20ma/ModbusMaster/tree/v0.9)
173-
- Add support for Arduino 1.0
174-
175-
176-
## [v0.8 (2011-11-09)](https://github.com/4-20ma/ModbusMaster/tree/v0.8)
177-
- Add support for ATmega2560
178-
179-
180-
## [v0.7 (2010-02-09)](https://github.com/4-20ma/ModbusMaster/tree/v0.7)
181-
- Modified capitalization of functions to match Arduino style where first letter is lower-case
182-
183-
184-
## [v0.6 (2010-02-04)](https://github.com/4-20ma/ModbusMaster/tree/v0.6)
185-
- Added documentation via Doxygen comments, modified methods used to get/set storage buffers
186-
187-
188-
## [v0.5 (2010-01-30)](https://github.com/4-20ma/ModbusMaster/tree/v0.5)
189-
- Added ability to select serial port 0..3, modified methods used to get/set storage arrays, miscellaneous bug fixes
190-
191-
192-
## [v0.3 (2010-01-29)](https://github.com/4-20ma/ModbusMaster/tree/v0.3)
193-
194-
195-
## [v0.2 (2010-01-25)](https://github.com/4-20ma/ModbusMaster/tree/v0.2)
196-
197-
198-
## [v0.1 (2010-01-24)](https://github.com/4-20ma/ModbusMaster/tree/v0.1)
199-
- Initial public release
200109

201110

202111
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

Rakefile

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#
1717

1818
require 'git'
19+
require 'github_changelog_generator/task'
1920
require 'rake'
2021
require 'rubygems'
2122
require 'rake/version_task' # gem install version
@@ -32,7 +33,7 @@ DOXYFILE = 'Doxyfile'
3233
GITHUB_USERNAME = '4-20ma'
3334
GITHUB_REPO = 'ModbusMaster'
3435
HEADER_FILE = "#{GITHUB_REPO}.h"
35-
HISTORY_FILE = 'HISTORY.md'
36+
CHANGELOG_FILE = 'CHANGELOG.md'
3637
PROPERTIES_FILE = 'library.properties'
3738
VERSION_FILE = Version.version_file('').basename.to_s
3839

@@ -72,14 +73,14 @@ task :info do
7273
end # task :info
7374

7475

75-
desc 'Prepare HISTORY file for release'
76+
desc "Prepare #{CHANGELOG_FILE} for release"
7677
task :prepare => 'prepare:default'
7778

7879
namespace :prepare do
7980
task :default => [
8081
:release_date,
8182
:library_properties,
82-
:history,
83+
:changelog,
8384
:documentation
8485
]
8586

@@ -110,28 +111,27 @@ namespace :prepare do
110111
end # task :documentation
111112

112113
desc 'Prepare release history'
113-
task :history, :tag do |t, args|
114-
g = Git.open(CWD)
115-
116-
current_tag = args[:tag] || Version.current.to_s
117-
prior_tag = g.tags.last
118-
119-
history = "## [v#{current_tag} (#{Time.now.strftime('%Y-%m-%d')})]"
120-
history << "(https://github.com/#{GITHUB_USERNAME}/#{GITHUB_REPO}/tree"
121-
history << "/v#{current_tag})\n"
122-
123-
commits = prior_tag ? g.log.between(prior_tag) : g.log
124-
history << commits.map do |commit|
125-
"- #{commit.message}"
126-
end.join("\n")
127-
history << "\n\n---\n"
128-
129-
file = File.join(CWD, HISTORY_FILE)
130-
puts "Updating file #{file}:"
131-
puts history
132-
contents = IO.read(file)
133-
IO.write(file, history << contents)
134-
end # task :history
114+
GitHubChangelogGenerator::RakeTask.new(:changelog) do |config|
115+
config.add_issues_wo_labels = false
116+
config.add_pr_wo_labels = false
117+
config.enhancement_labels = [
118+
'Type: Enhancement',
119+
'Type: Feature Request'
120+
]
121+
config.bug_labels = ['Type: Bug']
122+
config.exclude_labels = ['Type: Question']
123+
config.header = '# ModbusMaster CHANGELOG'
124+
config.include_labels = [
125+
'Type: Bug',
126+
'Type: Enhancement',
127+
'Type: Feature Request',
128+
'Type: Maintenance'
129+
]
130+
# config.since_tag = '0.1.0'
131+
config.future_release = "v#{Version.current.to_s}"
132+
config.user = GITHUB_USERNAME
133+
config.project = GITHUB_REPO
134+
end # GitHubChangelogGenerator::RakeTask.new
135135

136136
desc 'Update version in library properties file'
137137
task :library_properties do
@@ -196,7 +196,7 @@ namespace :release do
196196
task :source do
197197
version = Version.current.to_s
198198
`git add doc/#{DOXYFILE} "doc/#{GITHUB_REPO} reference-#{version}.pdf" \
199-
#{HEADER_FILE} #{HISTORY_FILE} #{PROPERTIES_FILE} #{VERSION_FILE}`
199+
#{HEADER_FILE} #{CHANGELOG_FILE} #{PROPERTIES_FILE} #{VERSION_FILE}`
200200
`git commit -m 'Version bump to v#{version}'`
201201
`git tag -a -f -m 'Version v#{version}' v#{version}`
202202
`git push origin master`

0 commit comments

Comments
 (0)