Commit graph

1110 commits

Author SHA1 Message Date
Travis Fields
419f51bdd9 Fix issue with Ruby 1.8.7 which did not allow for the return in an each_pair of the hash 2015-02-26 10:13:28 -08:00
Travis Fields
7021b1f55c Add Hash to upcase 2015-02-25 11:39:27 -08:00
Morgan Haskel
3da8d17390 Merge pull request #415 from nibalizer/master
Remove travis badge
2015-02-19 13:59:26 -08:00
Spencer Krum
ef539388cb Remove travis badge 2015-02-19 13:58:14 -08:00
Travis Fields
647e9bcbf9 Merge pull request #413 from mhaskel/fix
Check for string before copying
2015-02-19 12:02:15 -08:00
Morgan Haskel
b693c870d2 Check for string before copying 2015-02-19 12:01:26 -08:00
Morgan Haskel
fcd2f53908 Merge pull request #412 from seanmil/MODULES-1771
(MODULES-1771) Don't modify input to is_domain_name()
2015-02-19 11:33:34 -08:00
Sean Millichamp
1321d586a8 (MODULES-1771) Don't modify input to is_domain_name()
Fix is_domain_name() so it dup's its incoming argument
to avoid changing the original with a later chomp!
2015-02-14 10:49:26 -05:00
Colleen Murphy
ad5727266a Merge pull request #406 from elyscape/fix/fqdn_rotate_pollutes_global_seed
(MODULES-1738) Don't modify the global seed in fqdn_rotate()
2015-02-12 15:45:23 -08:00
Eli Young
84f866ffaf (MODULES-1738) Don't modify global seed in fqdn_rotate()
As per puppetlabs/puppet@292233c, this leaves the global seed in a
deterministic state, which is bad. Puppet::Util.deterministic_rand()
exists to avoid running into this issue, but is only present starting in
Puppet 3.2.0.
2015-02-12 14:04:47 -08:00
Colleen Murphy
afc83ea564 Merge pull request #411 from elyscape/fix/travis_build_issues
Fix Travis builds
2015-02-12 13:14:17 -08:00
Eli Young
f9855d99ec Have Travis actually test Facter 1.6/1.7
The Gemfile didn't actually specify which version to use for Facter,
even when there was an environment variable to that effect.
2015-02-12 11:45:39 -08:00
Eli Young
8524a17e0f Fix Travis builds
The release of rspec 3.2.0 broke a lot of tests. Pinning to rspec 3.1.0
provides a temporary fix.
2015-02-12 11:32:38 -08:00
Hunter Haugen
5863ab3901 Merge pull request #403 from cyberious/master
Merge 4.6.x back to master
2015-01-15 13:59:53 -08:00
Travis Fields
75d16ae001 Merge branch '4.6.x' back to master 2015-01-15 13:55:48 -08:00
Morgan Haskel
71a7a47d3c Merge pull request #402 from cyberious/4.6.x
Merge 4.5.x into 4.6.x
2015-01-15 08:44:20 -08:00
Travis Fields
0df670f3cd Merge branch '4.5.x' into 4.6.x
Conflicts:
	CHANGELOG.md
2015-01-14 20:54:27 -08:00
Colleen Murphy
7a91f20990 Merge pull request #401 from cyberious/FM-2131
FM-2131 Move to non temp directory for factor_dot_d
2015-01-14 16:27:21 -08:00
Travis Fields
9e380b9685 Prepare for 4.5.1 release 2015-01-14 12:46:10 -08:00
Travis Fields
e32afd7c7c FM-2130 Move cache file to non temp directory 2015-01-14 12:39:14 -08:00
Hunter Haugen
462bea8d80 Merge pull request #398 from puppetlabs/master
Pull in RSpec 3.0 fixes.
2015-01-14 09:17:24 -08:00
Colleen Murphy
712a58a5ce Merge pull request #397 from cyberious/4.6.x
4.6.x
2015-01-13 17:43:19 -08:00
Travis Fields
cfacdd543e Prep for 4.6.0 STDLIB release 2015-01-13 17:37:08 -08:00
Travis Fields
39fa2d1bd8 Merge pull request #396 from hunner/change_each
Change all to each
2015-01-13 17:26:14 -08:00
Hunter Haugen
bfb526899f Change all to each
The existence of this directory is behavior for each test, but will also
stop rspec 3 from complaining.
2015-01-13 17:21:28 -08:00
Travis Fields
ac3e51bac5 Merge branch 'master' into 4.5.x 2015-01-13 17:16:10 -08:00
Hunter Haugen
8db1f2e2f0 Merge pull request #395 from cyberious/FM-2130
FM-2130 Move cache file to non temp directory
2015-01-13 17:03:44 -08:00
Travis Fields
b11311ad65 FM-2130 Move cache file to non temp directory 2015-01-13 16:50:27 -08:00
Travis Fields
413dafbb52 Merge pull request #382 from hunner/fix_type
(MODULES-1473) Deprecate type() function for new parser
2015-01-08 08:57:30 -08:00
Hunter Haugen
7c8ae311ca (MODULES-1473) Deprecate type() function for new parser
The `type()` function will cease to work on the new parser because 'type'
is a reserved keyword. The `type3x()` function may be used to continue
similar functionality, but will be deprecated in favor of the built-in
typing system.

The `type_of()` function has been included to introspect types in the
new parser.
2015-01-07 16:40:06 -08:00
Travis Fields
4700f16e82 Merge pull request #336 from mklette/master
ensure_resource: be more verbose in debug mode
2015-01-02 12:27:33 -08:00
Morgan Haskel
79e79e8bba Merge pull request #394 from cmurphy/master
Add IntelliJ files to the ignore list
2014-12-29 11:22:11 -08:00
Colleen Murphy
9077bfef1e Add IntelliJ files to the ignore list 2014-12-29 10:41:22 -08:00
Hunter Haugen
dcc9605a84 Merge pull request #391 from petems/update_readme
Update README
2014-12-20 19:00:10 -08:00
Peter Souter
c125a08994 README fixes for recent merges
* (MODULES-444) Update README for concat changes
* (MODULES-1582) Update `validate_cmd` readme
* Plus some Whitespace fixes
2014-12-20 21:10:20 +00:00
Hunter Haugen
88e0e24d2b Merge pull request #393 from cyberious/DeleteDocUpdates
Update docs to reflect new behavior of delete function taking array in second argument
2014-12-19 11:27:13 -08:00
Travis Fields
f6e20d2068 Update docs to reflect new behavior of delete function taking array in second argument 2014-12-19 10:41:07 -08:00
Hunter Haugen
69c42b7eef Merge pull request #392 from cyberious/MOD-1606
MODULES-1606 add ability to pass array to delete for items to delete
2014-12-19 10:31:58 -08:00
Travis Fields
8ec6f8dbfd MODULES-1606 add ability to pass array to delete for items to delete 2014-12-19 10:26:01 -08:00
Travis Fields
9febb8b262 Merge pull request #389 from mhaskel/fix_test_374
Fix bad check in test
2014-12-18 16:26:42 -08:00
Morgan Haskel
31a6d89410 Fix bad check in test 2014-12-18 16:20:02 -08:00
Hunter Haugen
1ae0a10707 Merge pull request #388 from mhaskel/merge_4.5.x_into_master
Merge 4.5.x into master
2014-12-18 15:55:33 -08:00
Hunter Haugen
be46f0ea32 Merge pull request #377 from petems/MODULES-1582-improve_validate_cmd
(MODULES-1582) File location placeholder
2014-12-18 15:45:42 -08:00
Peter Souter
b3d007f1da (MODULES-1582) Improve % detection
Avoids any validate commands that have %'s in them other than "... % ..."
2014-12-18 23:35:24 +00:00
Peter Souter
cc8b147b5d (MODULES-1582) Specs for the new % placeholder
These specs are pretty much the same as the originals, but now check that the output has the correct replacement for file location
2014-12-18 23:08:33 +00:00
Peter Souter
165caa8be1 (MODULES-1582) Initial spike for % placeholder
This simply `gsub`'s the file path into where the % placeholder is.
2014-12-18 23:08:33 +00:00
Morgan Haskel
696c89de99 Merge pull request #372 from poikilotherm/feature/master/validate_absolute_path_allow_arrays
Allow array of pathes in validate_absolute_path
2014-12-17 14:19:30 -08:00
Morgan Haskel
841b0df210 Merge pull request #368 from rfugina/basename
Basename implementation
2014-12-17 11:00:23 -08:00
Rob Fugina
ef3d42f7bb Added basename() based on Ruby's File.basename
Based on dirname code.  Includes RSpec tests and docs.
2014-12-17 12:39:40 -06:00
Hunter Haugen
8726caf996 Merge pull request #374 from petems/MODULES-444-add_concat_multiple
MODULES-444-Add concat multiple
2014-12-17 09:24:51 -08:00