prick 0.10.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fa13b0150bd8e2a403643947215116be13d78d33f053e15c766a258574cf79e
-  data.tar.gz: 8b817641aff64c1ad488ce7562ac03a26c8d2144b3bf79999ef0af0ae910d298
+  metadata.gz: 65c56eb6650acf4a9a15acc00589075fe551548f06df7f714db56b89fc8f0f7d
+  data.tar.gz: 585b320426243c5a3a82df87a924e89e03807c47b618a44350a8c7e646112f34
 SHA512:
-  metadata.gz: 5b0896b4d9d38984cee6f3a3d6481ed4b9607c54101a120aaa4344b701ed649fe7ef5ca25bcb1214aa1802700e80e0bee41aa47157039f4f2774825d0af04f44
-  data.tar.gz: e19f8f4b6529bc1463f01fdcb5077ddfd55fe970ac062ef8fbbfd79dd31d1c8f74dcef759222cfdbaf4890158ef6b7993ddeb369d8c0499ead2265f20073769a
+  metadata.gz: 72f83cb2412de38665afac3c6b3e7bd293d17ad35c64910bec6ef6db5080922d5d6771b044b76dcc52539da60327843861f681f979f3e04739a3cb04f804f8e1
+  data.tar.gz: c5460d78662709f1c5cb8bc5badd3243230cd41ff800b3d8fb9eee3d3e49cd314f51548dab060f0435d5c1aa58c3dbdfb22c490acc96b8e4dc101659675af027

data/exe/prick

@@ -195,6 +195,13 @@ begin
     exit 0
   end
 
+  # 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)
+    Dir.chdir("..")
+  end
+
   # Check prick version
   file = PrickVersion.new
   file.exist? or raise Prick::Error, "Can't find prick version file '#{file.path}'"

data/lib/prick/builder.rb

@@ -7,20 +7,24 @@ module Prick
   # and is used to match a build file. Build files are looked up in the
   # following order:
   #
-  #   #{name}, #{name}.* executable
+  #   #{name} executable
+  #   #{name}.* executable
   #   #{name}.yml
   #   #{name}.sql
   #   #{name}/
   #
+  # The output from executable objects is expected to be SQL statements that
+  # are fed into postgres
+  #
   # 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 directory doesn't contain a build resource, the resources in the
-  # directory are built in alphabetic order
+  # '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
   #
-  # Build SQL scripts are executed with search path set to containing schema
+  # Build (but not migration) SQL scripts and executables are executed with
+  # search path set to containing schema
   #
   class Builder
     attr_reader :database
@@ -34,6 +38,7 @@ module Prick
       @default = default
       @execute = true
       @lines = []
+      @cwd = Dir.getwd # used in error messages
     end
 
     def build(subject = default, execute: true)
@@ -63,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
@@ -71,12 +82,18 @@ module Prick
       true
     end
 
-    def do_exe(path)
+    def do_exe(path, schema: nil)
 #     puts "do_exe(#{path})"
       do_dir(path) { |file| 
-        lines = Command.command "#{file} #{database.name} #{database.user}" # FIXME Security
+        lines = Command.command "./#{file} #{database.name} #{database.user}" # FIXME Security
         if @execute
-          Rdbms.exec_sql(database.name, lines.join("\n"), database.user)
+          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
@@ -126,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
@@ -167,6 +192,11 @@ module Prick
       schema = Dir.getwd.sub(/^.*schema\/([^\/]+)(?:\/.*)?$/, '\1')
       super(path, schema: schema)
     end
+
+    def do_exe(path)
+      schema = Dir.getwd.sub(/^.*schema\/([^\/]+)(?:\/.*)?$/, '\1')
+      super(path, schema: schema)
+    end
   end
 end
 

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/program.rb

@@ -10,8 +10,10 @@ module Prick
 
     attr_accessor :quiet
     attr_accessor :verbose
+    attr_accessor :current_directory # Path to the directory where prick was called from
 
-    def initialize(quiet: false, verbose: false)
+    def initialize(current_directory = Dir.getwd, quiet: false, verbose: false)
+      @current_directory = current_directory
       @quiet = quiet
       @verbose = verbose
     end
@@ -95,8 +97,9 @@ module Prick
         database = database ? Database.new(database, project.user) : project.database(version)
         project.load(database, version: version)
         mesg "Loaded v#{version}", into_mesg, "from cache"
-      else file = file_or_version
-        project.load(database, file: file)
+      else 
+        file = file_or_version
+        project.load(database, file: norm_path(file))
         mesg "Loaded #{File.basename(file)}", into_mesg
       end
     end
@@ -104,9 +107,8 @@ module Prick
     def save(version, file)
       database = project.database(version)
       database.exist? or raise "Can't find database '#{database}'"
-      subj_mesg = file ? file : "cache"
-      project.save(database, file: file)
-      mesg "Saved #{database} to #{subj_mesg}"
+      project.save(database, file: norm_path(file))
+      mesg "Saved #{database} to #{file || 'cache'}"
     end
 
     def drop(database, all)
@@ -230,15 +232,16 @@ module Prick
 
     # TODO: Create a Backup class and a Project#backup_store object
     def backup(file = nil) 
-      file = file || File.join(SPOOL_DIR, "#{project.name}-#{Time.now.utc.strftime("%Y%m%d-%H%M%S")}.sql.gz")
-      project.save(file: file) 
+      path = norm_path(file) || 
+          File.join(SPOOL_DIR, "#{project.name}-#{Time.now.utc.strftime("%Y%m%d-%H%M%S")}.sql.gz")
+      project.save(file: path) 
       mesg "Backed-up database to #{file}"
     end
 
-    def restore(file_arg = nil)
-      file = file_arg || Dir.glob(File.join(SPOOL_DIR, "#{name}-*.sql.gz")).sort.last
-      File.exist?(file) or raise Error, "Can't find #{file_arg || "any backup file"}"
-      project.load(file: file)
+    def restore(file = nil)
+      path =  norm_path(file) || Dir.glob(File.join(SPOOL_DIR, "#{name}-*.sql.gz")).sort.last
+      File.exist?(path) or raise Error, "Can't find #{file || "any backup file"}"
+      project.load(file: path)
       mesg "Restored database from #{file}"
     end
 
@@ -249,6 +252,16 @@ module Prick
       project_name == project.name or raise Error, "Database not owned by this prick project: #{database}"
     end
 
+    # Expand relative path with respect to the directory where prick was called
+    # from. Return nil if file is nil
+    def norm_path(file)
+      if file && !file.start_with?("/")
+        File.join(current_directory, file)
+      else
+        file
+      end
+    end
+
     def mesg(*args) puts args.compact.grep(/\S/).join(' ') if !quiet end
     def verb(*args) puts args.compact.grep(/\S/).join(' ') if verbose end
   end

data/lib/prick/version.rb

@@ -4,7 +4,7 @@
 
 # Required by gem
 module Prick
-  VERSION = "0.10.0"
+  VERSION = "0.15.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.10.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shellopts