Skip to content

Commit 79c48f9

Browse files
dsesterodsestero
committed
updated to pdk 1.4.1
1 parent 0be6281 commit 79c48f9

19 files changed

Lines changed: 332 additions & 137 deletions

‎.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@
1313
/Gemfile.lock
1414
/junit/
1515
/log/
16-
/log/
1716
/pkg/
1817
/spec/fixtures/manifests/
1918
/spec/fixtures/modules/
2019
/tmp/
2120
/vendor/
2221
/convert_report.txt
23-
22+
.DS_Store

‎.pdkignore‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
.*.sw[op]
2+
.metadata
3+
.yardoc
4+
.yardwarns
5+
*.iml
6+
/.bundle/
7+
/.idea/
8+
/.vagrant/
9+
/coverage/
10+
/bin/
11+
/doc/
12+
/Gemfile.local
13+
/Gemfile.lock
14+
/junit/
15+
/log/
16+
/pkg/
17+
/spec/fixtures/manifests/
18+
/spec/fixtures/modules/
19+
/tmp/
20+
/vendor/
21+
/convert_report.txt
22+
.DS_Store

‎.rubocop.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ Style/TrailingCommaInLiteral:
6363
Style/SymbolArray:
6464
Description: Using percent style obscures symbolic intent of array's contents.
6565
EnforcedStyle: brackets
66+
RSpec/MessageSpies:
67+
EnforcedStyle: receive
6668
Style/CollectionMethods:
6769
Enabled: true
6870
Style/MethodCalledOnDoEndBlock:

‎.travis.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ script:
1515
bundler_args: --without system_tests
1616
rvm:
1717
- 2.4.1
18-
- 2.1.9
1918
env:
20-
- PUPPET_GEM_VERSION="~> 4.0" CHECK=spec
19+
- PUPPET_GEM_VERSION="~> 5.0" CHECK=spec
2120
matrix:
2221
fast_finish: true
2322
include:
@@ -27,6 +26,11 @@ matrix:
2726
env: CHECK="syntax lint"
2827
-
2928
env: CHECK=metadata_lint
29+
-
30+
env: CHECK=spec
31+
-
32+
env: PUPPET_GEM_VERSION="~> 4.0" CHECK=spec
33+
rvm: 2.1.9
3034
branches:
3135
only:
3236
- master

‎.yardopts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
--markup markdown
2-
--output-dir docs/

‎appveyor.yml‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ init:
99
- 'mkdir C:\ProgramData\PuppetLabs\hiera && exit 0'
1010
- 'mkdir C:\ProgramData\PuppetLabs\puppet\var && exit 0'
1111
environment:
12-
PUPPET_GEM_VERSION: ~> 4.0
1312
matrix:
1413
-
1514
RUBY_VERSION: 24-x64
@@ -21,26 +20,25 @@ environment:
2120
RUBY_VERSION: 24-x64
2221
CHECK: rubocop
2322
-
24-
RUBY_VERSION: 24-x64
23+
PUPPET_GEM_VERSION: ~> 4.0
24+
RUBY_VERSION: 21
2525
CHECK: spec
2626
-
27+
PUPPET_GEM_VERSION: ~> 4.0
2728
RUBY_VERSION: 21-x64
2829
CHECK: spec
30+
-
31+
PUPPET_GEM_VERSION: ~> 5.0
32+
RUBY_VERSION: 24
33+
CHECK: spec
34+
-
35+
PUPPET_GEM_VERSION: ~> 5.0
36+
RUBY_VERSION: 24-x64
37+
CHECK: spec
2938
matrix:
3039
fast_finish: true
3140
install:
3241
- set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
33-
# Due to a bug in the version of OpenSSL shipped with Ruby 2.4.1 on Windows
34-
# (https://bugs.ruby-lang.org/issues/11033). Errors are ignored because the
35-
# mingw gem calls out to pacman to install OpenSSL which is already
36-
# installed, causing gem to raise a warning that powershell determines to be
37-
# a fatal error.
38-
- ps: |
39-
$ErrorActionPreference = "SilentlyContinue"
40-
if($env:RUBY_VERSION -eq "24-x64") {
41-
gem install openssl "~> 2.0.4" --no-rdoc --no-ri -- --with-openssl-dir=C:\msys64\mingw64
42-
}
43-
$host.SetShouldExit(0)
4442
- bundle install --jobs 4 --retry 2 --without system_tests
4543
- type Gemfile.lock
4644
build: off

‎docs/puppet_classes/java_3A_3Ajava_6.html‎

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -75,24 +75,32 @@ <h2>Overview</h2>
7575
<div class="docstring">
7676
<div class="discussion">
7777

78-
<p>Class: java::java_6</p>
79-
8078
<p>This class installs Java-6.</p>
8179

82-
<p>Actions:</p>
83-
84-
<p>Installs Java-6 by declaring the <code>java</code> define.</p>
85-
86-
<p>Requires: see Modulefile</p>
87-
88-
<p>Sample Usage:</p>
89-
90-
<p>include java::java_6</p>
91-
9280
</div>
9381
</div>
9482
<div class="tags">
9583

84+
<div class="examples">
85+
<p class="tag_title">Examples:</p>
86+
87+
88+
<p class="example_title"><div class='inline'>
89+
<p>Declaring in manifest</p>
90+
</div></p>
91+
92+
<pre class="example code"><code><span class='id identifier rubyid_include'>include</span> <span class='id identifier rubyid_java'>java</span><span class='op'>::</span><span class='id identifier rubyid_java_6'>java_6</span></code></pre>
93+
94+
95+
<p class="example_title"><div class='inline'>
96+
<p>Hiera data for using java_6</p>
97+
</div></p>
98+
99+
<pre class="example code"><code>classes:
100+
- java::java_6</code></pre>
101+
102+
</div>
103+
96104

97105
</div><div class="method_details_list">
98106
<table class="source_code">
@@ -101,13 +109,13 @@ <h2>Overview</h2>
101109
<pre class="lines">
102110

103111

104-
14
105-
15
106-
16
107-
17</pre>
112+
8
113+
9
114+
10
115+
11</pre>
108116
</td>
109117
<td>
110-
<pre class="code"><span class="info file"># File 'manifests/java_6.pp', line 14</span>
118+
<pre class="code"><span class="info file"># File 'manifests/java_6.pp', line 8</span>
111119

112120
class java::java_6 {
113121

‎docs/puppet_classes/java_3A_3Ajava_7.html‎

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -75,24 +75,32 @@ <h2>Overview</h2>
7575
<div class="docstring">
7676
<div class="discussion">
7777

78-
<p>Class: java::java_7</p>
79-
8078
<p>This class installs Java-7.</p>
8179

82-
<p>Actions:</p>
83-
84-
<p>Installs Java-7 by declaring the <code>java</code> define.</p>
85-
86-
<p>Requires: see Modulefile</p>
87-
88-
<p>Sample Usage:</p>
89-
90-
<p>include java::java_7</p>
91-
9280
</div>
9381
</div>
9482
<div class="tags">
9583

84+
<div class="examples">
85+
<p class="tag_title">Examples:</p>
86+
87+
88+
<p class="example_title"><div class='inline'>
89+
<p>Declaring in manifest</p>
90+
</div></p>
91+
92+
<pre class="example code"><code><span class='id identifier rubyid_include'>include</span> <span class='id identifier rubyid_java'>java</span><span class='op'>::</span><span class='id identifier rubyid_java_7'>java_7</span></code></pre>
93+
94+
95+
<p class="example_title"><div class='inline'>
96+
<p>Hiera data for using java_7</p>
97+
</div></p>
98+
99+
<pre class="example code"><code>classes:
100+
- java::java_7</code></pre>
101+
102+
</div>
103+
96104

97105
</div><div class="method_details_list">
98106
<table class="source_code">
@@ -101,13 +109,13 @@ <h2>Overview</h2>
101109
<pre class="lines">
102110

103111

104-
14
105-
15
106-
16
107-
17</pre>
112+
8
113+
9
114+
10
115+
11</pre>
108116
</td>
109117
<td>
110-
<pre class="code"><span class="info file"># File 'manifests/java_7.pp', line 14</span>
118+
<pre class="code"><span class="info file"># File 'manifests/java_7.pp', line 8</span>
111119

112120
class java::java_7 {
113121

‎docs/puppet_classes/java_3A_3Ajava_8.html‎

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -75,24 +75,32 @@ <h2>Overview</h2>
7575
<div class="docstring">
7676
<div class="discussion">
7777

78-
<p>Class: java::java_8</p>
79-
8078
<p>This class installs Java-8.</p>
8179

82-
<p>Actions:</p>
83-
84-
<p>Installs Java-8 by declaring the <code>java</code> define.</p>
85-
86-
<p>Requires: see Modulefile</p>
87-
88-
<p>Sample Usage:</p>
89-
90-
<p>include java::java_8</p>
91-
9280
</div>
9381
</div>
9482
<div class="tags">
9583

84+
<div class="examples">
85+
<p class="tag_title">Examples:</p>
86+
87+
88+
<p class="example_title"><div class='inline'>
89+
<p>Declaring in manifest</p>
90+
</div></p>
91+
92+
<pre class="example code"><code><span class='id identifier rubyid_include'>include</span> <span class='id identifier rubyid_java'>java</span><span class='op'>::</span><span class='id identifier rubyid_java_8'>java_8</span></code></pre>
93+
94+
95+
<p class="example_title"><div class='inline'>
96+
<p>Hiera data for using java_8</p>
97+
</div></p>
98+
99+
<pre class="example code"><code>classes:
100+
- java::java_8</code></pre>
101+
102+
</div>
103+
96104

97105
</div><div class="method_details_list">
98106
<table class="source_code">
@@ -101,13 +109,13 @@ <h2>Overview</h2>
101109
<pre class="lines">
102110

103111

104-
14
105-
15
106-
16
107-
17</pre>
112+
8
113+
9
114+
10
115+
11</pre>
108116
</td>
109117
<td>
110-
<pre class="code"><span class="info file"># File 'manifests/java_8.pp', line 14</span>
118+
<pre class="code"><span class="info file"># File 'manifests/java_8.pp', line 8</span>
111119

112120
class java::java_8 {
113121

‎docs/puppet_defined_types/java.html‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,22 @@ <h2>Overview</h2>
8383
target node the command <code>update-alternatives</code> is issued to set
8484
the default java accordingly.</p>
8585

86-
<p>Requires: see Modulefile</p>
87-
88-
<p>Sample Usage:</p>
89-
90-
<p>java {&#39;6&#39;: }</p>
91-
9286
</div>
9387
</div>
9488
<div class="tags">
95-
<p class="tag_title">Parameters:</p>
89+
90+
<div class="examples">
91+
<p class="tag_title">Examples:</p>
92+
93+
94+
<p class="example_title"><div class='inline'>
95+
<p>Declaring in manifest</p>
96+
</div></p>
97+
98+
<pre class="example code"><code>java {&#39;6&#39;: }</code></pre>
99+
100+
</div>
101+
<p class="tag_title">Parameters:</p>
96102
<ul class="param">
97103

98104
<li>
@@ -119,7 +125,7 @@ <h2>Overview</h2>
119125
<span class='name'>java_default_version</span>
120126

121127

122-
<span class='type'>(<tt>Integer</tt>)</span>
128+
<span class='type'>(<tt>Optional[Integer]</tt>)</span>
123129

124130

125131
<em class="default">(defaults to: <tt>hiera(&#39;java::java_default_version&#39;, undef)</tt>)</em>
@@ -144,6 +150,8 @@ <h2>Overview</h2>
144150
<pre class="lines">
145151

146152

153+
24
154+
25
147155
26
148156
27
149157
28
@@ -152,16 +160,14 @@ <h2>Overview</h2>
152160
31
153161
32
154162
33
155-
34
156-
35
157-
36</pre>
163+
34</pre>
158164
</td>
159165
<td>
160-
<pre class="code"><span class="info file"># File 'manifests/init.pp', line 26</span>
166+
<pre class="code"><span class="info file"># File 'manifests/init.pp', line 24</span>
161167

162168
define java (
163-
$java_version = $title,
164-
$java_default_version = hiera(&#39;java::java_default_version&#39;, undef)) {
169+
Integer $java_version = $title,
170+
Optional[Integer] $java_default_version = hiera(&#39;java::java_default_version&#39;, undef)) {
165171

166172
if $facts[&#39;os&#39;][&#39;family&#39;] == &#39;Debian&#39; {
167173
include apt

0 commit comments

Comments
 (0)