capistrano-karaf 1.5.1 → 1.5.2

data/lib/capistrano-karaf/core.rb

@@ -11,8 +11,9 @@ SSHKit.config.command_map[:features_install] = 'features:install'
 SSHKit.config.command_map[:features_uninstall] = 'features:uninstall'
 SSHKit.config.command_map[:features_list] = 'features:list'
 SSHKit.config.command_map[:features_info] = 'features:info'
-SSHKit.config.command_map[:headers] = 'headers'
-SSHKit.config.command_map[:list] = 'osgi:list -t 0'
+SSHKit.config.command_map[:headers] = 'osgi:headers --force'
+SSHKit.config.command_map[:list] = 'osgi:list'
+SSHKit.config.command_map[:list_all] = 'osgi:list -t 0'
 SSHKit.config.command_map[:log_set] = 'log:set'
 SSHKit.config.command_map[:stop] = 'osgi:stop'
 SSHKit.config.command_map[:start] = 'osgi:start'
@@ -72,14 +73,28 @@ module Capistrano_Karaf
   # Uninstall a feature on the karaf server
   #
   # name - the string containing the feature name
+  # version - the string containing the version number
   #
   # Examples
-  #   feature_uninstall "hello"
+  #   feature_uninstall "hello" "2.19.0"
   #   # => nil
   #
   # Returns nothing
-  def feature_uninstall (name)
+  def feature_uninstall(name, version)
+    
+    # Keep track of the bundles that are part of the feature
+    #bundles = feature_bundles(name, version)    
     execute(:features_uninstall, name)
+    
+    # Verify all bundles have been uninstalled and remove the bundle if not
+    #headers = list_headers
+    #bundles.each do |b|
+    #  matching_headers = headers.find do |h| 
+    #    h['Bundle-SymbolicName'] == b[:artifactId] && h['Bundle-Version'] == b[:version]
+    #  end
+
+    #  matching_headers.each {|h| uninstall['Bundle-Number']}
+    #end
   end
 
   # Set the log level on the karaf server
@@ -142,13 +157,14 @@ module Capistrano_Karaf
   #
   # Returns a list of hashmaps containing all feature repositories
   def list_urls
-    url_line_matcher = %r{        (?<status> \w+){0}
-				(?<groupID> [\d\w\.\-]+){0}
-				(?<artifactID> [\w\.\-]+){0}
-				(?<version> [\w\.\-]+){0} 
+    url_line_matcher = 
+        %r{ (?<status> \w+){0}
+            (?<groupID> [\d\w\.\-]+){0}
+            (?<artifactID> [\w\.\-]+){0}
+            (?<version> [\w\.\-]+){0} 
 
-			\s*\g<status>\s*mvn\:\g<groupID>\/\g<artifactID>\/\g<version>.*
-			}x
+            \s*\g<status>\s*mvn\:\g<groupID>\/\g<artifactID>\/\g<version>.*
+          }x
 
     data = capture(:features_listurl)
     matcher_to_hash(url_line_matcher, data)
@@ -162,13 +178,14 @@ module Capistrano_Karaf
   #
   # Returns a list of hashmaps containing all available features
   def list_features
-    feature_line_matcher = %r{    (?<status> \w+){0}
-				(?<version> [\d\w\-\.\s]+){0}
-				(?<name> [\w\-\.\:]+){0}
-				(?<repository> [\w\-\s\:\.]+){0}
+    feature_line_matcher = 
+        %r{ (?<status> \w+){0}
+            (?<version> [\d\w\-\.\s]+){0}
+            (?<name> [\w\-\.\:]+){0}
+            (?<repository> [\w\-\s\:\.]+){0}
 
-			^\[\s*\g<status>\s*\]\s\[\s*\g<version>\s*\]\s*\g<name>\s*\g<repository>
-                           }x
+            ^\[\s*\g<status>\s*\]\s\[\s*\g<version>\s*\]\s*\g<name>\s*\g<repository>
+          }x
 
     data = capture(:features_list)
     matcher_to_hash(feature_line_matcher, data)
@@ -182,21 +199,69 @@ module Capistrano_Karaf
   #
   # Returns a list of hashmaps containing the installed bundles
   def list_bundles
-    bundle_line_matcher = %r{(?<id> \d+){0}
-                           (?<status> \w+){0}
-                           (?<blueprint> \w*){0}
-                           (?<context> \w*){0}
-                           (?<level> \d+){0}
-                           (?<name> [\w\s\.\-\:]+){0}
-                           (?<version> .+){0}
-
-                           ^\[\s*\g<id>\]\s\[\s*\g<status>\s*\]\s\[\s*\g<blueprint>\s*\]\s\[\s*\g<context>\s*\]\s\[\s*\g<level>\s*\]\s\g<name>\s\(\g<version>\)
-                          }x
+    bundle_line_matcher = 
+        %r{ (?<id> \d+){0}
+            (?<status> \w+){0}
+            (?<blueprint> \w*){0}
+            (?<context> \w*){0}
+            (?<level> \d+){0}
+            (?<name> [\w\s\.\-\:]+){0}
+            (?<version> .+){0}
+
+            ^\[\s*\g<id>\]\s\[\s*\g<status>\s*\]\s\[\s*\g<blueprint>\s*\]\s\[\s*\g<context>\s*\]\s\[\s*\g<level>\s*\]\s\g<name>\s\(\g<version>\)
+          }x
+
+    fragments_matcher = /\s*Fragments: ([\d\s]+)\s*/
     
     data = capture(:list)
+
+    fragments = []
+    bundles = []
+
+    data.lines.each do |line|
+      m1 = bundle_line_matcher.match line
+      m2 = fragments_matcher.match line
+
+      if m1 then
+        bundles.push(m1)
+      elsif m2 then
+        fragment_bundles = m2[1].split /\s+/
+        fragment_bundles.each {|fb| fragments.push fb}
+      end
+    end
+
+    bundles1 = bundles.collect {|m| Hash[m.names.collect {|k| k.to_sym }.zip(m.captures)]}
+    bundles1.collect do |b| 
+      b[:fragment] = fragments.include? b[:id]
+      b
+    end
+  end
+
+  # List all bundles on the karaf server
+  #
+  # Examples
+  #   list_bundles
+  #   # => [{:id => "10", :status => "INSTALLED", :blueprint => "", :context => "", :level => "60", :name => "camel-core", :version => "1.0.0"}]
+  #
+  # Returns a list of hashmaps containing the installed bundles
+  def list_all_bundles
+    bundle_line_matcher = 
+        %r{ (?<id> \d+){0}
+            (?<status> \w+){0}
+            (?<blueprint> \w*){0}
+            (?<context> \w*){0}
+            (?<level> \d+){0}
+            (?<name> [\w\s\.\-\:]+){0}
+            (?<version> .+){0}
+
+            ^\[\s*\g<id>\]\s\[\s*\g<status>\s*\]\s\[\s*\g<blueprint>\s*\]\s\[\s*\g<context>\s*\]\s\[\s*\g<level>\s*\]\s\g<name>\s\(\g<version>\)
+          }x
+    
+    data = capture(:list_all)
     matcher_to_hash(bundle_line_matcher, data)
   end
 
+
   # Get the headers for a bundle
   #
   # bundleId - A number containing the bundle id
@@ -211,17 +276,23 @@ module Capistrano_Karaf
     extract_bundle_headers(data)
   end
 
+  def list_headers
+    data = capture(:headers)
+    data.collect {|h| extract_bundles_from_feature(h)}
+  end
+
   # List all bundles provided by a feature
   #
   # name - A string containing the name of the feature
+  # version - A string containing the version of the feature
   # 
   # Examples
-  #   feature_bundles "camel-core"
+  #   feature_bundles "camel-core" "2.18"
   #   # => [{:groupId => "org.apache.camel", :artifactId => "camel-core", :version => "2.18"}]
   #
   # Returns a list containing the hashes with the bundle information
-  def feature_bundles (name)
-    data = capture(:features_info, name)
+  def feature_bundles(name, version)
+    data = capture(:features_info, "#{name} #{version}")
     extract_bundles_from_feature(data)
   end
 
@@ -233,7 +304,7 @@ module Capistrano_Karaf
       m = matcher.match(line)
       breaklist.push(m) unless m.nil?
     end
-    breaklist.collect {|m| Hash[m.names.zip(m.captures)]}
+    breaklist.collect {|m| Hash[m.names.collect {|n| n.to_sym}.zip(m.captures)]}
   end
 
   def extract_bundles_from_feature (data)
@@ -241,18 +312,25 @@ module Capistrano_Karaf
     data.lines.each do |l|
       m = l.match(/.*mvn:(?<GroupId>[\w\.]+)\/(?<ArtifactId>[-\w\.]+)\/(?<Version>[-\d\w\.]+)/)
       if m then 
-        bundles.push({:groupId 	=> m['GroupId'],
+        bundles.push({ :groupId 	=> m['GroupId'],
                        :artifactId	=> m['ArtifactId'],
-                       :version	=> m['Version']})
+                       :version	        => m['Version']})
       end
     end
     bundles
   end
 
-  def extract_bundle_headers (headers)
+  def extract_bundle_headers (hdrs)
     re = /(.+) = (.+)/
     header =  {}
-    headers.lines.map {|l| m = l.match(re); if m then header[m[1].strip!] = m[2] end}
+    lines = hdrs.lines
+    lines.map {|l| m = l.match(re); if m then header[m[1].strip!] = m[2] end}
+    
+    m = lines[2].match(/\w+ \(([\d+])\)/)
+    if m then
+      header['Bundle-Number'] = m[1].to_i
+    end
+
     header
   end
 end

data/lib/capistrano-karaf/extended.rb

@@ -20,7 +20,7 @@ module Capistrano_Karaf
                           }x
     urls_to_remove=matcher_to_hash(url_details_regex,url)
     urls_to_remove.each do |u|   	
-	remove_artifact_urls(u['groupID'],u['artifactID'])
+	remove_artifact_urls(u[:groupID],u[:artifactID])
     end
   end
 
@@ -35,9 +35,9 @@ module Capistrano_Karaf
   #
   # Returns nothing
   def remove_artifact_urls (groupID, artifactID)
-    urlsToRemove=list_urls.select {|url| url['groupID'] == groupID && url['artifactID'] == artifactID}	
+    urlsToRemove=list_urls.select {|url| url[:groupID] == groupID && url[:artifactID] == artifactID}	
     urlsToRemove.each do |url|   	
-      remove_url "mvn:#{url["groupID"]}/#{url["artifactID"]}/#{url["version"]}/xml/features"
+      remove_url "mvn:#{url[:groupID]}/#{url[:artifactID]}/#{url[:version]}/xml/features"
     end
   end
 
@@ -126,8 +126,8 @@ module Capistrano_Karaf
   #
   # Returns true if the feature is installed
   def feature_installed? (name)
-    feature = list_features.find {|f| f['name']==name}
-    feature['status'] == 'installed' unless feature.nil?
+    feature = list_features.find {|f| f[:name]==name}
+    feature[:status] == 'installed' unless feature.nil?
   end
 
   # Verify if a the bundle context is started

data/lib/capistrano-karaf/install.rb

@@ -8,6 +8,7 @@ require 'net/http'
 require 'rexml/document'
 
 module Install
+
   include Semantic_Versions
   
   # Upgrade a list of projects in karaf
@@ -61,20 +62,27 @@ module Install
   # Returns nothing
   def upgrade (projects)
     features = list_features()
-    projects.each do |project|
-      project = {:condition => :gt,
-                 :hooks => {}}.merge(project)
-     
-      install_new_feature = true      
-      installed_features = find_installed_with_name(features, project[:feature])
 
-      if project.keys.include? :groupId then
-        fh = create_feature_hash(project[:groupId], project[:repository], project[:feature], project[:version], project[:condition], project[:hooks])
-        upgrade_feature(installed_features, fh)
-      else
-        upgrade_feature(installed_features, project)
-      end
+    to_uninstall, to_install = calculate_upgrade_actions(projects, features)
+
+    # first start uninstalling features in reverse order
+    to_uninstall.reverse.each do |f| 
+      trigger_event(f, :before_uninstall_feature)
+      feature_uninstall(f[:name], f[:version])
+      trigger_event(f, :after_uninstall_feature)
+    end
+
+    # no install the new features
+    to_install.each do |f|
+      remove_otherversion_urls(f[:feature_url])
+      add_url(f[:feature_url])
+      trigger_event(f, :before_install_feature)
+      feature_install(f[:feature])
+      trigger_event(f, :after_install_feature)
     end
+
+    list_bundles.find_all {|b| !b[:fragment] && b[:context] == "Failed"}
+                .each {|b| restart_bundle b[:id]}
   end
 
   # Extract the latest version from a maven-metadata file
@@ -101,33 +109,25 @@ module Install
   end
 
   def find_installed_with_name (features, name)
-    features.select {|f| f["name"] == name and f["status"] == "installed"}
+    features.select {|f| f[:name] == name and f[:status] == "installed"}
   end
 
-  def upgrade_feature(installed_features, feature)
+  def upgrade_feature(installed_features, feature, to_install, to_uninstall)
     install_new_feature = true
     p = method(feature[:condition])
     
     installed_features.each do |f|
       trigger_event(feature, :before_upgrade_feature)
-      if p.call(f["version"], feature[:version])
-        trigger_event(feature, :before_uninstall_feature)
-        feature_uninstall("#{feature[:feature]}/#{f['version']}")
-        trigger_event(feature, :after_uninstall_feature)
+      if p.call(f[:version], feature[:version])
+        to_uninstall << f
       else
         install_new_feature = false
       end
     end
     
-
-    if install_new_feature 
-      remove_otherversion_urls(feature[:feature_url])
-      add_url(feature[:feature_url])
-      trigger_event(feature, :before_install_feature)
-      feature_install(feature[:feature])
-      trigger_event(feature, :after_install_feature)     
+    if install_new_feature
+      to_install << feature
     end
-    trigger_event(feature, :after_upgrade_feature)
   end
 
   def trigger_event (feature, event) 
@@ -158,4 +158,35 @@ module Install
      :hooks => hooks
     }    
   end
+
+  def fragment_bundle? (bundle)
+    bundle[:fragment]
+  end
+
+  def calculate_upgrade_actions (projects, features)
+    to_uninstall = []
+    to_install = []
+
+    projects.each do |project|
+      project = {:condition => :gt,
+                 :hooks => {}}.merge(project)
+     
+      install_new_feature = true      
+      installed_features = find_installed_with_name(features, project[:feature])
+
+      if project.keys.include? :groupId then
+        fh = create_feature_hash(project[:groupId], project[:repository], project[:feature], project[:version], project[:condition], project[:hooks])
+        upgrade_feature(installed_features, fh, to_install, to_uninstall)
+      else
+        upgrade_feature(installed_features, project, to_install, to_uninstall)
+      end
+    end
+
+    return to_uninstall, to_install
+  end
+
+  def restart_bundle (id)
+    stop id
+    start id
+  end
 end

metadata

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