serverkit 0.9.0 → 1.0.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/.github/workflows/test.yml +23 -0
- data/.rubocop.yml +8 -6
- data/CHANGELOG.md +3 -0
- data/Gemfile +6 -0
- data/README.md +1 -1
- data/Rakefile +2 -0
- data/Vagrantfile +2 -0
- data/bin/serverkit +1 -0
- data/lib/at_least_one_of_validator.rb +2 -0
- data/lib/readable_validator.rb +2 -0
- data/lib/regexp_validator.rb +2 -0
- data/lib/required_validator.rb +2 -0
- data/lib/serverkit/actions/apply.rb +2 -0
- data/lib/serverkit/actions/base.rb +2 -0
- data/lib/serverkit/actions/check.rb +2 -0
- data/lib/serverkit/actions/inspect.rb +2 -0
- data/lib/serverkit/actions/validate.rb +2 -0
- data/lib/serverkit/backends/base_backend.rb +2 -0
- data/lib/serverkit/backends/local_backend.rb +3 -1
- data/lib/serverkit/backends/ssh_backend.rb +2 -0
- data/lib/serverkit/command.rb +4 -6
- data/lib/serverkit/errors/attribute_validation_error.rb +2 -0
- data/lib/serverkit/errors/base.rb +2 -0
- data/lib/serverkit/errors/invalid_recipe_type_error.rb +2 -0
- data/lib/serverkit/errors/invalid_resources_type_error.rb +2 -0
- data/lib/serverkit/errors/missing_action_name_argument_error.rb +2 -0
- data/lib/serverkit/errors/missing_recipe_path_argument_error.rb +2 -0
- data/lib/serverkit/errors/missing_resource_type_error.rb +2 -0
- data/lib/serverkit/errors/non_existent_path_error.rb +2 -0
- data/lib/serverkit/errors/unknown_action_name_error.rb +2 -0
- data/lib/serverkit/errors/unknown_resource_type_error.rb +2 -0
- data/lib/serverkit/loaders/base_loader.rb +3 -1
- data/lib/serverkit/loaders/recipe_loader.rb +7 -7
- data/lib/serverkit/loaders/variables_loader.rb +2 -0
- data/lib/serverkit/logger.rb +3 -1
- data/lib/serverkit/recipe.rb +9 -9
- data/lib/serverkit/resource_builder.rb +2 -0
- data/lib/serverkit/resources/base.rb +3 -1
- data/lib/serverkit/resources/command.rb +2 -0
- data/lib/serverkit/resources/directory.rb +2 -0
- data/lib/serverkit/resources/entry.rb +2 -0
- data/lib/serverkit/resources/file.rb +2 -0
- data/lib/serverkit/resources/git.rb +3 -1
- data/lib/serverkit/resources/group.rb +2 -0
- data/lib/serverkit/resources/line.rb +3 -1
- data/lib/serverkit/resources/missing.rb +2 -0
- data/lib/serverkit/resources/nothing.rb +2 -0
- data/lib/serverkit/resources/package.rb +2 -0
- data/lib/serverkit/resources/recipe.rb +2 -0
- data/lib/serverkit/resources/remote_file.rb +2 -0
- data/lib/serverkit/resources/service.rb +2 -0
- data/lib/serverkit/resources/symlink.rb +2 -0
- data/lib/serverkit/resources/template.rb +7 -7
- data/lib/serverkit/resources/unknown.rb +2 -0
- data/lib/serverkit/resources/user.rb +2 -0
- data/lib/serverkit/variables.rb +3 -1
- data/lib/serverkit/version.rb +3 -1
- data/lib/serverkit.rb +4 -2
- data/lib/type_validator.rb +2 -0
- data/serverkit.gemspec +16 -16
- metadata +8 -65
- data/.travis.yml +0 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 894d31fd3a6adc6d2364db54013d8b254da7052e755cf98b80d8499dc551b56d
|
4
|
+
data.tar.gz: c7050346294dea0459150a52666695edda016c2c4ca241c105e743e2f3b0094b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7c29e0a02818f73b8eb26b75187eae59115f6b248c5f3a99d7a5512cdfb2ab9510bbe39254cb0eb3c6702dcb14426599eb884358f041b2f2fae9165ecb462c0a
|
7
|
+
data.tar.gz: 1d7e170fb63b0998b56139d31030957b768e38e8ac903288096e867416d03c50d4f2e802094d49899c7e43d8345db194c319bd4ce5bcad54e997058aeb44c979
|
@@ -0,0 +1,23 @@
|
|
1
|
+
name: Test
|
2
|
+
on:
|
3
|
+
push:
|
4
|
+
branches:
|
5
|
+
- master
|
6
|
+
- main
|
7
|
+
pull_request:
|
8
|
+
jobs:
|
9
|
+
rspec:
|
10
|
+
strategy:
|
11
|
+
matrix:
|
12
|
+
os: [ubuntu-latest, macos-latest]
|
13
|
+
ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "3.4"]
|
14
|
+
runs-on: ${{ matrix.os }}
|
15
|
+
steps:
|
16
|
+
- uses: actions/checkout@v4
|
17
|
+
- name: Set up Ruby ${{ matrix.ruby }}
|
18
|
+
uses: ruby/setup-ruby@v1
|
19
|
+
with:
|
20
|
+
ruby-version: ${{ matrix.ruby }}
|
21
|
+
bundler-cache: true
|
22
|
+
- name: Run rubocop and rspec
|
23
|
+
run: bundle exec rake
|
data/.rubocop.yml
CHANGED
@@ -1,5 +1,7 @@
|
|
1
1
|
AllCops:
|
2
2
|
TargetRubyVersion: 2.6
|
3
|
+
SuggestExtensions: false
|
4
|
+
NewCops: disable
|
3
5
|
|
4
6
|
Lint/AssignmentInCondition:
|
5
7
|
Enabled: false
|
@@ -19,6 +21,9 @@ Lint/UnusedBlockArgument:
|
|
19
21
|
Lint/UnusedMethodArgument:
|
20
22
|
Enabled: false
|
21
23
|
|
24
|
+
Lint/MissingSuper:
|
25
|
+
Enabled: false
|
26
|
+
|
22
27
|
Metrics/AbcSize:
|
23
28
|
Enabled: false
|
24
29
|
|
@@ -31,9 +36,6 @@ Metrics/ClassLength:
|
|
31
36
|
Metrics/CyclomaticComplexity:
|
32
37
|
Enabled: false
|
33
38
|
|
34
|
-
Metrics/LineLength:
|
35
|
-
Max: 120
|
36
|
-
|
37
39
|
Metrics/MethodLength:
|
38
40
|
Enabled: false
|
39
41
|
|
@@ -60,9 +62,6 @@ Style/DoubleNegation:
|
|
60
62
|
|
61
63
|
Style/EmptyMethod:
|
62
64
|
Enabled: false
|
63
|
-
|
64
|
-
Style/FrozenStringLiteralComment:
|
65
|
-
Enabled: false
|
66
65
|
|
67
66
|
Style/FormatString:
|
68
67
|
Enabled: false
|
@@ -105,3 +104,6 @@ Style/TrailingCommaInArguments:
|
|
105
104
|
|
106
105
|
Style/TrivialAccessors:
|
107
106
|
Enabled: false
|
107
|
+
|
108
|
+
Style/CollectionCompact:
|
109
|
+
Enabled: true
|
data/CHANGELOG.md
CHANGED
data/Gemfile
CHANGED
data/README.md
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
# Serverkit [](https://github.com/serverkit/serverkit/actions/workflows/test.yml) [](https://badge.fury.io/rb/serverkit)
|
2
2
|
Assemble servers from your recipe.
|
3
3
|
|
4
4
|

|
data/Rakefile
CHANGED
data/Vagrantfile
CHANGED
data/bin/serverkit
CHANGED
data/lib/readable_validator.rb
CHANGED
data/lib/regexp_validator.rb
CHANGED
data/lib/required_validator.rb
CHANGED
@@ -1,10 +1,12 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require "serverkit/backends/base_backend"
|
2
4
|
require "specinfra"
|
3
5
|
|
4
6
|
module Serverkit
|
5
7
|
module Backends
|
6
8
|
class LocalBackend < BaseBackend
|
7
|
-
HOST = "localhost"
|
9
|
+
HOST = "localhost"
|
8
10
|
|
9
11
|
# @note Override
|
10
12
|
def host
|
data/lib/serverkit/command.rb
CHANGED
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require "rainbow"
|
2
4
|
require "serverkit/actions/apply"
|
3
5
|
require "serverkit/actions/check"
|
@@ -75,9 +77,7 @@ module Serverkit
|
|
75
77
|
recipe_path: recipe_path,
|
76
78
|
variables_path: variables_path,
|
77
79
|
ssh_options: ssh_options,
|
78
|
-
}.
|
79
|
-
value.nil?
|
80
|
-
end
|
80
|
+
}.compact
|
81
81
|
end
|
82
82
|
|
83
83
|
def apply
|
@@ -136,9 +136,7 @@ module Serverkit
|
|
136
136
|
{
|
137
137
|
user: command_line_options["ssh-user"],
|
138
138
|
keys: keys,
|
139
|
-
}.
|
140
|
-
value.nil?
|
141
|
-
end
|
139
|
+
}.compact
|
142
140
|
end
|
143
141
|
end
|
144
142
|
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require "erb"
|
2
4
|
require "json"
|
3
5
|
require "pathname"
|
@@ -58,7 +60,7 @@ module Serverkit
|
|
58
60
|
|
59
61
|
# @return [String]
|
60
62
|
def expanded_erb_path_suffix
|
61
|
-
"
|
63
|
+
".#{pathname.basename('.erb').to_s.split('.', 2).last}"
|
62
64
|
end
|
63
65
|
|
64
66
|
# @note Memoizing to prevent GC
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require "serverkit/loaders/base_loader"
|
2
4
|
require "serverkit/loaders/variables_loader"
|
3
5
|
require "serverkit/recipe"
|
@@ -48,13 +50,11 @@ module Serverkit
|
|
48
50
|
|
49
51
|
# @return [Serverkit::Variables]
|
50
52
|
def variables
|
51
|
-
@variables ||=
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
end
|
57
|
-
end
|
53
|
+
@variables ||= if has_variables_path?
|
54
|
+
load_variables
|
55
|
+
else
|
56
|
+
Variables.new(DEFAULT_VARIABLES_DATA.dup)
|
57
|
+
end
|
58
58
|
end
|
59
59
|
end
|
60
60
|
end
|
data/lib/serverkit/logger.rb
CHANGED
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require "logger"
|
2
4
|
require "rainbow"
|
3
5
|
|
@@ -23,7 +25,7 @@ module Serverkit
|
|
23
25
|
|
24
26
|
class Formatter
|
25
27
|
def call(severity, time, program_name, message)
|
26
|
-
message = message.to_s.gsub(/\n\z/,
|
28
|
+
message = "#{message.to_s.gsub(/\n\z/, '').gsub(/\e\[(\d+)(;\d+)*m/, '')}\n"
|
27
29
|
message = Rainbow(message).black.bright if severity == "DEBUG"
|
28
30
|
message
|
29
31
|
end
|
data/lib/serverkit/recipe.rb
CHANGED
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require "active_support/core_ext/hash/deep_merge"
|
2
4
|
require "serverkit/errors/invalid_recipe_type_error"
|
3
5
|
require "serverkit/errors/invalid_resources_type_error"
|
@@ -16,15 +18,13 @@ module Serverkit
|
|
16
18
|
|
17
19
|
# @return [Array<Serverkit::Errors::Base>]
|
18
20
|
def errors
|
19
|
-
@errors ||=
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
end
|
27
|
-
end
|
21
|
+
@errors ||= if !has_valid_typed_recipe_data?
|
22
|
+
errors_for_invalid_typed_recipe_data
|
23
|
+
elsif !has_valid_typed_resources_property?
|
24
|
+
errors_for_invalid_typed_resources_property
|
25
|
+
else
|
26
|
+
errors_in_resources
|
27
|
+
end
|
28
28
|
end
|
29
29
|
|
30
30
|
# @return [Array<Serverkit::Resource>]
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require "active_model"
|
2
4
|
require "active_model/errors"
|
3
5
|
require "active_support/core_ext/module/delegation"
|
@@ -22,7 +24,7 @@ module Serverkit
|
|
22
24
|
def attribute(name, options = {})
|
23
25
|
default = options.delete(:default)
|
24
26
|
define_method(name) do
|
25
|
-
@attributes
|
27
|
+
@attributes.fetch(name.to_s, default)
|
26
28
|
end
|
27
29
|
validates name, options unless options.empty?
|
28
30
|
end
|
@@ -1,9 +1,11 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require "serverkit/resources/base"
|
2
4
|
|
3
5
|
module Serverkit
|
4
6
|
module Resources
|
5
7
|
class Git < Base
|
6
|
-
DEFAULT_STATE = "cloned"
|
8
|
+
DEFAULT_STATE = "cloned"
|
7
9
|
|
8
10
|
attribute :path, required: true, type: String
|
9
11
|
attribute :repository, required: true, type: String
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require "serverkit/resources/base"
|
2
4
|
|
3
5
|
module Serverkit
|
@@ -8,7 +10,7 @@ module Serverkit
|
|
8
10
|
# path: /etc/sudoers
|
9
11
|
# line: "#includedir /etc/sudoers.d"
|
10
12
|
class Line < Base
|
11
|
-
DEFAULT_STATE = "present"
|
13
|
+
DEFAULT_STATE = "present"
|
12
14
|
|
13
15
|
attribute :path, required: true, type: String
|
14
16
|
attribute :insert_after, type: String
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require "erb"
|
2
4
|
require "serverkit/loaders/variables_loader"
|
3
5
|
require "serverkit/resources/remote_file"
|
@@ -33,13 +35,11 @@ module Serverkit
|
|
33
35
|
|
34
36
|
# @return [Serverkit::Variables]
|
35
37
|
def variables
|
36
|
-
@variables ||=
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
end
|
42
|
-
end
|
38
|
+
@variables ||= if recipe.variables_path
|
39
|
+
Loaders::VariablesLoader.new(recipe.variables_path).load
|
40
|
+
else
|
41
|
+
Variables.new(DEFAULT_VARIABLES_DATA.dup)
|
42
|
+
end
|
43
43
|
end
|
44
44
|
end
|
45
45
|
end
|
data/lib/serverkit/variables.rb
CHANGED
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require "active_support/core_ext/hash/deep_merge"
|
2
4
|
require "hashie/mash"
|
3
5
|
|
@@ -33,7 +35,7 @@ module Serverkit
|
|
33
35
|
end
|
34
36
|
|
35
37
|
# @note Override visibility from private to public
|
36
|
-
def binding
|
38
|
+
def binding # rubocop:disable Lint/UselessMethodDefinition
|
37
39
|
super
|
38
40
|
end
|
39
41
|
end
|
data/lib/serverkit/version.rb
CHANGED
data/lib/serverkit.rb
CHANGED
data/lib/type_validator.rb
CHANGED
data/serverkit.gemspec
CHANGED
@@ -1,6 +1,6 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_relative "lib/serverkit/version"
|
4
4
|
|
5
5
|
Gem::Specification.new do |spec|
|
6
6
|
spec.name = "serverkit"
|
@@ -16,17 +16,17 @@ Gem::Specification.new do |spec|
|
|
16
16
|
spec.require_paths = ["lib"]
|
17
17
|
spec.required_ruby_version = ">= 2.6.0"
|
18
18
|
|
19
|
-
spec.
|
20
|
-
spec.
|
21
|
-
spec.
|
22
|
-
|
23
|
-
spec.
|
24
|
-
spec.
|
25
|
-
spec.
|
26
|
-
spec.
|
27
|
-
spec.
|
28
|
-
spec.
|
29
|
-
spec.
|
30
|
-
spec.
|
31
|
-
spec.
|
19
|
+
spec.metadata["homepage_uri"] = spec.homepage
|
20
|
+
spec.metadata["source_code_uri"] = "https://github.com/serverkit/serverkit"
|
21
|
+
spec.metadata["changelog_uri"] = "https://github.com/serverkit/serverkit/blob/main/CHANGELOG.md"
|
22
|
+
|
23
|
+
spec.add_dependency "activemodel"
|
24
|
+
spec.add_dependency "activesupport", ">= 5.0.0"
|
25
|
+
spec.add_dependency "bundler"
|
26
|
+
spec.add_dependency "hashie"
|
27
|
+
spec.add_dependency "highline"
|
28
|
+
spec.add_dependency "rainbow"
|
29
|
+
spec.add_dependency "slop", "~> 3.4"
|
30
|
+
spec.add_dependency "specinfra", ">= 2.31.0"
|
31
|
+
spec.add_dependency "unix-crypt"
|
32
32
|
end
|
metadata
CHANGED
@@ -1,14 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: serverkit
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 1.0.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ryo Nakamura
|
8
|
-
autorequire:
|
9
8
|
bindir: bin
|
10
9
|
cert_chain: []
|
11
|
-
date:
|
10
|
+
date: 2025-04-25 00:00:00.000000000 Z
|
12
11
|
dependencies:
|
13
12
|
- !ruby/object:Gem::Dependency
|
14
13
|
name: activemodel
|
@@ -136,63 +135,6 @@ dependencies:
|
|
136
135
|
- - ">="
|
137
136
|
- !ruby/object:Gem::Version
|
138
137
|
version: '0'
|
139
|
-
- !ruby/object:Gem::Dependency
|
140
|
-
name: pry
|
141
|
-
requirement: !ruby/object:Gem::Requirement
|
142
|
-
requirements:
|
143
|
-
- - ">="
|
144
|
-
- !ruby/object:Gem::Version
|
145
|
-
version: '0'
|
146
|
-
type: :development
|
147
|
-
prerelease: false
|
148
|
-
version_requirements: !ruby/object:Gem::Requirement
|
149
|
-
requirements:
|
150
|
-
- - ">="
|
151
|
-
- !ruby/object:Gem::Version
|
152
|
-
version: '0'
|
153
|
-
- !ruby/object:Gem::Dependency
|
154
|
-
name: rake
|
155
|
-
requirement: !ruby/object:Gem::Requirement
|
156
|
-
requirements:
|
157
|
-
- - ">="
|
158
|
-
- !ruby/object:Gem::Version
|
159
|
-
version: '0'
|
160
|
-
type: :development
|
161
|
-
prerelease: false
|
162
|
-
version_requirements: !ruby/object:Gem::Requirement
|
163
|
-
requirements:
|
164
|
-
- - ">="
|
165
|
-
- !ruby/object:Gem::Version
|
166
|
-
version: '0'
|
167
|
-
- !ruby/object:Gem::Dependency
|
168
|
-
name: rspec
|
169
|
-
requirement: !ruby/object:Gem::Requirement
|
170
|
-
requirements:
|
171
|
-
- - ">="
|
172
|
-
- !ruby/object:Gem::Version
|
173
|
-
version: '0'
|
174
|
-
type: :development
|
175
|
-
prerelease: false
|
176
|
-
version_requirements: !ruby/object:Gem::Requirement
|
177
|
-
requirements:
|
178
|
-
- - ">="
|
179
|
-
- !ruby/object:Gem::Version
|
180
|
-
version: '0'
|
181
|
-
- !ruby/object:Gem::Dependency
|
182
|
-
name: rubocop
|
183
|
-
requirement: !ruby/object:Gem::Requirement
|
184
|
-
requirements:
|
185
|
-
- - "~>"
|
186
|
-
- !ruby/object:Gem::Version
|
187
|
-
version: 0.93.0
|
188
|
-
type: :development
|
189
|
-
prerelease: false
|
190
|
-
version_requirements: !ruby/object:Gem::Requirement
|
191
|
-
requirements:
|
192
|
-
- - "~>"
|
193
|
-
- !ruby/object:Gem::Version
|
194
|
-
version: 0.93.0
|
195
|
-
description:
|
196
138
|
email:
|
197
139
|
- r7kamura@gmail.com
|
198
140
|
executables:
|
@@ -200,10 +142,10 @@ executables:
|
|
200
142
|
extensions: []
|
201
143
|
extra_rdoc_files: []
|
202
144
|
files:
|
145
|
+
- ".github/workflows/test.yml"
|
203
146
|
- ".gitignore"
|
204
147
|
- ".rspec"
|
205
148
|
- ".rubocop.yml"
|
206
|
-
- ".travis.yml"
|
207
149
|
- CHANGELOG.md
|
208
150
|
- Gemfile
|
209
151
|
- LICENSE.txt
|
@@ -295,8 +237,10 @@ files:
|
|
295
237
|
homepage: https://github.com/serverkit/serverkit
|
296
238
|
licenses:
|
297
239
|
- MIT
|
298
|
-
metadata:
|
299
|
-
|
240
|
+
metadata:
|
241
|
+
homepage_uri: https://github.com/serverkit/serverkit
|
242
|
+
source_code_uri: https://github.com/serverkit/serverkit
|
243
|
+
changelog_uri: https://github.com/serverkit/serverkit/blob/main/CHANGELOG.md
|
300
244
|
rdoc_options: []
|
301
245
|
require_paths:
|
302
246
|
- lib
|
@@ -311,8 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
311
255
|
- !ruby/object:Gem::Version
|
312
256
|
version: '0'
|
313
257
|
requirements: []
|
314
|
-
rubygems_version: 3.
|
315
|
-
signing_key:
|
258
|
+
rubygems_version: 3.6.2
|
316
259
|
specification_version: 4
|
317
260
|
summary: Assemble servers from your recipe.
|
318
261
|
test_files: []
|