haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Support a few more gem parameters - take 2

This commit is contained in:
Hugues Malphettes 2013-03-20 14:02:32 +08:00
parent 6babeb4188
commit 135adc8904
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/commands/plugin/action/install_gem.rb
View File

@ -16,15 +16,23 @@ module VagrantPlugins
def call(env) def call(env)
plugin_name = env[:plugin_name] plugin_name = env[:plugin_name]
prerelease = env[:plugin_prerelease]
version = env[:plugin_version]
# Install the gem # Install the gem
plugin_name_label = plugin_name
plugin_name_label += ' --prerelease' if prerelease
plugin_name_label += " --version \"#{version}\"" if version
env[:ui].info(I18n.t("vagrant.commands.plugin.installing", env[:ui].info(I18n.t("vagrant.commands.plugin.installing",
:name => plugin_name)) :name => plugin_name_label))
installed_gems = env[:gem_helper].with_environment do installed_gems = env[:gem_helper].with_environment do
installer = Gem::DependencyInstaller.new(:document => []) # Override the list of sources by the ones set on the cmd-line if any
Gem.sources = env[:plugin_sources] if env[:plugin_sources]
installer = Gem::DependencyInstaller.new(:document => [], :prerelease => prerelease)
begin begin
installer.install(plugin_name) installer.install(plugin_name, version)
rescue Gem::GemNotFoundException rescue Gem::GemNotFoundException
raise Vagrant::Errors::PluginInstallNotFound, raise Vagrant::Errors::PluginInstallNotFound,
:name => plugin_name :name => plugin_name

16
plugins/commands/plugin/command/install.rb
View File

@ -17,6 +17,19 @@ module VagrantPlugins
"The name of the entry point file for loading the plugin.") do |entry_point| "The name of the entry point file for loading the plugin.") do |entry_point|
options[:entry_point] = entry_point options[:entry_point] = entry_point
end end
o.on("--plugin-prerelease",
"Install a prereleased version of the plugin") do |plugin_prerelease|
options[:plugin_prerelease] = plugin_prerelease
end
o.on("--plugin-version PLUGIN_VERSION", String,
"Install a specific version of the plugin") do |plugin_version|
options[:plugin_version] = plugin_version
end
o.on("--plugin-source PLUGIN_SOURCE", String,
"Add a ruby gem repository") do |plugin_source|
options[:plugin_sources] = [] if !options[:plugin_sources]
options[:plugin_sources] << plugin_source
end
end end
# Parse the options # Parse the options
@ -27,6 +40,9 @@ module VagrantPlugins
# Install the gem # Install the gem
action(Action.action_install, { action(Action.action_install, {
:plugin_entry_point => options[:entry_point], :plugin_entry_point => options[:entry_point],
:plugin_prerelease => options[:plugin_prerelease],
:plugin_version => options[:plugin_version],
:plugin_sources => options[:plugin_sources],
:plugin_name => argv[0] :plugin_name => argv[0]
}) })