From ef82f79854f6cfaddfdc4e4af7db0c8098982c74 Mon Sep 17 00:00:00 2001 From: Kerri Miller Date: Mon, 15 Dec 2014 10:23:21 -0800 Subject: [PATCH 1/2] Release version 1.2.0 --- CHANGES.md | 8 ++++++++ Gemfile.lock | 39 ++++++++++++++++++++++----------------- lib/rails_erd/version.rb | 2 +- 3 files changed, 31 insertions(+), 18 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index ddf5b595..3817760f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,10 @@ +1.2.0 +----- + +* Fixed bug that prevented generation of diagrams on newer versions of OSX +* Added ability to store CLI configuration options in a config file, both a global version (in the user's home directory) as well as a per-project local versions +* Added a Code of Conduct for the project + 1.1.0 ----- @@ -8,6 +15,7 @@ Neil Chambers). * Add only/exclude to CLI (contributed by Dru Ibarra). + 1.0.0 ----- diff --git a/Gemfile.lock b/Gemfile.lock index 311c52c0..e24f6a1e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - rails-erd (1.1.0) + rails-erd (1.2.0) activerecord (>= 3.0) activesupport (>= 3.0) choice (~> 0.1.6) @@ -10,35 +10,40 @@ PATH GEM remote: http://rubygems.org/ specs: - activemodel (3.2.11) - activesupport (= 3.2.11) - builder (~> 3.0.0) - activerecord (3.2.11) - activemodel (= 3.2.11) - activesupport (= 3.2.11) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) + activemodel (4.1.8) + activesupport (= 4.1.8) + builder (~> 3.1) + activerecord (4.1.8) + activemodel (= 4.1.8) + activesupport (= 4.1.8) + arel (~> 5.0.0) activerecord-jdbc-adapter (1.2.5) activerecord-jdbcsqlite3-adapter (1.2.5) activerecord-jdbc-adapter (~> 1.2.5) jdbc-sqlite3 (~> 3.7.2) - activesupport (3.2.11) - i18n (~> 0.6) - multi_json (~> 1.0) - arel (3.0.2) + activesupport (4.1.8) + i18n (~> 0.6, >= 0.6.9) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.1) + tzinfo (~> 1.1) + arel (5.0.1.20140414130214) bouncy-castle-java (1.5.0146.1) - builder (3.0.4) + builder (3.2.2) choice (0.1.6) - i18n (0.6.1) + i18n (0.6.11) jdbc-sqlite3 (3.7.2) jruby-openssl (0.8.2) bouncy-castle-java (>= 1.5.0146.1) - multi_json (1.5.0) + json (1.8.1) + minitest (5.5.0) rake (10.0.3) redcarpet (2.2.2) ruby-graphviz (1.0.8) sqlite3 (1.3.7) - tzinfo (0.3.35) + thread_safe (0.3.4) + tzinfo (1.2.2) + thread_safe (~> 0.1) yard (0.8.3) PLATFORMS diff --git a/lib/rails_erd/version.rb b/lib/rails_erd/version.rb index d149bb85..ba5262ed 100644 --- a/lib/rails_erd/version.rb +++ b/lib/rails_erd/version.rb @@ -1,4 +1,4 @@ module RailsERD - VERSION = "1.1.0" + VERSION = "1.2.0" BANNER = "RailsERD #{VERSION}" end From f24f9b05de637c908ff433cb0259106a84f8c373 Mon Sep 17 00:00:00 2001 From: Kerri Miller Date: Mon, 15 Dec 2014 22:16:41 -0800 Subject: [PATCH 2/2] Lock Active* gems to ~> 3.2 --- Gemfile.lock | 39 +++++++++++++++++---------------------- rails-erd.gemspec | 4 ++-- 2 files changed, 19 insertions(+), 24 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e24f6a1e..516b06e2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,48 +2,43 @@ PATH remote: . specs: rails-erd (1.2.0) - activerecord (>= 3.0) - activesupport (>= 3.0) + activerecord (~> 3.2) + activesupport (~> 3.2) choice (~> 0.1.6) ruby-graphviz (~> 1.0.4) GEM remote: http://rubygems.org/ specs: - activemodel (4.1.8) - activesupport (= 4.1.8) - builder (~> 3.1) - activerecord (4.1.8) - activemodel (= 4.1.8) - activesupport (= 4.1.8) - arel (~> 5.0.0) + activemodel (3.2.19) + activesupport (= 3.2.19) + builder (~> 3.0.0) + activerecord (3.2.19) + activemodel (= 3.2.19) + activesupport (= 3.2.19) + arel (~> 3.0.2) + tzinfo (~> 0.3.29) activerecord-jdbc-adapter (1.2.5) activerecord-jdbcsqlite3-adapter (1.2.5) activerecord-jdbc-adapter (~> 1.2.5) jdbc-sqlite3 (~> 3.7.2) - activesupport (4.1.8) - i18n (~> 0.6, >= 0.6.9) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.1) - tzinfo (~> 1.1) - arel (5.0.1.20140414130214) + activesupport (3.2.19) + i18n (~> 0.6, >= 0.6.4) + multi_json (~> 1.0) + arel (3.0.3) bouncy-castle-java (1.5.0146.1) - builder (3.2.2) + builder (3.0.4) choice (0.1.6) i18n (0.6.11) jdbc-sqlite3 (3.7.2) jruby-openssl (0.8.2) bouncy-castle-java (>= 1.5.0146.1) - json (1.8.1) - minitest (5.5.0) + multi_json (1.10.1) rake (10.0.3) redcarpet (2.2.2) ruby-graphviz (1.0.8) sqlite3 (1.3.7) - thread_safe (0.3.4) - tzinfo (1.2.2) - thread_safe (~> 0.1) + tzinfo (0.3.42) yard (0.8.3) PLATFORMS diff --git a/rails-erd.gemspec b/rails-erd.gemspec index 2d93e60c..de7ee8aa 100644 --- a/rails-erd.gemspec +++ b/rails-erd.gemspec @@ -14,8 +14,8 @@ Gem::Specification.new do |s| s.rubyforge_project = "rails-erd" - s.add_runtime_dependency "activerecord", [">= 3.0"] - s.add_runtime_dependency "activesupport", [">= 3.0"] + s.add_runtime_dependency "activerecord", ["~> 3.2"] + s.add_runtime_dependency "activesupport", ["~> 3.2"] s.add_runtime_dependency "ruby-graphviz", ["~> 1.0.4"] s.add_runtime_dependency "choice", ["~> 0.1.6"]