prick 0.13.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da40d1823b2163a2ce84de52d2a41aa222ae87afc6bb7cbe22e2d5045a162fba
-  data.tar.gz: cee09b71589069b2dbe386afec271ef1677980e0e6d6735462a8c087338e71d9
+  metadata.gz: 70b51ae69f1d1cb0c2c27666273b0564d78f950de870104865203362258d40a2
+  data.tar.gz: e3b46dbc411282c05977940551246a8bfff7689889648ac7e481974c67ef326f
 SHA512:
-  metadata.gz: 1b8f5f478092b60b5745983d911f37e516b24957bcdd978157e97263d97c65857e71b1335dc10a7f38fdd742f27c62f4cd28071e4ff31f53cca4f51e88f55557
-  data.tar.gz: 7a3efb1a894edfa8b5ca82688b4820126f2898f2448a92d84af49e611b9156bfbf20f34e62deb605ca50cb9fbb57691d6e2ceae2d604fbb6bb6dc3166e751213
+  metadata.gz: 0431efaa5b92fe0497f642bb5bd4f115f533417122c9f7f71d6de17aa7c65128d79c4a74cfe82ac8fa18b88d9b3aff6905744a3129f62b63f865c64d0e63292f
+  data.tar.gz: 8e01993d41040f3d4db9f10d4aa461b420b81a5116836ba1cbb0cb298b75b2e9beaeb61ce3982ed21496ee459ab76e3f28ddf98c6f40fa17ad28c5f49ffcc97e

data/TODO

@@ -1,4 +1,7 @@
 
+o Add a top-level 'global' directory for stuff that doesn't belong to a schema or that 
+  require superuser privileges. prick-build should then execute the content of that
+  directory first before switching to the database user
 o Check for commits to tags
 o Accumulate version history in prick.versions instead of just having the newest
 o Using rc's in migration syntax: fork-version-fork-version.rc1 ?

data/exe/prick

@@ -198,7 +198,7 @@ begin
   # Change to parent directory containing the Prick version file if not found
   # in the current directory
   program.current_directory = Dir.getwd
-  while !Dir.getwd != "/" && !File.exist?(PRICK_VERSION_FILE)
+  while Dir.getwd != "/" && !File.exist?(PRICK_VERSION_FILE)
     Dir.chdir("..")
   end
 

data/lib/prick/builder.rb

@@ -19,7 +19,7 @@ module Prick
   # When a resource match a directory, the directory can contain a special
   # default resource ('build' or 'migrate') that takes over the rest of the
   # build process for that directory.  Typically, you'll use the 'build.yml' or
-  # 'migrate.yml' to control the build order of the other resources If a
+  # 'migrate.yml' to control the build order of the other resources. If a
   # directory doesn't contain a build resource, the resources in the directory
   # are built in alphabetic order
   #
@@ -38,6 +38,7 @@ module Prick
       @default = default
       @execute = true
       @lines = []
+      @cwd = Dir.getwd # used in error messages
     end
 
     def build(subject = default, execute: true)
@@ -67,7 +68,13 @@ module Prick
 #     puts "do_sql(#{path})"
       do_dir(path) { |file| 
         if @execute
-          Rdbms.exec_file(database.name, file, user: database.user, schema: schema) 
+          begin
+            Rdbms.exec_file(database.name, file, user: database.user, schema: schema)
+          rescue Command::Error => ex
+            $stderr.puts ex.stderr
+            $stderr.puts "in #{reldir}/#{file}"
+            exit 1
+          end  
         else
           @lines += IO.readlines(file).map(&:chomp)
         end
@@ -80,7 +87,13 @@ module Prick
       do_dir(path) { |file| 
         lines = Command.command "./#{file} #{database.name} #{database.user}" # FIXME Security
         if @execute
-          Rdbms.exec_sql(database.name, lines.join("\n"), user: database.user, schema: schema)
+          begin
+            Rdbms.exec_sql(database.name, lines.join("\n"), user: database.user, schema: schema)
+          rescue Command::Error => ex
+            $stderr.puts ex.stderr
+            $stderr.puts "from #{reldir}/#{file}"
+            exit 1
+          end
         else
           @lines += lines
         end
@@ -130,6 +143,14 @@ module Prick
         end
       }
     end
+
+  private
+    # Return the relative path to the current directory from the directory of
+    # the time of the instantiation of the Builder object. Used in error
+    # messages
+    def reldir
+      Dir.getwd.sub(/^#{@cwd}\//, "")
+    end
   end
 
   class MigrationBuilder < Builder

data/lib/prick/command.rb

@@ -55,7 +55,7 @@ module Command
     @status = Process.waitpid2(pid)[1].exitstatus
 
     out = pr[0].readlines.collect { |line| line.chop }
-    err = pe[0].readlines.collect { |line| line.chop }
+    err = pe[0].readlines.collect { |line| line.chop }.grep_v(/^NOTICE:/)
 
     pw[1].close
     pr[0].close

data/lib/prick/database.rb

@@ -59,7 +59,23 @@ module Prick
       @version = nil 
     end
 
-    def clean() recreate end # TODO: Find solution that doesn't involve dropping the database
+    # Hollow-out a database without dropping it. This is useful compared to a
+    # simple drop database since it wont block on other sessions wont block
+    def clean() 
+      if exist?
+        schemas = Rdbms.select_values(
+                      "postgres", 
+                      "select nspname from pg_namespace where nspowner != 10")
+        for schema in schemas
+          Rdbms.exec_sql(name, "drop schema \"#{schema}\" cascade")
+        end
+        Rdbms.exec_sql(name, "drop schema if exists public cascade")
+        Rdbms.exec_sql(name, "create schema public authorization postgres")
+        Rdbms.exec_sql(name, "grant usage, create on schema public to public")
+      else
+        create
+      end
+    end
 
     def to_s() name end
   end

data/lib/prick/version.rb

@@ -4,7 +4,7 @@
 
 # Required by gem
 module Prick
-  VERSION = "0.13.0"
+  VERSION = "0.17.0"
 end
 
 # Project related code starts here

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shellopts
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A release control and management system for postgresql