summaryrefslogtreecommitdiff
path: root/spec/unit/face/file_spec.rb
AgeCommit message (Collapse)AuthorFilesLines
2012-09-26(Maint) Remove rspec from shebang lineJeff McCune1-1/+1
Without this patch Ruby 1.9 is still complaining loudly about trying to parse the spec files. The previous attempt to clean up this problem in edc3ddf works for Ruby 1.8 but not 1.9. I'd prefer to remove the shebang lines entirely, but doing so will cause encoding errors in Ruby 1.9. This patch strives for a happy middle ground of convincing Ruby it is actually working with Ruby while not confusing it to think it should exec() to rspec. This patch is the result of the following command run against the source tree: find spec -type f -print0 | \ xargs -0 perl -pl -i -e 's,^\#\!\s?/(.*)rspec,\#! /usr/bin/env ruby,'
2012-09-25Revert "Merge branch 'fix/3.x/7316_load_faces_from_modulepath_try3' into 3.x"Andrew Parker1-3/+1
This reverts commit b277bb3874ecd50e1cd6e600bf6d36e3240d5510, reversing changes made to bdf193640701e9a107b1c6f6661499b31fdefb4d. These changes are being backed out because they referenced a undefined methods (`default_global_config_dir` and `default_global_var_dir`). After fixing that locally, there was still a problem with `puppet help` printing out a large number of warnings because it could not load face code correctly. I think we need to step back from this, re-evaluate what is happening, and try a new approach.
2012-09-24Revert "Merge branch 'revert/3.x/faces_from_modulepath' into 3.x"Jeff McCune1-1/+3
This is a "revert-the-revert" commit. This reverts commit 87ea7a8849f90a232f2bb683fb8a2ce1573a21db, reversing changes made to 8dff14b9c5a3cdd99ede63dbcbb2dbe00b457926.
2012-09-21Revert "Merge branch 'fix/3.x/7316_load_faces_from_modulepath' into 3.x"Jeff McCune1-3/+1
Revert the modulepath face loader change set for the following reason: This change set is intended to load faces from the module path. It works great... _if_ you explicitly set --confdir on the command line like I do with my zsh puppet() function. If you don't, then it blows up because the global for the confdir is set by defaults at a different enough point in the code for us to overlook the issue. If we invest in removing global state, specifically Puppet.settings, I think we'll see a very quick return. The confdir setting should be "available" for use at the same point, regardless of where it comes from; defaults, puppet.conf, CLI, or (hopefully) the environment. This reverts commit 8b059a9a9e7c765d3050163ca59abeffe3e297b5, reversing changes made to 7c3b620182602012b191a5b5ade7b1df5cbc8b19.
2012-09-20(#7316) Load applications from the modulepathJeff McCune1-1/+3
Without this patch Puppet does not search the modulepath lib subdirectories for application subcommands. This is a problem because face applications that aren't affected by #3947 should work. This patch fixes the problem by searching through the modules along the modulepath to find available subcommands in addition to those available along the Ruby $LOAD_PATH and RubyGems $GEM_PATH. Both legacy application files and modern face applications are loaded from the modulepath with this patch. This patch does _not_ add the module's `lib/` subdirectory to the $LOAD_PATH, so issue #3947 will still affect face applications that attempt to use `require` with library files inside the module.
2012-07-02(maint) Standardize on /usr/bin/env ruby -S rspecJeff McCune1-1/+1
Without this patch some spec files are using `ruby -S rspec` and others are using `rspec`. We should standardize on a single form of the interpreter used for spec files. `ruby -S rspec` is the best choice because it correctly informs editors such as Vim with Syntastic that the file is a Ruby file rather than an Rspec file.
2011-05-03(#7279) Adding some basic file actionsLuke Kanies1-1/+6
Add the ability to download a file into the local filebucket using a puppet URI or from disk. Also, the ability to store into the filebucket. These provide at least basic UI for moving data around using the filebucket service, and act as an example of how further work can be done. Also, update the code to eliminate a couple of redundant checks on arguments, and add some basic testing around the actions. Mostly only that they exist, at this point. Reviewed-By: Daniel Pittman <daniel@puppetlabs.com>
2011-04-22maint: clean up test headers on face spec files.Daniel Pittman1-0/+4
A whole pile of spec files for faces were not pulling in the regular spec_helper, or the puppet/face library before they used it. This worked fine by coincidence when they ran together, but blew up if run separately. Reviewed-By: Jesse Wolf <jesse@puppetlabs.com>
2011-04-13(#7056) Use 'face' rather than 'faces' in the production code.Daniel Pittman1-0/+3
After some discussion we decided that most uses of the Puppet Face infrastructure were about single faces on their own, not about the collection, and so we were better referring to Puppet::Face[...] in code. This implements that by translating names and references in the Ruby code to the new, s-less, name.