avm-eac_rails_base1 0.4.1 → 0.6.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/lib/avm/eac_rails_base1/apache_host.rb +1 -1
  3. data/lib/avm/eac_rails_base1/instances/base.rb +28 -0
  4. data/lib/avm/eac_rails_base1/instances.rb +11 -0
  5. data/lib/avm/eac_rails_base1/runner/log.rb +1 -1
  6. data/lib/avm/eac_rails_base1/runner_with/bundle.rb +1 -1
  7. data/lib/avm/eac_rails_base1/runner_with/rails_environment.rb +2 -2
  8. data/lib/avm/eac_rails_base1/systemd_unit.rb +1 -1
  9. data/lib/avm/eac_rails_base1/version.rb +1 -1
  10. data/template/avm/eac_rails_base1/systemd_unit/tasks_scheduler_command.sh +1 -1
  11. metadata +24 -21
  12. data/lib/avm/eac_rails_base1/instance.rb +0 -25
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 43c0ee031c0a990446158514203ea5356c3f5927a0e865393aa6cc708a53a17e
4
- data.tar.gz: 0ea8328b7cdc8d5a7e24b49840ca413968f232a6244011e19beeeed83ac93f7c
3
+ metadata.gz: a1c90d3dfb3e81da85980dc5791ad6940084b8cf31e0a15459e87809d2679a2e
4
+ data.tar.gz: 7083e86a075897d6ada5d5327684c8b8ecdf864a304d08af80fb84582d862439
5
5
  SHA512:
6
- metadata.gz: 59772adde699304f566f57ad9cac2ca7176c9568b6391da7d9e4a12b52164463c10c71f5598c0537268f25d196b3778523dd338a006534c2c1d2630ffa0999d0
7
- data.tar.gz: 5a212763460c37478774cec4b22d085af413c5b10b9384c8368b1ae888fce96515a35ae367325627e772b5664c7724e34ecca3ce9c8443af6c95520a4a5e6d63
6
+ metadata.gz: 42ad1e1cf98bfe5d1cae9ee3de7cf9413bf0bcdf68dcb8c9d304277d1c3a66d68851c30a40d88bc974fa3b19724016f722a0d55266ec48f04c437bb47ad803e6
7
+ data.tar.gz: 46679fdc666f604debb262b6e0c44b22dec64315166202f735ef1498ac9e79e23cadd98ed0de3d25a32778d6fffc10780c98267ac5593026810e51252aae38cc
data/lib/avm/eac_rails_base1/apache_host.rb CHANGED
@@ -6,7 +6,7 @@ module Avm
6
6
  module EacRailsBase1
7
7
  class ApacheHost < ::Avm::EacWebappBase0::ApacheHost
8
8
  def document_root
9
- "#{instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)}/public"
9
+ "#{instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)}/public"
10
10
  end
11
11
 
12
12
  def extra_content
data/lib/avm/eac_rails_base1/instances/base.rb ADDED
@@ -0,0 +1,28 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'avm/eac_ruby_base1/sources/base'
4
+ require 'avm/eac_webapp_base0/instances/base'
5
+
6
+ module Avm
7
+ module EacRailsBase1
8
+ module Instances
9
+ class Base < ::Avm::EacWebappBase0::Instances::Base
10
+ DEFAULT_RAILS_ENVIRONMENT = 'production'
11
+
12
+ def bundle(*args)
13
+ the_gem.bundle(*args).chdir_root.envvar('RAILS_ENV', DEFAULT_RAILS_ENVIRONMENT)
14
+ end
15
+
16
+ def rake(*args)
17
+ bundle('exec', 'rake', *args)
18
+ end
19
+
20
+ def the_gem
21
+ @the_gem ||= ::Avm::EacRubyBase1::Sources::Base.new(
22
+ ::File.join(read_entry('install.path'))
23
+ ).env_set(host_env)
24
+ end
25
+ end
26
+ end
27
+ end
28
+ end
data/lib/avm/eac_rails_base1/instances.rb ADDED
@@ -0,0 +1,11 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module Avm
6
+ module EacRailsBase1
7
+ module Instances
8
+ require_sub __FILE__
9
+ end
10
+ end
11
+ end
data/lib/avm/eac_rails_base1/runner/log.rb CHANGED
@@ -20,7 +20,7 @@ module Avm
20
20
  private
21
21
 
22
22
  def log_path
23
- ::File.join(rails_instance.read_entry('fs_path'), 'log', "#{rails_environment}.log")
23
+ ::File.join(rails_instance.read_entry('install.path'), 'log', "#{rails_environment}.log")
24
24
  end
25
25
 
26
26
  def start_banner
data/lib/avm/eac_rails_base1/runner_with/bundle.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avm/eac_rails_base1/instance'
3
+ require 'avm/eac_rails_base1/instances/base'
4
4
  require 'avm/eac_rails_base1/runner_with/rails_environment'
5
5
  require 'eac_cli/runner'
6
6
 
data/lib/avm/eac_rails_base1/runner_with/rails_environment.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avm/eac_rails_base1/instance'
3
+ require 'avm/eac_rails_base1/instances/base'
4
4
  require 'eac_cli/runner'
5
5
 
6
6
  module Avm
@@ -22,7 +22,7 @@ module Avm
22
22
  def default_rails_environment
23
23
  const_get(DEFAULT_RAILS_ENVIRONMENT_CONSTANT)
24
24
  rescue ::NameError
25
- ::Avm::EacRailsBase1::Instance::DEFAULT_RAILS_ENVIRONMENT
25
+ ::Avm::EacRailsBase1::Instances::Base::DEFAULT_RAILS_ENVIRONMENT
26
26
  end
27
27
  end
28
28
 
data/lib/avm/eac_rails_base1/systemd_unit.rb CHANGED
@@ -38,7 +38,7 @@ module Avm
38
38
  end
39
39
 
40
40
  def user
41
- instance.ssh_username
41
+ instance.install_username
42
42
  end
43
43
 
44
44
  private
data/lib/avm/eac_rails_base1/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRailsBase1
5
- VERSION = '0.4.1'
5
+ VERSION = '0.6.0'
6
6
  end
7
7
  end
data/template/avm/eac_rails_base1/systemd_unit/tasks_scheduler_command.sh CHANGED
@@ -3,4 +3,4 @@
3
3
  set -e
4
4
 
5
5
  source "$HOME/.rvm/scripts/rvm"
6
- ( cd '%%fs_path%%'; RAILS_ENV=production bundle exec tasks_scheduler "$@" )
6
+ ( cd '%%install.path%%'; RAILS_ENV=production bundle exec tasks_scheduler "$@" )
metadata CHANGED
@@ -1,69 +1,71 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: avm-eac_rails_base1
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.1
4
+ version: 0.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Put here the authors
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-07-18 00:00:00.000000000 Z
11
+ date: 2022-08-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
- name: avm-eac_ruby_base1
14
+ name: avm
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '0.9'
20
- - - ">="
21
- - !ruby/object:Gem::Version
22
- version: 0.9.1
19
+ version: '0.41'
23
20
  type: :runtime
24
21
  prerelease: false
25
22
  version_requirements: !ruby/object:Gem::Requirement
26
23
  requirements:
27
24
  - - "~>"
28
25
  - !ruby/object:Gem::Version
29
- version: '0.9'
30
- - - ">="
26
+ version: '0.41'
27
+ - !ruby/object:Gem::Dependency
28
+ name: avm-eac_ruby_base1
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - "~>"
31
32
  - !ruby/object:Gem::Version
32
- version: 0.9.1
33
+ version: '0.20'
34
+ type: :runtime
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - "~>"
39
+ - !ruby/object:Gem::Version
40
+ version: '0.20'
33
41
  - !ruby/object:Gem::Dependency
34
42
  name: avm-eac_webapp_base0
35
43
  requirement: !ruby/object:Gem::Requirement
36
44
  requirements:
37
45
  - - "~>"
38
46
  - !ruby/object:Gem::Version
39
- version: '0.3'
47
+ version: '0.6'
40
48
  type: :runtime
41
49
  prerelease: false
42
50
  version_requirements: !ruby/object:Gem::Requirement
43
51
  requirements:
44
52
  - - "~>"
45
53
  - !ruby/object:Gem::Version
46
- version: '0.3'
54
+ version: '0.6'
47
55
  - !ruby/object:Gem::Dependency
48
56
  name: eac_ruby_utils
49
57
  requirement: !ruby/object:Gem::Requirement
50
58
  requirements:
51
59
  - - "~>"
52
60
  - !ruby/object:Gem::Version
53
- version: '0.95'
54
- - - ">="
55
- - !ruby/object:Gem::Version
56
- version: 0.95.2
61
+ version: '0.102'
57
62
  type: :runtime
58
63
  prerelease: false
59
64
  version_requirements: !ruby/object:Gem::Requirement
60
65
  requirements:
61
66
  - - "~>"
62
67
  - !ruby/object:Gem::Version
63
- version: '0.95'
64
- - - ">="
65
- - !ruby/object:Gem::Version
66
- version: 0.95.2
68
+ version: '0.102'
67
69
  - !ruby/object:Gem::Dependency
68
70
  name: eac_ruby_gem_support
69
71
  requirement: !ruby/object:Gem::Requirement
@@ -86,7 +88,8 @@ extra_rdoc_files: []
86
88
  files:
87
89
  - lib/avm/eac_rails_base1.rb
88
90
  - lib/avm/eac_rails_base1/apache_host.rb
89
- - lib/avm/eac_rails_base1/instance.rb
91
+ - lib/avm/eac_rails_base1/instances.rb
92
+ - lib/avm/eac_rails_base1/instances/base.rb
90
93
  - lib/avm/eac_rails_base1/runner.rb
91
94
  - lib/avm/eac_rails_base1/runner/bundle.rb
92
95
  - lib/avm/eac_rails_base1/runner/code_runner.rb
data/lib/avm/eac_rails_base1/instance.rb DELETED
@@ -1,25 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- require 'avm/eac_ruby_base1/sources/base'
4
- require 'avm/eac_webapp_base0/instance'
5
-
6
- module Avm
7
- module EacRailsBase1
8
- class Instance < ::Avm::EacWebappBase0::Instance
9
- DEFAULT_RAILS_ENVIRONMENT = 'production'
10
-
11
- def bundle(*args)
12
- the_gem.bundle(*args).chdir_root.envvar('RAILS_ENV', DEFAULT_RAILS_ENVIRONMENT)
13
- end
14
-
15
- def rake(*args)
16
- bundle('exec', 'rake', *args)
17
- end
18
-
19
- def the_gem
20
- @the_gem ||= ::Avm::EacRubyBase1::Sources::Base.new(::File.join(read_entry('fs_path')))
21
- .env_set(host_env)
22
- end
23
- end
24
- end
25
- end