Skip to content

Commit 558fe70

Browse files
authored
Merge pull request voxpupuli#50 from voxpupuli/modulesync
Modulesync 0.16.11 & Release 2.1.0
2 parents 33532b4 + 7b30ba2 commit 558fe70

File tree

6 files changed

+21
-7
lines changed

6 files changed

+21
-7
lines changed

.msync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
modulesync_config_version: '0.16.8'
1+
modulesync_config_version: '0.16.11'

.rubocop.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,3 +518,7 @@ RSpec/RepeatedDescription:
518518

519519
RSpec/NestedGroups:
520520
Enabled: False
521+
522+
# disable Yaml safe_load. This is needed to support ruby2.0.0 development envs
523+
Security/YAMLLoad:
524+
Enabled: false

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ before_install:
77
- bundle -v
88
- rm Gemfile.lock || true
99
- gem update --system
10-
- gem update bundler
10+
- gem install bundler -v '~>1.13.0'
1111
- gem --version
1212
- bundle -v
1313
script:

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
# Changelog
2+
3+
## 2017-02-11 - Release 2.1.0
4+
5+
This is the last release with puppet3 support!
6+
* Fix several markdown issues
7+
* Add missing badges
8+
* Rubocop: Fix RSpec/ImplicitExpect
9+
* Set min version_requirement for Puppet + deps
10+
111
## 2016-08-19 - Release 2.0.0
212

313
* Modulesync with latest Vox Pupuli defaults

metadata.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "puppet-download_file",
3-
"version": "2.0.1-rc0",
3+
"version": "2.1.0",
44
"author": "Vox Pupuli",
55
"license": "MIT",
66
"summary": "A module that will download files for use on Windows servers. Requires the server to have PowerShell 2.0 and above",
@@ -26,7 +26,7 @@
2626
"dependencies": [
2727
{
2828
"name": "puppetlabs/stdlib",
29-
"version_requirement": ">=4.6.0 < 5.0.0"
29+
"version_requirement": ">= 4.6.0 < 5.0.0"
3030
},
3131
{
3232
"name": "puppetlabs/powershell",
@@ -36,7 +36,7 @@
3636
"requirements": [
3737
{
3838
"name": "puppet",
39-
"version_requirement": ">=3.8.7 < 5.0.0"
39+
"version_requirement": ">= 3.8.7 < 5.0.0"
4040
}
4141
]
4242
}

spec/spec_helper.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
puppetversion: Puppet.version,
2525
facterversion: Facter.version
2626
}
27-
default_facts.merge!(YAML.safe_load(File.read(File.expand_path('../default_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_facts.yml', __FILE__))
28-
default_facts.merge!(YAML.safe_load(File.read(File.expand_path('../default_module_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_module_facts.yml', __FILE__))
27+
default_facts.merge!(YAML.load(File.read(File.expand_path('../default_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_facts.yml', __FILE__))
28+
default_facts.merge!(YAML.load(File.read(File.expand_path('../default_module_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_module_facts.yml', __FILE__))
2929
c.default_facts = default_facts
3030
end
3131

0 commit comments

Comments
 (0)