Plugin working queue is managed by Plugin model

app/controllers/application_controller.rb

@@ -27,9 +27,7 @@ class ApplicationController < ActionController::Base
   end
 
   def installing_gems
-    Plugin::WORKING.find_all do |data|
+    Plugin.installing
-      data[:type] == :install && data[:state] == :running
-    end.map{|data| data[:plugin]}
   end
 
   def uninstalling_gem?
@@ -37,9 +35,7 @@ class ApplicationController < ActionController::Base
   end
 
   def uninstalling_gems
-    Plugin::WORKING.find_all do |data|
+    Plugin.uninstalling
-      data[:type] == :uninstall && data[:state] == :running
-    end.map{|data| data[:plugin]}
   end
 
   private

app/models/plugin.rb

@@ -100,6 +100,20 @@ class Plugin
     end
   end
 
+  def self.processing
+    WORKING.find_all do |data|
+      data[:state] == :running
+    end
+  end
+
+  def self.installing
+    processing.find_all{|data| data[:type] == :install }.map{|data| data[:plugin] }
+  end
+
+  def self.uninstalling
+    processing.find_all{|data| data[:type] == :uninstall }.map{|data| data[:plugin] }
+  end
+
   def self.gemfile_path
     Rails.root + "Gemfile.plugins"
   end
@@ -129,11 +143,21 @@ class Plugin
   end
 
   def gem_install
+    data = { plugin: self, state: :running, type: :install }
+    return if WORKING.grep(data).present?
+    WORKING.push(data)
     fluent_gem("install", gem_name, "-v", version)
+  ensure
+    WORKING.delete(data)
   end
 
   def gem_uninstall
+    data = { plugin: self, state: :running, type: :uninstall }
+    return if WORKING.grep(data).present?
+    WORKING.push(data)
     fluent_gem("uninstall", gem_name, "-x", "-a")
+  ensure
+    WORKING.delete(data)
   end
 
   def fluent_gem(*commands)

app/workers/gem_installer.rb

@@ -5,16 +5,8 @@ class GemInstaller
   def perform(gem_name, version = nil)
     SuckerPunch.logger.info "install #{gem_name} #{version}"
     pl = Plugin.new(gem_name: gem_name, version: version)
-    data = { plugin: pl, type: :install, state: :running }
+    pl.uninstall! if pl.installed?
-    if Plugin::WORKING.grep(data).blank?
+    pl.install!
-      Plugin::WORKING.push(data)
-      begin
-        pl.uninstall! if pl.installed?
-        pl.install!
-      ensure
-        Plugin::WORKING.delete(data)
-      end
-    end
     SuckerPunch.logger.info "installed #{gem_name} #{version}"
   end
 end

app/workers/gem_uninstaller.rb

@@ -5,15 +5,7 @@ class GemUninstaller
   def perform(gem_name)
     SuckerPunch.logger.info "uninstall #{gem_name}"
     pl = Plugin.new(gem_name: gem_name)
-    data = { plugin: pl, type: :uninstall, state: :running }
+    pl.uninstall!
-    if Plugin::WORKING.grep(data).blank?
-      Plugin::WORKING.push(data)
-      begin
-        pl.uninstall!
-      ensure
-        Plugin::WORKING.delete(data)
-      end
-    end
     SuckerPunch.logger.info "uninstalled #{gem_name}"
   end
 end