Skip to content

Commit 5e5bf2c

Browse files
committed
(MODULES-4098) Sync the rest of the files
1 parent 69602ed commit 5e5bf2c

7 files changed

+51
-12
lines changed

.gitignore

+12
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,24 @@
11
#This file is generated by ModuleSync, do not edit.
22
pkg/
33
Gemfile.lock
4+
Gemfile.local
45
vendor/
56
spec/fixtures/manifests/
67
spec/fixtures/modules/
8+
log/
9+
junit/
710
.vagrant/
811
.bundle/
912
coverage/
1013
log/
1114
.idea/
15+
.metadata
1216
*.iml
17+
.*.sw[op]
18+
.yardoc
19+
.yardwarns
20+
.DS_Store
21+
tmp/
22+
vendor/
23+
doc/
24+

.project

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>puppetlabs-vcsrepo</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>

.sync.yml

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
---
2+
appveyor.yml:
3+
delete: true
24
LICENSE:
35
unmanaged: true

CONTRIBUTING.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Checklist (and a short version for the impatient)
4343

4444
- Make sure you have a [GitHub account](https://github.com/join)
4545

46-
- [Create a ticket](https://tickets.puppetlabs.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppetlabs.com/browse/) you are patching for.
46+
- [Create a ticket](https://tickets.puppet.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppet.com/browse/) you are patching for.
4747

4848
* Preferred method:
4949

@@ -215,4 +215,3 @@ Additional Resources
215215
* [General GitHub documentation](http://help.github.com/)
216216

217217
* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
218-

Gemfile

+4-6
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,13 @@ group :development do
4949
gem 'json_pure', '<= 2.0.1', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
5050
gem 'fast_gettext', '1.1.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
5151
gem 'fast_gettext', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
52+
gem 'rainbow', '< 2.2.0', :require => false
5253
end
5354

5455
group :system_tests do
55-
gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~> 2.20') if supports_windows
56-
gem 'beaker', *location_for(ENV['BEAKER_VERSION']) if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0') and ! supports_windows
57-
gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '< 3') if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.3.0') and ! supports_windows
58-
gem 'beaker-pe', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')
59-
gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4') if ! supports_windows
60-
gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '~> 5.1') if supports_windows
56+
gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '>= 3')
57+
gem 'beaker-pe', :require => false
58+
gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'])
6159
gem 'beaker-puppet_install_helper', :require => false
6260
gem 'beaker-module_install_helper', :require => false
6361
gem 'master_manipulator', :require => false

MAINTAINERS.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
## Maintenance
2+
3+
Maintainers:
4+
- Puppet Forge Modules Team `forge-modules |at| puppet |dot| com`
5+
6+
Tickets: https://tickets.puppet.com/browse/MODULES. Make sure to set component to `vcsrepo`.

Rakefile

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
require 'puppet_blacksmith/rake_tasks'
2-
require 'puppet-lint/tasks/puppet-lint'
31
require 'puppetlabs_spec_helper/rake_tasks'
2+
require 'puppet-lint/tasks/puppet-lint'
3+
require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
44

5+
PuppetLint.configuration.fail_on_warnings = true
56
PuppetLint.configuration.send('relative')
6-
PuppetLint.configuration.send('disable_documentation')
7-
PuppetLint.configuration.send('disable_single_quote_string_with_variables')
87

98
desc 'Generate pooler nodesets'
109
task :gen_nodeset do

0 commit comments

Comments
 (0)