summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-05-06sync via modulesyncMorgan Haskel
2015-05-06sync via modulesyncMorgan Haskel
2015-04-22Merge pull request #241 from tykeal/masterTP Honey
Clean up puppet lint warnings
2015-04-22Merge pull request #237 from cmurphy/rspec-puppet-2TP Honey
Testing updates
2015-04-21Merge pull request #224 from puppet-by-examples/single-branchTP Honey
Shallow clone with one commit that corresponds to arbitrary tag from arbitrary branch
2015-04-16Merge pull request #243 from rnelson0/quotesMorgan Haskel
Enforce the style guide's recommendation of single quotes as the default.
2015-04-14Enforce the style guide's recommendation of single quotes as the default.Rob Nelson
2015-04-06Clean up puppet lint warningsAndrew Grimberg
There were puppet lint warnings due to indentation in several examples. This commit cleans up the warnings. Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
2015-03-30Merge pull request #220 from ddisisto/1.2.x_add_svn_acceptTP Honey
Add support for 'conflict' parameter to populate svn --accept arg
2015-03-26Merge pull request #238 from anodelman/masterJustin Stoller
(BKR-147) add Gemfile setting for BEAKER_VERSION for puppet...
2015-03-26Merge pull request #240 from cmurphy/hash_orderingBryan Jen
Fix remote hash ordering for unit tests
2015-03-25Fix remote hash ordering for unit testsColleen Murphy
Without this commit, the unit tests for the git provider changing multiple remotes mocks the remotes in a particular order. While in practice it doesn't matter which remote the update_remotes method updates first, the unit tests must be able to mock them in the correct order. For ruby 1.8.7, a Hash will not necessarily produce key value pairs in the same order on each run, which causes intermittent failures in the unit tests. This change sorts the :source property values before trying to update them, and updates the unit tests to expect the values in alphabetical order.
2015-03-24(BKR-147) add Gemfile setting for BEAKER_VERSION for puppet...Alice Nodelman
puppetdb, etc - support for BEAKER_VERSION and BEAKER_RSPEC_VERSION in gemfile
2015-03-23Update .travis.ymlColleen Murphy
This commit makes the following changes to the test matrix: - Runs tests on ruby 2.1.5 instead of 2.0.0 - Runs tests on ruby 1.8.7 with puppet 3.x - Adds an environment to run on an intermediate 3.x puppet version instead of latest (specifically 3.4.x) - Adds an environment to run with the future parser on latest puppet. This would affect the test runs for the validate and spec checks. - Runs the tests on docker
2015-03-23Keep testing on puppet 2.7Colleen Murphy
The modulesync config repo is dropping universal support for puppet 2.7, but individual repos should still keep support until the next naturally-occuring major release.
2015-03-19Unpin rspec-puppet and remove unneeded depsColleen Murphy
puppetlabs_spec_helper takes care of these for us.
2015-03-06(MODULES-1551) Add support for SVN conflict handlingDaniel DiSisto
2015-03-02Merge pull request #236 from dummey/masterTP Honey
Updating 'excludes' in readme to be more concise.
2015-02-12Update README.markdownRicky Ng
Clarified what the parameter 'excludes' is intended to do.
2015-02-04Merge pull request #235 from cmurphy/rspecHunter Haugen
Pin rspec gems
2015-02-04Pin rspec gemsColleen Murphy
2015-01-29Use branch parameterWłodzimierz Gajda
2015-01-22Merge pull request #230 from jonnytpuppet/multiple_remotesHunter Haugen
Implemented multiple remotes feature for git provider.
2015-01-21Implemented multiple remotes feature for git provider.Jonathan Tripathy
2015-01-18Merge pull request #218 from dduvnjak/masterAaron Stone
Add submodules feature to git provider
2015-01-18Add submodules feature to git providerdduvnjak
2015-01-14Merge pull request #229 from hunner/update_beforeColleen Murphy
Update let to use instance variable instead.
2015-01-14Remove let use as variable.Hunter Haugen
Since lets can't be used in before :all any more.
2015-01-13Merge pull request #228 from tphoney/removing_private_testsHunter Haugen
removing private tests
2015-01-13removing private teststphoney
removing private tests, due to rspec3 not handling private methods
2014-12-29Merge pull request #226 from cmurphy/masterMorgan Haskel
Add IntelliJ files to the ignore list
2014-12-29Add IntelliJ files to the ignore listColleen Murphy
2014-12-26Merge pull request #225 from mhaskel/MODULES-1596Travis Fields
MODULES-1596 - Repository repeatedly destroyed/created with force
2014-12-26MODULES-1596 - Repository repeatedly destroyed/created with forceMorgan Haskel
The `retrieve` method was calling `create` and `destroy` on every run with `force => true`. Retrieve should not be making any changes to the system, so removed that code, and updated `working_copy_exists` to make sure that the directory not only contains a `.git` directory, but also if `source` is specified it also matches `#{path}/.git/config` so that it will overwrite a git repo with a different source. Updated tests to not check for the old broken behavior. Added a regression test.
2014-12-16Merge pull request #223 from infopro-digital/MODULES-1597Aaron Stone
Fix for MODULES-1597: "format" is a file not a directory
2014-12-13Fix for MODULES-1597: "format" is a file not a directoryFarzad FARID
The "format" entry in a SVN directory is a file, not a directory.
2014-12-09Merge pull request #222 from cmurphy/masterMorgan Haskel
Update .travis.yml, Gemfile, Rakefile, and CONTRIBUTING.md
2014-12-08Add json gemColleen Murphy
The puppet_facts gem implicitly depends on the json gem. On Ruby 1.8.7, json is not built in. On Puppet 2.7, it is not explicitly pulled in by the hiera gem. So we add it here explicitly.
2014-12-08Update .travis.yml, Gemfile, Rakefile, and CONTRIBUTING.mdColleen Murphy
2014-11-20Merge pull request #219 from laurenrother/readmeMorgan Haskel
Updates README per MODULES-1425
2014-11-20Updates README per MODULES-1425Lauren Rother
Adds note to Setup section stating that the module will not create parent directories or install VCS software.
2014-11-04Merge pull request #217 from mhaskel/testTravis Fields
Merge 1.2.x into master
2014-11-03Merge pull request #216 from mhaskel/missing_docTravis Fields
Add missing doc update.
2014-11-03Add missing doc update.Morgan Haskel
2014-11-03Merge pull request #215 from mhaskel/1.2.0-prepTravis Fields
1.2.0 prep
2014-11-031.2.0 prepMorgan Haskel
2014-10-29Merge pull request #213 from jfautley/cvs-runasAaron Stone
Add `user` feature support to CVS provider
2014-10-29Add spec test for invokation as a different userJon Fautley
2014-10-29Rework spec tests to support new execution methodJon Fautley
2014-10-29Revamp debugging outputJon Fautley