Age | Commit message (Collapse) | Author | Files | Lines |
|
The current directory ('.') is on the load path for Ruby 1.8.7.
This is a security vulnerability as it allows arbitrary code loading if
users create ruby source files with names that correspond to those that
puppet is trying to load.
The fix is to explicitly remove '.' from the load path before any code
is loaded by puppet.
|
|
While doing testing around GH-1582 I wound up using a shared filesystem
with Windows, which casually stomped the execute permission for
bin/puppet. This commit readds the execute bit.
|
|
Using an object of class Puppet::Type::Cron is too error prone, as
instantiation of those objects have a lot of side effects. This replaces
the actual object with a stub to minimize the possible side effects.
|
|
This patch adds Travis support. It also makes sure that `bundle install
--path vendor` works with `bundle exec rake spec`.
This patch should coincide with enabling Travis CI support for pull requests.
A build status image is also included in the project README.
|
|
The previous commit removed the side-effect of loading rubygems as a
result of evaluating the `Puppet.features.rubygems?` feature. As a
result, the puppet script was the only place where we loaded rubygems,
breaking rack setups.
This commit moves the loading of rubygems into the
Puppet::Util::CommandLine, which is effectively puppet's entry point
for both command line and rack setsups.
In addition, `Bundler::Setup` doesn't always seem to exist, at least
not in all versions of bundler, so instead we're using `::Bundler` to
detect if it's loaded.
Paired-with: Andy Parker <andy@puppetlabs.com>
|
|
If bundler is handling gems we don't want to load rubygems ourselves, as it
can conflict and cause loading of system gems beyond what bundler has set up.
|
|
maint/3.x/merge-hiera-puppet-into-core
Conflicts:
.gitignore
CHANGELOG
LICENSE
README.md
Rakefile
ext/debian/changelog.erb
ext/debian/compat
ext/debian/control
ext/debian/copyright
ext/debian/rules
ext/osx/preflight.erb
spec/spec_helper.rb
spec/watchr.rb
Signed-off-by: Daniel Pittman <daniel@puppetlabs.com>
|
|
The hiera-puppet code base now uses two space indentation. This patch
also removes unnecessary calls to `Hiera::Scope`, which is no longer
required because core Puppet's scope object allows variable lookup via
the `[]` method.
This commit includes updated specs.
|
|
We were trying to load rubygems in lib/puppet.rb so that we could load other
libraries installed as gems, but this isn't anywhere near the first file
loaded. By moving this into bin/puppet and other executable entry points, we
ensure that rubygems is loaded as early as possible.
|
|
This removes the standalone filebucket, pi, puppetdoc, and ralsh commands.
|
|
|
|
Since it is no longer possible to find the running executable from the
call stack, docs have to be kept somewhere in the source tree.
Of course, at this point, we shouldn't be using RDoc::Usage at all.
|
|
This adds the --charset option to puppetdoc for RDoc mode.
This allows to set the charset for the generated html.
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
|
|
refactor CommandLine to be an object
Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
|
|
Extract the logic to determine the subcommand name into a method.
Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
|
|
Change the --help text to match the new single executable invocations
Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
|
|
restore the help text for the apply command
Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
|
|
Puppet's defaults change depending on which command invokes them.
This patch makes sure that we use the maintain the current behavior.
This is a temporary fix until I implement feature #2935.
Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
|
|
Add "puppet describe" as the new invocation of "pi"
Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
|
|
Added some tests to make the single executable command behavior
explicit.
Added logic to display the usage message if we're on a tty and no
arguments are passed.
Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
|
|
Added some tests to make the single executable command behavior
explicit.
Added logic to display the usage message if we're on a tty and no
arguments are passed.
Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
|
|
It was previously requiring that you specify an application
name, thus breaking the ability to easily run commands like:
puppet ~/bin/test.pp
Or even having '#/usr/bin/env puppet --verbose' in the first
line of an executable script and having that work.
Signed-off-by: Luke Kanies <luke@puppetlabs.com>
|
|
Signed-off-by: Luke Kanies <luke@puppetlabs.com>
|
|
|
|
|
|
Signed-off-by: Luke Kanies <luke@madstop.com>
|
|
Apologies if this violates the no-trivial-patches rule. I am getting
used to git and this seemed like a harmless place to start.
Documentation fix for help text, configuration reference URL is 404 now.
Updated to equivalent page on wiki, fixes #2466
Signed-off-by: Eric Sorenson <ahpook@gmail.com>
|
|
Requires the pandoc binary to function (http://johnmacfarlane.net/pandoc/).
|
|
Signed-off-by: James Turnbull <james@lovedthanlost.net>
|
|
|
|
|
|
|
|
|
|
|
|
This will need to be modified on the merge into 0.25,
because the daemon module becomes a class, but that should
be easy enough.
Signed-off-by: Luke Kanies <luke@madstop.com>
|
|
This uses the backported Application class, with a couple
of backported monkey-patches so the class works as expected
but in 0.24.
Signed-off-by: Luke Kanies <luke@madstop.com>
|
|
|
|
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
|
|
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
|
|
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
|
|
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
|
|
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
|
|
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
|
|
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
|
|
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
|
|
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
|
|
Most of these were small changes, like moved methods.
Signed-off-by: Luke Kanies <luke@madstop.com>
|
|
This replaces the short-lived EventManager class, all of
the service- and timer-related code in puppet.rb, and moves
code from agent.rb, server.rb, and other places into one
class responsible for starting, stopping, pids, and more.
The Daemon module is no longer in existence, so it's been
removed from the classes that were using it.
Signed-off-by: Luke Kanies <luke@madstop.com>
|
|
Once I went to add runinterval support to the Agent class,
I realized it's really two classes: One that handles starting,
stopping, running, et al (still called Agent), and one that
handles downloading the catalog, running it, etc. (now
called Configurer).
This commit includes some additional code, but 95% of it is just moving code around.
Signed-off-by: Luke Kanies <luke@madstop.com>
|
|
Signed-off-by: Luke Kanies <luke@madstop.com>
|