Add --version to chef-solr, fixes CHEF-1018

Author: jtimberman

chef-solr/lib/chef/solr.rb

@@ -34,6 +34,9 @@
 
 class Chef
   class Solr
+
+    VERSION = "0.8.6"
+
     include Chef::Mixin::XMLEscape
 
     attr_accessor :solr_url, :http

chef-solr/lib/chef/solr/application/solr.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,19 +21,20 @@
 require 'chef/application'
 require 'chef/daemon'
 require 'chef/client'
+require 'chef/solr'
 
 class Chef
   class Solr
     class Application
       class Solr < Chef::Application
-  
-        option :config_file, 
+
+        option :config_file,
           :short => "-c CONFIG",
           :long  => "--config CONFIG",
           :default => "/etc/chef/solr.rb",
           :description => "The configuration file to use"
 
-        option :log_level, 
+        option :log_level,
           :short        => "-l LEVEL",
           :long         => "--log_level LEVEL",
           :description  => "Set the log level (debug, info, warn, error, fatal)",
@@ -95,11 +96,19 @@ class Solr < Chef::Application
         option :solr_java_opts,
           :short => "-j OPTS",
           :long => "--java-opts OPTS",
-          :description => "Raw options passed to Java" 
+          :description => "Raw options passed to Java"
+
+        option :version,
+          :short => "-v",
+          :long => "--version",
+          :description => "Show chef-solr version",
+          :boolean => true,
+          :proc => lambda {|v| puts "chef-solr: #{Chef::Solr::VERSION}"},
+          :exit => 0
 
         def initialize
           super
-          Chef::Log.level = Chef::Config[:log_level] 
+          Chef::Log.level = Chef::Config[:log_level]
         end
 
         def setup_application
@@ -113,7 +122,7 @@ def setup_application
 
           # Create the Jetty container
           unless File.directory?(Chef::Config[:solr_jetty_path])
-            Chef::Log.warn("Initializing the Jetty container") 
+            Chef::Log.warn("Initializing the Jetty container")
             solr_jetty_dir = Chef::Resource::Directory.new(Chef::Config[:solr_jetty_path], nil, c.node)
             solr_jetty_dir.recursive(true)
             solr_jetty_dir.run_action(:create)
@@ -125,7 +134,7 @@ def setup_application
 
           # Create the solr home
           unless File.directory?(Chef::Config[:solr_home_path])
-            Chef::Log.warn("Initializing Solr home directory") 
+            Chef::Log.warn("Initializing Solr home directory")
             solr_home_dir = Chef::Resource::Directory.new(Chef::Config[:solr_home_path], nil, c.node)
             solr_home_dir.recursive(true)
             solr_home_dir.run_action(:create)
@@ -135,7 +144,7 @@ def setup_application
             solr_jetty_untar.run_action(:run)
           end
 
-          # Create the solr data path 
+          # Create the solr data path
           unless File.directory?(Chef::Config[:solr_data_path])
             Chef::Log.warn("Initializing Solr data directory")
             solr_data_dir = Chef::Resource::Directory.new(Chef::Config[:solr_data_path], nil, c.node)