prick 0.18.0 → 0.20.2

data/lib/subcommand/prick-make.rb

@@ -0,0 +1,202 @@
+#!/usr/bin/env ruby
+
+require 'builder/builder.rb'
+
+module Prick::SubCommand
+  def self.make(database, username, schema, timer: nil, dump: nil)
+    Timer.on! if timer
+    time "Prick::Command#build" do
+      begin
+        super_conn = PgConn.new
+        conn = nil
+        builder = nil
+        built_at = EPOCH
+        clean = false
+        create_schemas = []
+
+        time "Load build object" do
+          if super_conn.rdbms.exist? database
+            conn = PgConn.new(database, username)
+            if conn.schema.exist_table? "prick", "versions"
+              built_at = conn.value("select built_at from prick.versions")
+            end
+          else
+            super_conn.rdbms.create database, owner: username
+            conn = PgConn.new(database, username)
+            clean = true
+          end
+
+          builder = Prick::Build::Builder.new(conn, "schema", clean)
+
+          if schema
+            builder.pool.after_schema(schema).each { |schema|
+              conn.schema.drop(schema, cascade: true)
+              builder.pool.delete_schema(schema)
+            }
+          end
+
+          touched_nodes = builder.nodes.select { |node| File.mtime(node.path) > built_at }
+          touched_phases = touched_nodes.map(&:phase).uniq.compact
+          touched_kinds = touched_nodes.map(&:kind).uniq.compact
+          touched_schema = touched_nodes.first&.schema
+          missing_schema = builder.schemas.find { |schema| !conn.schema.exist?(schema) }
+          build_schema = builder.schemas.find { |schema| [touched_schema, missing_schema].include? schema }
+
+          if build_schema.nil?
+            puts "#{database} is up to date"
+            exit
+          end
+
+          if touched_phases.include?(:decl) || touched_phases.empty?
+            create_schemas = [build_schema] + builder.pool.after_schema(build_schema)
+            create_schemas.each { |schema| conn.schema.drop(schema, cascade: true) }
+            builder.pool.delete_schema(builder.pool.before_schema(build_schema), exclude: [:seed])
+          elsif touched_phases.include?(:init) || touched_phases.include?(:term)
+            builder.pool.clear(:decl, :seed)
+          elsif touched_phases.include?(:seed)
+            builder.pool.clear(:init, :decl, :term)
+          end
+
+          builder.group
+        end
+
+        case dump
+          when :nodes; builder.nodes.reject { |node| node.is_a?(Build::BuildNode) }.map &:dump
+          when :allnodes; builder.nodes.map &:dump
+          when :batches; builder.dump
+          when nil;
+        else
+          raise Prick::Error, "Illegal dump type: #{dump.inspect}"
+        end
+        exit if dump
+
+        time "Execute build object" do
+          builder.execute(conn, create_schemas: create_schemas)
+        end
+
+      rescue Prick::Build::Error => ex
+        $stderr.puts ex.message
+        exit 1
+
+      rescue Command::Error => ex
+        $stderr.puts ex.message
+        exit 1
+
+      end
+    end
+  end
+end
+
+__END__
+require 'prick_build.rb'
+
+require 'pg_conn'
+
+require 'ruby-prof'
+
+DATABASE = "mikras"
+USERNAME = "mikras"
+
+#PROFILE = true
+PROFILE = false
+TIME = true
+#TIME = false
+
+EPOCH = Time.at(0).utc
+
+schema = ARGV.first
+
+time "Program" do
+  RubyProf.start if PROFILE
+  begin
+    conn = nil
+    builder = nil
+    built_at = EPOCH
+    clean = false
+    create_schema = true
+
+    time "Load build object" do
+      PgConn.new { |super_conn|
+        if super_conn.rdbms.exist? DATABASE
+          conn = PgConn.new(DATABASE)
+          if conn.schema.exist_table? "prick", "versions"
+            built_at = conn.value("select built_at from prick.versions")
+          end
+        else
+          super_conn.rdbms.create DATABASE, owner: USERNAME
+          conn = PgConn.new(DATABASE)
+          clean = true
+        end
+      }
+
+      builder = Prick::Build::Builder.new(conn, "schema", clean)
+
+      if schema
+        builder.pool.after_schema(schema).each { |schema|
+          conn.schema.drop(schema, cascade: true)
+          builder.pool.delete_schema(schema)
+        }
+      end
+
+      touched_nodes = builder.nodes.select { |node| File.mtime(node.path) > built_at }
+      touched_phases = touched_nodes.map(&:phase).uniq.compact
+      touched_schema = touched_nodes.first&.schema
+      missing_schema = builder.schemas.find { |schema| !conn.schema.exist?(schema) }
+      build_schema = builder.schemas.find { |schema| [touched_schema, missing_schema].include? schema }
+
+#     puts "touched_nodes : #{touched_nodes.size} nodes"
+#     puts "touched_phases: #{touched_phases.inspect}"
+#     puts "touched_schema: #{touched_schema.inspect}"
+#     puts "missing_schema: #{missing_schema.inspect}"
+#     puts "build_schema  : #{build_schema.inspect}"
+
+#     builder.pool.dump
+
+      if build_schema.nil?
+        puts "#{DATABASE} is up to date"
+        exit
+      end
+
+      if touched_phases.include?(:decl) || touched_phases.empty?
+        schemas = [build_schema] + builder.pool.after_schema(build_schema)
+        schemas.each { |schema| conn.schema.drop(schema, cascade: true) }
+        builder.pool.delete_schema(builder.pool.before_schema(build_schema))
+      elsif touched_phases.include?(:init) || touched_phases.include?(:term)
+        builder.pool.clear(:decl, :seed)
+        create_schema = false
+      elsif touched_phases.include?(:seed)
+        builder.pool.clear(:init, :decl, :term)
+        create_schema = false
+      end
+
+#     builder.pool.dump
+      builder.group
+    end
+
+#   builder.dump
+#   p builder.schemas
+#   exit
+
+    time "Execute build object" do
+      builder.execute(conn, create_schema: create_schema)
+    end
+
+  rescue Prick::Build::Error => ex
+    $stderr.puts ex.message
+    exit 1
+
+  rescue Command::Error => ex
+    $stderr.puts ex.message
+    exit 1
+  end
+end
+
+if PROFILE
+  profile = RubyProf.stop
+# printer = RubyProf::GraphHtmlPrinter.new(profile)
+  printer = RubyProf::CallStackPrinter.new(profile)
+  File.open("t.html", "w") { |file|
+    printer.print(file, :min_percent => 2)
+  }
+end
+

data/lib/subcommand/prick-migrate.rb

@@ -0,0 +1,37 @@
+
+module Prick
+  module SubCommand
+#   def self.migrate(database, username, file) TODO
+    def self.migrate(database, username, file: nil)
+      PgConn.new(database, username) { |conn|
+        conn.schema.exist_relation? "prick", "versions" or 
+            raise Prick::Fail, "Can't read version from database"
+
+        from_version = PrickVersion.new(conn.value "select version from prick.versions") or
+            raise Prick::Fail, "Illegal version in table prick.versions"
+
+        if file
+          conn.transaction {
+            conn.exec File.read(file)
+          }
+        else
+          to_version = Prick.state.version
+          from_version != to_version or raise Prick::Fail, "Already up to date"
+          from_version < to_version or raise Prick::Fail, "Can't migrate backwards"
+
+          migration_dir = "#{MIGRATION_DIR}/#{from_version}" 
+          File.directory? migration_dir or 
+              raise Prick::Fail, "Can't migrate from #{from_version} to #{to_version}"
+
+          puts "Migrating from #{from_version} to #{to_version}"
+
+          builder = Prick::Build::Builder.new(conn, migration_dir)
+          conn.transaction {
+            builder.execute conn
+            conn.exec File.read(SCHEMA_VERSION_PATH)
+          }
+        end
+      }
+    end
+  end
+end

data/lib/subcommand/prick-release.rb

@@ -0,0 +1,23 @@
+
+module Prick
+  module SubCommand
+    def self.release(kind)
+      constrain kind, :major, :minor, :patch
+
+      Git.clean? or raise "Won't release: Repository is dirty"
+      Git.synchronized? or raise "Won't release: Repository is not synchronized with origin"
+
+      version = Prick.state.version.increment!(kind).to_s
+      Prick.state.save
+
+      Git.add(Prick.state.file)
+      Git.add(Prick.state.schema_file)
+      Git.commit "Release #{version}"
+      Git.tag.create "v#{version}"
+      Git.branch.create version
+      Git.push
+
+      puts version
+    end
+  end
+end

data/lib/subcommand/prick-setup.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require 'builder/builder.rb'
+
+module Prick::SubCommand
+  def self.setup(database, username)
+    conn = PgConn.new
+    if !conn.role.exist? username
+      # FIXME Should not be created as superuser but we can't do that before we
+      # have a super: option in build
+      conn.role.create username, superuser: true, can_login: true, create_role: true
+    end
+    if !conn.rdbms.exist? database
+      conn.rdbms.create database, owner: username
+    end
+    builder = Prick::Build::Builder.new(conn, "schema")
+    # TODO Run builder setup scrips
+  end
+end
+

data/lib/subcommand/prick-teardown.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+require 'builder/builder.rb'
+
+module Prick::SubCommand
+  def self.teardown(database, username)
+    conn = PgConn.new # Superuser connection
+    if conn.rdbms.exist? database
+      conn.rdbms.drop database
+    end
+    if conn.role.exist? username
+      conn.role.drop username, cascade: true
+    end
+    builder = Prick::Build::Builder.new(conn, "schema")
+    # TODO Run builder teardown scrips
+  end
+end
+

data/prick.gemspec

@@ -1,10 +1,6 @@
+# frozen_string_literal: true
 
-#$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"
-require_relative 'lib/prick/version'
+require_relative "lib/prick/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "prick"
@@ -15,23 +11,54 @@ Gem::Specification.new do |spec|
   spec.summary       = "A release control and management system for postgresql"
   spec.description   = "A release control and management system for postgresql"
   spec.homepage      = "http://www.nowhere.com/"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.1")
-
-# spec.metadata["homepage_uri"] = spec.homepage
-# spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
-# spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
+# spec.required_ruby_version = "~> 2.7.1"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features|old)/|\.(?:git|travis|circleci)|appveyor)})
+    end
   end
   spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-# spec.add_dependency "pg"
-  spec.add_dependency "shellopts", "2.0.0.pre.14"
+  # Uncomment to register a new dependency of your gem
+  # spec.add_dependency "example-gem", "~> 1.0"
+
+  # For more information and examples about making a new gem, checkout our
+  # guide at: https://bundler.io/guides/creating_gem.html
+
+  # Add your production dependencies here
+  # spec.add_dependency GEM [, VERSION]
   spec.add_dependency "semantic"
+
   spec.add_dependency "indented_io"
+  spec.add_dependency "constrain"
+  spec.add_dependency "forward_to"
+  spec.add_dependency "bootsnap"
+
+  # Add your development dependencies here
+  # spec.add_development_dependency GEM [, VERSION]
+  spec.add_development_dependency "ruby-prof"
+
+  # Remove when fox goes a gem
+  spec.add_dependency "pg"
+  spec.add_dependency "dry-inflector"
+  spec.add_dependency "boolean"
+  spec.add_dependency "developer_exceptions"
+  spec.add_dependency "shellopts", "~> 2.0.23"
+
+  # In development mode override load paths for gems whose source are located
+  # as siblings of this project directory
+  if File.directory?("#{__dir__}/.git")
+    local_projects = Dir["../*"].select { |path|
+      File.directory?(path) && File.exist?("#{path}/Gemfile")
+    }.map { |relpath| "#{File.absolute_path(relpath)}/lib" }
+    $LOAD_PATH.unshift *local_projects
+  end
+
+  # Also un-comment in spec/spec_helper to use simplecov
+  # spec.add_development_dependency "simplecov"
 end

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.20.2
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2022-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: shellopts
+  name: semantic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.14
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.14
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: semantic
+  name: indented_io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,77 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: indented_io
+  name: constrain
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: forward_to
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bootsnap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -52,6 +122,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: boolean
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: developer_exceptions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shellopts
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.23
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.23
 description: A release control and management system for postgresql
 email:
 - claus.l.rasmussen@gmail.com
@@ -60,83 +172,60 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
 - ".rspec"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
 - TODO
 - bin/console
 - bin/setup
-- doc/create_release.txt
-- doc/flow.txt
-- doc/migra
-- doc/migrations.txt
-- doc/notes.txt
-- doc/prick.txt
-- doc/sh.prick
+- doc/build-yml.txt
 - exe/prick
-- lib/ext/algorithm.rb
-- lib/ext/fileutils.rb
-- lib/ext/forward_method.rb
-- lib/ext/pg.rb
-- lib/ext/shortest_path.rb
+- lib/builder/batch.rb
+- lib/builder/builder.rb
+- lib/builder/node.rb
+- lib/builder/node_pool.rb
+- lib/builder/parser.rb
+- lib/local/command.rb
+- lib/local/git.rb
+- lib/local/timer.rb
 - lib/prick.rb
-- lib/prick/archive.rb
-- lib/prick/branch.rb
-- lib/prick/builder.rb
-- lib/prick/cache.rb
-- lib/prick/command.rb
 - lib/prick/constants.rb
-- lib/prick/database.rb
 - lib/prick/diff.rb
-- lib/prick/dsort.rb
-- lib/prick/ensure.rb
-- lib/prick/exceptions.rb
-- lib/prick/git.rb
-- lib/prick/head.rb
-- lib/prick/migration.rb
-- lib/prick/program.rb
-- lib/prick/project.rb
-- lib/prick/rdbms.rb
-- lib/prick/schema.rb
-- lib/prick/share.rb
+- lib/prick/prick_version.rb
 - lib/prick/state.rb
 - lib/prick/version.rb
-- libexec/strip-comments
-- make_releases
-- make_schema
+- lib/share/init/.gitignore
+- lib/share/init/.prick-context
+- lib/share/init/.rspec
+- lib/share/init/migration/.keep
+- lib/share/init/prick.yml
+- lib/share/init/schema/.keep
+- lib/share/init/schema/build.yml
+- lib/share/init/schema/prick/.keep
+- lib/share/init/schema/prick/build.yml
+- lib/share/init/schema/prick/data.sql
+- lib/share/init/schema/prick/tables.sql
+- lib/share/init/schema/public/.keep
+- lib/share/init/spec/prick_helper.rb
+- lib/share/init/spec/prick_spec.rb
+- lib/share/init/spec/spec_helper.rb
+- lib/share/migrate/migration/build.yml
+- lib/share/migrate/migration/diff.after-tables.sql
+- lib/share/migrate/migration/diff.before-tables.sql
+- lib/share/migrate/migration/diff.tables.sql
+- lib/subcommand/prick-build.rb
+- lib/subcommand/prick-create.rb
+- lib/subcommand/prick-drop.rb
+- lib/subcommand/prick-fox.rb
+- lib/subcommand/prick-init.rb
+- lib/subcommand/prick-make.rb
+- lib/subcommand/prick-migrate.rb
+- lib/subcommand/prick-release.rb
+- lib/subcommand/prick-setup.rb
+- lib/subcommand/prick-teardown.rb
 - prick.gemspec
-- share/diff/diff.after-tables.sql
-- share/diff/diff.before-tables.sql
-- share/diff/diff.tables.sql
-- share/features/diff.sql
-- share/features/feature/diff.sql
-- share/features/feature/migrate.sql
-- share/features/features.sql
-- share/features/features.yml
-- share/features/migrations.sql
-- share/gitignore
-- share/migration/diff.tables.sql
-- share/migration/features.yml
-- share/migration/migrate.sql
-- share/migration/migrate.yml
-- share/migration/tables.sql
-- share/schema/build.yml
-- share/schema/schema.sql
-- share/schema/schema/build.yml
-- share/schema/schema/prick/build.yml
-- share/schema/schema/prick/data.sql
-- share/schema/schema/prick/schema.sql
-- share/schema/schema/prick/tables.sql
-- share/schema/schema/public/.keep
-- share/schema/schema/public/build.yml
-- test_assorted
-- test_feature
-- test_refactor
-- test_single_dev
 homepage: http://www.nowhere.com/
 licenses: []
 metadata: {}
@@ -148,7 +237,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.1
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="