capistrano-karaf 1.6.0 → 1.6.1

data/lib/capistrano-karaf/core.rb

@@ -74,18 +74,23 @@ module Capistrano_Karaf
   # Uninstall a feature on the karaf server
   #
   # name - the string containing the feature name
-  # version - the string containing the version number
+  # version - the optional string containing the version number
   #
   # Examples
   #   feature_uninstall "hello" "2.19.0"
   #   # => nil
   #
   # Returns nothing
-  def feature_uninstall(name, version)
+  def feature_uninstall(name, version=nil)
     
     # Keep track of the bundles that are part of the feature
     feature_bundle_urls = feature_bundles(name, version).collect {|b| b[:url]}
-    execute(:features_uninstall, "#{name}/#{version}")
+
+    if version.nil? then
+      execute(:features_uninstall, "#{name}")
+    else
+      execute(:features_uninstall, "#{name}/#{version}")
+    end
     
     # Verify all bundles have been uninstalled and remove the bundle if not
     list_bundle_locations.each do |installed_bundle|

data/lib/capistrano-karaf/extended.rb

@@ -47,13 +47,14 @@ module Capistrano_Karaf
   # way it tries to avoid an exception on the karaf server.
   #
   # name - a string containing the feature name
+  # version - an optional version string
   # 
   # Examples
   #   feature_uninstall_safe "test", "1.0.0"
   #   # => nil
   #
   # Returns nothing  
-  def feature_uninstall_safe (name, version)
+  def feature_uninstall_safe (name, version=nil)
     feature_uninstall name, version unless !feature_installed? name, version
   end
 
@@ -119,6 +120,7 @@ module Capistrano_Karaf
   # Verify if a feature is installed
   #
   # name - a string containing the name of the feature
+  # version - an optional version string
   # 
   # Examples
   #   feature_installed? "camel-core"
@@ -126,7 +128,7 @@ module Capistrano_Karaf
   #
   # Returns true if the feature is installed
   def feature_installed? (name, version)
-    feature = list_features.find {|f| f[:name]==name and f[:version] == version}
+    feature = list_features.find {|f| f[:name]==name and (version.nil? or f[:version] == version)}
     feature[:status] == 'installed' unless feature.nil?
   end
 

metadata

@@ -1,12 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-karaf
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
   prerelease: 
 platform: ruby
 authors:
 - Brecht Hoflack
-- Jerome Morel
 autorequire: 
 bindir: bin
 cert_chain: []