Skip to content
This repository has been archived by the owner on Oct 24, 2021. It is now read-only.

Commit

Permalink
Merge pull request #13 from jantman/modulesync-update
Browse files Browse the repository at this point in the history
0.3.0 release; modulesync update
  • Loading branch information
jantman authored Feb 3, 2018
2 parents d5036e9 + 8e0f69b commit e265768
Show file tree
Hide file tree
Showing 45 changed files with 996 additions and 913 deletions.
4 changes: 3 additions & 1 deletion .fixtures.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
fixtures:
repositories:
stdlib:
repo: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
ref: "4.12.0"
archlinux_workstation:
repo: "https://github.com/jantman/puppet-archlinux-workstation.git"
stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
firewall: "https://github.com/puppetlabs/puppetlabs-firewall.git"
sysctl: "https://github.com/duritong/puppet-sysctl.git"
inifile: "https://github.com/puppetlabs/puppetlabs-inifile.git"
Expand Down
5 changes: 5 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#This file is generated by ModuleSync, do not edit.
*.rb eol=lf
*.erb eol=lf
*.pp eol=lf
*.sh eol=lf
28 changes: 21 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
pkg/
vendor/
spec/fixtures/
.vagrant/
# This file is generated by ModuleSync, do not edit.
*.iml
.*.sw[op]
.DS_Store
.bundle/
coverage/
.idea/
*.iml
log/*
.metadata
.vagrant/
.yardoc
.yardwarns
Gemfile.local
Gemfile.lock
bin/
coverage/
doc/
junit/
log/
pkg/
spec/fixtures/manifests/
spec/fixtures/modules/
tmp/
vendor/

23 changes: 23 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>jantman-archlinux_macbookretina</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.puppetlabs.geppetto.pp.dsl.ui.modulefileBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.puppetlabs.geppetto.pp.dsl.ui.puppetNature</nature>
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
</natures>
</projectDescription>
2 changes: 1 addition & 1 deletion .rspec
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
--format documentation
--color
--format documentation
98 changes: 98 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
---
require:
- rubocop-rspec
AllCops:
TargetRubyVersion: '2.1'
Include:
- "./**/*.rb"
Exclude:
- bin/*
- ".vendor/**/*"
- Gemfile
- Rakefile
- pkg/**/*
- spec/fixtures/**/*
- vendor/**/*
inherit_from: .rubocop_todo.yml
Metrics/LineLength:
Description: People have wide screens, use them.
Max: 200
RSpec/BeforeAfterAll:
Description: Beware of using after(:all) as it may cause state to leak between tests.
A necessary evil in acceptance testing.
Exclude:
- spec/acceptance/**/*.rb
RSpec/HookArgument:
Description: Prefer explicit :each argument, matching existing module's style
EnforcedStyle: each
Style/BlockDelimiters:
Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to
be consistent then.
EnforcedStyle: braces_for_chaining
Style/ClassAndModuleChildren:
Description: Compact style reduces the required amount of indentation.
EnforcedStyle: compact
Style/EmptyElse:
Description: Enforce against empty else clauses, but allow `nil` for clarity.
EnforcedStyle: empty
Style/FormatString:
Description: Following the main puppet project's style, prefer the % format format.
EnforcedStyle: percent
Style/FormatStringToken:
Description: Following the main puppet project's style, prefer the simpler template
tokens over annotated ones.
EnforcedStyle: template
Style/Lambda:
Description: Prefer the keyword for easier discoverability.
EnforcedStyle: literal
Style/RegexpLiteral:
Description: Community preference. See https://github.com/voxpupuli/modulesync_config/issues/168
EnforcedStyle: percent_r
Style/TernaryParentheses:
Description: Checks for use of parentheses around ternary conditions. Enforce parentheses
on complex expressions for better readability, but seriously consider breaking
it up.
EnforcedStyle: require_parentheses_when_complex
Style/TrailingCommaInArguments:
Description: Prefer always trailing comma on multiline argument lists. This makes
diffs, and re-ordering nicer.
EnforcedStyleForMultiline: comma
Style/TrailingCommaInLiteral:
Description: Prefer always trailing comma on multiline literals. This makes diffs,
and re-ordering nicer.
EnforcedStyleForMultiline: comma
Style/SymbolArray:
Description: Using percent style obscures symbolic intent of array's contents.
EnforcedStyle: brackets
Style/CollectionMethods:
Enabled: true
Style/MethodCalledOnDoEndBlock:
Enabled: true
Style/StringMethods:
Enabled: true
Metrics/AbcSize:
Enabled: false
Metrics/BlockLength:
Enabled: false
Metrics/ClassLength:
Enabled: false
Metrics/CyclomaticComplexity:
Enabled: false
Metrics/MethodLength:
Enabled: false
Metrics/ModuleLength:
Enabled: false
Metrics/ParameterLists:
Enabled: false
Metrics/PerceivedComplexity:
Enabled: false
RSpec/DescribeClass:
Enabled: false
RSpec/MessageExpectation:
Enabled: false
Style/AsciiComments:
Enabled: false
Style/IfUnlessModifier:
Enabled: false
Style/SymbolProc:
Enabled: false
Empty file added .rubocop_todo.yml
Empty file.
12 changes: 0 additions & 12 deletions .sync.yml

This file was deleted.

59 changes: 52 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,54 @@
#This file is generated by ModuleSync, do not edit.
---
sudo: false
language: ruby
bundler_args: --without development
before_install: rm Gemfile.lock || true
rvm:
- 2.3
script: bundle exec rake test
env:
- PUPPET_VERSION="~> 4.0"
cache: bundler
script: "bundle exec rake release_checks_nonparallel"
#Inserting below due to the following issue: https://github.com/travis-ci/travis-ci/issues/3531#issuecomment-88311203
before_install:
- gem update bundler
matrix:
fast_finish: true
include:
- rvm: 2.3.1
dist: trusty
env: PUPPET_INSTALL_TYPE=foss BEAKER_debug=true BEAKER_set=default
script: bundle exec rake beaker
services: docker
sudo: required
- rvm: 2.4.1
bundler_args: --without system_tests
env: PUPPET_GEM_VERSION="~> 5.0"
script: ["bundle exec rake release_checks_nonparallel", "bundle exec rake clean", "bundle exec rake build", "bundle exec rake docs"]
- rvm: 2.1.9
bundler_args: --without system_tests
env: PUPPET_GEM_VERSION="~> 4.0"
deploy:
- provider: pages
skip_cleanup: true
github_token:
secure: "XfxAA80XBKZV0eOL2M3FLw5IiEcgt8knwtHoYh6yYax1ZZiVbb6yIjN5LSlJsL7bQ7jxW7Q7XcZXygOI15JKTqM6kJ6N0Z+QPxljeqwI3CedDKHZCBa1lwfuSqHrAuek9q3tsqPBJGoe86/+fp9TnDogGX7q+Ie1Ct0k5wiBeFk="
local_dir: doc
on:
repo: jantman/puppet-archlinux-macbookretina
rvm: 2.4.1
# all_branches is required to use tags
all_branches: true
tags: true
- provider: puppetforge
user: jantman
password:
secure: "iGt519UxAls/ys0tPj3G6vDA8dvQfaJIZ1L2AaB4HkDGozPhEU5eas0LVnaV1vt5t05IqQRwTysY2UenrxQ9/NkAEB3M2xXdJJc69uUEuEnJKe7Ex/SklCeqGprxiylw7DKbSfUyVfF/IlssHPIThX9RW2UpQHVunRbK01J0F0w="
on:
repo: jantman/puppet-archlinux-macbookretina
rvm: 2.4.1
# all_branches is required to use tags
all_branches: true
tags: true
notifications:
email:
on_success: change
on_failure: change
branches:
except:
- "/^noci-.*$/"
22 changes: 0 additions & 22 deletions CHANGELOG

This file was deleted.

60 changes: 60 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

[comment]: # IMPORTANT: Remember to update the links at the bottom of the file!

## [0.3.0] Released 2018-02-03

This release makes major changes to the module code style, testing and deployment. It does not make any functional changes to what the module does or how it works.

- Switch to new-style typed parameters.
- Modernize module layout and testing.
- Update supported and tested Puppet versions to 4 and 5.
- Pin puppetlabs-stdlib dependency to 4.12.0, as this module still uses the deprecated ``validate_`` functions (and its archlinux_workstation dependency requires <= 4.12.0).
- Use puppet-strings for documentation
- Automate deployment through TravisCI
- Minor README and CONTRIBUTING documentation updates.
- Add automated ``github_release`` Rake task.
- Bump puppet-blacksmith gem version and configure for signed tags.
- Reformat changelog
- Add ``.sync.yml`` for my [modulesync_configs](https://github.com/jantman/modulesync_configs)
- Update ``.travis.yml``, ``Gemfile`` and some documentation via modulesync.
- Fix ``metadata.json`` casing of supported operatingsystem name.

## [0.2.2] Released 2017-07-09

- Update for AUR package changes: bcwc-pcie-dkms -> bcwc-pcie-git and bcwc-firmware -> facetimehd-firmware

## [0.2.1] Released 2017-01-08

- updated README with note that bluetooth now works
- many changes to testing (TravisCI, spec, beaker acceptance) and use new versions of dependencies (thanks to petems)
- fix ordering bug in archlinux_macbookretina::touchpad (thanks to petems)

## [0.2.0] Released 2016-10-25

- ensure xf86-input-mtrack-git is absent, in favor of xf86-input-synaptics
- update README.md with updated statuses as of 2016-10-25 and 4.8.4-1 kernel
- touchpad works, but some 3-finger-tap issues
- built-in ``brcmfmac`` WiFi driver works for both 2.4GHz and 5GHz
- backlight adjustment and other hotkeys work with keyboard function keys, using kernel built-in drivers
- webcam works using AUR reverse-engineered driver
- add ``archlinux_macbookretina::webcam`` for reverse-engineered driver

## [0.1.0] Released 2015-09-16

- complete rewrite to be more reusable, standalone module, and targeted at puppet4

## 0.0.1 Released 2014-03-15

- initial module creation

[0.3.0]: https://github.com/jantman/puppet-archlinux-macbookretina/compare/0.2.2...0.3.0
[0.2.2]: https://github.com/jantman/puppet-archlinux-macbookretina/compare/0.2.1...0.2.2
[0.2.1]: https://github.com/jantman/puppet-archlinux-macbookretina/compare/0.2.0...0.2.1
[0.2.0]: https://github.com/jantman/puppet-archlinux-macbookretina/compare/0.1.0...0.2.0
[0.1.0]: https://github.com/jantman/puppet-archlinux-macbookretina/releases/tag/0.1.0
Loading

0 comments on commit e265768

Please sign in to comment.