capistrano-karaf 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdd56615ed6078429913010f47255f2bae3c7492
-  data.tar.gz: ae7ff71216a4f651322ede1ebc98c63ccfc2d763
+  metadata.gz: ef0e08765fe3c86715be70affc4055105446ba12
+  data.tar.gz: 2035db8bf22c1d7fbe6a8018e30d8fbc104cdf75
 SHA512:
-  metadata.gz: 598b1266d1c1663e2961114f6e611cf045da453126be269dfd321eb5d5c651e6bec04b2102d459d9e8af2dacaa3ea4948ab4be91b43201c0744693d5cd7c9ef2
-  data.tar.gz: 84801dcb29581e76771bf38a05e3fa090fbc26087b5bb1c2e9e31c3a6bf7e0be3d1b626b83cf16d2e7718d1e0e808495ff838c729a1d9f4406222b0a43ed9fbf
+  metadata.gz: 56d9bc7ee59811c66c1b3b03833421ecd7a3ee87cc77e9be5dd3b7dbc392eaf99974730d04b30919bec98cc9a35b736b59756ddf15c8aa83a82d541a08626cf6
+  data.tar.gz: 3faff81ac8518e9602647bbada6cbf14fd1faf2d4206c2eec91511de8a9c7aea6e193bf40a4d6e82fd6d4513a69126115c988c03dcada5f9075b5e33714d0713

data/lib/capistrano-karaf.rb

@@ -1,15 +1,16 @@
 require 'sshkit'
 
-SSHKit.config.command_map = 
-    {
-        :features_addurl    => 'features:addurl',
-        :features_removeurl => 'features:removeurl',
-        :features_install   => 'features:install',
-        :features_list      => 'features:list',
-        :features_info      => 'features:info',
-        :headers            => 'headers',
-        :list               => 'list'
-    }
+SSHKit.config.command_map[:features_addurl] = 'features:addurl'
+SSHKit.config.command_map[:features_removeurl] = 'features:removeurl'
+SSHKit.config.command_map[:features_refreshurl] = 'features:refreshurl'
+SSHKit.config.command_map[:features_install] = 'features:install'
+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] = 'list'
+SSHKit.config.command_map[:log_set] = 'log:set'
+SSHKit.config.command_map[:stop] = 'osgi:stop'
+SSHKit.config.command_map[:start] = 'osgi:start'
 
 def add_url (url)
     execute(:features_addurl, url)
@@ -19,6 +20,10 @@ def remove_url (url)
     execute(:features_removeurl, url)
 end
 
+def features_refreshurl
+    execute(:features_refreshurl)
+end
+
 def feature_install (name)
     execute(:features_install, name)
 end
@@ -27,25 +32,43 @@ def feature_uninstall (name)
     execute(:features_uninstall, name)
 end
 
+def log_set (level)
+    execute(:log_set, level)
+end
+
+def start (bundleId)
+    execute(:start, bundleId)
+end
+
+def stop (bundleId)
+    execute(:stop, bundleId)
+end
+
+def fragment_bundle? (bundleId)
+    headers = capture(:headers)
+    headers.lines.any? {|l| l.match('^Fragment-Host.*')}
+end
+
 def list_bundles ()
-  bundle_line_matcher = /^\[(?<BundleId>[ \d]+)\] \[(?<BundleStatus>[ \w]+)\] \[[ ]*\] \[(?<ContextStatus>[ \w]+)\] \[(?<BundleLevel> [ \d]+)\] (?<BundleName>[\w\-\:]+) \((?<BundleVersion>.+)\)/
+  bundle_line_matcher = %r{(?<id> \d+){0}
+                           (?<status> \w+){0}
+                           (?<context> \w*){0}
+                           (?<level> \d+){0}
+                           (?<name> [\w\s\-\:]+){0}
+                           (?<version> .+){0}
 
-  
+                           ^\[\s*\g<id>\]\s\[\s*\g<status>\s*\]\s\[\s{12}\]\s\[\s*\g<context>\s*\]\s\[\s*\g<level>\s*\]\s\g<name>\s\(\g<version>\)
+                          }x
+      
     data = capture(:list)
     bundles = []
     data.lines.each do |line|
       m = bundle_line_matcher.match(line)
       if m then
-        bundles.push({ :id => m['BundleId'],
-                       :status => m['BundleStatus'],
-                       :context => m['ContextStatus'],
-                       :level => m['BundleLevel'],
-                       :name => m['BundleName'],
-                       :version => m['BundleVersion']
-                     })
+        bundles.push(m)
       end
-      bundles
     end
+    bundles
 end
 
 def started? (name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-karaf
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Brecht Hoflack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: brecht.hoflack@gmail.com