serverkit 0.2.1 → 0.2.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +5 -1
- data/README.md +3 -3
- data/lib/serverkit/actions/apply.rb +2 -2
- data/lib/serverkit/actions/base.rb +6 -0
- data/lib/serverkit/actions/{diff.rb → check.rb} +2 -2
- data/lib/serverkit/command.rb +5 -5
- data/lib/serverkit/resources/file.rb +1 -1
- data/lib/serverkit/resources/git.rb +1 -1
- data/lib/serverkit/resources/homebrew_cask.rb +1 -1
- data/lib/serverkit/resources/package.rb +1 -1
- data/lib/serverkit/resources/service.rb +1 -1
- data/lib/serverkit/resources/symlink.rb +1 -1
- data/lib/serverkit/version.rb +1 -1
- data/serverkit.gemspec +1 -1
- metadata +17 -17
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b3236f3d4ad0dbab87e87f35c9afbdb165591f1c
|
4
|
+
data.tar.gz: 3374bf2a87f000bf63358af4b5e40dc0051d086a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 163de635af19fdffa01010cf04c8bce58a5876789343a265aa0d641e60e1b04e8037840df5729c89ddf03dd57e34552a3a48a70379beefdec2782600b7a2a533
|
7
|
+
data.tar.gz: 8866a193ae71db7d4f97bf71e01258f8ff04f615a0392ba6177abcfd2bb85e876fb84e9d1e421d501d082c79339533aa9b63b70365d1e3793f619fa75aeeb536
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,7 @@
|
|
1
|
+
## 0.2.2
|
2
|
+
- Change action name: `serverkit diff` -> `serverkit check`
|
3
|
+
- Load gems from Gemfile before running action
|
4
|
+
|
1
5
|
## 0.2.1
|
2
6
|
- Change action name: `serverkit check` -> `serverkit diff`
|
3
7
|
|
@@ -36,4 +40,4 @@
|
|
36
40
|
|
37
41
|
## 0.0.1
|
38
42
|
- 1st Release on 2015-03-30
|
39
|
-
- Support `serverkit
|
43
|
+
- Support `serverkit check` and `serverkit apply` actions
|
data/README.md
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
Configuration management toolkit for IT automation.
|
3
3
|
|
4
4
|
## Usage
|
5
|
-
Write a recipe, then run `serverkit` executable to validate, inspect,
|
5
|
+
Write a recipe, then run `serverkit` executable to validate, inspect, check, and apply the recipe.
|
6
6
|
|
7
7
|
### serverkit validate
|
8
8
|
Validates recipe schema, resources, and attributes.
|
@@ -57,11 +57,11 @@ $ serverkit inspect recipe.yml
|
|
57
57
|
}
|
58
58
|
```
|
59
59
|
|
60
|
-
### serverkit
|
60
|
+
### serverkit check
|
61
61
|
Shows the difference between your recipe and the state of the target host.
|
62
62
|
|
63
63
|
```
|
64
|
-
$ serverkit
|
64
|
+
$ serverkit check recipe.yml
|
65
65
|
[ OK ] install_mysql
|
66
66
|
[ OK ] install_redis
|
67
67
|
[ OK ] install_licecap
|
@@ -9,11 +9,11 @@ module Serverkit
|
|
9
9
|
Thread.new do
|
10
10
|
recipe.resources.map(&:dup).each do |resource|
|
11
11
|
resource.backend = backend
|
12
|
-
if resource.
|
12
|
+
if resource.check
|
13
13
|
puts "[SKIP] #{resource.id} on #{host_for(backend)}"
|
14
14
|
else
|
15
15
|
resource.apply
|
16
|
-
result = resource.
|
16
|
+
result = resource.check ? "DONE" : "FAIL"
|
17
17
|
puts "[#{result}] #{resource.id} on #{host_for(backend)}"
|
18
18
|
end
|
19
19
|
end
|
@@ -1,3 +1,4 @@
|
|
1
|
+
require "bundler"
|
1
2
|
require "etc"
|
2
3
|
require "net/ssh"
|
3
4
|
require "serverkit/errors/missing_recipe_path_argument_error"
|
@@ -50,6 +51,10 @@ module Serverkit
|
|
50
51
|
end
|
51
52
|
end
|
52
53
|
|
54
|
+
def bundle
|
55
|
+
Bundler.require(:default)
|
56
|
+
end
|
57
|
+
|
53
58
|
def hosts
|
54
59
|
options[:hosts].split(",")
|
55
60
|
end
|
@@ -70,6 +75,7 @@ module Serverkit
|
|
70
75
|
end
|
71
76
|
|
72
77
|
def setup
|
78
|
+
bundle
|
73
79
|
abort_with_errors unless recipe.valid?
|
74
80
|
end
|
75
81
|
|
@@ -3,13 +3,13 @@ require "thread"
|
|
3
3
|
|
4
4
|
module Serverkit
|
5
5
|
module Actions
|
6
|
-
class
|
6
|
+
class Check < Base
|
7
7
|
def run
|
8
8
|
backends.map do |backend|
|
9
9
|
Thread.new do
|
10
10
|
recipe.resources.map(&:dup).each do |resource|
|
11
11
|
resource.backend = backend
|
12
|
-
result = resource.
|
12
|
+
result = resource.check ? "OK" : "NG"
|
13
13
|
puts "[ #{result} ] #{resource.id} on #{host_for(backend)}"
|
14
14
|
end
|
15
15
|
end
|
data/lib/serverkit/command.rb
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
require "serverkit/actions/apply"
|
2
|
-
require "serverkit/actions/
|
2
|
+
require "serverkit/actions/check"
|
3
3
|
require "serverkit/actions/inspect"
|
4
4
|
require "serverkit/actions/validate"
|
5
5
|
require "serverkit/errors/missing_action_name_argument_error"
|
@@ -19,8 +19,8 @@ module Serverkit
|
|
19
19
|
raise Errors::MissingActionNameArgumentError
|
20
20
|
when "apply"
|
21
21
|
apply
|
22
|
-
when "
|
23
|
-
|
22
|
+
when "check"
|
23
|
+
check
|
24
24
|
when "inspect"
|
25
25
|
_inspect
|
26
26
|
when "validate"
|
@@ -43,8 +43,8 @@ module Serverkit
|
|
43
43
|
Actions::Apply.new(@argv).call
|
44
44
|
end
|
45
45
|
|
46
|
-
def
|
47
|
-
Actions::
|
46
|
+
def check
|
47
|
+
Actions::Check.new(@argv).call
|
48
48
|
end
|
49
49
|
|
50
50
|
# @note #inspect is reserved ;(
|
data/lib/serverkit/version.rb
CHANGED
data/serverkit.gemspec
CHANGED
@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
|
|
18
18
|
|
19
19
|
spec.add_runtime_dependency "activemodel"
|
20
20
|
spec.add_runtime_dependency "activesupport"
|
21
|
+
spec.add_runtime_dependency "bundler"
|
21
22
|
spec.add_runtime_dependency "hashie"
|
22
23
|
spec.add_runtime_dependency "highline"
|
23
24
|
spec.add_runtime_dependency "slop", "~> 3.4"
|
24
25
|
spec.add_runtime_dependency "specinfra"
|
25
|
-
spec.add_development_dependency "bundler", "~> 1.7"
|
26
26
|
spec.add_development_dependency "pry", "0.10.1"
|
27
27
|
spec.add_development_dependency "rake", "~> 10.0"
|
28
28
|
spec.add_development_dependency "rspec", "3.2.0"
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: serverkit
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ryo Nakamura
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-04-
|
11
|
+
date: 2015-04-07 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activemodel
|
@@ -38,6 +38,20 @@ dependencies:
|
|
38
38
|
- - ">="
|
39
39
|
- !ruby/object:Gem::Version
|
40
40
|
version: '0'
|
41
|
+
- !ruby/object:Gem::Dependency
|
42
|
+
name: bundler
|
43
|
+
requirement: !ruby/object:Gem::Requirement
|
44
|
+
requirements:
|
45
|
+
- - ">="
|
46
|
+
- !ruby/object:Gem::Version
|
47
|
+
version: '0'
|
48
|
+
type: :runtime
|
49
|
+
prerelease: false
|
50
|
+
version_requirements: !ruby/object:Gem::Requirement
|
51
|
+
requirements:
|
52
|
+
- - ">="
|
53
|
+
- !ruby/object:Gem::Version
|
54
|
+
version: '0'
|
41
55
|
- !ruby/object:Gem::Dependency
|
42
56
|
name: hashie
|
43
57
|
requirement: !ruby/object:Gem::Requirement
|
@@ -94,20 +108,6 @@ dependencies:
|
|
94
108
|
- - ">="
|
95
109
|
- !ruby/object:Gem::Version
|
96
110
|
version: '0'
|
97
|
-
- !ruby/object:Gem::Dependency
|
98
|
-
name: bundler
|
99
|
-
requirement: !ruby/object:Gem::Requirement
|
100
|
-
requirements:
|
101
|
-
- - "~>"
|
102
|
-
- !ruby/object:Gem::Version
|
103
|
-
version: '1.7'
|
104
|
-
type: :development
|
105
|
-
prerelease: false
|
106
|
-
version_requirements: !ruby/object:Gem::Requirement
|
107
|
-
requirements:
|
108
|
-
- - "~>"
|
109
|
-
- !ruby/object:Gem::Version
|
110
|
-
version: '1.7'
|
111
111
|
- !ruby/object:Gem::Dependency
|
112
112
|
name: pry
|
113
113
|
requirement: !ruby/object:Gem::Requirement
|
@@ -194,7 +194,7 @@ files:
|
|
194
194
|
- lib/serverkit.rb
|
195
195
|
- lib/serverkit/actions/apply.rb
|
196
196
|
- lib/serverkit/actions/base.rb
|
197
|
-
- lib/serverkit/actions/
|
197
|
+
- lib/serverkit/actions/check.rb
|
198
198
|
- lib/serverkit/actions/inspect.rb
|
199
199
|
- lib/serverkit/actions/validate.rb
|
200
200
|
- lib/serverkit/command.rb
|