pgtk 0.29.4 → 0.30.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/pgtk/liquibase_task.rb +6 -0
- data/lib/pgtk/pgsql_task.rb +6 -5
- data/lib/pgtk/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: cbdc13b881e0f4d821ef1472fa129962cc30d3662ee912efa8f1b8b33b564074
|
|
4
|
+
data.tar.gz: a7fa85d5ae31e7e03cce4852436396a6082a4454c4d7f70557b8f25cd6a0dc61
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5b9e7911574caa29d8377b290b59ff15f5f522d019382da39f0c2501bf7fbdfa7397667af94415f0c3937c7eb441d68f62a4a2661fc79573527f01438438c51d
|
|
7
|
+
data.tar.gz: 1da06567aaf82aaab703f23753cd1bb3b548ae01ddebc560c60674345d494f2196e8060017ee237cb69a858f817baf1ae0daf1dd4964839c0dbb5f7465da409a
|
data/lib/pgtk/liquibase_task.rb
CHANGED
|
@@ -51,12 +51,17 @@ class Pgtk::LiquibaseTask < Rake::TaskLib
|
|
|
51
51
|
# @return [String]
|
|
52
52
|
attr_accessor :contexts
|
|
53
53
|
|
|
54
|
+
# Use docker (set to either :never, :always, or :maybe)
|
|
55
|
+
# @return [Symbol]
|
|
56
|
+
attr_accessor :docker
|
|
57
|
+
|
|
54
58
|
# Initialize a new Liquibase task.
|
|
55
59
|
#
|
|
56
60
|
# @param [Array] args Task arguments
|
|
57
61
|
# @yield [Pgtk::LiquibaseTask, Object] Yields self and task arguments
|
|
58
62
|
def initialize(*args, &task_block)
|
|
59
63
|
super()
|
|
64
|
+
@docker ||= :maybe
|
|
60
65
|
@name = args.shift || :liquibase
|
|
61
66
|
@quiet = false
|
|
62
67
|
@contexts = ''
|
|
@@ -128,6 +133,7 @@ class Pgtk::LiquibaseTask < Rake::TaskLib
|
|
|
128
133
|
)
|
|
129
134
|
end
|
|
130
135
|
return unless @schema
|
|
136
|
+
raise 'Cannot generate schema without docker' if @docker == :never
|
|
131
137
|
@schema = File.expand_path(@schema)
|
|
132
138
|
host = yml.dig('pgsql', 'host')
|
|
133
139
|
host = donce_host if OS.mac? && ['localhost', '127.0.0.1'].include?(host)
|
data/lib/pgtk/pgsql_task.rb
CHANGED
|
@@ -61,9 +61,9 @@ class Pgtk::PgsqlTask < Rake::TaskLib
|
|
|
61
61
|
# @return [Hash]
|
|
62
62
|
attr_accessor :config
|
|
63
63
|
|
|
64
|
-
# Use
|
|
65
|
-
# @return [
|
|
66
|
-
attr_accessor :
|
|
64
|
+
# Use docker (set to either :never, :always, or :maybe)
|
|
65
|
+
# @return [Symbol]
|
|
66
|
+
attr_accessor :docker
|
|
67
67
|
|
|
68
68
|
# Initialize a new PostgreSQL server task.
|
|
69
69
|
#
|
|
@@ -71,6 +71,7 @@ class Pgtk::PgsqlTask < Rake::TaskLib
|
|
|
71
71
|
# @yield [Pgtk::PgsqlTask, Object] Yields self and task arguments
|
|
72
72
|
def initialize(*args, &task_block)
|
|
73
73
|
super()
|
|
74
|
+
@docker ||= :maybe
|
|
74
75
|
@name = args.shift || :pgsql
|
|
75
76
|
@fresh_start = false
|
|
76
77
|
@quiet = false
|
|
@@ -99,7 +100,7 @@ class Pgtk::PgsqlTask < Rake::TaskLib
|
|
|
99
100
|
raise \
|
|
100
101
|
"Failed to find either PostgreSQL or Docker:\n#{pg_out.first}\n#{docker_out.first}"
|
|
101
102
|
end
|
|
102
|
-
raise 'You cannot force Docker to run, because it is not installed locally' if @
|
|
103
|
+
raise 'You cannot force Docker to run, because it is not installed locally' if @docker == :always && !docker
|
|
103
104
|
raise "Option 'dir' is mandatory" unless @dir
|
|
104
105
|
raise "Option 'yaml' is mandatory" unless @yaml
|
|
105
106
|
home = File.expand_path(@dir)
|
|
@@ -113,7 +114,7 @@ class Pgtk::PgsqlTask < Rake::TaskLib
|
|
|
113
114
|
else
|
|
114
115
|
puts "Required TCP port #{port} is used for PostgreSQL server" unless @quiet
|
|
115
116
|
end
|
|
116
|
-
if local &&
|
|
117
|
+
if (local && @docker != :always) || @docker == :never
|
|
117
118
|
pid = run_local(home, stdout, port)
|
|
118
119
|
place = "in process ##{pid}"
|
|
119
120
|
else
|
data/lib/pgtk/version.rb
CHANGED