Skip to content

Commit ea45b43

Browse files
bittnerbittner
committed
Merge branch 'master' of https://github.com/edestecd/puppet-software into feature/add-vmware-player-to-virtualization
2 parents b7c1519 + 869f401 commit ea45b43

40 files changed

+796
-374
lines changed

‎.fixtures.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ fixtures:
22
repositories:
33
stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
44
apt: "https://github.com/puppetlabs/puppetlabs-apt.git"
5+
chocolatey: "https://github.com/puppetlabs/puppetlabs-chocolatey.git"
6+
powershell: "https://github.com/puppetlabs/puppetlabs-powershell.git"
7+
registry: "https://github.com/puppetlabs/puppetlabs-registry.git"
58
vcsrepo: "https://github.com/puppetlabs/puppetlabs-vcsrepo.git"
69
symlinks:
710
software: "#{source_dir}"

‎.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
*.rb eol=lf
2+
*.erb eol=lf
3+
*.pp eol=lf
4+
*.sh eol=lf

‎.gitignore

Lines changed: 23 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,23 @@
1-
# See http://help.github.com/ignore-files/ for more about ignoring files.
2-
#
3-
# If you find yourself ignoring temporary files generated by your text editor
4-
# or operating system, you probably want to add a global ignore instead:
5-
# git config --global core.excludesfile ~/.gitignore_global
6-
7-
# OS generated files #
8-
######################
9-
.DS_Store*
10-
Thumbs.db
11-
12-
# Bundler #
13-
###########
14-
.bundle
15-
Gemfile.lock
16-
17-
# puppet module build #
18-
#######################
19-
/pkg
20-
21-
# Librarian Puppet #
22-
####################
23-
.tmp/
24-
modules/
25-
26-
# Puppet testing #
27-
##################
28-
spec/fixtures/
29-
.vagrant
30-
coverage/
31-
.rake_tasks~
32-
33-
# tmp & log contents #
34-
######################
35-
/log/*
36-
/tmp/*
37-
38-
# Never ignore .gitignore/keep files #
39-
# Has to be last to override above #
40-
# Basically for keeping empty dirs #
41-
######################################
42-
!.gitignore
43-
!.gitkeep
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+
/update_report.txt
23+
.DS_Store

‎.gitlab-ci.yml

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
---
2+
stages:
3+
- test_2.4.1
4+
- test_2.1.9
5+
6+
before_script:
7+
- bundle -v
8+
- rm Gemfile.lock || true
9+
- gem update --system
10+
- gem update bundler
11+
- gem --version
12+
- bundle -v
13+
- bundle install --without system_tests --path vendor/bundle
14+
15+
cache:
16+
key: "$CI_JOB_STAGE-$CI_COMMIT_REF_NAME"
17+
paths:
18+
- vendor/bundle
19+
20+
21+
rubocop-2.4.1:
22+
stage: test_2.4.1
23+
image: ruby:2.4.1
24+
variables:
25+
PUPPET_GEM_VERSION: ~> 5.0
26+
script:
27+
- bundle exec rake rubocop
28+
29+
syntax-2.4.1:
30+
stage: test_2.4.1
31+
image: ruby:2.4.1
32+
variables:
33+
PUPPET_GEM_VERSION: ~> 5.0
34+
script:
35+
- bundle exec rake syntax lint
36+
37+
metadata-2.4.1:
38+
stage: test_2.4.1
39+
image: ruby:2.4.1
40+
variables:
41+
PUPPET_GEM_VERSION: ~> 5.0
42+
script:
43+
- bundle exec rake metadata_lint
44+
45+
rspec-puppet-2.4.1:
46+
stage: test_2.4.1
47+
image: ruby:2.4.1
48+
variables:
49+
PUPPET_GEM_VERSION: ~> 5.0
50+
CHECK: spec
51+
script:
52+
- bundle update
53+
- bundle exec rake $CHECK
54+
55+
rubocop-2.1.9:
56+
stage: test_2.1.9
57+
image: ruby:2.1.9
58+
variables:
59+
PUPPET_GEM_VERSION: ~> 4.0
60+
script:
61+
- bundle exec rake rubocop
62+
63+
syntax-2.1.9:
64+
stage: test_2.1.9
65+
image: ruby:2.1.9
66+
variables:
67+
PUPPET_GEM_VERSION: ~> 4.0
68+
script:
69+
- bundle exec rake syntax lint
70+
71+
metadata-2.1.9:
72+
stage: test_2.1.9
73+
image: ruby:2.1.9
74+
variables:
75+
PUPPET_GEM_VERSION: ~> 4.0
76+
script:
77+
- bundle exec rake metadata_lint
78+
79+
rspec-puppet-2.1.9:
80+
stage: test_2.1.9
81+
image: ruby:2.1.9
82+
variables:
83+
PUPPET_GEM_VERSION: ~> 4.0
84+
CHECK: spec
85+
script:
86+
- bundle update
87+
- bundle exec rake $CHECK

‎.pdkignore

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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+
/update_report.txt
23+
.DS_Store

‎.project

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>edestecd-software</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>com.puppetlabs.geppetto.pp.dsl.ui.modulefileBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>com.puppetlabs.geppetto.pp.dsl.ui.puppetNature</nature>
21+
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
22+
</natures>
23+
</projectDescription>

‎.rspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
--color
2+
--format documentation

‎.rubocop.yml

Lines changed: 98 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,107 @@
1-
# RuboCop config file
2-
# Configure cops
3-
# https://github.com/bbatsov/rubocop
4-
# https://github.com/bbatsov/rubocop/blob/master/config/default.yml
5-
# https://github.com/bbatsov/ruby-style-guide
6-
#
7-
1+
---
2+
require: rubocop-rspec
83
AllCops:
4+
DisplayCopNames: true
5+
TargetRubyVersion: '2.1'
96
Include:
10-
- '**/*.gemspec'
11-
- '**/*.rake'
12-
- '**/Gemfile'
13-
- '**/Puppetfile'
14-
- '**/Rakefile'
15-
- '**/Guardfile'
7+
- "./**/*.rb"
168
Exclude:
17-
- 'modules/**/*'
18-
- 'pkg/**/*'
19-
- 'spec/fixtures/**/*'
20-
- 'vendor/**/*'
21-
DisplayCopNames: true
22-
23-
#################### Layout ###############################
24-
25-
# The shebang stuff at the top triggers this
26-
Layout/LeadingCommentSpace:
9+
- bin/*
10+
- ".vendor/**/*"
11+
- Gemfile
12+
- Rakefile
13+
- pkg/**/*
14+
- spec/fixtures/**/*
15+
- vendor/**/*
16+
Metrics/LineLength:
17+
Description: People have wide screens, use them.
18+
Max: 200
19+
RSpec/BeforeAfterAll:
20+
Description: Beware of using after(:all) as it may cause state to leak between tests.
21+
A necessary evil in acceptance testing.
2722
Exclude:
28-
- Puppetfile
29-
30-
#################### Style ###############################
31-
32-
# Cop supports --auto-correct.
33-
# Configuration parameters: SupportedStyles.
34-
# Support ruby 1.8.7
35-
Style/HashSyntax:
36-
EnforcedStyle: hash_rockets
37-
38-
#################### Metrics ###############################
39-
23+
- spec/acceptance/**/*.rb
24+
RSpec/HookArgument:
25+
Description: Prefer explicit :each argument, matching existing module's style
26+
EnforcedStyle: each
27+
Style/BlockDelimiters:
28+
Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to
29+
be consistent then.
30+
EnforcedStyle: braces_for_chaining
31+
Style/ClassAndModuleChildren:
32+
Description: Compact style reduces the required amount of indentation.
33+
EnforcedStyle: compact
34+
Style/EmptyElse:
35+
Description: Enforce against empty else clauses, but allow `nil` for clarity.
36+
EnforcedStyle: empty
37+
Style/FormatString:
38+
Description: Following the main puppet project's style, prefer the % format format.
39+
EnforcedStyle: percent
40+
Style/FormatStringToken:
41+
Description: Following the main puppet project's style, prefer the simpler template
42+
tokens over annotated ones.
43+
EnforcedStyle: template
44+
Style/Lambda:
45+
Description: Prefer the keyword for easier discoverability.
46+
EnforcedStyle: literal
47+
Style/RegexpLiteral:
48+
Description: Community preference. See https://github.com/voxpupuli/modulesync_config/issues/168
49+
EnforcedStyle: percent_r
50+
Style/TernaryParentheses:
51+
Description: Checks for use of parentheses around ternary conditions. Enforce parentheses
52+
on complex expressions for better readability, but seriously consider breaking
53+
it up.
54+
EnforcedStyle: require_parentheses_when_complex
55+
Style/TrailingCommaInArguments:
56+
Description: Prefer always trailing comma on multiline argument lists. This makes
57+
diffs, and re-ordering nicer.
58+
EnforcedStyleForMultiline: comma
59+
Style/TrailingCommaInLiteral:
60+
Description: Prefer always trailing comma on multiline literals. This makes diffs,
61+
and re-ordering nicer.
62+
EnforcedStyleForMultiline: comma
63+
Style/SymbolArray:
64+
Description: Using percent style obscures symbolic intent of array's contents.
65+
EnforcedStyle: brackets
66+
RSpec/MessageSpies:
67+
EnforcedStyle: receive
68+
Style/CollectionMethods:
69+
Enabled: true
70+
Style/MethodCalledOnDoEndBlock:
71+
Enabled: true
72+
Style/StringMethods:
73+
Enabled: true
74+
Layout/EndOfLine:
75+
Enabled: false
4076
Metrics/AbcSize:
41-
# Ruduce this... Max: 15
42-
Max: 30
43-
77+
Enabled: false
78+
Metrics/BlockLength:
79+
Enabled: false
80+
Metrics/ClassLength:
81+
Enabled: false
4482
Metrics/CyclomaticComplexity:
45-
# Ruduce this... Max: 6
46-
Max: 8
47-
48-
Metrics/LineLength:
49-
# Ruduce this... Max: 80
50-
Max: 111
51-
83+
Enabled: false
5284
Metrics/MethodLength:
53-
# Ruduce this... Max: 10
54-
Max: 28
55-
56-
Metrics/BlockLength:
5785
Enabled: false
58-
59-
##################### Bundler ##############################
60-
61-
Bundler/DuplicatedGem:
86+
Metrics/ModuleLength:
87+
Enabled: false
88+
Metrics/ParameterLists:
89+
Enabled: false
90+
Metrics/PerceivedComplexity:
91+
Enabled: false
92+
RSpec/DescribeClass:
93+
Enabled: false
94+
RSpec/ExampleLength:
95+
Enabled: false
96+
RSpec/MessageExpectation:
97+
Enabled: false
98+
RSpec/MultipleExpectations:
99+
Enabled: false
100+
RSpec/NestedGroups:
101+
Enabled: false
102+
Style/AsciiComments:
103+
Enabled: false
104+
Style/IfUnlessModifier:
105+
Enabled: false
106+
Style/SymbolProc:
62107
Enabled: false

‎.ruby-gemset

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.ruby-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)