prick 0.5.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67c64dcd2eb2d716544b81a7b17f15c8b42af6b863821f411596fac4b6868edd
-  data.tar.gz: 178c2bd8cd8617fb4a10d6e1f76f15a601bb1341a2c64456a5c83ecc9eeff629
+  metadata.gz: 8fa13b0150bd8e2a403643947215116be13d78d33f053e15c766a258574cf79e
+  data.tar.gz: 8b817641aff64c1ad488ce7562ac03a26c8d2144b3bf79999ef0af0ae910d298
 SHA512:
-  metadata.gz: 31fd38814ff54a3b535cabe371f1578abfcd025e749e9a9b1d18cdd454f7c74e5797b9166c4429f1bbda5ece50432bc0ace27d07a97e25591d1bae9648bb4b63
-  data.tar.gz: 8c9bf98db283cb79a11edd4016339c74c84fc02517b9872b476e776ecf21e91ecde490e87689a8ae1a041ecd25836f92d5d145ac6e2452824480a8a9db5c65c5
+  metadata.gz: 5b0896b4d9d38984cee6f3a3d6481ed4b9607c54101a120aaa4344b701ed649fe7ef5ca25bcb1214aa1802700e80e0bee41aa47157039f4f2774825d0af04f44
+  data.tar.gz: e19f8f4b6529bc1463f01fdcb5077ddfd55fe970ac062ef8fbbfd79dd31d1c8f74dcef759222cfdbaf4890158ef6b7993ddeb369d8c0499ead2265f20073769a

data/exe/prick

@@ -4,206 +4,163 @@ require 'prick.rb'
 require 'prick/program.rb'
 
 require 'shellopts'
-require 'indented_io'
 
 require 'tempfile'
 
 include ShellOpts
 include Prick
 
-PROGRAM = File.basename($0)
-
 SPEC = %(
-  n,name=NAME
-  C,directory=DIR
-  h,help
-  v,verbose
-  q,quiet
-  version
-
-  init! u,user=USER
-
-  info!
-  list! 
-  list.releases! m,migrations c,cancelled 
-  list.migrations! 
-  list.upgrades! a,all
-  list.cache!
-
-  build! d,database=DATABASE C,nocache
-  make! d,database=DATABASE C,nocache
-  make.clean! a,all
-  load! d,database=DATABASE
-  save! 
-  drop! a,all
-
-  diff! m,mark t,tables T,notables
-  migrate!
-
-  prepare! prepare.release! prepare.migration! prepare.schema! prepare.diff!
-  include! include.feature!
-  check!
-
-  create! create.release! create.prerelease! create.feature!
-  cancel! cancel.release!
-
-  generate! generate.migration! generate.schema!
-  upgrade!
-  backup!
-  restore!
-)
-
-USAGE = "Usage: #{PROGRAM} -h -v -n NAME -C DIR COMMAND" # FIXME: Why doesn't shellopts include PROGRAM?
-
-HELP = %(
-  NAME
-    prick - Database version management
-
-  USAGE
-    prick -v -n NAME -C DIR -h <command>
-
-  OPTIONS
-    -n, --name=NAME
+  -n,name=NAME
       Name of project. Defauls to the environment variable `PRICK_PROJECT` if
       set and else the name of the current directory
 
-    -C, --directory=DIR
-      Change to directory DIR before anything else
+  -C,directory=DIR
+      Change to directory DIR before doing anything else
 
-    -h, --help
+  -h,help COMMAND...
       Print this page
 
-    -v, --verbose
-      Be verbose
-
-    --version
-      Print prick version
+  +v,verbose
+      Be verbose. Repeated --verbose options increase the verbosity level
 
-  COMMANDS
-    INITIALIZATION
-      init --user=USER [DIR]
-        Initialize a project in the given directory. DIR defaults to the
-        current directory. The USER is the postgres user, it defaults to 
-        the project name
+  -q,quiet
+      Be quiet
 
-    INFO COMMANDS
-      info
+  --version
+      Print prick version
 
-      list releases --migrations --cancelled
-      list migrations
-      list upgrades --all
-        List releases/migrations/upgrades
+  init! -u,user=USER [DIR]
+      Initialize a project in the given directory. DIR defaults to the current
+      directory. The USER is the postgres user, it defaults to the project name
 
-    BUILDING
-      build -d DATABASE -C --nocache [TAG]
-        Build the current database from the content in the schemas/ directory.
-        With a tag the version is built into the associated versioned database.
-        The result is saved to cache unless the -C option is given. The -d option
-        overrides the default database
+  info!
+      Print project information
 
-      make -d DATABASE -C --nocache [TAG]
-        Loads the current database from cache if present and build it
-        otherwise. With a tag, the version is built into the associated
-        versioned database. The -C option ignores the cache and the -d option
-        overrides the default database
+  list.releases! -m,migrations -c,cancelled 
+      List releases. Include migration releases if the --migration option is
+      present and also include cancelled releases if the --cancelled option is
+      present
 
-      make clean -a
-        Drop versioned databases and remove cached and other temporary files.
-        Also drop the project database if the -a option is given
-        
-      load -d DATABASE VERSION|FILE
-        Load the cached version or the file into the associated versioned
-        database. It is an error if the version hasn't been cached. The
-        --database argument overrides the database
+  list.migrations! 
+      List migrations
 
-      save VERSION [FILE]
-        Save the versioned database associated with version to the cache or the
-        given file
+  list.upgrades! [FROM [TO]]
+      List available upgrades
 
-      drop --all [DATABASE]
-        Drop the given database or all versioned databases. The --all option also drops the project
-        database
-  
+  list.cache!
+      List cache files
+
+  build! -d,database=DATABASE -C,no-cache [TAG]
+      Build the current database from the content in the schemas/ directory.
+      With a tag the version is built into the associated versioned database
+      and the result is saved to cache unless the -C option is given. The -d
+      option overrides the default database
+
+  make! -d,database=DATABASE -C,no-cache [TAG]
+      Build the current database from the content in the schemas/ directory.
+      With a tag the associated versioned database is loaded from cache if
+      present. The -C option ignores the cache and the -d option overrides
+      the default database
+
+  make.clean! -a,all
+      Drop versioned databases and remove cached and other temporary files.
+      Also drop the project database if the -a option is given
+
+  load! -d,database=DATABASE VERSION|FILE
+      Load the cached version or the file into the associated versioned
+      database. It is an error if the version hasn't been cached. The --database 
+      argument overrides the database
+
+  save! VERSION [FILE]
+      Save the versioned database associated with version to the cache or the
+      given file
+
+  drop! -a,all [DATABASE]
+      Drop the given database or all versioned databases. The --all option also
+      drops the project database
+
+  diff! -m,mark -t,tables -T,notables
       diff [FROM-DATABASE|FROM-VERSION [TO-DATABASE|TO-VERSION]]
-        Create a schema diff between the given databases or versions. Default
-        to-version is the current schema and default from-version is the base
-        version of this branch/tag
+      Create a schema diff between the given databases or versions. Default
+      to-version is the current schema and default from-version is the base
+      version of this branch/tag
 
-      migrate
-        Not yet implemented
+  migrate!
+      Not yet implemented
 
-    PREPARING RELEASES
-      prepare release [FORK]
-        Populate the current migration directory with migration files
+  prepare! 
+      Prepare a release. Just a shorthand for 'prick prepare release'
 
-      prepare feature NAME
-        Create and populate a feature as a subdirectory of the current
-        directory. Also prepares the current release directory
+  prepare.release! [FORK]
+      Populate the current migration directory with migration files
 
-      prepare migration FROM
-        Create and populate a migration directory
+  prepare.feature! NAME
+      Create and populate a feature as a subdirectory of the current directory.
+      Also prepares the current release directory
 
-      prepare schema NAME
-        Create and populate a new schema directory. Existing files and
-        directories are kept
+  prepare.migration! [FROM]
+      Create and populate a migration directory
 
-      prepare diff [VERSION]
+  prepare.schema! NAME
+      Create and populate a new schema directory. Existing files and
+      directories are kept
+    
+  prepare.diff! [VERSION]
+      Not yet implemented
 
-      include feature FEATURE
-        Include the given feature in the current pre-release
+  include.feature! FEATURE
+      Include the given feature in the current pre-release
 
-      check
-        Check that the current migration applied to the base version yields the
-        same result as loading the current schema
+  check!
+      Check that the current migration applied to the base version yields the
+      same result as loading the current schema
 
-    CREATING RELEASES
-      create release [RELEASE]
-        Prepare a release and create release directory and migration file
-        before tagging and branching to a release branch. The RELEASE argument
-        can be left out if the current branch is a prerelease branch
+  create.release! [RELEASE]
+      Prepare a release and create release directory and migration file before
+      tagging and branching to a release branch. The RELEASE argument can be
+      left out if the current branch is a prerelease branch
 
-      create prerelease RELEASE
-        Prepare a release and create release directory and migration file
-        before branching to a prerelease branch
-        
-      create feature NAME
-        Prepare a feature before branching to a feature branch
+  create.prerelease! RELEASE
+      Prepare a release and create release directory and migration file before
+      branching to a prerelease branch
 
-      cancel release RELEASE
-        Cancel a release. Since tags are immutable, the release is cancelled by
-        added a special cancel-tag to the release that makes prick ignore it
+  create.feature! NAME
+      Prepare a feature before branching to a feature branch
 
-    DEPLOYING RELEASES
-      generate migration
-      generate schema
-        Create a PostgreSQL script to migrate or create the database
+  cancel! 
+      Cancel a release. Just a shorthand for 'prick cancel release'
+  
+  cancel.release!
+      Cancel a release. Since tags are immutable, the release is cancelled by
+      added a special cancel-tag to the release that makes prick ignore it
 
-      upgrade
-        Migrate the database to match the current schema
+  generate.migration! 
+      Create a script to migrate the database
 
-      backup [FILE]
-        Saves a backup of the database to the given file or to the var/spool
-        directory
+  generate.schema!
+      Create a script to create the database
 
-      restore [FILE]
-        Restore the database from the given backup file or from the latest
-        backup in the var/spool directory
+  upgrade!
+      Migrate the database to match the current schema
+
+  backup! [FILE]
+      Saves a backup of the database to the given file or to the var/spool
+      directory
+    
+  restore! [FILE]
+      Restore the database from the given backup file or from the latest backup
+      in the var/spool directory
 )
 
 
-opts, args = ShellOpts.as_struct(SPEC, ARGV)
+
+opts, args = ShellOpts.process(SPEC, ARGV)
 
 # Handle --help
-if opts.help? 
-  begin 
-    file = Tempfile.new("prick") 
-    file.puts HELP.split("\n").map { |l| l.sub(/^  /, "") } 
-    file.flush 
-    system "less #{file.path}" 
-  ensure 
-    file.close 
-  end 
-  exit 
+if opts.help?
+  ShellOpts.help
+  exit
 end 
 
 # Handle --version
@@ -214,7 +171,7 @@ end
 
 begin
   # Honor -C option
-  if opts.directory
+  if opts.directory?
     if File.exist?(opts.directory)
       begin
         Dir.chdir(opts.directory)
@@ -232,8 +189,8 @@ begin
   # Handle init command
   if opts.subcommand == :init
     directory = args.expect(0..1)
-    name = opts.name || directory || File.basename(Dir.getwd)
-    user = opts.init.user || name
+    name = opts.name || (directory && File.basename(directory)) || File.basename(Dir.getwd)
+    user = opts.init!.user || name
     program.init(name, user, directory || ".")
     exit 0
   end
@@ -247,40 +204,59 @@ begin
   # TODO: Check for dirty detached head
 
   # Expect a sub-command
-  opts.subcommand? or raise Prick::Error, "Subcomand expected"
+  opts.subcommand or raise Prick::Error, "Subcomand expected"
 
   case opts.subcommand
     when :info
       args.expect(0)
       program.info
 
+    when :list
+      command = opts.list!
+      case command.subcommand
+        when :releases;
+          obj = command.releases!
+          program.list_releases(migrations: obj.migrations?, cancelled: obj.cancelled?)
+        when :migrations; program.list_migrations
+        when :upgrades; program.list_upgrades(*args.expect(0..2).compact)
+        when :cache; 
+          args.expect(0)
+          program.list_cache
+        when NilClass; raise Prick::Error, "list requires a releases|migrations|upgrades sub-command"
+      else
+        raise Prick::Internal, "Subcommand #{opts.subcommand}.#{command.subcommand} is not matched"
+      end
+
     when :build
       version = args.expect(0..1)
-      program.build(opts.build.database, version, opts.build.nocache)
+      program.build(opts.build!.database, version, opts.build!.no_cache?)
 
     when :make
-      command = opts.make
+      command = opts.make!
       case command.subcommand
         when :clean
           args.expect(0)
-          program.make_clean(command.clean.all)
+          program.make_clean(command.clean!.all?)
         else
           version = args.expect(0..1)
-          program.make(opts.make.database, version, opts.make.nocache)
+          program.make(opts.make!.database, version, opts.make!.no_cache?)
       end
 
     when :load
       version_or_file = args.expect(1)
-      program.load(opts.load.database, version_or_file)
+      program.load(opts.load!.database, version_or_file)
 
     when :save
       version, file = args.expect(1..2)
       program.save(version, file)
 
+    when :drop
+      program.drop(args.expect(0..1), opts.drop!.all?)
+
     when :diff
-      mark = opts.diff.mark
-      tables = opts.diff.tables
-      no_tables = opts.diff.notables
+      mark = opts.diff!.mark
+      tables = opts.diff!.tables
+      no_tables = opts.diff!.notables
       tables.nil? && no_tables.nil? || tables ^ no_tables or
           raise Error, "--tables and --no-tables options are exclusive"
       select = tables ? :tables : (no_tables ? :no_tables : :all)
@@ -290,31 +266,12 @@ begin
     when :migrate
       raise NotYet
 
-    when :drop
-      program.drop(args.expect(0..1), opts.drop.all)
-
-    when :list
-      command = opts.list
-      case command.subcommand
-        when :releases;
-          obj = command.releases
-          program.list_releases(migrations: obj.migrations?, cancelled: obj.cancelled?)
-        when :migrations; program.list_migrations
-        when :upgrades; program.list_upgrades(*args.expect(0..2).compact)
-        when :cache; 
-          args.expect(0)
-          program.list_cache
-        when NilClass; raise Prick::Error, "list requires a releases|migrations|upgrades sub-command"
-      else
-        raise Prick::Internal, "Subcommand #{opts.subcommand}.#{command.subcommand} is not matched"
-      end
-
     when :prepare
-      cmd = opts.prepare.subcommand || :release
+      cmd = opts.prepare!.subcommand || :release
       case cmd
         when :release; program.prepare_release(args.expect(0..1))
-        when :feature; raise NotYet
-        when :migration; program.prepare_migration(args.expect(1))
+        when :feature; program.prepare_feature(args.expect(1))
+        when :migration; program.prepare_migration(args.expect(0..1))
         when :schema; program.prepare_schema(args.expect(1))
         when :diff; program.prepare_diff(args.expect(0..1))
       else
@@ -322,7 +279,7 @@ begin
       end
 
     when :include
-      cmd = opts.include.subcommand || :feature
+      cmd = opts.include!.subcommand || :feature
       case cmd
         when :feature; program.include_feature(args.expect(1))
       else
@@ -334,7 +291,7 @@ begin
       program.check
 
     when :create
-      cmd = opts.create.subcommand || :release
+      cmd = opts.create!.subcommand || :release
       case cmd
         when :release; program.create_release(args.expect(0..1))
         when :prerelease; program.create_prerelease(args.expect(0..1))
@@ -344,20 +301,20 @@ begin
       end
 
     when :cancel
-      cmd = opts.cancel.subcommand
+      cmd = opts.cancel!.subcommand
       case cmd
         when :release; program.cancel_release(args.expect(1))
-        when nil; raise Prick::Error, "'cancel' subcommand require a release argument"
+        when nil; raise Prick::Error, "'cancel' subcommand requires a release argument"
       else
         raise Prick::Internal, "Subcommand #{opts.subcommand}.#{cmd} is not matched"
       end
 
     when :generate
-      cmd = opts.generate.subcommand
+      cmd = opts.generate!.subcommand
       case cmd
         when :schema; program.generate_schema
         when :migration; program.generate_migration
-        when nil; raise Prick::Error, "'genrate' subcommand require a 'schema' or 'migration' argument"
+        when nil; raise Prick::Error, "'generate' subcommand requires a 'schema' or 'migration' argument"
       else
         raise Prick::Internal, "Subcommand #{opts.subcommand}.#{cmd} is not matched"
       end
@@ -381,3 +338,56 @@ rescue Prick::Error => ex
   ShellOpts.error(ex.message)
 end
 
+__END__
+
+# Awaits support for sections in ShellOpts
+HELP = %(
+  OPTIONS
+    -n, --name=NAME
+    -C, --directory=DIR
+    -h, --help
+    -v, --verbose
+    --version
+
+  COMMANDS
+    INITIALIZATION
+      init --user=USER [DIR]
+
+    INFO COMMANDS
+      info
+      list releases --migrations --cancelled
+      list migrations
+      list upgrades --all
+
+    BUILDING
+      build -d DATABASE -C --nocache [TAG]
+      make -d DATABASE -C --nocache [TAG]
+      make clean -a
+      load -d DATABASE VERSION|FILE
+      save VERSION [FILE]
+      drop --all [DATABASE]
+      diff [FROM-DATABASE|FROM-VERSION [TO-DATABASE|TO-VERSION]]
+      migrate
+
+    PREPARING RELEASES
+      prepare release [FORK]
+      prepare feature NAME
+      prepare migration FROM
+      prepare schema NAME
+      prepare diff [VERSION]
+      include feature FEATURE
+      check
+
+    CREATING RELEASES
+      create release [RELEASE]
+      create prerelease RELEASE
+      create feature NAME
+      cancel release RELEASE
+
+    DEPLOYING RELEASES
+      generate migration
+      generate schema
+      upgrade
+      backup [FILE]
+      restore [FILE]
+)

data/lib/prick.rb

@@ -1,4 +1,6 @@
 
+#$LOAD_PATH.unshift("/home/clr/prj/shellopts/lib")
+
 # 'semantic' is required here instead of in prick/version.rb to avoid having Gem depend on it
 require "semantic" 
 
@@ -25,7 +27,5 @@ require "prick/version.rb"
 require "ext/fileutils.rb"
 require "ext/shortest_path.rb"
 
-require "indented_io"
-
 module Prick
 end

data/lib/prick/builder.rb

@@ -20,6 +20,8 @@ module Prick
   # 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
+  #
   class Builder
     attr_reader :database
     attr_reader :directory
@@ -57,11 +59,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
@@ -159,6 +161,12 @@ 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
   end
 end
 

data/lib/prick/database.rb

@@ -1,6 +1,4 @@
 
-#require "prick/ensure.rb"
-
 module Prick
   class Database
     attr_reader :name

data/lib/prick/program.rb

@@ -25,7 +25,7 @@ module Prick
     def init(name, user, directory)
       !Project.exist?(directory) or raise Error, "Directory #{directory} is already initialized"
       Project.create(name, user, directory)
-      if name != File.basename(directory)
+      if name != directory
         mesg "Initialized project #{name} in #{directory}"
       else
         mesg "Initialized project #{name}"
@@ -46,12 +46,23 @@ module Prick
       puts "  Schema version  : #{sv}" + (sv != bv ? " (mismatch)" : "")
     end
 
+    def list_releases(migrations: false, cancelled: false)
+      raise NotYet
+    end
+
+    def list_migrations
+      raise NotYet
+    end
+
+    def list_upgrades(from = nil, to = nil)
+      raise NotYet
+    end
+
     def list_cache
       project.cache.list.each { |l| puts l }
     end
 
     def build(database, version, nocache)
-      check_owned(database) if database
       into_mesg = database && "into #{database}"
       version_mesg = version ? "v#{version}" : "current schema"
       version &&= Version.new(version)
@@ -63,7 +74,6 @@ module Prick
     end
 
     def make(database, version, nocache)
-      check_owned(database) if database
       version &&= Version.new(version)
       version.nil? || Git.tag?(version) or raise Error, "Can't find tag v#{version}"
       if !nocache && version && project.cache.exist?(version)
@@ -74,7 +84,7 @@ module Prick
     end
 
     def make_clean(all)
-      project.cache.clean.each { |file| puts "Removed cache file #{File.basename(file)}" }
+      project.cache.clean.each { |file| mesg "Removed cache file #{File.basename(file)}" }
       drop(nil, all)
     end
 
@@ -135,10 +145,26 @@ module Prick
       end
     end
 
+    def migrate
+      raise NotYet
+    end
+
     def prepare_release(fork)
       project.prepare_release(fork)
     end
 
+    def prepare_feature(name)
+      raise NotYet
+    end
+
+    def prepare_migration(from = nil)
+      raise NotYet
+    end
+
+    def prepare_schema(name)
+      project.prepare_schema(name)
+    end
+
     def prepare_diff(version = nil)
       # Helpful check to ensure the user has built the current version
 #     Diff.same?(to_db, database) or 
@@ -153,6 +179,20 @@ module Prick
       end
     end
 
+    def include(name)
+      raise NotYet
+    end
+
+    def check
+      version ||= 
+          if project.prerelease? || project.migration?
+            project.branch.base_version
+          else
+            project.branch.version
+          end
+      project.check_migration(version)
+    end
+
     def create_release(version = nil)
       if project.prerelease_branch?
         raise NotYet
@@ -164,6 +204,18 @@ module Prick
       mesg "Created release v#{project.head.version}"
     end
 
+    def create_prerelease(version = nil)
+      raise NotYet
+    end
+
+    def create_feature(name)
+      raise NotYet
+    end 
+
+    def cancel(version)
+      raise NotYet
+    end
+
     def generate_schema
       project.generate_schema
     end
@@ -172,6 +224,10 @@ module Prick
       project.generate_migration
     end
 
+    def upgrade
+      raise NotYet
+    end
+
     # 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")

data/lib/prick/project.rb

@@ -98,8 +98,6 @@ module Prick
       Project.new(state.name, state.user, branch)
     end
 
-#   def checkout(branch_or_tag) end
-
     def build(database = self.database, version: nil)
       database.clean
       if version
@@ -118,17 +116,6 @@ module Prick
       self
     end
 
-#   def make(database = self.database, version: nil)
-#     database.clean
-#     if cache.exist?(version)
-#       load(database, version: version)
-#     else
-#       build(database, version: version)
-#       cache.save(database, version) if version
-#     end
-#     self
-#   end
-
     def load(database = self.database, version: nil, file: nil)
       version.nil? ^ file.nil? or raise Internal, "Need exactly one of :file and :version to be defined"
       database.clean
@@ -175,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

@@ -1,30 +1,29 @@
 require 'prick/command.rb'
-#require 'prick/ensure.rb'
 
 require 'csv'
 
 module Prick
   module Rdbms
-#   extend Ensure
-
     ### EXECUTE SQL
 
-    # Execute the SQL statement and return stdout as an array of tuples. FIXME:
-    # SQL can't contain '"'
-    def self.exec_sql(db, sql, user: ENV['USER'])
+    # Execute the SQL statement and return stdout as an array of tuples
+    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 "#{sql}"
+          echo "set search_path to #{schema};"
+          cat <<'EOF'
+          #{sql}
+EOF
         } | psql --csv --tuples-only --quiet -v ON_ERROR_STOP=1 -d #{db}
       )
       CSV.new(stdout.join("\n")).read
     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
@@ -132,16 +131,6 @@ module Prick
       data_opt = (data ? "" : "--schema-only")
       Command.command "pg_dump --no-owner #{data_opt} #{db} | gzip --to-stdout >#{file}"
     end
-
-  private
-    @ensure_states = {
-      exist_user: [:create_user, :drop_user],
-      exist_database: [
-        lambda { |this, db, user| this.ensure_state(:exist_user, user) },
-        lambda { |this, db, user| this.create_database(db, owner: user) },
-        :drop_database
-      ]
-    }
   end
 end
 

data/lib/prick/schema.rb

@@ -7,9 +7,10 @@ module Prick
   BUILD_SQL_FILE = BUILD_BASE_NAME + ".sql"
   BUILD_YML_FILE = BUILD_BASE_NAME + ".yml"
 
-  # Note this models the SCHEMAS_DIR directory, not a database schema
+  # 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.5.0"
+  VERSION = "0.10.0"
 end
 
 # Project related code starts here

data/prick.gemspec

@@ -1,4 +1,6 @@
 
+#$LOAD_PATH.unshift("/home/clr/prj/shellopts/lib")
+
 #lib = File.expand_path("../lib", __FILE__)
 #$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 #require "prick/version"
@@ -29,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
 # spec.add_dependency "pg"
-  spec.add_dependency "shellopts", "2.0.0.pre.11"
+  spec.add_dependency "shellopts", "2.0.0.pre.14"
   spec.add_dependency "semantic"
   spec.add_dependency "indented_io"
 end

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.5.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-27 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shellopts
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.11
+        version: 2.0.0.pre.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.11
+        version: 2.0.0.pre.14
 - !ruby/object:Gem::Dependency
   name: semantic
   requirement: !ruby/object:Gem::Requirement
@@ -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.2
+rubygems_version: 3.1.4
 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;
-
-