vagrant-puppetconf 0.1.5 → 0.2.1

data/README.md

@@ -38,6 +38,14 @@ Example Vagrant file:
       config.puppetconf.updates = {'main/environment' => 'test'} # Set environment to test
     end 
 
+Additional commands:
+
+Updates and puppet.conf config on the fly.
+    vagrant puppetconf -k main/environment -v test 
+
+Update puppet.conf environment config on the fly.
+    vagrant puppetenv test 
+
 ## Contributing
 
 1. Fork it

data/lib/vagrant-puppetconf/command/puppetconf.rb

@@ -0,0 +1,42 @@
+module VagrantPuppetconf
+  module Command
+
+    class Puppetconf < Vagrant::Command::Base
+
+      def validate(options)
+        %w{key value}.each do |opt|
+          if options[opt.to_sym].empty?
+            @ui.error "#{opt.upcase} not set"
+            @ui.info "#{@opts}"
+            exit 1
+          end
+        end
+      end
+
+      def execute
+        @ui = Vagrant::UI::Colored.new('puppetconf')
+
+        options = {}
+        @opts = OptionParser.new do |opts|
+          opts.banner = "Usage: vagrant [vm-name] puppetconf -k config_key -v config_value"
+
+          opts.on('-k', '--key CONFIG_KEY', I18n.t('vagrant.plugins.puppetconf.command.options.key')) do |val|
+            options[:key] = val
+          end
+
+          opts.on('-v', '--value CONFIG_VALUE', I18n.t('vagrant.plugins.puppetconf.command.options.value')) do |val|
+            options[:value] = val
+          end
+        end
+
+        vms = parse_options @opts
+
+        validate options
+
+        with_target_vms(vms) do |vm|
+          Updater.update(vm, @ui, {options[:key] => options[:value]})
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-puppetconf/command/puppetenv.rb

@@ -0,0 +1,35 @@
+
+module VagrantPuppetconf
+  module Command
+
+    class Puppetenv < Vagrant::Command::Base
+
+      def validate(options)
+        %w{environment}.each do |opt|
+          if options[opt.to_sym].nil? || options[opt.to_sym].empty?
+            @ui.error "#{opt.upcase} not set"
+            @ui.info "Usage: vagrant [vm-name] puppetenv #{I18n.t('vagrant.plugins.puppetconf.command.options.environment')}"
+            exit 1
+          end
+        end
+      end
+
+      def execute
+        @ui = Vagrant::UI::Colored.new('puppetconf')
+        options = {}
+
+        argv = parse_options OptionParser.new
+        args = split_main_and_subcommand argv
+
+        vms = args[0]
+        options[:environment] = args[1]
+
+        validate options
+
+        with_target_vms(vms) do |vm|
+          Updater.update(vm, @ui, {'main/environment' => options[:environment]})
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-puppetconf/middleware.rb

@@ -9,28 +9,10 @@ module VagrantPuppetconf
       @env = env
       create_puppet_conf unless puppet_conf_exists?
       install_augeas unless augeas_installed?
-      update
+      Updater.update(@env[:vm], @env[:ui], @env[:vm].config.puppetconf.updates, @env[:vm].config.puppetconf.update_only)
       @app.call env
     end
 
-    def update
-      @env[:vm].channel.sudo("rm -f /etc/puppet/puppet.conf.augsave")
-      unless @env[:vm].config.puppetconf.update_only
-        @env[:vm].channel.sudo("cp /dev/null /etc/puppet/puppet.conf")
-      end
-      aug_commands = []
-      @env[:vm].config.puppetconf.updates.each_pair do |path, value|
-        aug_commands << "set /files/etc/puppet/puppet.conf/#{path} #{value}"
-      end
-      @env[:vm].channel.execute("echo -e \"#{aug_commands.join("\n")} \n save\" | sudo augtool -b")
-      if @env[:vm].channel.execute("ls /etc/puppet/puppet.conf.augsave")
-        @env[:ui].info I18n.t('vagrant.plugins.puppetconf.middleware.puppetconf_diff')
-        @env[:vm].channel.execute('diff -u /etc/puppet/puppet.conf /etc/puppet/puppet.conf.augsave', :error_check => false) do |type, data|
-          @env[:ui].success data, :prefix => false
-        end
-      end
-    end
-
     def puppet_conf_exists?
       @env[:vm].channel.execute("ls /etc/puppet/puppet.conf", :error_check => false) == 0
     end

data/lib/vagrant-puppetconf/updater.rb

@@ -0,0 +1,23 @@
+module VagrantPuppetconf
+
+  class Updater
+
+    def self.update(vm, logger, updates, update_only = true)
+      vm.channel.sudo("rm -f /etc/puppet/puppet.conf.augsave")
+      vm.channel.sudo("cp /dev/null /etc/puppet/puppet.conf") unless update_only
+      aug_commands = []
+      updates.each_pair do |path, value|
+        aug_commands << "set /files/etc/puppet/puppet.conf/#{path} #{value}"
+      end
+      vm.channel.execute("echo -e \"#{aug_commands.join("\n")} \n save\" | sudo augtool -b")
+      if vm.channel.execute("ls /etc/puppet/puppet.conf.augsave", :error_check => false) == 0
+        logger.info I18n.t('vagrant.plugins.puppetconf.updater.puppetconf_diff')
+        vm.channel.execute('diff -u /etc/puppet/puppet.conf.augsave /etc/puppet/puppet.conf', :error_check => false) do |type, data|
+          logger.success data, :prefix => false
+        end
+      else
+        logger.warn I18n.t('vagrant.plugins.puppetconf.updater.puppetconf_nochange')
+      end
+    end
+  end
+end

data/lib/vagrant-puppetconf/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Puppetconf
-    VERSION = "0.1.5"
+    VERSION = "0.2.1"
   end
 end

data/lib/vagrant-puppetconf.rb

@@ -1,7 +1,13 @@
 require 'vagrant'
+require 'vagrant-puppetconf/updater'
+require 'vagrant-puppetconf/command/puppetconf'
+require 'vagrant-puppetconf/command/puppetenv'
 require 'vagrant-puppetconf/middleware'
 require 'vagrant-puppetconf/config'
 
+Vagrant.commands.register(:puppetconf) { VagrantPuppetconf::Command::Puppetconf }
+Vagrant.commands.register(:puppetenv) { VagrantPuppetconf::Command::Puppetenv }
+
 Vagrant.config_keys.register(:puppetconf) { VagrantPuppetconf::Config }
 
 Vagrant.actions[:start].use VagrantPuppetconf::Middleware

data/locales/en.yml

@@ -2,7 +2,14 @@ en:
   vagrant:
     plugins:
       puppetconf:
+        command:
+          options:
+            key: "Config key to update."
+            value: "Value to set"
+            environment: "ENVIRONMENT"
         middleware:
           create_puppetconf: "Creating puppet.conf"
           install_augeas: "Installing augeas-tools"
+        updater:
           puppetconf_diff: "diff puppet.conf:"
+          puppetconf_nochange: "No change to puppet.conf"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-puppetconf
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2012-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant
@@ -39,8 +39,11 @@ files:
 - README.md
 - Rakefile
 - lib/vagrant-puppetconf.rb
+- lib/vagrant-puppetconf/command/puppetconf.rb
+- lib/vagrant-puppetconf/command/puppetenv.rb
 - lib/vagrant-puppetconf/config.rb
 - lib/vagrant-puppetconf/middleware.rb
+- lib/vagrant-puppetconf/updater.rb
 - lib/vagrant-puppetconf/version.rb
 - lib/vagrant_init.rb
 - locales/en.yml