prick 0.11.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2788abf0737d8f89b08f4dcbe8cf026ffb4927a2a155655b28350c53951c2c1f
-  data.tar.gz: a336758b7ff556e11346f7bb0f6da9e949a2d51b7f4f377b24d9e91d0b92af50
+  metadata.gz: 2ace97cb91395a8de26e7b53d840e28592d01c08b0e670d58b4b5b5dc09533fe
+  data.tar.gz: 4795c70d4dcbdb3a9792f6eb1946236485f2923e7a09fb5fb9cf89d585db1639
 SHA512:
-  metadata.gz: e8352c55f6fd37f84c4495f8c1ffe89b5594f936fe74d500e77fe44a7c5fe367c7995dd6824a446c67c36891af892bc277c4c757fe5e6c60a4b07b12e8698809
-  data.tar.gz: 25e407b34434192eb797cb83bd265b6b2b7004341dee7ba7ab8b64582d9730d2a5ea19dacde7eaa9474d2c2f7e96559a0fbdf4d9fb9fc1e07c8ac9fb6a0c55e6
+  metadata.gz: d1bf65cb0a904ac5875a679a0065ab1a55f6c20ec21c229b653e6ca8354a3e962f4ed3154d194054a20564c8e3d27284972dbcfe8c61cec4ddf7a18b71398668
+  data.tar.gz: 3cb98096319ac679df0a70c59680120a781db47657e532c9f75be8d37a13ff62313eae88b2a6704860b47c3d529379cb99404e15a9e3310bbf510ac152d66df5

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

@@ -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
@@ -78,9 +85,15 @@ module Prick
     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"), 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/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.11.0"
+  VERSION = "0.16.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.11.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shellopts