cinch-deploy 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45a0f8f0d40417a383245e3264d213824248ebd6
-  data.tar.gz: 4ab32e9c7f8c433696a48a87cbf952c5f4803180
+  metadata.gz: 71d6e5426915fbf6bab8a3bd8059733da00c8c15
+  data.tar.gz: ebc5ca49e1f3cafcff25f9cd4d2e99810e07d23d
 SHA512:
-  metadata.gz: aacb2604aefe74d49edcc4a6f758273976be9a0366478c480bf80cfc03f706d74db29d2129c7ade12add74fa7425c70ebe3b5e15bd5c31c1bce10a438ed59549
-  data.tar.gz: f4e24bc44220c243b342ada46e00c283868d1200d40141c6d7064512e1e07c67238b64ba190360976d525d4809735ff5d4093880d2ac8b33a7fb7969a71dc3e7
+  metadata.gz: 1b9c630db5be4a171b947bf42cbd0b689819eb94e0d5297da33aee3bf34fd791235f69508a8247174fdddaf7b5752a167b7e7a01d7e94c6211445d4bdcdd1d55
+  data.tar.gz: 10794d420d1309d15e7958775dddc6a07aec4b87eae762d5c7a914d552fbfd0c472bb87b65408eabed6737f8829d5b42a53d0175f31fc737c1839b81a22522ec

data/lib/cinch/plugins/deploy.rb

@@ -3,25 +3,43 @@ module Cinch
     class Deploy
       include Cinch::Plugin
 
+      def initialize
+        @running = {}
+      end
+
       listen_to :message
 
       def listen(m)
-        return if @running
-        @running = true
         config[:configurations].each do |config|
-          if config[:channels].include?(m.channel.to_s) and config[:users].include?(m.user.nick) and m.message =~ Regexp.new(config[:trigger])
-            IO.popen("#{config[:command]} 2>&1") do |handle|
-              while line = handle.gets
-                m.reply "#{config[:command]} > #{line}", true
-              end
-            end
-          end
+          deploy(m) if can_deploy?(m)
         end
       rescue Exception => e
-        m.reply "#{config[:command]} - exception: #{e.message}", true
-        puts e.backtrace
+        m.reply "exception - #{e.message}", true
+        exception(e)
+      end
+
+    private
+
+      def can_deploy?(m)
+        config[:channels].include?(m.channel.to_s) &&
+        config[:users].include?(m.user.nick) &&
+        m.message =~ Regexp.new(config[:trigger])
+      end
+
+      def deploy(m)
+        return if @running[command]
+        @running[command] = true
+        IO.popen("#{command} 2>&1") do |handle|
+          while line = handle.gets
+            m.reply "#{command} > #{line}", true
+          end
+        end
       ensure
-        @running = nil
+        @running.delete(command)
+      end
+
+      def command
+        config[:command]
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch-deploy
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Michal Papis
@@ -54,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A Cinch plugin to start deploy process via irc messages.