gris 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d24e479d857e250201458ae8d8e87857ca973677
-  data.tar.gz: 95231f647554f326516432a6228963eccfd201b5
+  metadata.gz: f7a9d87376c3a34905e0ae62a2cf778917964e9a
+  data.tar.gz: beb8cd90e47c105a9465cca0d212c09ee12e98ae
 SHA512:
-  metadata.gz: 3308f4baea02ab03e62da41a922c96a0fa41cc2909da23b07a7c4709b78c6d417832277b2b531aa31cc1cb9631a456a000605d66cf37a1f4fa1de231265289eb
-  data.tar.gz: bee140a75df7feb198809c9cd5ab29733e90a6a52076d265f2181d697df05126c74076215590df394765f0fe64808f8798d07a779b819806c4d5a1c1d80c9f88
+  metadata.gz: 9a4b903572ba4db5c49f94a7492881cbea0e31e2dfc90114f145f52150474790974d33d074c50bbdf2a09c4cad938ce097d2b5aec74cf938d530fb70cd2b5018
+  data.tar.gz: bb006bd646aebde08d0fe1a313d975bdc4ae106fcec1965a11d5407b3141c2bccba335dc34e5ce5b067aaddc8c89742e24e85dd73f59aabb9bdbc3eaa3203b07

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gris (0.1.5)
+    gris (0.1.6)
       activesupport (~> 4.2, >= 4.2.0)
       dotenv (~> 1.0.2, >= 1.0.2)
       git (~> 1.2, >= 1.2.8)

data/lib/gris/setup.rb

@@ -15,5 +15,9 @@ module Gris
     def env=(environment)
       @_env = ActiveSupport::StringInquirer.new(environment)
     end
+
+    def db_connection_details
+      YAML.load(ERB.new(File.read('./config/database.yml')).result)[Gris.env]
+    end
   end
 end

data/lib/gris/version.rb

@@ -1,5 +1,5 @@
 module Gris
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 
   class Version
     class << self

data/lib/tasks/db.rake

@@ -1,8 +1,6 @@
 unless defined?(Rails)
   task :environment do
-    require 'erb'
     require './config/application.rb'
-
     fail 'ActiveRecord Not Found' unless Module.const_defined?(:ActiveRecord)
   end
 
@@ -22,27 +20,19 @@ unless defined?(Rails)
 
     desc 'Create the database'
     task create: :environment do
-      db = YAML.load(ERB.new(File.read('./config/database.yml')).result)[Gris.env]
-
-      options = {}.tap do |o|
-        o[:adapter] = db['adapter']
-        o[:database] = 'postgres' if db['adapter'] == 'postgresql'
-      end
-
-      ActiveRecord::Base.establish_connection(options)
+      db = Gris.db_connection_details
+      admin_connection = db.merge(database: 'postgres',
+                                  schema_search_path: 'public')
+      ActiveRecord::Base.establish_connection(admin_connection)
       ActiveRecord::Base.connection.create_database(db['database'])
     end
 
     desc 'Delete the database'
     task drop: :environment do
-      db = YAML.load(ERB.new(File.read('./config/database.yml')).result)[Gris.env]
-
-      options = {}.tap do |o|
-        o[:adapter] = db['adapter']
-        o[:database] = 'postgres' if db['adapter'] == 'postgresql'
-      end
-
-      ActiveRecord::Base.establish_connection(options)
+      db = Gris.db_connection_details
+      admin_connection = db.merge(database: 'postgres',
+                                  schema_search_path: 'public')
+      ActiveRecord::Base.establish_connection(admin_connection)
       ActiveRecord::Base.connection.drop_database(db['database'])
     end
 
@@ -65,17 +55,13 @@ unless defined?(Rails)
       desc 'Load a schema.rb file into the database'
       task load: :environment do
         file = ENV['SCHEMA'] || 'db/schema.rb'
-        db = YAML.load(ERB.new(File.read('./config/database.yml')).result)[Gris.env]
-        ActiveRecord::Base.establish_connection(db)
+        db = Gris.db_connection_details
+        admin_connection = db.merge(database: 'postgres',
+                                    schema_search_path: 'public')
+        ActiveRecord::Base.establish_connection(admin_connection)
         ActiveRecord::Schema.verbose = true
         load(file)
       end
     end
-
-    desc 'Load the seed data from db/seeds.rb'
-    task seed: :environment do
-      ActiveRecord::Tasks::DatabaseTasks.seed_loader = Gris::ActiveRecordSeeder.new './db/seeds.rb'
-      ActiveRecord::Tasks::DatabaseTasks.load_seed
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gris
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Dylan Fareed