foreman_debian 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 271ef8aace3bdb0c52d45d7fbb8f6bfde9cac2ec
-  data.tar.gz: c132607d3f5a018aac3512c51a4bcf60e6b80710
+  metadata.gz: 7971faa8f4ca6bfa0014a2109f40dbb6393c9a38
+  data.tar.gz: 80659136f7cb9233312455d85953c22c78397277
 SHA512:
-  metadata.gz: d0c7fddddba615f3c5df5825400924452776365150bba330b22f60f1ecb9ce2b5f382230ed08531c1d92dc3af335b758283ede6acf8c8d79979b8d5ec7b15025
-  data.tar.gz: de8c112b23c54344d2335fbe9a240e15ddfd3ebdeb88b1cf8ae6e663d44a793a5b491a53051c36c1698b988c0e52d4611e1158beb2969f259a61a2c083a15fe4
+  metadata.gz: d2273945251adfe25774f1da888576d955a88fec40f7b1285c9fd4dfd14e4f64b1715228a9c17f8be5bc83c9e5549c3e876bd63ff7bd2e4ee46ba9c278dd3e19
+  data.tar.gz: 5fbeaec424c57cdbaecd14ea06fd331d08ccaba78aed9b23acf9bef10794c0db032b5e098ebb80e2d0ec7c06ea116736e4682a65c71142527034874b01a2a49c

data/lib/foreman_debian/command/install.rb

@@ -4,6 +4,10 @@ module ForemanDebian
     option %w(-f --procfile), '<path>', 'alternative Procfile',
            :attribute_name => :procfile_path_relative
 
+    option %w(-u --user), '<user>', 'Specify the user the application should be run as',
+           :attribute_name => :user,
+           :default => 'root'
+
     option %w(-c --concurrency), '<encoded_hash>', 'concurrency (job1=0,job2=1)',
            :attribute_name => :concurrency_encoded,
            :default => 'all=1'
@@ -18,7 +22,7 @@ module ForemanDebian
         jobs[name] = expand_procfile_command(command)
       end
       concurrency = decode_concurrency(concurrency_encoded)
-      get_engine.install(jobs, concurrency)
+      get_engine.install(jobs, concurrency, user)
     end
 
     def expand_procfile_command(command)

data/lib/foreman_debian/command.rb

@@ -4,15 +4,12 @@ module ForemanDebian
   class Command < Clamp::Command
 
     option %w(-a --app), '<name>', 'application name',
-           :attribute_name => :app_name,
+           :attribute_name => :app,
            :default => 'app'
-    option %w(-u --user), '<user>', 'Specify the user the application should be run as',
-           :attribute_name => :app_user,
-           :default => 'root'
 
     # @return [ForemanDebian::Engine]
     def get_engine
-      ForemanDebian::Engine.new(app_name, app_user)
+      ForemanDebian::Engine.new(app)
     end
   end
 end

data/lib/foreman_debian/engine.rb

@@ -1,35 +1,35 @@
 module ForemanDebian
   class Engine
 
-    def initialize(app, user)
+    def initialize(app)
       @app = app
-      @user = user
-      @initd_engine = Initd::Engine.new(@app, @user)
-      @monit_engine = Monit::Engine.new(@app, @user)
     end
 
-    def install(jobs, concurrency)
+    def install(jobs, concurrency, user)
+      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)
-          @initd_engine.install(script)
-          @monit_engine.install(name, script)
+          script = @initd_engine.create_script(name, command, user)
+          initd_engine.install(script)
+          monit_engine.install(name, script)
         end
       end
-      @initd_engine.cleanup
-      @monit_engine.cleanup
+      initd_engine.cleanup
+      monit_engine.cleanup
     end
 
     def uninstall
-      install({}, {})
+      Initd::Engine.new(@app).cleanup
+      Monit::Engine.new(@app).cleanup
     end
 
     def start
-      @initd_engine.start
+      Initd::Engine.new(@app).start
     end
 
     def stop
-      @initd_engine.stop
+      Initd::Engine.new(@app).stop
     end
 
     def job_concurrency(concurrency, name)

data/lib/foreman_debian/initd/engine.rb

@@ -4,21 +4,20 @@ module ForemanDebian
 
       include ForemanDebian::EngineHelper
 
-      def initialize(app, user, export_path = nil)
+      def initialize(app, export_path = nil)
         @app = app
-        @user = user
         @export_path = Pathname.new(export_path || '/etc/init.d')
         @system_export_path = Pathname.new('/etc/init.d')
         setup
       end
 
-      def create_script(name, command)
+      def create_script(name, command, user)
         pidfile = pidfile(name)
         args = Shellwords.split(command)
         script = args.shift
         name = "#{@app}-#{name}"
         script_path = @export_path.join(name)
-        Script.new(script_path, name, name, @user, script, args, pidfile)
+        Script.new(script_path, name, name, user, script, args, pidfile)
       end
 
       def install(script)

data/lib/foreman_debian/monit/engine.rb

@@ -4,9 +4,8 @@ module ForemanDebian
 
       include ForemanDebian::EngineHelper
 
-      def initialize(app, user, export_path = nil)
+      def initialize(app, export_path = nil)
         @app = app
-        @user = user
         @export_path = Pathname.new(export_path || '/etc/monit/conf.d')
         setup
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_debian
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - cargomedia