ops_team 0.13.3 → 0.14.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/dependencies/apt.rb +4 -18
- data/lib/dependencies/gem.rb +19 -7
- data/lib/dependencies/versioned_dependency.rb +25 -0
- data/lib/output.rb +1 -1
- data/ops_team.gemspec +1 -1
- metadata +2 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 158077a8d8c025f32b231991165c500b93000422bfc411ff88124a86dad7af05
|
4
|
+
data.tar.gz: db0c44533b58f0a65b9d25921b77a5eb41f1a058f8ecae444c175a635d9f455d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a5a7026cbb1b3eee2e16128d5f1f3d36f54197327bbe5562eb28ac2c7eb74a29feb5cc743cae4f4afaef40a9e5dabc5cf4cdc17eab5dd373ed826b87e1b6744f
|
7
|
+
data.tar.gz: 540a77c3f21b3c015bd45300bd50c0a42b6d467607b77869b141f3a03a15399e0f3d74a59aeef8a6b6781b6538783ce874dc00d6f0811c442bc36a88923d3602
|
data/lib/dependencies/apt.rb
CHANGED
@@ -1,14 +1,12 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require '
|
3
|
+
require 'dependencies/versioned_dependency'
|
4
4
|
require 'dependencies/helpers/apt_cache_policy'
|
5
5
|
|
6
6
|
module Dependencies
|
7
|
-
class Apt <
|
8
|
-
PACKAGE_NAME_SEPARATOR = "/"
|
9
|
-
|
7
|
+
class Apt < VersionedDependency
|
10
8
|
def met?
|
11
|
-
return apt_cache_policy.installed_version ==
|
9
|
+
return apt_cache_policy.installed_version == dep_version if dep_version
|
12
10
|
|
13
11
|
apt_cache_policy.installed?
|
14
12
|
end
|
@@ -28,20 +26,8 @@ module Dependencies
|
|
28
26
|
|
29
27
|
private
|
30
28
|
|
31
|
-
def package_name
|
32
|
-
name_components[0]
|
33
|
-
end
|
34
|
-
|
35
|
-
def package_version
|
36
|
-
name_components[1]
|
37
|
-
end
|
38
|
-
|
39
|
-
def name_components
|
40
|
-
name.split(PACKAGE_NAME_SEPARATOR, 2)
|
41
|
-
end
|
42
|
-
|
43
29
|
def apt_cache_policy
|
44
|
-
@apt_cache_policy ||= Dependencies::Helpers::AptCachePolicy.new(
|
30
|
+
@apt_cache_policy ||= Dependencies::Helpers::AptCachePolicy.new(dep_name)
|
45
31
|
end
|
46
32
|
|
47
33
|
def sudo_string
|
data/lib/dependencies/gem.rb
CHANGED
@@ -4,18 +4,20 @@ require 'dependency'
|
|
4
4
|
require 'options'
|
5
5
|
|
6
6
|
module Dependencies
|
7
|
-
class Gem <
|
7
|
+
class Gem < VersionedDependency
|
8
8
|
def met?
|
9
|
-
|
9
|
+
if versioned?
|
10
|
+
execute("gem list -i '^#{dep_name}$' -v '#{dep_version}'") if versioned?
|
11
|
+
else
|
12
|
+
execute("gem list -i '^#{name}$'")
|
13
|
+
end
|
10
14
|
end
|
11
15
|
|
12
16
|
def meet
|
13
|
-
if
|
14
|
-
execute("
|
15
|
-
elsif Options.get("gem.user_install")
|
16
|
-
execute("gem install --user-install #{name}")
|
17
|
+
if versioned?
|
18
|
+
execute("#{sudo_string}gem install #{user_install_string}'#{dep_name}' -v '#{dep_version}'")
|
17
19
|
else
|
18
|
-
execute("gem install #{name}")
|
20
|
+
execute("#{sudo_string}gem install #{user_install_string}'#{name}'")
|
19
21
|
end
|
20
22
|
end
|
21
23
|
|
@@ -23,5 +25,15 @@ module Dependencies
|
|
23
25
|
# do nothing; we don't want to uninstall packages and reinstall them every time
|
24
26
|
true
|
25
27
|
end
|
28
|
+
|
29
|
+
private
|
30
|
+
|
31
|
+
def sudo_string
|
32
|
+
Options.get("gem.use_sudo") ? "sudo " : ""
|
33
|
+
end
|
34
|
+
|
35
|
+
def user_install_string
|
36
|
+
Options.get("gem.user_install") ? "--user-install " : ""
|
37
|
+
end
|
26
38
|
end
|
27
39
|
end
|
@@ -0,0 +1,25 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Dependencies
|
4
|
+
class VersionedDependency < Dependency
|
5
|
+
VERSION_SEPARATOR = " "
|
6
|
+
|
7
|
+
def dep_name
|
8
|
+
name_components[0]
|
9
|
+
end
|
10
|
+
|
11
|
+
def dep_version
|
12
|
+
name_components[1]
|
13
|
+
end
|
14
|
+
|
15
|
+
def versioned?
|
16
|
+
!!dep_version
|
17
|
+
end
|
18
|
+
|
19
|
+
private
|
20
|
+
|
21
|
+
def name_components
|
22
|
+
name.split(VERSION_SEPARATOR, 2)
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
data/lib/output.rb
CHANGED
data/ops_team.gemspec
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ops_team
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.14.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- nickthecook@gmail.com
|
@@ -170,6 +170,7 @@ files:
|
|
170
170
|
- lib/dependencies/gem.rb
|
171
171
|
- lib/dependencies/helpers/apt_cache_policy.rb
|
172
172
|
- lib/dependencies/sshkey.rb
|
173
|
+
- lib/dependencies/versioned_dependency.rb
|
173
174
|
- lib/dependency.rb
|
174
175
|
- lib/environment.rb
|
175
176
|
- lib/executor.rb
|