prick 0.8.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98dae1ae969be39dba2d394c5ef973837bddd75b57e95a50984369b9b63b68a9
-  data.tar.gz: 2d346ef2b8b6ea0bde7c6a0442278f9c9a3132a8268555417790f7cd5f45a936
+  metadata.gz: da40d1823b2163a2ce84de52d2a41aa222ae87afc6bb7cbe22e2d5045a162fba
+  data.tar.gz: cee09b71589069b2dbe386afec271ef1677980e0e6d6735462a8c087338e71d9
 SHA512:
-  metadata.gz: fe461c8c031c7279cdd53329b92808a92367939841d30c4e7a995ae2c42e089fbdf0c8e143beef9997512bb94dc0b2c838df83d8990b545a27dec1ab94e0f3ba
-  data.tar.gz: 03cd1324f95be8e3672cc0e1a05e1818c287d62e786a4ac27eebf42d9f71151766d7002f1f19de0c1f44b86568797e80d96e6209103661ba1d4cb8132d959ca8
+  metadata.gz: 1b8f5f478092b60b5745983d911f37e516b24957bcdd978157e97263d97c65857e71b1335dc10a7f38fdd742f27c62f4cd28071e4ff31f53cca4f51e88f55557
+  data.tar.gz: 7a3efb1a894edfa8b5ca82688b4820126f2898f2448a92d84af49e611b9156bfbf20f34e62deb605ca50cb9fbb57691d6e2ceae2d604fbb6bb6dc3166e751213

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}'"
@@ -251,7 +258,7 @@ begin
       program.save(version, file)
 
     when :drop
-      program.drop(args.expect(0..1), opts.drop!.all)
+      program.drop(args.expect(0..1), opts.drop!.all?)
 
     when :diff
       mark = opts.diff!.mark

data/lib/prick/builder.rb

@@ -7,18 +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
+  # '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
   #
-  # If a directory doesn't contain a build resource, the resources in the
-  # directory are built in alphabetic order
+  # Build (but not migration) SQL scripts and executables are executed with
+  # search path set to containing schema
   #
   class Builder
     attr_reader :database
@@ -57,11 +63,11 @@ module Prick
       Dir.chdir(dir) { yield(file) }
     end
 
-    def do_sql(path)
+    def do_sql(path, schema: nil)
 #     puts "do_sql(#{path})"
       do_dir(path) { |file| 
         if @execute
-          Rdbms.exec_file(database.name, file, user: database.user) 
+          Rdbms.exec_file(database.name, file, user: database.user, schema: schema) 
         else
           @lines += IO.readlines(file).map(&:chomp)
         end
@@ -69,12 +75,12 @@ 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)
+          Rdbms.exec_sql(database.name, lines.join("\n"), user: database.user, schema: schema)
         else
           @lines += lines
         end
@@ -159,6 +165,17 @@ module Prick
     end
 
     def self.yml_file(directory) File.join(directory, "build") + ".yml" end
+
+  protected
+    def do_sql(path)
+      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/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)
@@ -162,7 +164,7 @@ module Prick
     end
 
     def prepare_schema(name)
-      raise NotYet
+      project.prepare_schema(name)
     end
 
     def prepare_diff(version = nil)
@@ -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/project.rb

@@ -162,6 +162,16 @@ module Prick
       self
     end
 
+    def prepare_schema(name, commit: true)
+      path = File.join(SCHEMA_DIR, name)
+      FileUtils.mkdir_p(path)
+      Git.add Share.cp("schema/schema.sql", path, clobber: false, templates: { 'SCHEMA' => name })
+      Git.add Share.cp("schema/build.yml", path, clobber: false)
+      File.open(Schema.yml_file, "a") { |f| f.write("- #{name}\n") }
+      Git.add(Schema.yml_file)
+      submit "Added schema #{name}", commit
+    end
+
     def prepare_diff(from_version = version)
       begin
         from_name = "#{name}-base"

data/lib/prick/rdbms.rb

@@ -4,16 +4,15 @@ require 'csv'
 
 module Prick
   module Rdbms
-#   extend Ensure
-
     ### EXECUTE SQL
 
     # Execute the SQL statement and return stdout as an array of tuples
-    def self.exec_sql(db, sql, user: ENV['USER'])
+    def self.exec_sql(db, sql, user: ENV['USER'], schema: nil)
+      schema ||= "public"
       stdout = Command.command %(
         {
           echo "set role #{user};"
-          echo "set search_path to public;"
+          echo "set search_path to #{schema};"
           cat <<'EOF'
           #{sql}
 EOF
@@ -23,8 +22,8 @@ EOF
     end
 
     # Execute the given file and return stdout as an array of tuples
-    def self.exec_file(db, file, user: ENV['USER'])
-      self.exec_sql(db, File.read(file), user: user)
+    def self.exec_file(db, file, user: ENV['USER'], schema: nil)
+      self.exec_sql(db, File.read(file), user: user, schema: schema)
     end
 
     # Execute the SQL statement and return the result as an array of record tuples

data/lib/prick/schema.rb

@@ -9,7 +9,8 @@ module Prick
 
   # Note this models the SCHEMA_DIR directory, not a database schema
   class Schema
-    def yml_file() SchemaBuilder.yml_file(SCHEMA_DIR) end
+    def yml_file() self.class.yml_file end
+    def self.yml_file() SchemaBuilder.yml_file(SCHEMA_DIR) end
 
     def version() SchemaVersion.load end
     def version=(version) SchemaVersion.new(version).write end

data/lib/prick/version.rb

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

data/share/schema/schema.sql

@@ -1,5 +1,3 @@
 
 drop schema if exists [<SCHEMA>] cascade;
 create schema [<SCHEMA>];
-
-set search_path to [<SCHEMA>];

data/share/schema/schema/prick/schema.sql

@@ -1,5 +1,3 @@
 
 drop schema if exists prick cascade;
 create schema prick;
-
-set search_path to prick;

data/share/schema/schema/public/build.yml

@@ -1,7 +1,6 @@
 # Default schema files
 #
 ---
-- schema 
 - roles 
 - types 
 - tables

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-10 00:00:00.000000000 Z
+date: 2021-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shellopts
@@ -133,7 +133,6 @@ files:
 - share/schema/schema/prick/tables.sql
 - share/schema/schema/public/.keep
 - share/schema/schema/public/build.yml
-- share/schema/schema/public/schema.sql
 - test_assorted
 - test_feature
 - test_refactor
@@ -156,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A release control and management system for postgresql

data/share/schema/schema/public/schema.sql

@@ -1,3 +0,0 @@
-set search_path to public;
-
-