communard 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93fe86a1450877912e94bf0d8d6c61d6994d0731
-  data.tar.gz: 8b41d0725025b0901e1c574f3be1196c7441219c
+  metadata.gz: 254deb5e41f164f82d78f8e790607c3043914a54
+  data.tar.gz: b06a55879156c64e6118a3d02f068719d0c94770
 SHA512:
-  metadata.gz: 3725a5b59c63946c9532e4f189719590404faad6e2df3584f66c6d5673ae9d8e1f75fa895dc4c39f5c970f9628f3cb72af0fecae98284ade648f6ba965b1dd87
-  data.tar.gz: 300f1d6b8033c35ab87101581d499ba93102e090fcda8774c7817e01b4e3908b9d186332a054009bd0b9c49a0a71f9a2aa20b170392d1fb34592d27da447d6d7
+  metadata.gz: 18d3919f1171c3285de8f6b93e7c2c07659ac99bec515c093dd4b93513c28292407b39573bff10baae2a9951817a238a1ce5923b26dd6e091a5030b8ad409773
+  data.tar.gz: 9e466e1fba88680672d88289dc5493aaa5bd8caf7ced131582025b9ec2f3eaa266f6767d2b185214cb68bd39a1a6cffc8dbe2f9639ffdde13e77ed9573e7db4a

data/lib/communard/configuration.rb

@@ -4,15 +4,20 @@ require "pathname"
 module Communard
   class Configuration
 
-    attr_accessor :environment, :root, :logger
+    attr_accessor :environment, :root, :logger, :dump_same_db
 
     def initialize
-      self.environment = ENV["RACK_ENV"] || ENV["RUBY_ENV"] || ENV["RACK_ENV"] || "development"
-      self.root        = Pathname(Dir.pwd)
-      self.logger      = default_logger
+      self.environment  = ENV["RACK_ENV"] || ENV["RUBY_ENV"] || ENV["RACK_ENV"] || "development"
+      self.root         = Pathname(Dir.pwd)
+      self.logger       = default_logger
+      self.dump_same_db = false
       yield self if block_given?
     end
 
+    def dump_same_db!
+      self.dump_same_db = true
+    end
+
     private
 
     def default_logger

data/lib/communard/context.rb

@@ -30,7 +30,13 @@ module Communard
     end
 
     def create_database(env: environment)
-      run_without_database("CREATE DATABASE IF NOT EXISTS %{database_name}", env: env)
+      run_without_database("CREATE DATABASE %{database_name}", env: env)
+    rescue Sequel::DatabaseError => error
+      if /database (.*) already exists/ === error.message
+        logger.info "Database #{$1} already exists, which is fine."
+      else
+        raise
+      end
     end
 
     def drop_database(env: environment)
@@ -39,7 +45,7 @@ module Communard
     end
 
     def migrate(target: nil, env: environment)
-      maintenance(env: env).migrate(target: target)
+      maintenance(env: env).migrate(target: target, dump_same_db: configuration.dump_same_db)
     end
 
     def seed(env: environment)
@@ -47,7 +53,7 @@ module Communard
     end
 
     def rollback(step: 1, env: environment)
-      maintenance(env: env).rollback(step: step)
+      maintenance(env: env).rollback(step: step, dump_same_db: configuration.dump_same_db)
     end
 
     def load_schema(env: environment)
@@ -55,7 +61,7 @@ module Communard
     end
 
     def dump_schema(env: environment)
-      maintenance(env: env).dump_schema
+      maintenance(env: env).dump_schema(dump_same_db: configuration.dump_same_db)
     end
 
     def status(env: environment)
@@ -65,6 +71,10 @@ module Communard
     def run_without_database(cmd, env: environment)
       opts = options(env: env).dup
       database_name = opts.delete("database")
+      if opts.fetch("adapter") == "postgres"
+        opts["database"]           = "postgres"
+        opts["schema_search_path"] = "public"
+      end
       connection = connect(opts)
       connection.run(cmd % { database_name: database_name })
     end

data/lib/communard/maintenance.rb

@@ -9,20 +9,20 @@ module Communard
       @root       = root
     end
 
-    def migrate(target: nil)
+    def migrate(target: nil, dump_same_db: false)
       target = Integer(target) if target
       ::Sequel::Migrator.run(connection, migrations, target: target, allow_missing_migration_files: true)
-      dump_schema
+      dump_schema(dump_same_db: dump_same_db)
     end
 
     def seed
       load seeds_file if seeds_file.exist?
     end
 
-    def rollback(step: 1)
+    def rollback(step: 1, dump_same_db: false)
       target = applied_migrations[-step - 1]
       if target
-        migrate(target: target.split(/_/, 2).first)
+        migrate(target: target.split(/_/, 2).first, dump_same_db: dump_same_db)
       else
         fail ArgumentError, "Cannot roll back that far"
       end
@@ -33,9 +33,9 @@ module Communard
       migration.apply(connection, :up)
     end
 
-    def dump_schema
+    def dump_schema(dump_same_db: false)
       connection.extension :schema_dumper
-      schema = connection.dump_schema_migration(same_db: false)
+      schema = connection.dump_schema_migration(same_db: dump_same_db)
       schema_file.open("w") { |f| f << schema.gsub(/\s+$/m, "") }
     end
 

data/lib/communard/rake.rb

@@ -8,43 +8,47 @@ module Communard
     def self.add_tasks(ns = :db, &block)
 
       namespace ns do
+        task :_load_communard do
+          @_communard_context = Communard.context(&block)
+        end
+
         desc "Creates the database, migrate the schema, and loads seed data"
         task :setup => [:create, :migrate, :seed, "db:test:prepare"]
 
         desc "Creates the database"
-        task :create do
-          Communard.context(&block).create_database
+        task :create => :_load_communard do
+          @_communard_context.create_database
         end
 
         desc "Drops the database"
-        task :drop do
-          Communard.context(&block).drop_database
+        task :drop => :_load_communard do
+          @_communard_context.drop_database
         end
 
         desc "Drops and creates the database"
         task :reset => [:drop, :setup]
 
         desc "Migrate the database"
-        task :migrate do
+        task :migrate => :_load_communard do
           target = ENV["VERSION"] || ENV["TARGET"]
-          Communard.context(&block).migrate(target: target)
+          @_communard_context.migrate(target: target)
         end
 
         desc "Load the seed data from db/seeds.rb"
-        task :seed do
-          Communard.context(&block).seed
+        task :seed => :_load_communard do
+          @_communard_context.seed
         end
 
         desc "Rolls the schema back to the previous version"
-        task :rollback do
+        task :rollback => :_load_communard do
           step = Integer(ENV["STEP"] || 1)
-          Communard.context(&block).rollback(step: step)
+          @_communard_context.rollback(step: step)
         end
 
         namespace :test do
           desc "Cleans the test database"
-          task :prepare do
-            context = Communard.context(&block)
+          task :prepare => :_load_communard do
+            context = @_communard_context
             context.drop_database(env: "test")
             context.create_database(env: "test")
             context.migrate(env: "test")
@@ -54,28 +58,28 @@ module Communard
         namespace :migrate do
 
           desc "Redo the last migration"
-          task :redo do
-            context = Communard.context(&block)
+          task :redo => :_load_communard do
+            context = @_communard_context
             context.rollback
             context.migrate
           end
 
           desc "Display status of migrations"
-          task :status do
-            Communard.context(&block).status
+          task :status, :_load_communard do
+            @_communard_context.status
           end
         end
 
         namespace :schema do
 
           desc "Load the schema from db/schema.rb"
-          task :load do
-            Communard.context(&block).load_schema
+          task :load => :_load_communard do
+            @_communard_context.load_schema
           end
 
           desc "Dumps the schema to db/schema.rb"
-          task :dump do
-            Communard.context(&block).dump_schema
+          task :dump => :_load_communard do
+            @_communard_context.dump_schema
           end
 
         end

data/lib/communard/version.rb

@@ -1,3 +1,3 @@
 module Communard
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: communard
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - iain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel