lib/plugins/pluginmanager.rb in rsence-pre-2.2.0.5 vs lib/plugins/pluginmanager.rb in rsence-pre-2.2.0.7

@@ -25,10 +25,13 @@
     
     @@incr = 0
     def incr
       return @@incr
     end
+    def incr!
+      @@incr += 1
+    end
     
     # Returns the registry data for plugin bundle +plugin_name+
     def registry( plugin_name=false )
       return @registry unless plugin_name
       if @registry.has_key?( plugin_name )
@@ -613,11 +616,11 @@
         end
         call( name, :open )
         puts "done!" if RSence.args[:verbose]
       end
       if not (to_load.empty? and to_unload.empty? and to_reload.empty?)
-        @@incr += 1
+        incr!
         puts "@@incr: #{@@incr}" if RSence.args[:debug]
         puts "Plugin bundles:"
         puts "  loaded: #{to_load.join(', ')}" unless to_load.empty?
         puts "  unloaded: #{to_unload.join(', ')}" unless to_unload.empty?
         puts "  reloaded: #{to_reload.join(', ')}" unless to_reload.empty?
@@ -669,9 +672,13 @@
       end
       
       @autoreload = options[:autoreload]
       @name_prefix = options[:name_prefix]
       @parent_manager = options[:parent_manager]
+      
+      if @parent_manager == nil
+        RSence.plugin_manager = self
+      end
       
       @deps = Dependencies.new( options[:resolved_deps], options[:resolved_categories] )
       
       puts "Loading #{@name_prefix.to_s+' ' if @name_prefix}plugins..." if RSence.args[:verbose]
       init_bundles!