neptuno 1.2.1 → 1.4.10
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 +5 -5
- data/.github/workflows/gem-push.yml +12 -0
- data/.github/workflows/gem-push_new.yml +48 -0
- data/Gemfile.lock +65 -36
- data/lib/neptuno/cli/init.rb +5 -5
- data/lib/neptuno/cli/install.rb +14 -13
- data/lib/neptuno/docker/build.rb +22 -5
- data/lib/neptuno/docker/down.rb +11 -9
- data/lib/neptuno/docker/restart.rb +22 -8
- data/lib/neptuno/environment/update.rb +1 -1
- data/lib/neptuno/overmind/connect.rb +4 -4
- data/lib/neptuno/services/update.rb +9 -9
- data/lib/neptuno/templates/neptuno.yml +1 -1
- data/lib/neptuno/tty/config.rb +4 -1
- data/lib/neptuno/tty/file.rb +17 -7
- data/lib/neptuno/version.rb +1 -1
- data/neptuno.gemspec +29 -28
- metadata +36 -35
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
2
|
+
SHA256:
|
3
|
+
metadata.gz: 9645517fa0e9ac31ac28a1342df8f7a599438b9f1ea93223542c102015fd6100
|
4
|
+
data.tar.gz: d2d11a6271037b0009e62e4f60936c102886a7f36983fa2c6b3953543698bf38
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8b29c38cb0e066be69ca9975b497e03b3e3f4b59dcdcea956b04a2376d7a745d7a93f2e328e2c4c1ae9fe7b8f4cacbdc9171ce5b2a803759084017fad53f9cda
|
7
|
+
data.tar.gz: b4d368a5bd49de9e1cd24e68d78ce1181b8731facd0f57821d003bb3e98163f8dc3ab196437b6b3b6ac0dc1a0cbbc9409951cf0830a72097fe5b49208e95b490
|
@@ -20,6 +20,18 @@ jobs:
|
|
20
20
|
uses: ruby/setup-ruby@v1
|
21
21
|
with:
|
22
22
|
ruby-version: 2.0.0
|
23
|
+
|
24
|
+
- name: Publish to GPR
|
25
|
+
run: |
|
26
|
+
mkdir -p $HOME/.gem
|
27
|
+
touch $HOME/.gem/credentials
|
28
|
+
chmod 0600 $HOME/.gem/credentials
|
29
|
+
printf -- "---\n:github: Bearer ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
|
30
|
+
cat $HOME/.gem/credentials
|
31
|
+
gem build *.gemspec
|
32
|
+
gem push --KEY github --host https://rubygems.pkg.github.com/apptegy *.gem
|
33
|
+
env:
|
34
|
+
GEM_HOST_API_KEY: "${{secrets.GITHUB_TOKEN}}"
|
23
35
|
|
24
36
|
- name: Publish to RubyGems
|
25
37
|
run: |
|
@@ -0,0 +1,48 @@
|
|
1
|
+
name: Ruby Gem
|
2
|
+
|
3
|
+
on:
|
4
|
+
push:
|
5
|
+
branches: [ "main" ]
|
6
|
+
pull_request:
|
7
|
+
branches: [ "main" ]
|
8
|
+
|
9
|
+
jobs:
|
10
|
+
build:
|
11
|
+
name: Build + Publish
|
12
|
+
runs-on: ubuntu-latest
|
13
|
+
permissions:
|
14
|
+
contents: read
|
15
|
+
packages: write
|
16
|
+
|
17
|
+
steps:
|
18
|
+
- uses: actions/checkout@v4
|
19
|
+
- name: Set up Ruby 3.3.0
|
20
|
+
# To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
|
21
|
+
# change this to (see https://github.com/ruby/setup-ruby#versioning):
|
22
|
+
# uses: ruby/setup-ruby@v1
|
23
|
+
uses: ruby/setup-ruby@v1
|
24
|
+
with:
|
25
|
+
ruby-version: 3.3.0
|
26
|
+
|
27
|
+
- name: Publish to GPR
|
28
|
+
run: |
|
29
|
+
mkdir -p $HOME/.gem
|
30
|
+
touch $HOME/.gem/credentials
|
31
|
+
chmod 0600 $HOME/.gem/credentials
|
32
|
+
printf -- "---\n:github: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
|
33
|
+
gem build *.gemspec
|
34
|
+
gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} *.gem
|
35
|
+
env:
|
36
|
+
GEM_HOST_API_KEY: "Bearer ${{secrets.GITHUB_TOKEN}}"
|
37
|
+
OWNER: ${{ github.repository_owner }}
|
38
|
+
|
39
|
+
- name: Publish to RubyGems
|
40
|
+
run: |
|
41
|
+
mkdir -p $HOME/.gem
|
42
|
+
touch $HOME/.gem/credentials
|
43
|
+
chmod 0600 $HOME/.gem/credentials
|
44
|
+
printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
|
45
|
+
gem build *.gemspec
|
46
|
+
gem push *.gem
|
47
|
+
env:
|
48
|
+
GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
neptuno (1.
|
4
|
+
neptuno (1.4.10)
|
5
5
|
dotiw
|
6
6
|
dry-cli
|
7
7
|
hirb
|
@@ -17,59 +17,86 @@ PATH
|
|
17
17
|
GEM
|
18
18
|
remote: https://rubygems.org/
|
19
19
|
specs:
|
20
|
-
activesupport (
|
21
|
-
|
20
|
+
activesupport (8.0.0)
|
21
|
+
base64
|
22
|
+
benchmark (>= 0.3)
|
23
|
+
bigdecimal
|
24
|
+
concurrent-ruby (~> 1.0, >= 1.3.1)
|
25
|
+
connection_pool (>= 2.2.5)
|
26
|
+
drb
|
22
27
|
i18n (>= 1.6, < 2)
|
28
|
+
logger (>= 1.4.2)
|
23
29
|
minitest (>= 5.1)
|
24
|
-
|
30
|
+
securerandom (>= 0.3)
|
31
|
+
tzinfo (~> 2.0, >= 2.0.5)
|
32
|
+
uri (>= 0.13.1)
|
25
33
|
ansi (1.5.0)
|
26
34
|
ast (2.4.2)
|
27
|
-
|
28
|
-
|
29
|
-
|
35
|
+
base64 (0.2.0)
|
36
|
+
benchmark (0.4.0)
|
37
|
+
bigdecimal (3.1.8)
|
38
|
+
builder (3.3.0)
|
39
|
+
concurrent-ruby (1.3.4)
|
40
|
+
connection_pool (2.4.1)
|
41
|
+
diff-lcs (1.5.1)
|
30
42
|
dotiw (5.3.3)
|
31
43
|
activesupport
|
32
44
|
i18n
|
33
|
-
|
45
|
+
drb (2.2.1)
|
46
|
+
dry-cli (1.2.0)
|
34
47
|
hirb (0.7.3)
|
35
|
-
i18n (1.
|
48
|
+
i18n (1.14.6)
|
36
49
|
concurrent-ruby (~> 1.0)
|
37
|
-
json (2.
|
38
|
-
|
39
|
-
|
50
|
+
json (2.8.2)
|
51
|
+
language_server-protocol (3.17.0.3)
|
52
|
+
lint_roller (1.1.0)
|
53
|
+
logger (1.6.1)
|
54
|
+
minitest (5.25.2)
|
55
|
+
minitest-reporters (1.7.1)
|
40
56
|
ansi
|
41
57
|
builder
|
42
58
|
minitest (>= 5.0)
|
43
59
|
ruby-progressbar
|
44
|
-
parallel (1.
|
45
|
-
parser (3.
|
60
|
+
parallel (1.26.3)
|
61
|
+
parser (3.3.6.0)
|
46
62
|
ast (~> 2.4.1)
|
63
|
+
racc
|
47
64
|
pastel (0.8.0)
|
48
65
|
tty-color (~> 0.5)
|
49
66
|
psych (3.3.4)
|
67
|
+
racc (1.8.1)
|
50
68
|
rainbow (3.1.1)
|
51
|
-
rake (13.
|
52
|
-
regexp_parser (2.
|
53
|
-
|
54
|
-
rubocop (1.39.0)
|
69
|
+
rake (13.2.1)
|
70
|
+
regexp_parser (2.9.2)
|
71
|
+
rubocop (1.68.0)
|
55
72
|
json (~> 2.3)
|
73
|
+
language_server-protocol (>= 3.17.0)
|
56
74
|
parallel (~> 1.10)
|
57
|
-
parser (>= 3.
|
75
|
+
parser (>= 3.3.0.2)
|
58
76
|
rainbow (>= 2.2.2, < 4.0)
|
59
|
-
regexp_parser (>=
|
60
|
-
|
61
|
-
rubocop-ast (>= 1.23.0, < 2.0)
|
77
|
+
regexp_parser (>= 2.4, < 3.0)
|
78
|
+
rubocop-ast (>= 1.32.2, < 2.0)
|
62
79
|
ruby-progressbar (~> 1.7)
|
63
|
-
unicode-display_width (>=
|
64
|
-
rubocop-ast (1.
|
65
|
-
parser (>= 3.
|
66
|
-
rubocop-performance (1.
|
67
|
-
rubocop (>= 1.
|
68
|
-
rubocop-ast (>=
|
69
|
-
ruby-progressbar (1.
|
70
|
-
|
71
|
-
|
72
|
-
|
80
|
+
unicode-display_width (>= 2.4.0, < 3.0)
|
81
|
+
rubocop-ast (1.36.1)
|
82
|
+
parser (>= 3.3.1.0)
|
83
|
+
rubocop-performance (1.22.1)
|
84
|
+
rubocop (>= 1.48.1, < 2.0)
|
85
|
+
rubocop-ast (>= 1.31.1, < 2.0)
|
86
|
+
ruby-progressbar (1.13.0)
|
87
|
+
securerandom (0.3.2)
|
88
|
+
standard (1.42.1)
|
89
|
+
language_server-protocol (~> 3.17.0.2)
|
90
|
+
lint_roller (~> 1.0)
|
91
|
+
rubocop (~> 1.68.0)
|
92
|
+
standard-custom (~> 1.0.0)
|
93
|
+
standard-performance (~> 1.5)
|
94
|
+
standard-custom (1.0.2)
|
95
|
+
lint_roller (~> 1.0)
|
96
|
+
rubocop (~> 1.50)
|
97
|
+
standard-performance (1.5.0)
|
98
|
+
lint_roller (~> 1.1)
|
99
|
+
rubocop-performance (~> 1.22.0)
|
73
100
|
tty-color (0.6.0)
|
74
101
|
tty-command (0.10.1)
|
75
102
|
pastel (~> 0.8)
|
@@ -86,17 +113,19 @@ GEM
|
|
86
113
|
tty-cursor (~> 0.7)
|
87
114
|
tty-screen (~> 0.8)
|
88
115
|
wisper (~> 2.0)
|
89
|
-
tty-screen (0.8.
|
116
|
+
tty-screen (0.8.2)
|
90
117
|
tty-spinner (0.9.3)
|
91
118
|
tty-cursor (~> 0.7)
|
92
119
|
tty-which (0.5.0)
|
93
120
|
tzinfo (2.0.6)
|
94
121
|
concurrent-ruby (~> 1.0)
|
95
|
-
unicode-display_width (2.
|
122
|
+
unicode-display_width (2.6.0)
|
123
|
+
uri (1.0.2)
|
96
124
|
wisper (2.0.1)
|
97
|
-
zeitwerk (2.
|
125
|
+
zeitwerk (2.7.1)
|
98
126
|
|
99
127
|
PLATFORMS
|
128
|
+
arm64-darwin-22
|
100
129
|
x86_64-darwin-21
|
101
130
|
x86_64-darwin-22
|
102
131
|
x86_64-linux
|
@@ -110,4 +139,4 @@ DEPENDENCIES
|
|
110
139
|
standard
|
111
140
|
|
112
141
|
BUNDLED WITH
|
113
|
-
2.
|
142
|
+
2.5.18
|
data/lib/neptuno/cli/init.rb
CHANGED
@@ -8,19 +8,19 @@ module Neptuno
|
|
8
8
|
include TTY::Config
|
9
9
|
include TTY::Which
|
10
10
|
|
11
|
-
desc
|
11
|
+
desc 'Initializes a Neptuno project folder structure'
|
12
12
|
|
13
|
-
WORK_TREE = {
|
13
|
+
WORK_TREE = { '.' => [{ 'services' => [], 'dockerfiles' => [], 'procfiles' => [], 'environments' => [] }] }.freeze
|
14
14
|
|
15
15
|
CONFIG = nil
|
16
16
|
|
17
17
|
def call(**)
|
18
|
-
abort
|
18
|
+
abort 'Neptuno projects can not be nested.' if neptuno_path != ''
|
19
19
|
::TTY::File.create_dir(WORK_TREE, Dir.pwd)
|
20
|
-
config.set(:configured_services, value:
|
20
|
+
config.set(:configured_services, value: '')
|
21
21
|
config.set(:services, value: [])
|
22
22
|
config.write(create: true, force: true)
|
23
|
-
`cp -r #{File.expand_path(
|
23
|
+
`cp -r #{File.expand_path('../templates', __dir__)}/* ./`
|
24
24
|
end
|
25
25
|
end
|
26
26
|
end
|
data/lib/neptuno/cli/install.rb
CHANGED
@@ -10,20 +10,20 @@ module Neptuno
|
|
10
10
|
include TTY::Config
|
11
11
|
include TTY::Which
|
12
12
|
|
13
|
-
desc
|
13
|
+
desc 'Installs git, docker, tmux, tmuxinator and overmind'
|
14
14
|
|
15
15
|
CONFIG = nil
|
16
16
|
|
17
17
|
def call(**)
|
18
|
-
install
|
19
|
-
install
|
20
|
-
install
|
21
|
-
install
|
22
|
-
install
|
18
|
+
install 'git'
|
19
|
+
install 'docker'
|
20
|
+
install 'tmux'
|
21
|
+
install 'overmind'
|
22
|
+
install 'tmuxinator'
|
23
23
|
|
24
|
-
return unless system(
|
24
|
+
return unless system('apt-get -v')
|
25
25
|
|
26
|
-
system(
|
26
|
+
system('sudo apt-get update')
|
27
27
|
end
|
28
28
|
|
29
29
|
def install(package)
|
@@ -31,12 +31,13 @@ module Neptuno
|
|
31
31
|
puts "#{package} is already installed"
|
32
32
|
else
|
33
33
|
puts "Installing #{package}"
|
34
|
-
if system(
|
34
|
+
if system('brew -v')
|
35
35
|
system("brew install #{package}")
|
36
|
-
elsif package ==
|
37
|
-
system(
|
38
|
-
elsif package ==
|
39
|
-
system(
|
36
|
+
elsif package == 'overmind'
|
37
|
+
system('go install github.com/DarthSim/overmind/v2@latest')
|
38
|
+
elsif package == 'tmuxinator'
|
39
|
+
system('ASDF_RUBY_VERSION=system gem update bundler')
|
40
|
+
system('ASDF_RUBY_VERSION=system gem install tmuxinator')
|
40
41
|
else
|
41
42
|
system("sudo apt-get install #{package} -y")
|
42
43
|
end
|
data/lib/neptuno/docker/build.rb
CHANGED
@@ -4,17 +4,34 @@ module Neptuno
|
|
4
4
|
module Docker
|
5
5
|
# Build docker container for Neptuno project
|
6
6
|
class Build < Neptuno::CLI::Base
|
7
|
-
desc
|
7
|
+
desc 'Docker: Build docker containers for project'
|
8
8
|
|
9
|
-
option :all, type: :boolean, default: false, desc:
|
10
|
-
argument :services, type: :array, required: false, desc:
|
9
|
+
option :all, type: :boolean, default: false, desc: 'Run on all services'
|
10
|
+
argument :services, type: :array, required: false, desc: 'Optional list of services'
|
11
|
+
option :options, required: false, desc: 'Optional string of options passed to build'
|
11
12
|
|
12
13
|
def call(services: [], **options)
|
13
|
-
command_services_to(
|
14
|
+
command_services_to('build', all: options.fetch(:all), services_as_args: services) do |services|
|
14
15
|
make_service_files(services)
|
15
|
-
|
16
|
+
opts = options.fetch(:options, nil) || get_gpr
|
17
|
+
services.each do |service|
|
18
|
+
puts '********************'
|
19
|
+
puts "building #{service}"
|
20
|
+
puts '********************'
|
21
|
+
system("cd #{neptuno_path} && docker compose build #{opts} #{service}")
|
22
|
+
end
|
16
23
|
end
|
17
24
|
end
|
25
|
+
|
26
|
+
def get_gpr
|
27
|
+
begin
|
28
|
+
lines = File.readlines("#{Dir.home}/.bundle/config")
|
29
|
+
rescue Errno::ENOENT
|
30
|
+
return
|
31
|
+
end
|
32
|
+
gpr = lines&.select { |line| line[/BUNDLE_RUBYGEMS__PKG__GITHUB__COM/] }&.last&.split(' ')&.last
|
33
|
+
"--build-arg gpr=#{gpr}".gsub('\"', '') if gpr
|
34
|
+
end
|
18
35
|
end
|
19
36
|
end
|
20
37
|
end
|
data/lib/neptuno/docker/down.rb
CHANGED
@@ -4,24 +4,26 @@ module Neptuno
|
|
4
4
|
module Docker
|
5
5
|
# Stop docker containers for Neptuno project
|
6
6
|
class Down < Neptuno::CLI::Base
|
7
|
-
desc
|
7
|
+
desc 'Docker: Stop docker containers for current project'
|
8
8
|
|
9
|
-
option :all, type: :boolean, default: false, desc:
|
10
|
-
|
9
|
+
option :all, type: :boolean, default: false, desc: 'Run on all services'
|
10
|
+
option :volumes, type: :boolean, default: false, desc: 'Remove named volumes'
|
11
|
+
argument :services, type: :array, required: false, desc: 'Optional list of services'
|
11
12
|
|
12
13
|
def call(services: [], **options)
|
13
|
-
command_services_to(
|
14
|
-
make_service_files(services)
|
14
|
+
command_services_to('go down', all: options.fetch(:all), services_as_args: services) do |services|
|
15
15
|
services_to_stop = services.intersection(services_with_procs).intersection(running_services)
|
16
|
-
|
17
|
-
system("cd #{neptuno_path} && docker compose
|
18
|
-
|
16
|
+
make_service_files(services_to_stop)
|
17
|
+
system("cd #{neptuno_path} && docker compose stop -t 0 #{services.join(' ')}")
|
18
|
+
system("cd #{neptuno_path} && docker compose rm -f #{services.join(' ')}")
|
19
|
+
system("cd #{neptuno_path} && docker compose down -v #{services.join(' ')}") if options.fetch(:volumes)
|
20
|
+
if config.fetch('procfile_manager') == 'tmux'
|
19
21
|
services_to_stop.each do |service|
|
20
22
|
system("tmux kill-session -t #{service} 2>/dev/null ")
|
21
23
|
puts "Neptuno killed Tmux session for: #{service}" if `echo $TMUX`.strip.empty?
|
22
24
|
end
|
23
25
|
else
|
24
|
-
system("cd #{neptuno_path} && tmux kill-session -t neptuno")
|
26
|
+
system("cd #{neptuno_path} && tmux kill-session -t neptuno") if options.fetch(:all)
|
25
27
|
services_to_stop.each do
|
26
28
|
system("cd #{neptuno_path}/procfiles/#{service} && rm .overmind.sock > /dev/null 2>&1")
|
27
29
|
end
|
@@ -4,20 +4,34 @@ module Neptuno
|
|
4
4
|
module Docker
|
5
5
|
# Restart docker containers for Neptuno project
|
6
6
|
class Restart < Neptuno::CLI::Base
|
7
|
-
desc
|
7
|
+
desc 'Docker: Rebuild and restart docker containers for current project'
|
8
8
|
|
9
|
-
option :all, type: :boolean, default: false, desc:
|
10
|
-
|
9
|
+
option :all, type: :boolean, default: false, desc: 'Run on all services'
|
10
|
+
option :volumes, type: :boolean, default: false, desc: 'Remove named volumes'
|
11
|
+
argument :services, type: :array, required: false, desc: 'Optional list of services'
|
12
|
+
option :options, required: false, desc: 'Optional string of options passed to build'
|
11
13
|
|
12
14
|
def call(services: [], **options)
|
13
|
-
command_services_to(
|
15
|
+
command_services_to('restart', all: options.fetch(:all), services_as_args: services) do |services|
|
14
16
|
make_service_files(services)
|
15
|
-
|
16
|
-
system("cd #{neptuno_path} && docker compose
|
17
|
-
system("cd #{neptuno_path} && docker compose
|
18
|
-
system("cd #{neptuno_path} && docker compose
|
17
|
+
opts = options.fetch(:options, nil) || get_gpr
|
18
|
+
system("cd #{neptuno_path} && docker compose stop -t 0 #{services.join(' ')}")
|
19
|
+
system("cd #{neptuno_path} && docker compose down -v #{services.join(' ')}") if options.fetch(:volumes)
|
20
|
+
system("cd #{neptuno_path} && docker compose rm -f #{services.join(' ')}")
|
21
|
+
system("cd #{neptuno_path} && docker compose build #{opts} #{services.join(' ')}")
|
22
|
+
system("cd #{neptuno_path} && docker compose up -d #{services.join(' ')}")
|
19
23
|
end
|
20
24
|
end
|
25
|
+
|
26
|
+
def get_gpr
|
27
|
+
begin
|
28
|
+
lines = File.readlines("#{Dir.home}/.bundle/config")
|
29
|
+
rescue Errno::ENOENT
|
30
|
+
return
|
31
|
+
end
|
32
|
+
gpr = lines&.select { |line| line[/BUNDLE_RUBYGEMS__PKG__GITHUB__COM/] }&.last&.split(' ')&.last
|
33
|
+
"--build-arg gpr=#{gpr}".gsub('\"', '') if gpr
|
34
|
+
end
|
21
35
|
end
|
22
36
|
end
|
23
37
|
end
|
@@ -4,7 +4,7 @@ module Neptuno
|
|
4
4
|
module Environment
|
5
5
|
# Build docker container for Neptuno project
|
6
6
|
class Update < Neptuno::CLI::Base
|
7
|
-
desc
|
7
|
+
desc 'Environment: Update all environment files'
|
8
8
|
|
9
9
|
def call
|
10
10
|
env_path = "#{neptuno_path}/environments/"
|
@@ -16,16 +16,16 @@ module Neptuno
|
|
16
16
|
|
17
17
|
def call(services: [], **options)
|
18
18
|
command_services_to('connect to procs', all: options.fetch(:all), services_as_args: services) do |services|
|
19
|
-
`neptuno up #{services.join(' ')}` if options.fetch(:up)
|
20
19
|
original_services = services
|
21
20
|
services = services_with_procs.intersection(get_dependants(services).concat(services).uniq).sort
|
21
|
+
`neptuno up #{services.join(' ')}` if options.fetch(:up)
|
22
22
|
|
23
23
|
outside_tmux = `echo $TMUX`.strip.empty?
|
24
24
|
|
25
25
|
if config.fetch('procfile_manager') == 'tmux'
|
26
26
|
services.each do |service|
|
27
27
|
if /#{service}/.match?(`tmux ls`)
|
28
|
-
puts "Neptuno
|
28
|
+
puts "Neptuno will use the existing Tmux session for: #{service}"
|
29
29
|
next
|
30
30
|
end
|
31
31
|
|
@@ -37,10 +37,10 @@ module Neptuno
|
|
37
37
|
else
|
38
38
|
puts `neptuno start --no-up #{services.join(' ')}` if options.fetch(:start)
|
39
39
|
if outside_tmux
|
40
|
-
system("cd #{neptuno_path} && tmuxinator start neptuno #{services.join(' ')}")
|
40
|
+
system("cd #{neptuno_path} && sleep 1 && tmuxinator start neptuno #{services.join(' ')}")
|
41
41
|
else
|
42
42
|
puts "Connecting to #{original_services.first}"
|
43
|
-
system("cd #{neptuno_path}/procfiles/#{original_services.first} && overmind connect shell")
|
43
|
+
system("cd #{neptuno_path}/procfiles/#{original_services.first} && sleep 2 && overmind connect shell")
|
44
44
|
end
|
45
45
|
end
|
46
46
|
end
|
@@ -4,32 +4,32 @@ module Neptuno
|
|
4
4
|
module Services
|
5
5
|
# Update project to to latest GH master/main
|
6
6
|
class Update < Neptuno::CLI::Base
|
7
|
-
desc
|
7
|
+
desc 'Stashes changes and pulls latest from main/master'
|
8
8
|
|
9
|
-
option :all, type: :boolean, default: false, desc:
|
9
|
+
option :all, type: :boolean, default: false, desc: 'Run on all services'
|
10
10
|
option :main, type: :boolean, default: false,
|
11
|
-
|
12
|
-
argument :services, type: :array, required: false, desc:
|
11
|
+
desc: "Keep service on main/master after pull. Uncommited changes are stashed as 'neptuno_stash'"
|
12
|
+
argument :services, type: :array, required: false, desc: 'Optional list of services'
|
13
13
|
|
14
14
|
def call(services: [], **options)
|
15
|
-
command_services_to(
|
15
|
+
command_services_to('update', all: options.fetch(:all), services_as_args: services) do |services|
|
16
16
|
services.each do |service|
|
17
17
|
puts "---Updating #{service}---"
|
18
18
|
current_branch = `git branch --show-current`
|
19
19
|
puts current_branch
|
20
|
-
system("cd #{neptuno_path}/services/#{service} 2>/dev/null && git stash save -u -q neptuno_stash")
|
20
|
+
system("cd #{neptuno_path}/services/#{service} 2>/dev/null && git add . && git stash save -u -q neptuno_stash")
|
21
21
|
`cd #{neptuno_path}/services/#{service} 2>/dev/null && git checkout main 2>/dev/null`
|
22
22
|
`cd #{neptuno_path}/services/#{service} 2>/dev/null && git checkout master 2>/dev/null`
|
23
23
|
system("cd #{neptuno_path}/services/#{service} 2>/dev/null && git pull")
|
24
24
|
unless options.fetch(:main)
|
25
|
-
stash_id = `git stash list`.lines.find { |str| str =~ /neptuno_stash/ }&.split(
|
25
|
+
stash_id = `git stash list`.lines.find { |str| str =~ /neptuno_stash/ }&.split(':')&.first
|
26
26
|
`cd #{neptuno_path}/services/#{service} 2>/dev/null && git checkout #{current_branch} 2>/dev/null`
|
27
27
|
if stash_id
|
28
|
-
puts
|
28
|
+
puts 'Applying stashed changes'
|
29
29
|
system("cd #{neptuno_path}/services/#{service} 2>/dev/null && git stash pop -q #{stash_id}")
|
30
30
|
end
|
31
31
|
end
|
32
|
-
puts
|
32
|
+
puts ''
|
33
33
|
end
|
34
34
|
end
|
35
35
|
end
|
data/lib/neptuno/tty/config.rb
CHANGED
@@ -47,7 +47,10 @@ module Neptuno
|
|
47
47
|
end
|
48
48
|
|
49
49
|
def json_services_status
|
50
|
-
|
50
|
+
neptuno_path = './'
|
51
|
+
services = `cd #{neptuno_path} && docker compose ps --all --format json`.split("\n")
|
52
|
+
services.map do |line|
|
53
|
+
service = JSON.parse(line)
|
51
54
|
[service.dig('Service'), service.dig('Status')]
|
52
55
|
end
|
53
56
|
end
|
data/lib/neptuno/tty/file.rb
CHANGED
@@ -5,7 +5,7 @@ module Neptuno
|
|
5
5
|
# Wrapper class for TTY gem
|
6
6
|
module File
|
7
7
|
TTY = ::TTY::File
|
8
|
-
ABORT_MESSAGE =
|
8
|
+
ABORT_MESSAGE = 'fatal: not a Neptuno repository (or any of the parent directories)'
|
9
9
|
|
10
10
|
def file
|
11
11
|
TTY
|
@@ -13,7 +13,7 @@ module Neptuno
|
|
13
13
|
|
14
14
|
# define path helpers
|
15
15
|
def project
|
16
|
-
neptuno_path.split(
|
16
|
+
neptuno_path.split('/').last
|
17
17
|
end
|
18
18
|
|
19
19
|
def in_service?
|
@@ -21,7 +21,7 @@ module Neptuno
|
|
21
21
|
end
|
22
22
|
|
23
23
|
def service
|
24
|
-
ENV[
|
24
|
+
ENV['PWD'].match(%r{services/([^/]*)})&.captures&.first
|
25
25
|
end
|
26
26
|
|
27
27
|
def neptuno_path
|
@@ -29,18 +29,28 @@ module Neptuno
|
|
29
29
|
|
30
30
|
pwd = Dir.pwd
|
31
31
|
loop do
|
32
|
-
return pwd if pwd ==
|
33
|
-
return @base_path = pwd if Dir.children(pwd).include?(
|
32
|
+
return pwd if pwd == ''
|
33
|
+
return @base_path = pwd if Dir.children(pwd).include?('neptuno.yml')
|
34
34
|
|
35
|
-
pwd = pwd.split(
|
35
|
+
pwd = pwd.split('/')[0..-2].join('/')
|
36
36
|
end
|
37
37
|
end
|
38
38
|
|
39
39
|
def make_service_files(services)
|
40
40
|
services.each do |service|
|
41
|
+
`cd #{neptuno_path}/services/#{service} 2>/dev/null`
|
42
|
+
if $?.exitstatus.zero?
|
43
|
+
`cd #{neptuno_path}/services/#{service} 2>/dev/null && git add . 2>/dev/null`
|
44
|
+
unless $?.exitstatus.zero?
|
45
|
+
`cd #{neptuno_path}/services/#{service} 2>/dev/null && git submodule update --init --recursive #{neptuno_path}/services/#{service}`
|
46
|
+
`cd #{neptuno_path}/services/#{service} 2>/dev/null && git checkout main 2>/dev/null`
|
47
|
+
`cd #{neptuno_path}/services/#{service} 2>/dev/null && git checkout master 2>/dev/null`
|
48
|
+
end
|
49
|
+
end
|
41
50
|
`cd #{neptuno_path} && mkdir -p environments/#{service} procfiles/#{service} dockerfiles/#{service}`
|
42
|
-
`cd #{neptuno_path} && touch environments/#{service}/
|
51
|
+
`cd #{neptuno_path} && touch environments/#{service}/default`
|
43
52
|
`cd #{neptuno_path} && touch dockerfiles/#{service}/Dockerfile`
|
53
|
+
`cd #{neptuno_path} && touch dockerfiles/#{service}/entrypoint.sh`
|
44
54
|
end
|
45
55
|
end
|
46
56
|
end
|
data/lib/neptuno/version.rb
CHANGED
data/neptuno.gemspec
CHANGED
@@ -1,47 +1,48 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require_relative
|
3
|
+
require_relative 'lib/neptuno/version'
|
4
4
|
|
5
5
|
Gem::Specification.new do |spec|
|
6
|
-
spec.name =
|
6
|
+
spec.name = 'neptuno'
|
7
7
|
spec.version = Neptuno::VERSION
|
8
|
-
spec.authors = [
|
9
|
-
spec.email = [
|
8
|
+
spec.authors = ['Roberto Plancarte']
|
9
|
+
spec.email = ['roberto.plancarte@gmail.com']
|
10
10
|
|
11
|
-
spec.summary =
|
12
|
-
spec.description =
|
13
|
-
spec.homepage =
|
14
|
-
spec.license =
|
15
|
-
spec.required_ruby_version =
|
11
|
+
spec.summary = 'Unified Development Environment CLI'
|
12
|
+
spec.description = 'A CLI for Neptuno distributed architectural style applications'
|
13
|
+
spec.homepage = 'https://github.com/apptegy/neptuno'
|
14
|
+
spec.license = 'Apache-2.0'
|
15
|
+
spec.required_ruby_version = '>= 2.3.0'
|
16
16
|
|
17
17
|
# spec.metadata['allowed_push_host'] = "TODO: Set to 'https://mygemserver.com'"
|
18
18
|
|
19
|
-
spec.metadata[
|
20
|
-
spec.metadata[
|
21
|
-
spec.metadata[
|
19
|
+
spec.metadata['homepage_uri'] = 'https://apptegy.github.io/neptuno/'
|
20
|
+
spec.metadata['source_code_uri'] = 'https://github.com/apptegy/neptuno'
|
21
|
+
spec.metadata['changelog_uri'] = 'https://github.com/apptegy/releases'
|
22
|
+
spec.metadata['github_repo'] = 'git@github.com:apptegy/neptuno.git'
|
22
23
|
|
23
24
|
# Specify which files should be added to the gem when it is released.
|
24
25
|
# The `git ls-files -z` loads the files in the RubyGem that have been added into git.
|
25
26
|
spec.files = Dir.chdir(File.expand_path(__dir__)) do
|
26
27
|
`git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
|
27
28
|
end
|
28
|
-
spec.bindir =
|
29
|
+
spec.bindir = 'exe'
|
29
30
|
spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
|
30
|
-
spec.require_paths = [
|
31
|
+
spec.require_paths = ['lib']
|
31
32
|
|
32
33
|
# Neptuno dependency list
|
33
|
-
spec.add_dependency
|
34
|
-
spec.add_dependency
|
35
|
-
spec.add_dependency
|
36
|
-
spec.add_dependency
|
37
|
-
spec.add_dependency
|
38
|
-
spec.add_dependency
|
39
|
-
spec.add_dependency
|
40
|
-
spec.add_dependency
|
41
|
-
spec.add_dependency
|
42
|
-
spec.add_dependency
|
43
|
-
spec.add_dependency
|
44
|
-
|
45
|
-
spec.add_development_dependency
|
46
|
-
spec.add_development_dependency
|
34
|
+
spec.add_dependency 'dotiw'
|
35
|
+
spec.add_dependency 'dry-cli'
|
36
|
+
spec.add_dependency 'hirb'
|
37
|
+
spec.add_dependency 'psych', '< 4'
|
38
|
+
spec.add_dependency 'tty-command'
|
39
|
+
spec.add_dependency 'tty-config'
|
40
|
+
spec.add_dependency 'tty-file'
|
41
|
+
spec.add_dependency 'tty-prompt'
|
42
|
+
spec.add_dependency 'tty-spinner'
|
43
|
+
spec.add_dependency 'tty-which'
|
44
|
+
spec.add_dependency 'zeitwerk'
|
45
|
+
|
46
|
+
spec.add_development_dependency 'minitest-reporters'
|
47
|
+
spec.add_development_dependency 'standard'
|
47
48
|
end
|
metadata
CHANGED
@@ -1,195 +1,195 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: neptuno
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.4.10
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Roberto Plancarte
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2024-11-22 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: dotiw
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- -
|
17
|
+
- - ">="
|
18
18
|
- !ruby/object:Gem::Version
|
19
19
|
version: '0'
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
|
-
- -
|
24
|
+
- - ">="
|
25
25
|
- !ruby/object:Gem::Version
|
26
26
|
version: '0'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: dry-cli
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
|
-
- -
|
31
|
+
- - ">="
|
32
32
|
- !ruby/object:Gem::Version
|
33
33
|
version: '0'
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
|
-
- -
|
38
|
+
- - ">="
|
39
39
|
- !ruby/object:Gem::Version
|
40
40
|
version: '0'
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: hirb
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
|
-
- -
|
45
|
+
- - ">="
|
46
46
|
- !ruby/object:Gem::Version
|
47
47
|
version: '0'
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
|
-
- -
|
52
|
+
- - ">="
|
53
53
|
- !ruby/object:Gem::Version
|
54
54
|
version: '0'
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: psych
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
|
-
- - <
|
59
|
+
- - "<"
|
60
60
|
- !ruby/object:Gem::Version
|
61
61
|
version: '4'
|
62
62
|
type: :runtime
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
|
-
- - <
|
66
|
+
- - "<"
|
67
67
|
- !ruby/object:Gem::Version
|
68
68
|
version: '4'
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: tty-command
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
72
72
|
requirements:
|
73
|
-
- -
|
73
|
+
- - ">="
|
74
74
|
- !ruby/object:Gem::Version
|
75
75
|
version: '0'
|
76
76
|
type: :runtime
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
|
-
- -
|
80
|
+
- - ">="
|
81
81
|
- !ruby/object:Gem::Version
|
82
82
|
version: '0'
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
84
|
name: tty-config
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
86
86
|
requirements:
|
87
|
-
- -
|
87
|
+
- - ">="
|
88
88
|
- !ruby/object:Gem::Version
|
89
89
|
version: '0'
|
90
90
|
type: :runtime
|
91
91
|
prerelease: false
|
92
92
|
version_requirements: !ruby/object:Gem::Requirement
|
93
93
|
requirements:
|
94
|
-
- -
|
94
|
+
- - ">="
|
95
95
|
- !ruby/object:Gem::Version
|
96
96
|
version: '0'
|
97
97
|
- !ruby/object:Gem::Dependency
|
98
98
|
name: tty-file
|
99
99
|
requirement: !ruby/object:Gem::Requirement
|
100
100
|
requirements:
|
101
|
-
- -
|
101
|
+
- - ">="
|
102
102
|
- !ruby/object:Gem::Version
|
103
103
|
version: '0'
|
104
104
|
type: :runtime
|
105
105
|
prerelease: false
|
106
106
|
version_requirements: !ruby/object:Gem::Requirement
|
107
107
|
requirements:
|
108
|
-
- -
|
108
|
+
- - ">="
|
109
109
|
- !ruby/object:Gem::Version
|
110
110
|
version: '0'
|
111
111
|
- !ruby/object:Gem::Dependency
|
112
112
|
name: tty-prompt
|
113
113
|
requirement: !ruby/object:Gem::Requirement
|
114
114
|
requirements:
|
115
|
-
- -
|
115
|
+
- - ">="
|
116
116
|
- !ruby/object:Gem::Version
|
117
117
|
version: '0'
|
118
118
|
type: :runtime
|
119
119
|
prerelease: false
|
120
120
|
version_requirements: !ruby/object:Gem::Requirement
|
121
121
|
requirements:
|
122
|
-
- -
|
122
|
+
- - ">="
|
123
123
|
- !ruby/object:Gem::Version
|
124
124
|
version: '0'
|
125
125
|
- !ruby/object:Gem::Dependency
|
126
126
|
name: tty-spinner
|
127
127
|
requirement: !ruby/object:Gem::Requirement
|
128
128
|
requirements:
|
129
|
-
- -
|
129
|
+
- - ">="
|
130
130
|
- !ruby/object:Gem::Version
|
131
131
|
version: '0'
|
132
132
|
type: :runtime
|
133
133
|
prerelease: false
|
134
134
|
version_requirements: !ruby/object:Gem::Requirement
|
135
135
|
requirements:
|
136
|
-
- -
|
136
|
+
- - ">="
|
137
137
|
- !ruby/object:Gem::Version
|
138
138
|
version: '0'
|
139
139
|
- !ruby/object:Gem::Dependency
|
140
140
|
name: tty-which
|
141
141
|
requirement: !ruby/object:Gem::Requirement
|
142
142
|
requirements:
|
143
|
-
- -
|
143
|
+
- - ">="
|
144
144
|
- !ruby/object:Gem::Version
|
145
145
|
version: '0'
|
146
146
|
type: :runtime
|
147
147
|
prerelease: false
|
148
148
|
version_requirements: !ruby/object:Gem::Requirement
|
149
149
|
requirements:
|
150
|
-
- -
|
150
|
+
- - ">="
|
151
151
|
- !ruby/object:Gem::Version
|
152
152
|
version: '0'
|
153
153
|
- !ruby/object:Gem::Dependency
|
154
154
|
name: zeitwerk
|
155
155
|
requirement: !ruby/object:Gem::Requirement
|
156
156
|
requirements:
|
157
|
-
- -
|
157
|
+
- - ">="
|
158
158
|
- !ruby/object:Gem::Version
|
159
159
|
version: '0'
|
160
160
|
type: :runtime
|
161
161
|
prerelease: false
|
162
162
|
version_requirements: !ruby/object:Gem::Requirement
|
163
163
|
requirements:
|
164
|
-
- -
|
164
|
+
- - ">="
|
165
165
|
- !ruby/object:Gem::Version
|
166
166
|
version: '0'
|
167
167
|
- !ruby/object:Gem::Dependency
|
168
168
|
name: minitest-reporters
|
169
169
|
requirement: !ruby/object:Gem::Requirement
|
170
170
|
requirements:
|
171
|
-
- -
|
171
|
+
- - ">="
|
172
172
|
- !ruby/object:Gem::Version
|
173
173
|
version: '0'
|
174
174
|
type: :development
|
175
175
|
prerelease: false
|
176
176
|
version_requirements: !ruby/object:Gem::Requirement
|
177
177
|
requirements:
|
178
|
-
- -
|
178
|
+
- - ">="
|
179
179
|
- !ruby/object:Gem::Version
|
180
180
|
version: '0'
|
181
181
|
- !ruby/object:Gem::Dependency
|
182
182
|
name: standard
|
183
183
|
requirement: !ruby/object:Gem::Requirement
|
184
184
|
requirements:
|
185
|
-
- -
|
185
|
+
- - ">="
|
186
186
|
- !ruby/object:Gem::Version
|
187
187
|
version: '0'
|
188
188
|
type: :development
|
189
189
|
prerelease: false
|
190
190
|
version_requirements: !ruby/object:Gem::Requirement
|
191
191
|
requirements:
|
192
|
-
- -
|
192
|
+
- - ">="
|
193
193
|
- !ruby/object:Gem::Version
|
194
194
|
version: '0'
|
195
195
|
description: A CLI for Neptuno distributed architectural style applications
|
@@ -200,9 +200,10 @@ executables:
|
|
200
200
|
extensions: []
|
201
201
|
extra_rdoc_files: []
|
202
202
|
files:
|
203
|
-
- .github/workflows/gem-push.yml
|
204
|
-
- .github/workflows/
|
205
|
-
- .
|
203
|
+
- ".github/workflows/gem-push.yml"
|
204
|
+
- ".github/workflows/gem-push_new.yml"
|
205
|
+
- ".github/workflows/main.yml"
|
206
|
+
- ".gitignore"
|
206
207
|
- AUTHORS
|
207
208
|
- CHANGELOG.md
|
208
209
|
- CODE_OF_CONDUCT.md
|
@@ -271,23 +272,23 @@ metadata:
|
|
271
272
|
homepage_uri: https://apptegy.github.io/neptuno/
|
272
273
|
source_code_uri: https://github.com/apptegy/neptuno
|
273
274
|
changelog_uri: https://github.com/apptegy/releases
|
275
|
+
github_repo: git@github.com:apptegy/neptuno.git
|
274
276
|
post_install_message:
|
275
277
|
rdoc_options: []
|
276
278
|
require_paths:
|
277
279
|
- lib
|
278
280
|
required_ruby_version: !ruby/object:Gem::Requirement
|
279
281
|
requirements:
|
280
|
-
- -
|
282
|
+
- - ">="
|
281
283
|
- !ruby/object:Gem::Version
|
282
284
|
version: 2.3.0
|
283
285
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
284
286
|
requirements:
|
285
|
-
- -
|
287
|
+
- - ">="
|
286
288
|
- !ruby/object:Gem::Version
|
287
289
|
version: '0'
|
288
290
|
requirements: []
|
289
|
-
|
290
|
-
rubygems_version: 2.0.14.1
|
291
|
+
rubygems_version: 3.5.3
|
291
292
|
signing_key:
|
292
293
|
specification_version: 4
|
293
294
|
summary: Unified Development Environment CLI
|