procfile-upstart-exporter 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d2d1e53d73c1d9c485b125698e2e0ab41528de6
-  data.tar.gz: 4f13e9cb6eee0144dfb49ea5a000606b2403533d
+  metadata.gz: 429328d9f681e98dd3566923a98cf7e3540c3b73
+  data.tar.gz: 60e80f223088d9b05bed18f788bc827b1fa8462e
 SHA512:
-  metadata.gz: 9ea702b920af27f119b7266aabc033b72ea4f809621fc2fc57c1f7aae53b6a806ab4b5fdd191bf1925ab19787e3878bab6d8056f823c969ce2c5082feb3afcc9
-  data.tar.gz: 343a676082a37552fee0982068e24233ac63dd64c8560b19e5ceddda96bc269e4e70c198e978e1c2c7f79f8221695d1c1807a73e299ae81275f5dcacc1fbbbff
+  metadata.gz: f94f32034c86751266ff7aa09e3c4481910b000268636bae74518878d9db092e586e1bfc8d90112031f9ce8779b73a0f6623231f16d796fb4858f01cc5112df2
+  data.tar.gz: a45d1ff7faf10e50b7822f5a22edc1b73c9341f1b0ee7af4fa79021a990620d7873479211c69229ad0c274c2decde2c13f57066c0f16b4815c65584aca8be71e

data/README.md

@@ -72,6 +72,11 @@ Usage
 Changelog
 ---------
 
+### `v0.0.3`
+
+- Fix logging in job destruction.
+- Only stop and destroy needed jobs.
+
 ### `v0.0.2`
 
 - Warn if `Procfile` or `.env` don't exist.

data/lib/procfile_upstart_exporter/cli.rb

@@ -18,7 +18,8 @@ class ProcfileUpstartExporter::Cli < Thor
   option :user, default: 'app'
   option :path, default: '/etc/init'
   def create
-    destroy
+    enter_verbose_mode if options[:verbose]
+    destroyer.destroy options[:application], options[:path], options[:procfile]
     creator.create options[:application],
                    options[:procfile],
                    options[:log],

data/lib/procfile_upstart_exporter/destroyer.rb

@@ -1,12 +1,41 @@
 class ProcfileUpstartExporter::Destroyer
-  def destroy application, path
-    ProcfileUpstartExporter.logger.debug 'Starting Upstart jobs deletion'
+  def initialize procfile_parser = ProcfileUpstartExporter::ProcfileParser.new
+    self.procfile_parser = procfile_parser
+  end
+
+  def destroy application, path, procfile = nil
+    ProcfileUpstartExporter.logger.debug 'Starting Upstart jobs deletion ' \
                                          "for `#{ application }'"
+    if procfile
+      destroy_jobs application, path, procfile_parser.parse(procfile)
+                                                     .map(&:name)
+    else
+      destroy_all_jobs application, path
+    end
+    ProcfileUpstartExporter.logger.debug 'Deleted Upstart jobs for ' \
+                                         "`#{ application }'"
+  end
+
+  private
+
+  attr_accessor :procfile_parser
+
+  def destroy_all_jobs application, path
     stopping_output = IO.popen(['stop', application], err: [:child, :out]).read
     ProcfileUpstartExporter.logger.debug stopping_output
     FileUtils.rm_rf File.join(path, "#{ application }.conf")
     FileUtils.rm_rf File.join(path, application)
-    ProcfileUpstartExporter.logger.debug 'Deleted Upstart jobs for ' \
-                                         "`#{ application }'"
+  end
+
+  def destroy_jobs application, path, processes_names
+    Dir.glob("#{ path }/#{ application }/*.conf").each do |job_absolute_path|
+      process_name = File.basename job_absolute_path, '.conf'
+      unless processes_names.include? process_name
+        job = File.join application, process_name
+        stopping_output = IO.popen(['stop', job], err: [:child, :out]).read
+        ProcfileUpstartExporter.logger.debug stopping_output
+        FileUtils.rm_rf File.join(path, "#{ job }.conf")
+      end
+    end
   end
 end

data/lib/procfile_upstart_exporter/version.rb

@@ -1,3 +1,3 @@
 module ProcfileUpstartExporter
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/procfile_upstart_exporter/creator_spec.rb

@@ -11,6 +11,13 @@ describe ProcfileUpstartExporter::Creator do
   let(:process_job_renderer) { double }
 
   describe '#create' do
+    subject(:create) {
+      Dir.chdir 'spec/fixtures/sample-application' do
+        creator.create application, procfile, log, environment, user,
+                                                              upstart_jobs_path
+      end
+    }
+
     let(:application)       { 'application'              }
     let(:procfile)          { 'Procfile'                 }
     let(:log)               { "#{ temp_dir }/log"        }
@@ -37,13 +44,6 @@ describe ProcfileUpstartExporter::Creator do
       )
     }
 
-    let(:act) {
-      Dir.chdir 'spec/fixtures/sample-application' do
-        creator.create application, procfile, log, environment, user,
-                                                              upstart_jobs_path
-      end
-    }
-
     before do
       allow(procfile_parser).to receive(:parse)
         .and_return [web_process, background_process]
@@ -73,14 +73,14 @@ JOB_CONFIGURATION
     end
 
     it 'creates an Upstart job for the application' do
-      act
+      create
       expect(
         File.exists? "#{ upstart_jobs_path }/#{ application }.conf"
       ).to be_true
     end
 
     it 'renders the Upstart job template for each process in Procfile' do
-      act
+      create
       expect(
         File.read "#{ upstart_jobs_path }/#{ application }/web.conf"
       ).to match 'bundle exec rails server -p 5000'
@@ -91,12 +91,12 @@ JOB_CONFIGURATION
 
     it 'creates a folder for logging owned by the user' do
       expect(FileUtils).to receive(:chown).with(user, user, application_log)
-      act
+      create
       expect(File.directory? application_log).to be_true
     end
 
     it "places environment variables from environment file in Upstart job" do
-      act
+      create
       expect(
         File.read("#{ upstart_jobs_path }/#{ application }/background.conf")
       ).to match 'RAILS_ENV=production'

data/spec/procfile_upstart_exporter/destroyer_spec.rb

@@ -1,37 +1,84 @@
 require 'spec_helper'
 
 describe ProcfileUpstartExporter::Destroyer do
-  subject(:destroyer) { ProcfileUpstartExporter::Destroyer.new }
+  subject(:destroyer) {
+    ProcfileUpstartExporter::Destroyer.new procfile_parser
+  }
+
+  let(:procfile_parser) { double }
 
   describe '#destroy' do
-    let(:application) { 'application' }
-    let(:path)        { temp_dir      }
-    let(:application_path) { "#{ path }/#{ application }" }
-    let(:application_job)  { "#{ path }/#{ application }.conf" }
-    let(:process_job)      { "#{ path }/#{ application }/web.conf" }
-
-    let(:act) {
-      destroyer.destroy application, path
+    subject(:destroy) {
+      destroyer.destroy application, path, procfile
     }
 
+    let(:application)      { 'application'                                }
+    let(:path)             { temp_dir                                     }
+    let(:procfile)         { nil                                          }
+    let(:application_path) { "#{ path }/#{ application }"                 }
+    let(:application_job)  { "#{ path }/#{ application }.conf"            }
+    let(:web_job)          { "#{ path }/#{ application }/web.conf"        }
+    let(:background_job)   { "#{ path }/#{ application }/background.conf" }
+
     before do
       FileUtils.mkdir_p application_path
       FileUtils.touch   application_job
-      FileUtils.touch   process_job
-      allow(Kernel).to receive(:system)
+      FileUtils.touch   web_job
+      FileUtils.touch   background_job
+      allow(IO).to receive(:popen).and_call_original
     end
 
     it 'stops the jobs' do
       expect(IO).to receive(:popen).with(['stop', application],
                                          err: [:child, :out]).and_call_original
-      act
+      destroy
     end
 
     it 'deletes Upstart jobs' do
-      act
-      [application_path, application_job, process_job].each do |path|
+      destroy
+      [
+        application_path,
+        application_job,
+        web_job,
+        background_job
+      ].each do |path|
         expect(File.exists? path).to be_false
       end
     end
+
+    context 'a Procfile is given' do
+      let(:procfile) { 'Procfile' }
+      let(:web_process) {
+        ProcfileUpstartExporter::Process.with(
+          name: 'web',
+          command: 'bundle exec rails server -p 5000'
+        )
+      }
+
+      before do
+        allow(procfile_parser).to receive(:parse)
+                                  .with(procfile)
+                                  .and_return([web_process])
+      end
+
+      it 'only stops the processes not present in the Procfile' do
+        expect(IO).to receive(:popen)
+                      .with(['stop', "#{ application }/background"],
+                                         err: [:child, :out]).and_call_original
+        destroy
+      end
+
+      it 'only deletes the jobs not present in the Procfile' do
+        destroy
+        expect(File.exists? background_job).to be_false
+        [
+          application_path,
+          application_job,
+          web_job
+        ].each do |path|
+          expect(File.exists? path).to be_true
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procfile-upstart-exporter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Das Dad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor