From 3e28921643fe26b7bda24c3ed296a80aaeddc09f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Sun, 24 Mar 2019 19:08:58 +0100 Subject: [PATCH 1/8] Backfill changelog entries --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf6ce04e..d7a27af2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Master (unreleased) +* Fix deprecation warning about single arity template handlers on Rails 6. [#110][] by [@aramvisser][] +* Fix rendering `link_to` with a block in a arbre template. [#64][] by [@varyonic][] * Drop support for EOL'd rubies (under 2.3) by [@deivid-rodriguez][] ## 1.1.1 [☰](https://github.com/activeadmin/arbre/compare/v1.1.0...v1.1.1) @@ -66,6 +68,10 @@ Initial release and extraction from Active Admin [#40]: https://github.com/activeadmin/arbre/issues/40 [#49]: https://github.com/activeadmin/arbre/issues/49 [#59]: https://github.com/activeadmin/arbre/issues/59 +[#64]: https://github.com/activeadmin/arbre/pull/64 +[#110]: https://github.com/activeadmin/arbre/pull/110 + +[@aramvisser]: https://github.com/aramvisser [@LTe]: https://github.com/LTe [@OscarBarrett]: https://github.com/OscarBarrett [@alexesDev]: https://github.com/alexesDev @@ -78,3 +84,4 @@ Initial release and extraction from Active Admin [@ramontayag]: https://github.com/ramontayag [@seanlinsley]: https://github.com/seanlinsley [@timoschilling]: https://github.com/timoschilling +[@varyonic]: https://github.com/varyonic From 92a337c588255fa680c4b4b58be49643ae57f233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Sun, 24 Mar 2019 19:13:03 +0100 Subject: [PATCH 2/8] bundle update --bundler --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 05eba770..4027ab49 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -205,4 +205,4 @@ DEPENDENCIES rubocop BUNDLED WITH - 1.17.1 + 2.0.1 From 6d3c27f0f60fd64e21a49bb3fbc645a1ab0f3e77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Sun, 24 Mar 2019 19:11:10 +0100 Subject: [PATCH 3/8] Add chandler to manage github releases --- Gemfile | 4 ++++ Gemfile.lock | 15 ++++++++++++++- Rakefile | 1 + tasks/release.rake | 6 ++++++ 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 tasks/release.rake diff --git a/Gemfile b/Gemfile index c4431fe4..90d5c347 100644 --- a/Gemfile +++ b/Gemfile @@ -13,6 +13,10 @@ group :tools do gem 'rubocop' end +group :release do + gem 'chandler' +end + group :rails do gem 'rails', '>= 5.0.0.1' # fixes CVE-2016-6316 gem 'rspec-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 4027ab49..6b24bbfc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,7 +48,7 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.6.0) + addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) arel (9.0.0) ast (2.4.0) @@ -61,6 +61,9 @@ GEM rack-test (>= 0.6.3) regexp_parser (~> 1.2) xpath (~> 3.2) + chandler (0.9.0) + netrc + octokit (>= 2.2.0) coderay (1.1.2) combustion (1.1.0) activesupport (>= 3.0.0) @@ -70,6 +73,8 @@ GEM crass (1.0.4) diff-lcs (1.3) erubi (1.8.0) + faraday (0.15.4) + multipart-post (>= 1.2, < 3) ffi (1.9.25-java) globalid (0.4.2) activesupport (>= 4.2.0) @@ -89,11 +94,15 @@ GEM mini_mime (1.0.1) mini_portile2 (2.4.0) minitest (5.11.3) + multipart-post (2.0.0) + netrc (0.11.0) nio4r (2.3.1) nio4r (2.3.1-java) nokogiri (1.10.1) mini_portile2 (~> 2.4.0) nokogiri (1.10.1-java) + octokit (4.13.0) + sawyer (~> 0.8.0, >= 0.5.3) parallel (1.13.0) parser (2.6.0.0) ast (~> 2.4.0) @@ -166,6 +175,9 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (~> 1.4.0) ruby-progressbar (1.10.0) + sawyer (0.8.1) + addressable (>= 2.3.5, < 2.6) + faraday (~> 0.8, < 1.0) spoon (0.0.6) ffi sprockets (3.7.2) @@ -196,6 +208,7 @@ PLATFORMS DEPENDENCIES arbre! capybara + chandler combustion pry rails (>= 5.0.0.1) diff --git a/Rakefile b/Rakefile index d544452e..e0a3c159 100644 --- a/Rakefile +++ b/Rakefile @@ -5,6 +5,7 @@ require 'rspec/core/rake_task' RSpec::Core::RakeTask.new(:spec) import 'tasks/lint.rake' +import 'tasks/release.rake' task default: [:spec, :lint] diff --git a/tasks/release.rake b/tasks/release.rake new file mode 100644 index 00000000..e98c7790 --- /dev/null +++ b/tasks/release.rake @@ -0,0 +1,6 @@ +require "chandler/tasks" + +# +# Add chandler as a prerequisite for `rake release` +# +task "release:rubygem_push" => "chandler:push" From 91194234aa3e29dde2adb5fc8a57aa52191e5a90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Sun, 24 Mar 2019 19:26:14 +0100 Subject: [PATCH 4/8] Add missing reference to PR in changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7a27af2..e983eb35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ * Fix deprecation warning about single arity template handlers on Rails 6. [#110][] by [@aramvisser][] * Fix rendering `link_to` with a block in a arbre template. [#64][] by [@varyonic][] -* Drop support for EOL'd rubies (under 2.3) by [@deivid-rodriguez][] +* Drop support for EOL'd rubies (under 2.3). [#78][] by [@deivid-rodriguez][] ## 1.1.1 [☰](https://github.com/activeadmin/arbre/compare/v1.1.0...v1.1.1) @@ -69,6 +69,7 @@ Initial release and extraction from Active Admin [#49]: https://github.com/activeadmin/arbre/issues/49 [#59]: https://github.com/activeadmin/arbre/issues/59 [#64]: https://github.com/activeadmin/arbre/pull/64 +[#78]: https://github.com/activeadmin/arbre/pull/78 [#110]: https://github.com/activeadmin/arbre/pull/110 [@aramvisser]: https://github.com/aramvisser From 56009eede7c9f560c2c52377130f8ceb0561d850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Sun, 24 Mar 2019 19:32:19 +0100 Subject: [PATCH 5/8] Bump rubies to latest patch level in Travis matrix --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 07c8e749..f661c1e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,10 @@ before_install: gem update --system 3.0.2 rvm: - 2.3.8 - 2.4.5 - - 2.5.3 - - 2.6.0 + - 2.5.5 + - 2.6.2 - jruby-9.1.17.0 - - jruby-9.2.5.0 + - jruby-9.2.6.0 branches: only: - master From ce8409f6dfa5ec345178ac44719f42c0d4491a5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Sun, 24 Mar 2019 19:32:56 +0100 Subject: [PATCH 6/8] Use latest rubygems in CI --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f661c1e9..39bb8e00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby sudo: false -before_install: gem update --system 3.0.2 +before_install: gem update --system 3.0.3 rvm: - 2.3.8 - 2.4.5 From eef28e99bb540000a512b5a9f889ac9b53eb4874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Sun, 24 Mar 2019 19:12:39 +0100 Subject: [PATCH 7/8] Cut 1.2.0.rc1 --- CHANGELOG.md | 2 ++ Gemfile.lock | 2 +- lib/arbre/version.rb | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e983eb35..88b29d88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Master (unreleased) +## 1.2.0.rc1 [☰](https://github.com/activeadmin/arbre/compare/v1.1.1...v1.2.0.rc1) + * Fix deprecation warning about single arity template handlers on Rails 6. [#110][] by [@aramvisser][] * Fix rendering `link_to` with a block in a arbre template. [#64][] by [@varyonic][] * Drop support for EOL'd rubies (under 2.3). [#78][] by [@deivid-rodriguez][] diff --git a/Gemfile.lock b/Gemfile.lock index 6b24bbfc..8211654d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - arbre (1.1.1) + arbre (1.2.0.rc1) activesupport (>= 3.0.0) GEM diff --git a/lib/arbre/version.rb b/lib/arbre/version.rb index 8e2314f3..16c04755 100644 --- a/lib/arbre/version.rb +++ b/lib/arbre/version.rb @@ -1,3 +1,3 @@ module Arbre - VERSION = "1.1.1" + VERSION = "1.2.0.rc1" end From eac3f6d4de64f04989a5c9bebb2b667c0494f8e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Sun, 24 Mar 2019 19:40:21 +0100 Subject: [PATCH 8/8] Install proper bundler in CI --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 39bb8e00..d1958924 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ language: ruby sudo: false -before_install: gem update --system 3.0.3 +before_install: + - gem update --system 3.0.3 + - gem install bundler:2.0.1 rvm: - 2.3.8 - 2.4.5