Merge pull request #97 from kerrizor/release-v1.2.0

Release version 1.2.0
voormedia · Dec 16, 2014 · 2cd607a · 2cd607a
2 parents 7708434 + f24f9b0
commit 2cd607a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 17 deletions.
diff --git 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
@@ -1,44 +1,44 @@
 PATH
   remote: .
   specs:
-    rails-erd (1.1.0)
-      activerecord (>= 3.0)
-      activesupport (>= 3.0)
+    rails-erd (1.2.0)
+      activerecord (~> 3.2)
+      activesupport (~> 3.2)
       choice (~> 0.1.6)
       ruby-graphviz (~> 1.0.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
+    activemodel (3.2.19)
+      activesupport (= 3.2.19)
       builder (~> 3.0.0)
-    activerecord (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
+    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 (3.2.11)
-      i18n (~> 0.6)
+    activesupport (3.2.19)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    arel (3.0.2)
+    arel (3.0.3)
     bouncy-castle-java (1.5.0146.1)
     builder (3.0.4)
     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)
+    multi_json (1.10.1)
     rake (10.0.3)
     redcarpet (2.2.2)
     ruby-graphviz (1.0.8)
     sqlite3 (1.3.7)
-    tzinfo (0.3.35)
+    tzinfo (0.3.42)
     yard (0.8.3)
 
 PLATFORMS

diff --git 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
diff --git 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"]