capistrano-karaf 1.6.14 → 1.6.15

data/lib/capistrano-karaf/core.rb

@@ -83,9 +83,9 @@ module Capistrano_Karaf
   #
   # Returns nothing
   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]}
+    puts "Bundles in feature: #{feature_bundle_urls}"
 
     if version.nil? then
       execute(:features_uninstall, "#{name}")
@@ -96,6 +96,7 @@ module Capistrano_Karaf
     # Verify all bundles have been uninstalled and remove the bundle if not
     list_bundle_locations.each do |installed_bundle|
       if feature_bundle_urls.include? installed_bundle[:url] then
+        puts "Uninstall bundle #{installed_bundle}"
         uninstall installed_bundle[:id]
       end
     end
@@ -382,6 +383,7 @@ module Capistrano_Karaf
 
   def extract_bundles_from_feature (data)
     bundles = []
+
     data.lines.each do |l|
       m = l.match(/mvn:(?<GroupId>[\w\.]+)\/(?<ArtifactId>[-\w\.]+)\/(?<Version>[-\d\w\.]+)/)
       if m then 

data/lib/capistrano-karaf/extended.rb

@@ -88,9 +88,12 @@ module Capistrano_Karaf
     args = {:timeout => 60, :sleeptime => 5}.merge(args)
     timeout = Time.now + args[:timeout]
     
-    until Time.now > timeout or list_bundles.all? { |b| pred.call b} 
-      puts "Some bundles are still failing the predicate"
+    bundles = list_bundles
+    until Time.now > timeout or bundles.all? { |b| pred.call b} 
+      failing_bundles = bundles.select { |b| !pred.call b }
+      puts "Some bundles are still failing the predicate #{pred}: #{failing_bundles}"
       sleep args[:sleeptime]
+      bundles = list_bundles
     end
 
     raise "Not all bundles pass the predicate within the timeout of #{args[:timeout]} seconds" unless list_bundles.all? { |b| pred.call b }

data/lib/capistrano-karaf/install.rb

@@ -78,7 +78,10 @@ module Install
   def upgrade (projects, args={})
     args = {:startlevel_before_upgrade => 60, :startlevel_after_upgrade => 100}.merge(args)
     features = list_features
+    puts "Features #{features}"
     to_uninstall, to_install = calculate_upgrade_actions(projects, features)
+    puts "To uninstall #{to_uninstall}"
+    puts "To install #{to_install}"
 
     begin
       # decrease the start level
@@ -257,8 +260,9 @@ module Install
   def ensure_all_bundles_are_restarted (level_before_upgrade, initial_level)
     wait_for_all_bundles(:timeout => 600, :sleeptime => 10) do |b|
       if (b[:level].to_i > level_before_upgrade and 
-          b[:level].to_i <= initial_level)
-        ["Active","Resolved","Failed"].include? b[:status]
+          b[:level].to_i <= initial_level and
+          b[:name] != 'activemq-blueprint')
+        ["Active","Failed"].include? b[:status]
       else
         true
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-karaf
 version: !ruby/object:Gem::Version
-  version: 1.6.14
+  version: 1.6.15
   prerelease: 
 platform: ruby
 authors: