prick 0.20.4 → 0.20.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16661e75996622c695a8c0d0d6ed65f383b98f825251c21cc6c357d8a64e030a
-  data.tar.gz: 9c3dc5d7c43b129e5c01808ae8e237ef3ad9cb87d792da711c4dad5f410f5eaf
+  metadata.gz: 546c5ddee2590544bc4d77eeac96db85cbe2bcf1f752a310ead0623bd02af69c
+  data.tar.gz: fe5ea7a76834b33d4e50664fa379d617b7820b89b82907613fa9d7e4be9d81b4
 SHA512:
-  metadata.gz: 97ea15b9490ababf188bb81c1355e70dbc805b55d03cf22b24df43971fe5d0cd4c8c74e9defc9faa3b8ecdae74c3188f0371d9ab668e1f07b953dd7394ef3265
-  data.tar.gz: cb4a420a3463b16371f0b89306471ecd7ae0cb1a8c11240b1a96d445248050c7b9e913671bcc882255168fcf3b3334ab56a9e9243dcd3eeab796e566ab5a1afd
+  metadata.gz: f7c3c32abf035d32c787df578b7ba9a6b9f87cac4b76afb37f3293621a4dc3c7b098bf102e64fe0c9959cca75559d0b8f5273833067b76101b82f3439598bad9
+  data.tar.gz: b7628d68390952963b185e68bdcb8431fa86a1bc7e847ba546eaed57525ac748dedc951f6619c202dc192fe5bd03e841699d75f4e10746b013a86a44f4a79ed3

data/lib/prick/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Prick
-  VERSION = "0.20.4"
+  VERSION = "0.20.5"
 end

data/lib/subcommand/prick-drop.rb

@@ -4,18 +4,18 @@ require 'builder/builder.rb'
 
 module Prick::SubCommand
   def self.drop_users(database)
-    PgConn.new(database) { |conn|
+    PgConn.new(postgres) { |conn|
       users = conn.role.list(database: database)
       conn.role.drop(users, cascade: true)
     }
   end
 
   def self.drop_database(database)
-    PgConn.new { |conn| conn.rdbms.drop database }
+    PgConn.new(postgres) { |conn| conn.rdbms.drop database }
   end
 
   def self.drop_all(database)
-    PgConn.new { |conn|
+    PgConn.new(postgres) { |conn|
       users = conn.role.list(database: database)
       PgConn.new(database) { |db| db.role.drop(users, cascade: true) }
       conn.rdbms.drop database

data/lib/subcommand/prick-make.rb

@@ -87,116 +87,3 @@ module Prick::SubCommand
   end
 end
 
-__END__
-require 'prick_build.rb'
-
-require 'pg_conn'
-
-require 'ruby-prof'
-
-DATABASE = "mikras"
-USERNAME = "mikras"
-
-#PROFILE = true
-PROFILE = false
-TIME = true
-#TIME = false
-
-EPOCH = Time.at(0).utc
-
-schema = ARGV.first
-
-time "Program" do
-  RubyProf.start if PROFILE
-  begin
-    conn = nil
-    builder = nil
-    built_at = EPOCH
-    clean = false
-    create_schema = true
-
-    time "Load build object" do
-      PgConn.new { |super_conn|
-        if super_conn.rdbms.exist? DATABASE
-          conn = PgConn.new(DATABASE)
-          if conn.schema.exist_table? "prick", "versions"
-            built_at = conn.value("select built_at from prick.versions")
-          end
-        else
-          super_conn.rdbms.create DATABASE, owner: USERNAME
-          conn = PgConn.new(DATABASE)
-          clean = true
-        end
-      }
-
-      builder = Prick::Build::Builder.new(conn, "schema", clean)
-
-      if schema
-        builder.pool.after_schema(schema).each { |schema|
-          conn.schema.drop(schema, cascade: true)
-          builder.pool.delete_schema(schema)
-        }
-      end
-
-      touched_nodes = builder.nodes.select { |node| File.mtime(node.path) > built_at }
-      touched_phases = touched_nodes.map(&:phase).uniq.compact
-      touched_schema = touched_nodes.first&.schema
-      missing_schema = builder.schemas.find { |schema| !conn.schema.exist?(schema) }
-      build_schema = builder.schemas.find { |schema| [touched_schema, missing_schema].include? schema }
-
-#     puts "touched_nodes : #{touched_nodes.size} nodes"
-#     puts "touched_phases: #{touched_phases.inspect}"
-#     puts "touched_schema: #{touched_schema.inspect}"
-#     puts "missing_schema: #{missing_schema.inspect}"
-#     puts "build_schema  : #{build_schema.inspect}"
-
-#     builder.pool.dump
-
-      if build_schema.nil?
-        puts "#{DATABASE} is up to date"
-        exit
-      end
-
-      if touched_phases.include?(:decl) || touched_phases.empty?
-        schemas = [build_schema] + builder.pool.after_schema(build_schema)
-        schemas.each { |schema| conn.schema.drop(schema, cascade: true) }
-        builder.pool.delete_schema(builder.pool.before_schema(build_schema))
-      elsif touched_phases.include?(:init) || touched_phases.include?(:term)
-        builder.pool.clear(:decl, :seed)
-        create_schema = false
-      elsif touched_phases.include?(:seed)
-        builder.pool.clear(:init, :decl, :term)
-        create_schema = false
-      end
-
-#     builder.pool.dump
-      builder.group
-    end
-
-#   builder.dump
-#   p builder.schemas
-#   exit
-
-    time "Execute build object" do
-      builder.execute(conn, create_schema: create_schema)
-    end
-
-  rescue Prick::Build::Error => ex
-    $stderr.puts ex.message
-    exit 1
-
-  rescue Command::Error => ex
-    $stderr.puts ex.message
-    exit 1
-  end
-end
-
-if PROFILE
-  profile = RubyProf.stop
-# printer = RubyProf::GraphHtmlPrinter.new(profile)
-  printer = RubyProf::CallStackPrinter.new(profile)
-  File.open("t.html", "w") { |file|
-    printer.print(file, :min_percent => 2)
-  }
-end
-

data/lib/subcommand/prick-teardown.rb

@@ -4,7 +4,7 @@ require 'builder/builder.rb'
 
 module Prick::SubCommand
   def self.teardown(database, username)
-    conn = PgConn.new # Superuser connection
+    conn = PgConn.new "postgres" # Superuser connection
     if conn.rdbms.exist? database
       conn.rdbms.drop database
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.20.4
+  version: 0.20.5
 platform: ruby
 authors:
 - Claus Rasmussen