daemontools 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cfe155135f411080262557e67c56d203a6589fc9
-  data.tar.gz: f8bc727120045f5cd713bc45bf89e9a004618da5
+SHA256:
+  metadata.gz: 9dfea32b1c19fb71a22c1e6fcd414522b7470cec233ddd85e54ee00c5e4eb82e
+  data.tar.gz: 5f2bd483ce8e98235039bd4c084d84a6b6cf0f2612f997be167a7b8e705f096a
 SHA512:
-  metadata.gz: 309f6b10d84c43d8a557354bc58e84a07396b66261163f6bfc14ca337df13eea80cd39bab336c9cf8e40135497786ec8c13c3cfe105fd0e466cc3f761ff29bed
-  data.tar.gz: b2e902de6ca608ef34355caf4fe85bf9fb18aa3ec783f68d424d00c467e558f2ed7ffbb9ba477fc1517555351552d77ac8531d62c50fbb667808c7a61b747365
+  metadata.gz: d2e573d9827f32d2ed84f93d4423526f416767ea8117aca68e544b931a9f211e138efa38bcd0d87e221ba98d7b9d6252f22131a8ff55f46bc7bf8981757366e8
+  data.tar.gz: 419eee00aef1789ea1ca2705548b0f0f385d5dd96e64165f83cdfee03202821449ea62e61ab6731ca5b7b07db38cdaefd6f5f38e0c492e8c1792ccbc09376beb

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/Rakefile

@@ -1,2 +1,11 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rake'
+require 'rspec/core/rake_task'
+
+desc 'Run tests'
+RSpec::Core::RakeTask.new(:test) do |t|
+  t.rspec_opts = '--format documentation'
+end
+
+task :test

data/bin/daemontools-gen

@@ -7,5 +7,16 @@ environment = ARGV[0] || "production"
 roles = ARGV[1] || ""
 puts "Building svc services for roles #{roles} .."
 
-builder = Daemontools::Builder.new("#{Dir.pwd}/config/services.rb")
-builder.gen(roles, environment)
+old_path = ARGV[2] || ''
+new_path = ARGV[3] || ''
+
+if old_path.empty? || new_path.empty?
+  builder = Daemontools::Builder.new("#{Dir.pwd}/config/services.rb")
+  builder.gen(roles, environment)
+else
+  previous_builder = Daemontools::Builder.new("#{old_path}/config/services.rb")
+  current_builder = Daemontools::Builder.new("#{new_path}/config/services.rb")
+  remover = Daemontools::Remover.new(roles, previous_builder, current_builder)
+  remover.remove_unused_services
+  current_builder.gen(roles, environment)
+end

data/daemontools.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "rake"
+  gem.add_development_dependency "rspec"
 end

data/fixtures/new_services.rb

@@ -0,0 +1,33 @@
+# coding: utf-8
+run_command :command1, "cd /home/user/dir && command1 :task"
+run_command :command2, "cd /home/user/dir && command2 :task"
+run_command :command3, "cd /home/user/dir && command3 :task"
+change_user_command 'setsid sudo -u'
+
+service :service1, :roles => [:role_without_changes] do
+  command1 "service1.sh"
+end
+
+service :service_non_modified, :roles => [:role_with_modifies] do
+  command2 "service_non_modified.sh"
+end
+
+service :service2, :roles => [:role_with_deleted] do
+  command3 "bin/service3"
+end
+
+service :service3, :roles => [:role_without_changes] do
+  command3 "service3 -flag"
+end
+
+service :service_modified, :roles => [:role_with_modifies] do
+  command2 "task/SERVICE_MODIFIED.sh arg1"
+end
+
+service :service_new_1, :roles => [:role_with_modifies] do
+  command1 "service_new_1 arg1"
+end
+
+service :service_new_2, :roles => [:new_role] do
+  command1 "service_new_2 arg1"
+end

data/fixtures/old_services.rb

@@ -0,0 +1,37 @@
+# coding: utf-8
+run_command :command1, "cd /home/user/dir && command1 :task"
+run_command :command2, "cd /home/user/dir && command2 :task"
+run_command :command3, "cd /home/user/dir && command3 :task"
+change_user_command 'setsid sudo -u'
+
+service :service1, :roles => [:role_without_changes] do
+  command1 "service1.sh"
+end
+
+service :service_non_modified, :roles => [:role_with_modifies] do
+  command2 "service_non_modified.sh"
+end
+
+service :service2, :roles => [:role_with_deleted] do
+  command3 "bin/service3"
+end
+
+service :deleted_service_1, :roles => [:role_with_deleted] do
+  command1 "script/deleted_service_1 argument1 argument2"
+end
+
+service :service3, :roles => [:role_without_changes] do
+  command3 "service3 -flag"
+end
+
+service :service_modified, :roles => [:role_with_modifies] do
+  command2 "task/service_modified.sh arg1 arg2"
+end
+
+service :deleted_service_2, :roles => [:role_with_modifies] do
+  command2 "task/deleted_service_2.sh arg1 arg2"
+end
+
+service :deleted_service_3, :roles => [:role_deleted] do
+  command3 "script/deleted_service_3 argument1"
+end

data/fixtures/services.rb

@@ -0,0 +1,30 @@
+# coding: utf-8
+run_command :command1, "cd /home/user/dir && command1 :task"
+run_command :command2, "cd /home/user/dir && command2 :task"
+run_command :command3, "cd /home/user/dir && command3 :task"
+change_user_command 'setsid sudo -u'
+delete_command ''
+
+service :service1, :roles => [:role1] do
+  command1 "service1.sh"
+end
+
+service :service2, :roles => [:role1] do
+  command2 "service2.sh"
+end
+
+service :service3, :roles => [:role1] do
+  command3 "bin/service3"
+end
+
+service :service4, :roles => [:role2] do
+  command1 "script/service4 argument1 argument2"
+end
+
+service :service5, :roles => [:role2] do
+  command3 "service5 -flag"
+end
+
+service :service6, :roles => [:role2] do
+  command2 "task/service6.sh arg1 arg2"
+end

data/fixtures/stubs/service_builder_stub.rb

@@ -0,0 +1,13 @@
+require 'daemontools'
+
+module Daemontools
+  class BuilderStub < Builder
+    def start_service(_param1 = nil, _param2 = nil, _param3 = nil)
+      true
+    end
+
+    def delete_services(service_names, role)
+      find_services_by_name(service_names, role).map(&:first)
+    end
+  end
+end

data/fixtures/stubs/service_remover_stub.rb

@@ -0,0 +1,13 @@
+require 'daemontools'
+
+module Daemontools
+  class RemoverStub < Remover
+    def remove_unused_services
+      return if @deleted_services.empty?
+
+      @deleted_services.map do |role, services|
+        @previous_builder.delete_services(services, role)
+      end
+    end
+  end
+end

data/lib/daemontools.rb

@@ -1,5 +1,6 @@
-require "daemontools/version"
-require "daemontools/service_builder"
+require 'daemontools/version'
+require 'daemontools/service_builder'
+require 'daemontools/service_remover'
 require 'etc'
 require 'erb'
 
@@ -89,10 +90,11 @@ module Daemontools
     true
   end
 
-  def self.delete(name)
+  def self.delete(name, rm_cmd = nil)
     check_service_exists(name)
     stop(name)
-    r = `sudo rm -rf #{@path} 2>&1`
+    cmd = rm_cmd.nil? ? "sudo rm -rf #{@path} 2>&1" : "#{rm_cmd} #{@path}"
+    r = `#{cmd}`
     raise r if $?.exitstatus != 0
     true
   end

data/lib/daemontools/capistrano.rb

@@ -5,32 +5,32 @@ Capistrano::Configuration.instance(:must_exist).load do
     desc "Update daemontools services using services.rb"
     task :update do
       builder = Daemontools::Builder.new("#{Dir.pwd}/config/services.rb")
-      
-      servers = find_servers.inject({}) do |map, server| 
+
+      servers = find_servers.inject({}) do |map, server|
         map[server] = role_names_for_host(server) & builder.all_roles
         map
       end.select {|server, roles| roles.size > 0}
-      
+
       if servers.any?
         if task_call_frames[0].task.fully_qualified_name == 'deploy:rollback'
           path = fetch(:previous_release)
           puts "rollback 1"
         else
           path = fetch(:release_path)
-                    
+
           servers.each do |server, roles|
-            command = "cd #{path} && bundle exec daemontools-gen #{fetch :rails_env, "production"} #{roles.join(',')}"
+            command = "cd #{path} && bundle exec daemontools-gen #{fetch :rails_env, "production"} #{roles.join(',')} #{current_path} #{release_path}"
             run command, :hosts => server
           end
         end
-        
+
         on_rollback do
           puts "rollback 2"
         end
       end
     end
   end
-  
+
   after "deploy:create_symlink", "daemontools:update"
   after "deploy:rollback", "daemontools:update"
 end

data/lib/daemontools/service_builder.rb

@@ -1,6 +1,8 @@
+require 'fileutils'
+
 module Daemontools
   class Builder
-    attr_accessor :environment, :all_roles, :services, :curr_service_name, :change_user_command, :ulimit, :write_time
+    attr_accessor :environment, :all_roles, :services, :curr_service_name, :change_user_command, :ulimit, :write_time, :delete_command
 
     def initialize(filename)
       @all_roles = []
@@ -15,27 +17,17 @@ module Daemontools
       self.class.send(:define_method, command_name) do |task, options = {}|
         p = param.gsub(':task', task)
         options.each { |key, val| p.gsub!(":#{key}", val.to_s) }
-        command(p, options)
+        p
       end
     end
 
-    def command(param, options = {})
-      Daemontools.stop(@curr_service_name) if Daemontools.exists?(@curr_service_name)
-      @command = param.gsub(':environment', @environment)
-      template_path = File.expand_path(File.dirname(__FILE__))+'/../../templates/rvm.erb'
-      cmd = ERB.new(File.read(template_path)).result(binding())
-      Daemontools.add(@curr_service_name, cmd, { :change_user_command => @change_user_command, :ulimit => @ulimit, :write_time => @write_time })
-      Daemontools.make_run_status_up(@curr_service_name)
-      Daemontools.start(@curr_service_name)
-    end
-
     def service(name, opts = {}, &block)
       if opts[:roles]
         opts[:roles].each do |role|
           role = role.to_sym
           @all_roles << role unless @all_roles.member?(role)
           @services[role] = [] unless @services[role]
-          @services[role] << [name, block]
+          @services[role] << [name, block.call]
         end
       else
         raise "service without roles"
@@ -47,7 +39,7 @@ module Daemontools
       roles.split(',').each do |role|
         (@services[role.to_sym] || []).each do |service|
           @curr_service_name = service[0].to_s
-          service[1].call
+          start_service(service[1])
         end
       end
     end
@@ -63,5 +55,30 @@ module Daemontools
     def write_time(val)
       @write_time = val
     end
+
+    def start_service(command, service = nil, env = nil)
+      @environment = env if env
+      @curr_service_name = service if service
+      Daemontools.stop(@curr_service_name) if Daemontools.exists?(@curr_service_name)
+      @command = command.gsub(':environment', @environment)
+      template_path = File.expand_path(File.dirname(__FILE__)) + '/../../templates/rvm.erb'
+      cmd = ERB.new(File.read(template_path)).result(binding())
+      Daemontools.add(@curr_service_name, cmd, { :change_user_command => @change_user_command, :ulimit => @ulimit, :write_time => @write_time })
+      Daemontools.make_run_status_up(@curr_service_name)
+      Daemontools.start(@curr_service_name)
+    end
+
+    def delete_command(cmd)
+      @delete_command = cmd.empty? ? nil : cmd
+    end
+
+    def delete_services(service_names, role)
+      services = find_services_by_name(service_names, role)
+      services.each { |service| Daemontools.delete(service[0], @delete_command) }
+    end
+
+    def find_services_by_name(service_names, role)
+      @services[role].select { |service| service_names.include?(service[0]) }
+    end
   end
 end

data/lib/daemontools/service_remover.rb

@@ -0,0 +1,36 @@
+module Daemontools
+  class Remover
+    attr_accessor :previous_builder, :current_builder, :deleted_services
+
+    def initialize(roles, previous_builder, current_builder)
+      raise ArgumentError, "previous_builder couldn't be nil" if previous_builder.nil?
+      raise ArgumentError, "current_builder couldn't be nil" if current_builder.nil?
+
+      @roles = roles.split(',').map(&:to_sym)
+      @previous_builder = previous_builder
+      @current_builder = current_builder
+      find_services_changes(@previous_builder.services, @current_builder.services)
+    end
+
+    def remove_unused_services
+      return if @deleted_services.empty?
+
+      @deleted_services.each do |role, services|
+        puts "Delete services #{services} for role #{role}"
+        @previous_builder.delete_services(services, role)
+      end
+    end
+
+    private
+
+    def find_services_changes(old_services, new_services)
+      @deleted_services = {}
+      @roles.each do |role|
+        old_role_services = (old_services[role] || []).map(&:first)
+        new_role_services = (new_services[role] || []).map(&:first)
+        services_for_del = old_role_services - new_role_services
+        @deleted_services[role] = services_for_del unless services_for_del.empty?
+      end
+    end
+  end
+end

data/lib/daemontools/version.rb

@@ -1,3 +1,3 @@
 module Daemontools
-  VERSION = "0.1.7"
+  VERSION = "0.2.0"
 end

data/spec/builder_spec.rb

@@ -0,0 +1,37 @@
+require 'daemontools'
+
+RSpec.describe Daemontools::Builder, '#initialize' do
+  context 'Check commands' do
+    builder = Daemontools::Builder.new("#{Dir.pwd}/fixtures/services.rb")
+    it 'Second element must be contain right string for COMMAND2 method' do
+      command = builder.services[:role1][1][1]
+      expect(command).to eq 'cd /home/user/dir && command2 service2.sh'
+    end
+    it 'Second element must be contain right string for COMMAND1 method' do
+      command = builder.services[:role1][0][1]
+      expect(command).to eq 'cd /home/user/dir && command1 service1.sh'
+    end
+    it 'Second element must be contain right string for COMMAND3 method' do
+      command = builder.services[:role1][2][1]
+      expect(command).to eq 'cd /home/user/dir && command3 bin/service3'
+    end
+  end
+end
+
+RSpec.describe Daemontools::Builder, '#delete_command' do
+  context 'Check delete_command method' do
+    builder = Daemontools::Builder.new("#{Dir.pwd}/fixtures/services.rb")
+    it 'Should return a nil after initialize' do
+      expect(builder.instance_variable_get(:@delete_command)).to eq nil
+    end
+    it 'Should return a nil after assignment an empty string' do
+      builder.delete_command ''
+      expect(builder.instance_variable_get(:@delete_command)).to eq nil
+    end
+    it 'Should return a the same string after assignment delete_command' do
+      delete_command = 'delete_command'
+      builder.delete_command delete_command
+      expect(builder.instance_variable_get(:@delete_command)).to eq delete_command
+    end
+  end
+end

data/spec/service_delete_spec.rb

@@ -0,0 +1,38 @@
+require 'daemontools'
+require "#{Dir.pwd}/fixtures/stubs/service_builder_stub.rb"
+require "#{Dir.pwd}/fixtures/stubs/service_remover_stub.rb"
+
+RSpec.describe Daemontools::Remover, '#initialize' do
+  context 'Check initialization process' do
+    old_builder = Daemontools::BuilderStub.new("#{Dir.pwd}/fixtures/old_services.rb")
+    new_builder = Daemontools::BuilderStub.new("#{Dir.pwd}/fixtures/new_services.rb")
+
+    roles = old_builder.all_roles + new_builder.all_roles
+    roles += ['role_without_any_service']
+    roles.uniq!
+    roles = roles.join(',')
+
+    remover = Daemontools::RemoverStub.new(roles, old_builder, new_builder)
+    deleted = remover.deleted_services
+    deleted_roles = %i[role_with_deleted role_with_modifies role_deleted]
+
+    context 'Check roles where services were deleted' do
+      it 'Number of roles for deleted services must be equal to length of deleted roles' do
+        expect(deleted.keys.size).to eq deleted_roles.length
+      end
+
+      deleted.each_key do |role|
+        it "Should contain #{role}" do
+          expect(deleted_roles.include?(role)).to eq true
+        end
+      end
+    end
+
+    context 'Removing unused services' do
+      deleted_services_names = %i[deleted_service_1 deleted_service_2 deleted_service_3]
+      it 'Should remove services which was deleted' do
+        expect(remover.remove_unused_services.flatten.sort).to eq deleted_services_names.sort
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,100 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
+  # have no way to turn it off -- the option exists only for backwards
+  # compatibility in RSpec 3). It causes shared context metadata to be
+  # inherited by the metadata hash of host groups and examples, rather than
+  # triggering implicit auto-inclusion in groups with matching metadata.
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = "spec/examples.txt"
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = "doc"
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daemontools
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - sh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2020-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Distributed storage
 email:
 - cntyrf@gmail.com
@@ -47,16 +61,26 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/daemontools-gen
 - daemontools.gemspec
+- fixtures/new_services.rb
+- fixtures/old_services.rb
+- fixtures/services.rb
+- fixtures/stubs/service_builder_stub.rb
+- fixtures/stubs/service_remover_stub.rb
 - lib/daemontools.rb
 - lib/daemontools/capistrano.rb
 - lib/daemontools/service_builder.rb
+- lib/daemontools/service_remover.rb
 - lib/daemontools/version.rb
+- spec/builder_spec.rb
+- spec/service_delete_spec.rb
+- spec/spec_helper.rb
 - templates/log.erb
 - templates/run.erb
 - templates/rvm.erb
@@ -79,8 +103,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Distributed storage
-test_files: []
+test_files:
+- spec/builder_spec.rb
+- spec/service_delete_spec.rb
+- spec/spec_helper.rb