Merge branch 'development'

rascasone · Jun 22, 2016 · c081387 · c081387
2 parents 15fd6d6 + 82c9662
commit c081387
Show file tree

Hide file tree

Showing 11 changed files with 95 additions and 344 deletions.
diff --git a/Appraisals b/Appraisals
@@ -1,15 +1,3 @@
-appraise "activerecord-3-0" do
-  gem "activerecord", "~> 3.0.20"
-end
-
-appraise "activerecord-3-1" do
-  gem "activerecord", "~> 3.1.12"
-end
-
-appraise "activerecord-3-2" do
-  gem "activerecord", "~> 3.2.22.2"
-end
-
 appraise "activerecord-4-0" do
   gem "activerecord", "~> 4.0.13"
 end

diff --git a/active_explorer.gemspec b/active_explorer.gemspec
@@ -20,19 +20,19 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'ruby-graphviz'
-  spec.add_dependency 'activerecord', '~> 4.2.0'  # TODO: Support older versions as well.
+  spec.add_dependency 'ruby-graphviz', '~> 1.2'
+  spec.add_dependency 'activerecord', '>= 4.0.13'
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency 'rspec' , '>=3.0.0'
-  spec.add_development_dependency "rspec-nc"
-  spec.add_development_dependency "guard"
-  spec.add_development_dependency "guard-rspec"
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency 'ruby-graphviz', '~> 1.2', '>= 1.2.2'
-  spec.add_development_dependency 'awesome_print'
-  spec.add_development_dependency 'factory_girl'
-  spec.add_development_dependency 'appraisal'
-  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rspec' , "~> 3.0"
+  spec.add_development_dependency "rspec-nc", "~> 0.3"
+  spec.add_development_dependency "guard", "~> 2.14"
+  spec.add_development_dependency "guard-rspec", "~> 4.7"
+  spec.add_development_dependency "sqlite3", "~> 1.3"
+  spec.add_development_dependency 'awesome_print', "~> 1.7"
+  spec.add_development_dependency 'factory_girl', "~> 4.7"
+  spec.add_development_dependency 'appraisal', "~> 2.1"
+  spec.add_development_dependency 'pry', "~> 0.10"
+  spec.add_development_dependency 'pry-byebug', "~> 3.4"
 end
diff --git a/gemfiles/activerecord_3_0.gemfile.lock b/gemfiles/activerecord_3_0.gemfile.lock
diff --git a/gemfiles/activerecord_3_2.gemfile.lock b/gemfiles/activerecord_3_2.gemfile.lock
diff --git a/gemfiles/activerecord_4_0.gemfile.lock b/gemfiles/activerecord_4_0.gemfile.lock
@@ -1,9 +1,9 @@
 PATH
   remote: ../
   specs:
-    active_explorer (0.0.6)
-      activerecord
-      ruby-graphviz
+    active_explorer (0.0.8)
+      activerecord (>= 4.0.13)
+      ruby-graphviz (~> 1.2)
 
 GEM
   remote: https://rubygems.org/
@@ -30,6 +30,7 @@ GEM
     arel (4.0.2)
     awesome_print (1.7.0)
     builder (3.1.4)
+    byebug (9.0.5)
     coderay (1.1.1)
     diff-lcs (1.2.5)
     factory_girl (4.7.0)
@@ -59,7 +60,6 @@ GEM
     method_source (0.8.2)
     minitest (4.7.5)
     multi_json (1.12.1)
-    mysql (2.9.1)
     nenv (0.3.0)
     notiffany (0.1.0)
       nenv (~> 0.1)
@@ -68,6 +68,9 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    pry-byebug (3.4.0)
+      byebug (~> 9.0)
+      pry (~> 0.10)
     rake (10.5.0)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
@@ -92,28 +95,30 @@ GEM
     ruby_dep (1.3.1)
     shellany (0.0.1)
     slop (3.6.0)
+    sqlite3 (1.3.11)
     terminal-notifier (1.6.3)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tzinfo (0.3.49)
+    tzinfo (0.3.50)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   active_explorer!
   activerecord (~> 4.0.13)
-  appraisal
-  awesome_print
+  appraisal (~> 2.1)
+  awesome_print (~> 1.7)
   bundler (~> 1.10)
-  factory_girl
-  guard
-  guard-rspec
-  mysql
+  factory_girl (~> 4.7)
+  guard (~> 2.14)
+  guard-rspec (~> 4.7)
+  pry (~> 0.10)
+  pry-byebug (~> 3.4)
   rake (~> 10.0)
-  rspec (>= 3.0.0)
-  rspec-nc
-  ruby-graphviz (~> 1.2, >= 1.2.2)
+  rspec (~> 3.0)
+  rspec-nc (~> 0.3)
+  sqlite3 (~> 1.3)
 
 BUNDLED WITH
    1.11.2