foreman-export-initd 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b705ba7b9d2252a400554e266f8ab160b51cc57
-  data.tar.gz: 5e6d7ec59532f56545b35e771bb26c4ce5b7847a
+  metadata.gz: dee0c30fbc1a2ab4e63333ac1c0fb6a3da43990b
+  data.tar.gz: 885e3be0f73c0d93ad3fbfcceaf012f979a6862c
 SHA512:
-  metadata.gz: 8a83f285439c023f13c7e3a99d34617fb45dba2e1d660f2d0a0d78d3265038129dd78ec0f29c0d4c8c579814940162d32992706f518c08fcf5a92e2e979d457f
-  data.tar.gz: 6dc00a5c79ffd30bf42ac41bde0f5b3f2a36da55f42041b3066317b994ba67fe57dbd1b4cacff4bcc3d493ddc2a703845ff6a36d0d00d4a594633ec66f004db7
+  metadata.gz: 08abc5542da2835c7682d678ac1eedee0646e2781407ab736ab252ec2c3a61cb61d49c62b6e2c431d81d86110763e946da065d1f9305d6df504c4806d7b6491b
+  data.tar.gz: 8e0d70cee0d439db9c4dd63e954555374f3d9d55e2b7c80097d35371fb33dc5e558364587ee9138427b8a21366b7534d80a59cb32b10de83f1e2eccc45ab63ff

data/README.md

@@ -5,6 +5,6 @@
 Usage:
 ```
 gem install foreman-export-initd
-foreman-initd export initd /etc/init.d
-foreman-initd export initd-monit /etc/monit/conf.d
+foreman export initd /etc/init.d
+foreman export initd-monit /etc/monit/conf.d
 ```

data/lib/foreman-export-initd.rb

@@ -5,8 +5,9 @@ module Initd
   require 'shellwords'
   require 'foreman/export'
   require 'foreman/cli'
-  require 'foreman/export/initd'
-  require 'foreman/export/initd_monit'
   require 'initd/script'
   require 'initd/monit_config'
+  require 'initd/export'
+  require 'foreman/export/initd'
+  require 'foreman/export/initd_monit'
 end

data/lib/foreman/export/initd.rb

@@ -1,40 +1,23 @@
 require 'foreman-export-initd'
 
 class Foreman::Export::Initd < Foreman::Export::Base
+  include Initd::Export
 
   def export
     error('Must specify a location') unless location
+    setup
 
-    cwd = Pathname.new(engine.root)
-    export_path = Pathname.new(location)
-    say "creating: #{export_path}"
-    FileUtils.mkdir_p(export_path)
-
-    existing = []
-    Dir.glob export_path.join("#{app}-*") do |filename|
-      contents = File.new(filename, 'r').read
-      existing.push(filename) if contents.match(/# Autogenerated by foreman/)
-    end
-
-    exported = []
     engine.each_process do |name, process|
-      path = export_path.join("#{app}-#{name}")
-      args = process.command.split(/\s+/)
-      script = Pathname.new(cwd).join(args.shift)
-      concurrency = engine.formation[name]
+      args = Shellwords.split(process.command)
+      script = Pathname.new(engine.root).join(args.shift)
+      path = path(name)
+      concurrency = concurrency(name)
       if concurrency > 0
         say 'Warning: Initd exporter ignores concurrency > 1' if concurrency > 1
         contents = Initd::Script.new(path, script, args, user).content
-        write_file(path, contents)
-        File.chmod(0755, path)
-        exported.push path.to_s
+        export_file path, contents
       end
     end
-
-    to_remove = existing - exported
-    to_remove.each do |filename|
-      say 'removing ' + filename
-      File.unlink filename
-    end
+    cleanup
   end
 end

data/lib/foreman/export/initd_monit.rb

@@ -1,38 +1,20 @@
 require 'foreman-export-initd'
 
 class Foreman::Export::InitdMonit < Foreman::Export::Base
+  include Initd::Export
 
   def export
     error('Must specify a location') unless location
-
-    cwd = Pathname.new(engine.root)
-    export_path = Pathname.new(location)
-    say "creating: #{export_path}"
-    FileUtils.mkdir_p(export_path)
-
-    existing = []
-    Dir.glob export_path.join("#{app}-*") do |filename|
-      contents = File.new(filename, 'r').read
-      existing.push(filename) if contents.match(/# Autogenerated by foreman/)
-    end
-
-    exported = []
+    setup
     engine.each_process do |name, process|
-      path = export_path.join("#{app}-#{name}")
-      concurrency = engine.formation[name]
+      concurrency = concurrency name
+      path = path name
       if concurrency > 0
         say 'Warning: Initd exporter ignores concurrency > 1' if concurrency > 1
         contents = Initd::MonitConfig.new(app, path).content
-        write_file(path, contents)
-        File.chmod(0755, path)
-        exported.push path.to_s
+        export_file path, contents
       end
     end
-
-    to_remove = existing - exported
-    to_remove.each do |filename|
-      say 'removing ' + filename
-      File.unlink filename
-    end
+    cleanup
   end
 end

data/lib/initd/export.rb

@@ -0,0 +1,36 @@
+module Initd::Export
+
+  def export_path
+    Pathname.new location
+  end
+
+  def setup
+    @exported = []
+    say "creating: #{export_path}"
+    FileUtils.mkdir_p(export_path)
+  end
+
+  def cleanup
+    Dir.glob export_path.join("#{app}-*") do |filename|
+      contents = File.new(filename, 'r').read
+      next unless contents.match(/# Autogenerated by foreman/)
+      next if @exported.include? filename.to_s
+      say 'removing ' + filename
+      File.unlink filename
+    end
+  end
+
+  def export_file (path, contents)
+    write_file(path, contents)
+    File.chmod(0755, path)
+    @exported.push path.to_s
+  end
+
+  def concurrency(name)
+    engine.formation[name]
+  end
+
+  def path(name)
+    export_path.join("#{app}-#{name}")
+  end
+end

data/lib/initd/script.rb

@@ -11,14 +11,14 @@ class Initd::Script
     @daemon = {
         :name => name,
         :script => script,
-        :args => args.join(' '),
+        :args => args,
         :user => user,
     }
     @description = name
   end
 
   def name
-    path.basename.to_s
+    @path.basename.to_s
   end
 
   def pidfile

data/templates/monit_config.erb

@@ -1,5 +1,5 @@
 # Autogenerated by foreman
-check process <%= name %> with pidfile <%= pidfile %>
+check process <%= name.shellescape %> with pidfile <%= pidfile.to_s.shellescape %>
 	group <%= app %>
 	start program = "/etc/init.d/<%= name %> start"
 	stop  program = "/etc/init.d/<%= name %> stop"

data/templates/script.erb

@@ -12,13 +12,12 @@
 # Description:          <%= description %>
 ### END INIT INFO
 
-NAME=<%= name %>
-DESC=<%= description %>
-DAEMON=<%= daemon[:script] %>
-DAEMON_USER=<%= daemon[:user] %>
-PIDDIR=<%= pidfile.dirname %>
-PIDFILE=<%= pidfile %>
-DAEMON_ARGS=<%= daemon[:args].shellescape %>
+NAME=<%= Shellwords.escape name %>
+DESC=<%= Shellwords.escape description %>
+DAEMON=<%= Shellwords.escape daemon[:script].to_s %>
+DAEMON_USER=<%= Shellwords.escape daemon[:user] %>
+PIDDIR=<%= Shellwords.escape pidfile.dirname.to_s %>
+PIDFILE=<%= Shellwords.escape pidfile.to_s %>
 
 test -x ${DAEMON} || exit 0
 set -e
@@ -29,7 +28,7 @@ case "${1}" in
 	start)
 		log_daemon_msg "Starting ${DESC}" "${NAME}"
 		mkdir -p ${PIDDIR}
-		if (start-stop-daemon --start --make-pidfile --background --pidfile $PIDFILE --chuid $DAEMON_USER --exec $DAEMON -- $DAEMON_ARGS); then
+		if (start-stop-daemon --start --make-pidfile --background --pidfile $PIDFILE --chuid $DAEMON_USER --exec $DAEMON -- <%= Shellwords.join daemon[:args] %>); then
 			log_end_msg 0
 		else
 			log_end_msg 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-export-initd
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Tomasz Durka
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman
@@ -53,20 +53,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -83,16 +69,15 @@ dependencies:
         version: 0.4.3
 description: init.d export scripts for foreman
 email: tomasz@durka.pl
-executables:
-- foreman-initd
+executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- bin/foreman-initd
 - lib/foreman/export/initd.rb
 - lib/foreman/export/initd_monit.rb
 - lib/foreman-export-initd.rb
+- lib/initd/export.rb
 - lib/initd/monit_config.rb
 - lib/initd/script.rb
 - templates/monit_config.erb

data/bin/foreman-initd

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
-require 'foreman-export-initd'
-require 'foreman/cli'
-
-Foreman::CLI.start