revamp 1.1.0 → 1.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +0 -1
- data/.rubocop.yml +4 -2
- data/.travis.yml +2 -1
- data/Gemfile +1 -3
- data/Gemfile.lock +153 -0
- data/README.md +9 -1
- data/lib/revamp/persister/rpm/rpm-spec.erb +1 -0
- data/lib/revamp/version.rb +1 -14
- data/spec/unit/revamp/persister/rpm/builder_spec.rb +1 -0
- data/spec/unit/revamp/version_spec.rb +3 -9
- metadata +4 -4
- data/Gemfile.ruby19 +0 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 977ae7b4decd86aabb3362345be51bd29f01c4d0
|
4
|
+
data.tar.gz: 7450ae67ed864623830f48317e17f11d78334704
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 07f2b7d4f8f00c1522eaddfdefff0634099f1970b54bd1c333ab2e1f309a41341023b340cd6e857d7920349112c2a0c48cbf543aef2fe0fa1aa313dfcf527bfb
|
7
|
+
data.tar.gz: 0cea0a5bb03501c4de5a5fbdf3fc2bfc64357c2db9305a7b9ec4e8f4805a0c8ab8133b042dac7cba27c489c9876df505bdfc556bb90f3ffcc21979f88f08d0d6
|
data/.gitignore
CHANGED
data/.rubocop.yml
CHANGED
@@ -3,6 +3,7 @@
|
|
3
3
|
inherit_from: .rubocop_todo.yml
|
4
4
|
|
5
5
|
AllCops:
|
6
|
+
TargetRubyVersion: 1.9
|
6
7
|
Include:
|
7
8
|
- 'lib/**/*.rb'
|
8
9
|
- 'bin/*'
|
@@ -25,5 +26,6 @@ Metrics/MethodLength:
|
|
25
26
|
|
26
27
|
Metrics/AbcSize:
|
27
28
|
Max: 20
|
28
|
-
|
29
|
-
|
29
|
+
|
30
|
+
Style/ClassAndModuleChildren:
|
31
|
+
EnforcedStyle: compact
|
data/.travis.yml
CHANGED
@@ -5,11 +5,12 @@ bundler_args: --without development --jobs=3 --retry=3 --path=${BUNDLE_PATH:-ven
|
|
5
5
|
cache: bundler
|
6
6
|
script:
|
7
7
|
- bundle exec rake test
|
8
|
-
before_install: rm -f Gemfile.lock
|
9
8
|
rvm:
|
10
9
|
- '1.9'
|
11
10
|
- '2.0'
|
12
11
|
- '2.1'
|
13
12
|
- '2.2'
|
13
|
+
- '2.3'
|
14
|
+
- '2.4'
|
14
15
|
notifications:
|
15
16
|
email: false
|
data/Gemfile
CHANGED
@@ -11,6 +11,7 @@ group :test do
|
|
11
11
|
gem 'inch', '~> 0.7.0', require: false
|
12
12
|
gem 'coveralls', '~> 0.8.9', require: false
|
13
13
|
gem 'codeclimate-test-reporter', '~> 0.4.8', require: false
|
14
|
+
gem 'tins', '~> 1.6.0', require: false if RUBY_VERSION < '2.0.0'
|
14
15
|
end
|
15
16
|
|
16
17
|
group :development do
|
@@ -21,9 +22,6 @@ group :development do
|
|
21
22
|
gem 'pry-byebug', '~> 3.2.0', require: false if RUBY_VERSION > '2.0.0'
|
22
23
|
end
|
23
24
|
|
24
|
-
local_gemfile = File.join(File.dirname(__FILE__), 'Gemfile.ruby19')
|
25
|
-
eval_gemfile local_gemfile if File.exist?(local_gemfile)
|
26
|
-
|
27
25
|
local_gemfile = File.join(File.dirname(__FILE__), 'Gemfile.local')
|
28
26
|
eval_gemfile local_gemfile if File.exist?(local_gemfile)
|
29
27
|
|
data/Gemfile.lock
ADDED
@@ -0,0 +1,153 @@
|
|
1
|
+
PATH
|
2
|
+
remote: .
|
3
|
+
specs:
|
4
|
+
revamp (1.1.1)
|
5
|
+
micro-optparse (~> 1.2.0)
|
6
|
+
|
7
|
+
GEM
|
8
|
+
remote: https://rubygems.org/
|
9
|
+
specs:
|
10
|
+
ast (2.3.0)
|
11
|
+
astrolabe (1.3.1)
|
12
|
+
parser (~> 2.2)
|
13
|
+
byebug (5.0.0)
|
14
|
+
columnize (= 0.9.0)
|
15
|
+
codeclimate-test-reporter (0.4.8)
|
16
|
+
simplecov (>= 0.7.1, < 1.0.0)
|
17
|
+
coderay (1.1.1)
|
18
|
+
columnize (0.9.0)
|
19
|
+
coveralls (0.8.9)
|
20
|
+
json (~> 1.8)
|
21
|
+
rest-client (>= 1.6.8, < 2)
|
22
|
+
simplecov (~> 0.10.0)
|
23
|
+
term-ansicolor (~> 1.3)
|
24
|
+
thor (~> 0.19.1)
|
25
|
+
tins (~> 1.6.0)
|
26
|
+
diff-lcs (1.3)
|
27
|
+
docile (1.1.5)
|
28
|
+
domain_name (0.5.20170404)
|
29
|
+
unf (>= 0.0.5, < 1.0.0)
|
30
|
+
ffi (1.9.18)
|
31
|
+
formatador (0.2.5)
|
32
|
+
guard (2.13.0)
|
33
|
+
formatador (>= 0.2.4)
|
34
|
+
listen (>= 2.7, <= 4.0)
|
35
|
+
lumberjack (~> 1.0)
|
36
|
+
nenv (~> 0.1)
|
37
|
+
notiffany (~> 0.0)
|
38
|
+
pry (>= 0.9.12)
|
39
|
+
shellany (~> 0.0)
|
40
|
+
thor (>= 0.18.1)
|
41
|
+
guard-bundler (2.1.0)
|
42
|
+
bundler (~> 1.0)
|
43
|
+
guard (~> 2.2)
|
44
|
+
guard-compat (~> 1.1)
|
45
|
+
guard-compat (1.2.1)
|
46
|
+
guard-rake (1.0.0)
|
47
|
+
guard
|
48
|
+
rake
|
49
|
+
guard-rubocop (1.2.0)
|
50
|
+
guard (~> 2.0)
|
51
|
+
rubocop (~> 0.20)
|
52
|
+
http-cookie (1.0.3)
|
53
|
+
domain_name (~> 0.5)
|
54
|
+
inch (0.7.1)
|
55
|
+
pry
|
56
|
+
sparkr (>= 0.2.0)
|
57
|
+
term-ansicolor
|
58
|
+
yard (~> 0.8.7.5)
|
59
|
+
json (1.8.6)
|
60
|
+
listen (3.0.8)
|
61
|
+
rb-fsevent (~> 0.9, >= 0.9.4)
|
62
|
+
rb-inotify (~> 0.9, >= 0.9.7)
|
63
|
+
lumberjack (1.0.12)
|
64
|
+
method_source (0.8.2)
|
65
|
+
micro-optparse (1.2.0)
|
66
|
+
mime-types (2.99.3)
|
67
|
+
nenv (0.3.0)
|
68
|
+
netrc (0.11.0)
|
69
|
+
notiffany (0.1.1)
|
70
|
+
nenv (~> 0.1)
|
71
|
+
shellany (~> 0.0)
|
72
|
+
parser (2.4.0.0)
|
73
|
+
ast (~> 2.2)
|
74
|
+
powerpack (0.1.1)
|
75
|
+
pry (0.10.4)
|
76
|
+
coderay (~> 1.1.0)
|
77
|
+
method_source (~> 0.8.1)
|
78
|
+
slop (~> 3.4)
|
79
|
+
pry-byebug (3.2.0)
|
80
|
+
byebug (~> 5.0)
|
81
|
+
pry (~> 0.10)
|
82
|
+
rainbow (2.2.2)
|
83
|
+
rake
|
84
|
+
rake (10.4.2)
|
85
|
+
rb-fsevent (0.10.2)
|
86
|
+
rb-inotify (0.9.10)
|
87
|
+
ffi (>= 0.5.0, < 2)
|
88
|
+
rest-client (1.8.0)
|
89
|
+
http-cookie (>= 1.0.2, < 2.0)
|
90
|
+
mime-types (>= 1.16, < 3.0)
|
91
|
+
netrc (~> 0.7)
|
92
|
+
rspec (3.3.0)
|
93
|
+
rspec-core (~> 3.3.0)
|
94
|
+
rspec-expectations (~> 3.3.0)
|
95
|
+
rspec-mocks (~> 3.3.0)
|
96
|
+
rspec-core (3.3.2)
|
97
|
+
rspec-support (~> 3.3.0)
|
98
|
+
rspec-expectations (3.3.1)
|
99
|
+
diff-lcs (>= 1.2.0, < 2.0)
|
100
|
+
rspec-support (~> 3.3.0)
|
101
|
+
rspec-its (1.2.0)
|
102
|
+
rspec-core (>= 3.0.0)
|
103
|
+
rspec-expectations (>= 3.0.0)
|
104
|
+
rspec-mocks (3.3.2)
|
105
|
+
diff-lcs (>= 1.2.0, < 2.0)
|
106
|
+
rspec-support (~> 3.3.0)
|
107
|
+
rspec-support (3.3.0)
|
108
|
+
rubocop (0.34.2)
|
109
|
+
astrolabe (~> 1.3)
|
110
|
+
parser (>= 2.2.2.5, < 3.0)
|
111
|
+
powerpack (~> 0.1)
|
112
|
+
rainbow (>= 1.99.1, < 3.0)
|
113
|
+
ruby-progressbar (~> 1.4)
|
114
|
+
ruby-progressbar (1.8.1)
|
115
|
+
shellany (0.0.1)
|
116
|
+
simplecov (0.10.0)
|
117
|
+
docile (~> 1.1.0)
|
118
|
+
json (~> 1.8)
|
119
|
+
simplecov-html (~> 0.10.0)
|
120
|
+
simplecov-html (0.10.1)
|
121
|
+
slop (3.6.0)
|
122
|
+
sparkr (0.4.1)
|
123
|
+
term-ansicolor (1.3.2)
|
124
|
+
tins (~> 1.0)
|
125
|
+
thor (0.19.4)
|
126
|
+
tins (1.6.0)
|
127
|
+
unf (0.1.4)
|
128
|
+
unf_ext
|
129
|
+
unf_ext (0.0.7.4)
|
130
|
+
yard (0.8.7.6)
|
131
|
+
|
132
|
+
PLATFORMS
|
133
|
+
ruby
|
134
|
+
|
135
|
+
DEPENDENCIES
|
136
|
+
bundler
|
137
|
+
codeclimate-test-reporter (~> 0.4.8)
|
138
|
+
coveralls (~> 0.8.9)
|
139
|
+
guard (~> 2.13.0)
|
140
|
+
guard-bundler (~> 2.1.0)
|
141
|
+
guard-rake (~> 1.0.0)
|
142
|
+
guard-rubocop (~> 1.2.0)
|
143
|
+
inch (~> 0.7.0)
|
144
|
+
pry-byebug (~> 3.2.0)
|
145
|
+
rake (~> 10.4.0)
|
146
|
+
revamp!
|
147
|
+
rspec (~> 3.3.0)
|
148
|
+
rspec-its (~> 1.2.0)
|
149
|
+
rubocop (~> 0.34.0)
|
150
|
+
simplecov (~> 0.10.0)
|
151
|
+
|
152
|
+
BUNDLED WITH
|
153
|
+
1.15.3
|
data/README.md
CHANGED
@@ -12,7 +12,15 @@ Install it yourself, globally as:
|
|
12
12
|
|
13
13
|
On Debian/Ubuntu systems to convert to RPM you will need also:
|
14
14
|
|
15
|
-
$ sudo apt-get install
|
15
|
+
$ sudo apt-get install -y rpm
|
16
|
+
|
17
|
+
On RHEL systems you will need also:
|
18
|
+
|
19
|
+
$ sudo yum install -y rpm-build
|
20
|
+
|
21
|
+
For convenience thare is a Docker image with system tools and revamp preinstalled: `coigovpl/revamp`. The usage is simply:
|
22
|
+
|
23
|
+
$ docker run --rm coigovpl/revamp revamp --help
|
16
24
|
|
17
25
|
## Usage
|
18
26
|
|
@@ -13,6 +13,7 @@ Provides: puppetmodule_<%= model.slugname %> = <%= model.version %>-<%= release
|
|
13
13
|
<% if has_requirements %>Requires: <%= requirements %><% end %>
|
14
14
|
%description
|
15
15
|
<%= model.summary %>
|
16
|
+
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
|
16
17
|
%prep
|
17
18
|
%setup
|
18
19
|
%build
|
data/lib/revamp/version.rb
CHANGED
@@ -1,20 +1,7 @@
|
|
1
1
|
# Top level module for Revamp
|
2
2
|
module Revamp
|
3
|
-
# Prepare version
|
4
|
-
#
|
5
|
-
# @param desired [String] a desired version
|
6
|
-
# @return [String] a prepared version
|
7
|
-
def self.version_prep(desired)
|
8
|
-
version = desired
|
9
|
-
if desired.match(/[^0-9\.]+/)
|
10
|
-
git = `git describe --tags --dirty --always`
|
11
|
-
version += '.' + git.tr('-', '.')
|
12
|
-
end
|
13
|
-
version.strip
|
14
|
-
end
|
15
|
-
|
16
3
|
# Version for Herald
|
17
|
-
VERSION =
|
4
|
+
VERSION = '1.1.1'
|
18
5
|
# Lincense for Herald
|
19
6
|
LICENSE = 'Apache-2.0'
|
20
7
|
# Project name
|
@@ -29,6 +29,7 @@ Provides: puppetmodule_puppetlabs-apache = 3.5.1-42
|
|
29
29
|
Requires: puppetmodule(puppetlabs-concat) >= 1.0.5, puppetmodule(puppetlabs-concat) < 2.0.0
|
30
30
|
%description
|
31
31
|
Installs, configures, and manages Apache virtual hosts, web services, and modules.
|
32
|
+
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
|
32
33
|
%prep
|
33
34
|
%setup
|
34
35
|
%build
|
@@ -1,13 +1,7 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
require 'revamp'
|
3
3
|
|
4
|
-
describe Revamp, '
|
5
|
-
|
6
|
-
|
7
|
-
it { expect(subject).to eq '1.2.3' }
|
8
|
-
end
|
9
|
-
context 'on unstable version v1.2.3.pre' do
|
10
|
-
subject { Revamp::version_prep '1.2.3.pre' }
|
11
|
-
it { expect(subject).to match /^1\.2\.3\.pre\.?(?:v\d+\.\d+\.\d+(?:\.\d+\.g)?)?(?:[0-9a-f]{7})?(?:\.dirty)?$/ }
|
12
|
-
end
|
4
|
+
describe Revamp, '::VERSION' do
|
5
|
+
subject { Revamp::VERSION }
|
6
|
+
it { expect(subject).to match /^\d+\.\d+\.\d+(?:\.pre)?$/ }
|
13
7
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: revamp
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.1.
|
4
|
+
version: 1.1.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Centralny Ośrodek Informatyki
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date:
|
12
|
+
date: 2017-08-04 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: bundler
|
@@ -71,7 +71,7 @@ files:
|
|
71
71
|
- ".rubocop_todo.yml"
|
72
72
|
- ".travis.yml"
|
73
73
|
- Gemfile
|
74
|
-
- Gemfile.
|
74
|
+
- Gemfile.lock
|
75
75
|
- LICENSE.txt
|
76
76
|
- README.md
|
77
77
|
- Rakefile
|
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
120
120
|
version: '0'
|
121
121
|
requirements: []
|
122
122
|
rubyforge_project:
|
123
|
-
rubygems_version: 2.
|
123
|
+
rubygems_version: 2.6.8
|
124
124
|
signing_key:
|
125
125
|
specification_version: 4
|
126
126
|
summary: Converts puppet module file to valid RPM or DEB package
|
data/Gemfile.ruby19
DELETED
@@ -1 +0,0 @@
|
|
1
|
-
gem 'tins', '~> 1.6.0', require: false if RUBY_VERSION < '2.0.0'
|