Skip to content

Commit e2ee0e6

Browse files
unknownbstopp
authored andcommitted
Initial merge of AEM 6 feature branch.
1 parent cd1aba9 commit e2ee0e6

36 files changed

+2709
-1
lines changed

.brackets.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"spaceUnits": 2
3+
}

.fixtures.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
fixtures:
2+
repositories:
3+
stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
4+
java: "https://github.com/puppetlabs/puppetlabs-java.git"
5+
symlinks:
6+
aem: "#{source_dir}"

.gitignore

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
pkg/
3+
vendor/
4+
spec/fixtures/
5+
.vagrant/
6+
.bundle/
7+
coverage/
8+
.idea/
9+
*.iml
10+
.project
11+
.buildpath
12+
log/
13+
junit/

.rubocop.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
2+
# Configure options
3+
Style/HashSyntax:
4+
EnforcedStyle: hash_rockets
5+
6+
Metrics/AbcSize:
7+
Max: 30
8+
9+
Metrics/ClassLength:
10+
Max: 250
11+
12+
Metrics/CyclomaticComplexity:
13+
Max: 10
14+
15+
Metrics/LineLength:
16+
Max: 120
17+
18+
Metrics/MethodLength:
19+
Max: 20
20+
21+
# Disabled undesired features
22+
Style/ClassAndModuleChildren:
23+
Enabled: false
24+
25+
Style/EmptyLinesAroundBlockBody:
26+
Enabled: false
27+
28+
Style/EmptyLinesAroundClassBody:
29+
Enabled: false
30+
31+
Style/EmptyLinesAroundMethodBody:
32+
Enabled: false
33+
34+
Style/PerlBackrefs:
35+
Enabled: false
36+
37+
Style/SymbolProc:
38+
Enabled: false
39+

.sync.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
spec/spec_helper.rb
3+
unmanged: true

.travis.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
language: ruby
2+
rvm:
3+
- "1.9.3"
4+
- "2.0.0"
5+
- "2.1.5"
6+
- "2.2.1"
7+
# uncomment this line if your project needs to run something other than `rake`:
8+
# script: bundle exec rspec spec

Gemfile

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
2+
3+
group :development, :tests do
4+
gem 'rspec', '~> 3.3', :require => false
5+
gem 'rake', :require => false
6+
gem 'metadata-json-lint', :require => false
7+
gem 'rspec-puppet', :require => false
8+
gem 'puppetlabs_spec_helper', :require => false
9+
end
10+
11+
group :linting do
12+
gem 'coveralls', :require => false
13+
gem 'puppet-lint', :require => false
14+
gem 'rubocop', :require => false
15+
end
16+
17+
group :system_tests do
18+
gem 'beaker', '~>2.18', :require => false
19+
gem 'beaker-rspec', :require => false
20+
gem 'serverspec', :require => false
21+
gem 'beaker-puppet_install_helper', '>= 0.2.1', :require => false
22+
end
23+
24+
if facterversion = ENV['FACTER_GEM_VERSION']
25+
gem 'facter', facterversion, :require => false
26+
else
27+
gem 'facter', :require => false
28+
end
29+
30+
if puppetversion = ENV['PUPPET_VERSION']
31+
gem 'puppet', puppetversion, :require => false
32+
else
33+
gem 'puppet', :require => false
34+
end

0 commit comments

Comments
 (0)