foreman_debian 0.0.13 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0db6d638cba341f0f659141b593102b37744c65a
-  data.tar.gz: d4d26d93e22a15d5425a7785cc35a136a3dd0335
+  metadata.gz: 5d6aa19d3ebbd8fe3265eb96870fd7002682c037
+  data.tar.gz: 2b2ae19872ecea10da5154d4f8b686116b2daa9c
 SHA512:
-  metadata.gz: be7a422c35826170588bc9684c7f49915a9c7d6230e5bea3a959796844c7d1afaff9a642463ea0b9b8fb94f0b82854a84ec34f0cf5799254e4e1ea82bc1067f1
-  data.tar.gz: 1517b9442e2be8ed2aba884d3615a728c4ca01b564521346608f83c07c8d962c204fda628ad856e26d72ea9d5aa2dde7e05273d91a40b7b64851beabfa2e5e8d
+  metadata.gz: 7a83b6b90a4d5728e691e593ee367fc51d24f0d16310d8128340fb82f1d2309bbde0cd8024b67ac151adb2c0bf21ae14458da176032641edba76ea40055a1ad7
+  data.tar.gz: 2b9ea9fd8c3354e4548ddb3255ffd5385b90ffbc7c61a1409300a7a08c2279f5ba5cb91d5fd8a287bc3912ca96d8d4740ea6db1e00e8c7d8f146a64f6a415500

data/lib/foreman_debian.rb

@@ -9,6 +9,7 @@ module ForemanDebian
   require 'fileutils'
   require 'logger'
   require 'open3'
+  require 'thwait'
   require 'foreman_debian/template'
   require 'foreman_debian/engine'
   require 'foreman_debian/engine_helper'
@@ -29,4 +30,6 @@ module ForemanDebian
   def self.logger=(logger)
     @logger = logger
   end
+
+  Thread.abort_on_exception = true
 end

data/lib/foreman_debian/engine.rb

@@ -6,21 +6,24 @@ module ForemanDebian
     end
 
     def install(jobs, concurrency, user)
+      threads = []
       initd_engine = Initd::Engine.new(@app)
       monit_engine = Monit::Engine.new(@app)
       jobs.each do |name, command|
         if job_concurrency(concurrency, name) > 0
-          script = initd_engine.create_script(name, command, user)
-          initd_engine.install(script)
-          monit_engine.install(name, script)
+          threads << Thread.new do
+            script = initd_engine.create_script(name, command, user)
+            initd_engine.install(script)
+            monit_engine.install(name, script)
+          end
         end
       end
+      ThreadsWait.all_waits(*threads)
       initd_engine.cleanup
       monit_engine.cleanup
     end
 
     def uninstall
-      stop
       Initd::Engine.new(@app).cleanup
       Monit::Engine.new(@app).cleanup
     end

data/lib/foreman_debian/engine_helper.rb

@@ -12,10 +12,12 @@ module ForemanDebian
     end
 
     def cleanup
+      threads = []
       each_file do |path|
         next if @exported.include? path
-        remove_file path
+        threads << Thread.new { remove_file path }
       end
+      ThreadsWait.all_waits(*threads)
     end
 
     def export_file(path)
@@ -28,10 +30,15 @@ module ForemanDebian
       @output.info " remove  #{path.to_s}"
     end
 
+    def get_files
+      paths = Pathname.glob(@export_path.join("#{@app}-*"))
+      paths.select do |path|
+        path.read.match(/# Autogenerated by foreman/)
+      end
+    end
+
     def each_file(&block)
-      Dir.glob @export_path.join("#{@app}-*") do |path|
-        path = Pathname.new(path)
-        next unless path.read.match(/# Autogenerated by foreman/)
+      get_files.each do |path|
         block.call(path)
       end
     end
@@ -40,8 +47,8 @@ module ForemanDebian
       Open3.popen3(command) do |i, o, e, w|
         i.close
         out, err, wait = o.read, e.read, w
-        s = wait ? wait.value : $?
-        s.success? or raise "Command `#{command}` failed: #{err}"
+        status = wait ? wait.value : $?
+        raise "Command `#{command}` failed: #{err}" unless status.success?
         out
       end
     end

data/lib/foreman_debian/initd/engine.rb

@@ -30,26 +30,30 @@ module ForemanDebian
       end
 
       def start
+        threads = []
         each_file do |path|
-          start_file(path)
+          threads << Thread.new { start_file(path) }
         end
+        ThreadsWait.all_waits(*threads)
       end
 
       def stop
+        threads = []
         each_file do |path|
-          stop_file(path)
+          threads << Thread.new { stop_file(path) }
         end
+        ThreadsWait.all_waits(*threads)
       end
 
       def start_file(path)
         exec_command("#{path.to_s} start")
-        @output.info " start  #{path.to_s}"
+        @output.info "  start  #{path.to_s}"
         exec_command("update-rc.d #{path.basename} defaults") if path.dirname.eql? @system_export_path
       end
 
       def stop_file(path)
         exec_command("#{path.to_s} stop")
-        @output.info "  stop  #{path.to_s}"
+        @output.info "   stop  #{path.to_s}"
         exec_command("update-rc.d -f #{path.basename} remove") if path.dirname.eql? @system_export_path
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_debian
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.1.0
 platform: ruby
 authors:
 - cargomedia
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.5.2
 description: Wrapper around foreman and Procfile concept. It implements basic exporting,
   installing and uninstalling of initd scripts and monit configs for debian.
 email: hello@cargomedia.ch
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Foreman wrapper for debian