depengine 3.0.20 → 3.0.21

data/spec/helper_spec.rb

@@ -1,22 +1,22 @@
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 require 'depengine'
 require 'depengine/cli'
 require 'tmpdir'
 require 'fileutils'
 
-describe "the date_unique method" do
+describe 'the date_unique method' do
 
   before :each do
     $recipe_config_backup = $recipe_config
     $recipe_config = {
-      :deploy_home => "/tmp/deploy_home",
-      :recipe_base_dir => "/tmp/recipe_base_dir",
-      :env => "TEST",
-      :version => "42.23.0",
-      :log_level => "ERROR",
-      :skip_cdb_setup => true,
-      :application_name => "testenvapp",
-      :module_name => "testenvmodule"
+      deploy_home: '/tmp/deploy_home',
+      recipe_base_dir: '/tmp/recipe_base_dir',
+      env: 'TEST',
+      version: '42.23.0',
+      log_level: 'ERROR',
+      skip_cdb_setup: true,
+      application_name: 'testenvapp',
+      module_name: 'testenvmodule'
     }
   end
 
@@ -24,15 +24,15 @@ describe "the date_unique method" do
     $recipe_config = $recipe_config_backup
   end
 
-  it "should use a specified format" do
-    expect(Deployment::Worker.new.date_unique("%Y")).to match /^\d{4}$/
+  it 'should use a specified format' do
+    expect(Deployment::Worker.new.date_unique('%Y')).to match(/^\d{4}$/)
   end
 
-  it "should have a default format" do
-    expect(Deployment::Worker.new.date_unique).to match /^\d{4}-\d{2}-\d{2}_\d+$/
+  it 'should have a default format' do
+    expect(Deployment::Worker.new.date_unique).to match(/^\d{4}-\d{2}-\d{2}_\d+$/)
   end
 
-  it "should cache its object" do
+  it 'should cache its object' do
     w = Deployment::Worker.new
     first = w.date_unique
     sleep(1)
@@ -41,18 +41,18 @@ describe "the date_unique method" do
 
 end
 
-describe "the copy_to_workspace method" do
+describe 'the copy_to_workspace method' do
   before :each do
     $recipe_config_backup = $recipe_config
     $recipe_config = {
-      :deploy_home => Dir.tmpdir,
-      :recipe_base_dir => File.expand_path(File.dirname(__FILE__) + "/demo_recipe/"),
-      :env => "TEST",
-      :version => "42.23.0",
-      :log_level => "ERROR",
-      :skip_cdb_setup => true,
-      :application_name => "testenvapp",
-      :module_name => "testenvmodule"
+      deploy_home: Dir.tmpdir,
+      recipe_base_dir: File.expand_path(File.dirname(__FILE__) + '/demo_recipe/'),
+      env: 'TEST',
+      version: '42.23.0',
+      log_level: 'ERROR',
+      skip_cdb_setup: true,
+      application_name: 'testenvapp',
+      module_name: 'testenvmodule'
     }
   end
 
@@ -61,42 +61,42 @@ describe "the copy_to_workspace method" do
     $recipe_config = $recipe_config_backup
   end
 
-  context "given an array of directories" do
-    it "should copy all direcotries" do
-      $recipe_config[:copy_to_workspace] = ["config"]
+  context 'given an array of directories' do
+    it 'should copy all direcotries' do
+      $recipe_config[:copy_to_workspace] = ['config']
       Deployment::Worker.new
-      expect(File.directory?(File.join($recipe_config[:deploy_home], "config"))).to be true
-      expect(File.file?(File.join($recipe_config[:deploy_home], "config", "config.properties"))).to be true
+      expect(File.directory?(File.join($recipe_config[:deploy_home], 'config'))).to be true
+      expect(File.file?(File.join($recipe_config[:deploy_home], 'config', 'config.properties'))).to be true
     end
   end
-  context "set to a truthy object" do
-    it "should copy the config/ dir" do
+  context 'set to a truthy object' do
+    it 'should copy the config/ dir' do
       $recipe_config[:copy_to_workspace] = true
       Deployment::Worker.new
-      expect(File.file?(File.join($recipe_config[:deploy_home], "config", "config.properties"))).to be true
+      expect(File.file?(File.join($recipe_config[:deploy_home], 'config', 'config.properties'))).to be true
     end
   end
-  context "not given" do
-    it "should not copy anything" do
+  context 'not given' do
+    it 'should not copy anything' do
       $recipe_config[:copy_to_workspace] = nil
       Deployment::Worker.new
-      expect(File.file?(File.join($recipe_config[:deploy_home], "config", "config.properties"))).to be false
+      expect(File.file?(File.join($recipe_config[:deploy_home], 'config', 'config.properties'))).to be false
     end
   end
 end
 
-describe "the report_by_mail method" do
+describe 'the report_by_mail method' do
   before :each do
     $recipe_config_backup = $recipe_config
     $recipe_config = {
-      :deploy_home => Dir.tmpdir,
-      :recipe_base_dir => File.expand_path(File.dirname(__FILE__) + "/demo_recipe/"),
-      :env => "TEST",
-      :version => "42.23.0",
-      :log_level => "ERROR",
-      :skip_cdb_setup => true,
-      :application_name => "testenvapp",
-      :module_name => "testenvmodule"
+      deploy_home: Dir.tmpdir,
+      recipe_base_dir: File.expand_path(File.dirname(__FILE__) + '/demo_recipe/'),
+      env: 'TEST',
+      version: '42.23.0',
+      log_level: 'ERROR',
+      skip_cdb_setup: true,
+      application_name: 'testenvapp',
+      module_name: 'testenvmodule'
     }
   end
   after :each do
@@ -104,43 +104,43 @@ describe "the report_by_mail method" do
     $recipe_config = $recipe_config_backup
   end
 
-  it "should send a automatically filled mail via smtp" do
+  it 'should send a automatically filled mail via smtp' do
     worker = Deployment::Worker.new
     worker.cdb['deploy_email_from'] = "#{ENV['USER']}@localhost"
     worker.cdb['deploy_email_to'] = "#{ENV['USER']}@localhost"
-    expect {worker.report_by_mail()}.to_not raise_error
+    expect { worker.report_by_mail }.to_not raise_error
   end
 
-  it "should send a manually filled mail via smtp" do
+  it 'should send a manually filled mail via smtp' do
     worker = Deployment::Worker.new
     h = {
-      :application_name => "thisisjustatestapplication",
-      :module_name => "andthisatestmodule",
-      :status => "somewhatsuccessful",
-      :message => "i dont know what could possibly go wrong",
-      :deploy_email_from => "#{ENV['USER']}@localhost",
-      :deploy_email_to   => "#{ENV['USER']}@localhost"
+      application_name: 'thisisjustatestapplication',
+      module_name: 'andthisatestmodule',
+      status: 'somewhatsuccessful',
+      message: 'i dont know what could possibly go wrong',
+      deploy_email_from: "#{ENV['USER']}@localhost",
+      deploy_email_to: "#{ENV['USER']}@localhost"
     }
-    expect {worker.report_by_mail(h)}.to_not raise_error
+    expect { worker.report_by_mail(h) }.to_not raise_error
   end
 
-  it "does set a subject" do
+  it 'does set a subject' do
     worker = Deployment::Worker.new
     h = {
-      :application_name => "testapplication",
-      :module_name => "testmodule",
-      :job_name => "testjob",
-      :status => "SUCCESS",
-      :message => "i dont know what could possibly go wrong",
-      :deploy_email_from => "#{ENV['USER']}@localhost",
-      :deploy_email_to   => "#{ENV['USER']}@localhost"
+      application_name: 'testapplication',
+      module_name: 'testmodule',
+      job_name: 'testjob',
+      status: 'SUCCESS',
+      message: 'i dont know what could possibly go wrong',
+      deploy_email_from: "#{ENV['USER']}@localhost",
+      deploy_email_to: "#{ENV['USER']}@localhost"
     }
     expect(worker).to receive(:sendmail).once.with(
-      {:to => h[:deploy_email_to],
-       :from => h[:deploy_email_from],
-       :subject => "TEST testjob testmodule testapplication 42.23.0 SUCCESS",
-       :body => kind_of(String)
-     }
+      to: h[:deploy_email_to],
+      from: h[:deploy_email_from],
+      subject: 'TEST testjob testmodule testapplication 42.23.0 SUCCESS',
+      body: kind_of(String)
+
     )
     worker.report_by_mail(h)
   end
@@ -149,18 +149,18 @@ describe "the report_by_mail method" do
     it 'does include the git history in the message object' do
       worker = Deployment::Worker.new
       h = {
-        :application_name => "testapplication",
-        :module_name => "testmodule",
-        :job_name => "testjob",
-        :status => "SUCCESS",
-        :message => "i dont know what could possibly go wrong",
-        :deploy_email_from => "#{ENV['USER']}@localhost",
-        :deploy_email_to   => "#{ENV['USER']}@localhost"
+        application_name: 'testapplication',
+        module_name: 'testmodule',
+        job_name: 'testjob',
+        status: 'SUCCESS',
+        message: 'i dont know what could possibly go wrong',
+        deploy_email_from: "#{ENV['USER']}@localhost",
+        deploy_email_to: "#{ENV['USER']}@localhost"
       }
       git_history = "825dc42 foo improved\ne626123 bar renamed\n"
       allow(Processor).to receive(:local_execute).and_return(git_history)
       expect(worker).to receive(:report_by_mail).once.with(
-        h.merge({:message => h[:message]+git_history})
+        h.merge(message: h[:message] + git_history)
       )
       worker.report_by_mail_with_git_history('', '', h)
     end

data/spec/junit.rb

@@ -1,86 +1,84 @@
-=begin
-
-Copyright (c) 2012, Nathaniel Ritmeyer
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-3. Neither the name Nathaniel Ritmeyer nor the names of contributors to
-this software may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
-IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-=end
+#
+# Copyright (c) 2012, Nathaniel Ritmeyer
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name Nathaniel Ritmeyer nor the names of contributors to
+# this software may be used to endorse or promote products derived from this
+# software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
+# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
 
 require 'time'
 require 'builder'
 require 'rspec/core/formatters/base_formatter'
 
 class JUnit < RSpec::Core::Formatters::BaseFormatter
-  def initialize output
+  def initialize(output)
     super output
     @test_results = []
   end
 
-  def example_passed example
+  def example_passed(example)
     @test_results << example
   end
 
-  def example_failed example
+  def example_failed(example)
     @test_results << example
   end
 
-  def example_pending example
+  def example_pending(example)
     @test_results << example
   end
 
-  def failure_details_for example
+  def failure_details_for(example)
     exception = example.metadata[:execution_result][:exception]
-    exception.nil? ? "" : "#{exception.message}\n#{format_backtrace(exception.backtrace, example).join("\n")}"
+    exception.nil? ? '' : "#{exception.message}\n#{format_backtrace(exception.backtrace, example).join("\n")}"
   end
 
-  def full_name_for example
-    test_name = ""
+  def full_name_for(example)
+    test_name = ''
     current_example_group = example.metadata[:example_group]
-    until current_example_group.nil? do
+    until current_example_group.nil?
       test_name = "#{current_example_group[:description]}." + test_name
       current_example_group = current_example_group[:example_group]
     end
     test_name << example.metadata[:description]
   end
 
-  def dump_summary duration, example_count, failure_count, pending_count
-    builder = Builder::XmlMarkup.new :indent => 2
-    builder.instruct! :xml, :version => "1.0", :encoding => "UTF-8"
-    builder.testsuite :errors => 0, :failures => failure_count, :skipped => pending_count, :tests => example_count, :time => duration, :timestamp => Time.now.iso8601 do
+  def dump_summary(duration, example_count, failure_count, pending_count)
+    builder = Builder::XmlMarkup.new indent: 2
+    builder.instruct! :xml, version: '1.0', encoding: 'UTF-8'
+    builder.testsuite errors: 0, failures: failure_count, skipped: pending_count, tests: example_count, time: duration, timestamp: Time.now.iso8601 do
       builder.properties
       @test_results.each do |test|
-        builder.testcase :classname => full_name_for(test), :name => test.metadata[:full_description], :time => test.metadata[:execution_result][:run_time] do
+        builder.testcase classname: full_name_for(test), name: test.metadata[:full_description], time: test.metadata[:execution_result][:run_time] do
           case test.metadata[:execution_result][:status]
-          when "failed"
-            builder.failure :message => "failed #{test.metadata[:full_description]}", :type => "failed" do
+          when 'failed'
+            builder.failure message: "failed #{test.metadata[:full_description]}", type: 'failed' do
               builder.cdata! failure_details_for test
             end
-          when "pending" then builder.skipped
+          when 'pending' then builder.skipped
           end
         end
       end

data/spec/local_execute.rb

@@ -7,21 +7,21 @@ require_relative '../lib/depengine/log/log'
 $log       = Log::DeploymentLogger.new
 $log.writer.level = Log4r::ERROR
 
-describe "the local executor" do
+describe 'the local executor' do
   include Processor
 
-  it "should execute commands locally" do
+  it 'should execute commands locally' do
     tmp_dir = Dir.mktmpdir
     begin
-      local_execute(["touch #{tmp_dir}/dummy1","touch #{tmp_dir}/dummy2","ls -la #{tmp_dir}"])
-      expect(File.file?(File.join(tmp_dir,'dummy1'))).to be_truthy
-      expect(File.file?(File.join(tmp_dir,'dummy2'))).to be_truthy
+      local_execute(["touch #{tmp_dir}/dummy1", "touch #{tmp_dir}/dummy2", "ls -la #{tmp_dir}"])
+      expect(File.file?(File.join(tmp_dir, 'dummy1'))).to be_truthy
+      expect(File.file?(File.join(tmp_dir, 'dummy2'))).to be_truthy
     ensure
       FileUtils.remove_entry tmp_dir
     end
   end
 
-  it "does stop executing further commands" do
-    expect{local_execute(["false"])}.to raise_error
+  it 'does stop executing further commands' do
+    expect { local_execute(['false']) }.to raise_error
   end
 end

data/spec/log_spec.rb

@@ -4,67 +4,66 @@ require_relative '../lib/depengine/log/log'
 require 'stringio'
 require 'tmpdir'
 
-describe "logging" do
-  it "should log a message to STDOUT" do
+describe 'logging' do
+  it 'should log a message to STDOUT' do
     # redirect STDOUT
     sio = StringIO.new
     old_stdout, $stdout = $stdout, sio
 
     log = Log::DeploymentLogger.new
     log.writer.level = Log4r::DEBUG
-    log.writer.debug "Logger is now setup"
+    log.writer.debug 'Logger is now setup'
 
     # restore STDOUT
     $stdout = old_stdout
     result  = sio.string
 
-    result.should include( "Logger is now setup" )
+    result.should include('Logger is now setup')
   end
 
-  it "should log a message to STDOUT with priority WARN" do
+  it 'should log a message to STDOUT with priority WARN' do
     # redirect STDOUT
     sio = StringIO.new
     old_stdout, $stdout = $stdout, sio
 
     log = Log::DeploymentLogger.new
     log.writer.level = Log4r::WARN
-    log.writer.warn "Logger is now setup"
+    log.writer.warn 'Logger is now setup'
 
     # restore STDOUT
     $stdout = old_stdout
     result  = sio.string
 
-    result.should include( "Logger is now setup" )
+    result.should include('Logger is now setup')
   end
 
-  it "should log a message to a logfile" do
+  it 'should log a message to a logfile' do
     tmp_dir = Dir.mktmpdir
     begin
       log = Log::DeploymentLogger.new
-      log.add_outputter(Log4r::FileOutputter.new('log_warn', :filename => "#{tmp_dir}/log_spec.log", :level => Log4r::INFO))
-      log.writer.info "Logger is now setup"
+      log.add_outputter(Log4r::FileOutputter.new('log_warn', filename: "#{tmp_dir}/log_spec.log", level: Log4r::INFO))
+      log.writer.info 'Logger is now setup'
 
       File.open("#{tmp_dir}/log_spec.log", 'r') do |line|
-        line.gets.should include("Logger is now setup")
+        line.gets.should include('Logger is now setup')
       end
     ensure
       FileUtils.rm_rf tmp_dir
     end
   end
 
-  it "should log a message to a logfile with a level set" do
+  it 'should log a message to a logfile with a level set' do
     tmp_dir = Dir.mktmpdir
     begin
       log = Log::DeploymentLogger.new
-      log.add_outputter(Log4r::FileOutputter.new('log_warn', :filename => "#{tmp_dir}/log_spec.log"), Log4r::WARN)
-      log.writer.info "this is an info message"
-      log.writer.warn "this is a warn message"
+      log.add_outputter(Log4r::FileOutputter.new('log_warn', filename: "#{tmp_dir}/log_spec.log"), Log4r::WARN)
+      log.writer.info 'this is an info message'
+      log.writer.warn 'this is a warn message'
 
-      File.open("#{tmp_dir}/log_spec.log", 'r').read.should_not include("this is an info message")
-      File.open("#{tmp_dir}/log_spec.log", 'r').read.should include("this is a warn message")
+      File.open("#{tmp_dir}/log_spec.log", 'r').read.should_not include('this is an info message')
+      File.open("#{tmp_dir}/log_spec.log", 'r').read.should include('this is a warn message')
     ensure
       FileUtils.rm_rf tmp_dir
     end
   end
 end
-

data/spec/properties_spec.rb

@@ -1,27 +1,25 @@
 require_relative '../lib/depengine/processor/properties'
 
-describe "the properties patcher" do
+describe 'the properties patcher' do
 
-  it "should patch properties in a file by key/value" do
-    test = Processor::Properties.new()
-    test.properties_hash = { "webhost" => "www.sinnerschrader.com", "mailhost" => "mail.google.com" }
-    test.assigner = "="
-    test.patch("spec/properties/source/config.properties", "spec/properties/target/config.properties")
+  it 'should patch properties in a file by key/value' do
+    test = Processor::Properties.new
+    test.properties_hash = { 'webhost' => 'www.sinnerschrader.com', 'mailhost' => 'mail.google.com' }
+    test.assigner = '='
+    test.patch('spec/properties/source/config.properties', 'spec/properties/target/config.properties')
 
-
-    File.open('spec/properties/target/config.properties').read.should include "webhost=www.sinnerschrader.com"
+    File.open('spec/properties/target/config.properties').read.should include 'webhost=www.sinnerschrader.com'
 
     FileUtils.rm_rf('spec/properties/target/config.properties')
   end
 
-  it "should patch strings in file" do
-    test = Processor::Properties.new()
-    test.properties_hash = { "old_string" => "new_string", "even older string" => "" }
-    test.substitute("spec/properties/source/random.rb", "spec/properties/target/random.rb")
+  it 'should patch strings in file' do
+    test = Processor::Properties.new
+    test.properties_hash = { 'old_string' => 'new_string', 'even older string' => '' }
+    test.substitute('spec/properties/source/random.rb', 'spec/properties/target/random.rb')
 
-    File.open('spec/properties/target/random.rb').read.should include "new_string"
-    File.open('spec/properties/target/random.rb').read.should_not include "even older string"
+    File.open('spec/properties/target/random.rb').read.should include 'new_string'
+    File.open('spec/properties/target/random.rb').read.should_not include 'even older string'
     FileUtils.rm_rf('spec/properties/target/random.rb')
   end
 end
-

data/spec/recipe_spec.rb

@@ -1,34 +1,33 @@
 require_relative '../lib/depengine'
 
-describe "a recipe" do
+describe 'a recipe' do
 
-  context "when running" do
-    it "does create a Deployment.deliver block" do
+  context 'when running' do
+    it 'does create a Deployment.deliver block' do
 
-      Deployment::Methods.set :env, "test"
-      Deployment::Methods.set :version, "0.42"
-      Deployment::Methods.set :deploy_home, "."
-      Deployment::Methods.set :module_name, "module_name"
+      Deployment::Methods.set :env, 'test'
+      Deployment::Methods.set :version, '0.42'
+      Deployment::Methods.set :deploy_home, '.'
+      Deployment::Methods.set :module_name, 'module_name'
 
-      expect{Deployment.deliver {puts "."}}.to raise_error(SystemExit)
+      expect { Deployment.deliver { puts '.' } }.to raise_error(SystemExit)
 
     end
 
-    it "sets some values with the set method" do
+    it 'sets some values with the set method' do
       Deployment::Methods.set :spec_key, :this_is_set
       expect($recipe_config[:spec_key]).to be :this_is_set
     end
 
   end
 
+  context 'before running' do
+    it 'needs to set a module name' do
+      Deployment::Methods.set :env, 'test'
+      Deployment::Methods.set :version, '0.42'
+      Deployment::Methods.set :deploy_home, '.'
 
-  context "before running" do
-    it "needs to set a module name" do
-      Deployment::Methods.set :env, "test"
-      Deployment::Methods.set :version, "0.42"
-      Deployment::Methods.set :deploy_home, "."
-
-      expect{Deployment.deliver {puts "."}}.to raise_error(ArgumentError)
+      expect { Deployment.deliver { puts '.' } }.to raise_error(ArgumentError)
     end
   end