kafo 0.5.4 → 0.5.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: cefdaae9624b12013065f287d08701950388c0c9
4
- data.tar.gz: 25fb99c469306555c8496b58e7db3371d4e03a98
3
+ metadata.gz: cc890988e785b3514243e664fcd8ab858f74b6ef
4
+ data.tar.gz: 4b84e1e6f28d24c5dac79ca85755c148cb173d8d
5
5
  SHA512:
6
- metadata.gz: af6fe19e39bd857cdd0f9b437a6699eed00a7d98af68df4d15bc363ee3089d53915e282709b1375f099073ee8cc36e8d6998e2a5630c02004e8abfa9ffe8d76e
7
- data.tar.gz: 0705cd23f537dd6308917bd43cf52d2e33ca9631c386ddc24aafe93c322ae03ce0a6acdcab611bd1f919166adcfaa6e37f61e810189e509411939571c48742e2
6
+ metadata.gz: 109405f2e35a020736882fab93fa4bb682ded92035942bb44687a7c9c8898485ac189a8effb5ef5d1aa22e02a66722059399b35ab65431659d80a3b7d3a8ef5d
7
+ data.tar.gz: 31ed272c0a8600d1dd77a99811be8e4aed0f974c3c0f59722d7919bef70eaefe0b1f2627ebc2db030156c78777f4f188825c5c87e2df77636527694f60392027
@@ -40,5 +40,5 @@
40
40
  ## Hooks - hooks in these extra directories will be loaded,
41
41
  # by default they are loaded from $installer_dir/hooks/$type
42
42
  # when you specify your directory, it will be search for $yourdir/$type/*.rb
43
- # :hooks_dir:
43
+ # :hook_dirs:
44
44
  # - /opt/hooks
@@ -123,9 +123,10 @@ module Kafo
123
123
  self.class.exit_code
124
124
  end
125
125
 
126
- def self.exit(code)
127
- cleanup
126
+ def self.exit(code, &block)
128
127
  @exit_code = translate_exit_code(code)
128
+ block.call if block
129
+ cleanup
129
130
  throw :exit
130
131
  end
131
132
 
@@ -217,8 +218,8 @@ module Kafo
217
218
 
218
219
  private
219
220
 
220
- def exit(code)
221
- self.class.exit(code)
221
+ def exit(code, &block)
222
+ self.class.exit(code, &block)
222
223
  end
223
224
 
224
225
  def set_parameters
@@ -376,8 +377,9 @@ module Kafo
376
377
  @progress_bar.close if @progress_bar
377
378
  logger.info "Puppet has finished, bye!"
378
379
  FileUtils.rm(temp_config_file, :force => true)
379
- self.class.hooking.execute(:post)
380
- exit(exit_code)
380
+ exit(exit_code) do
381
+ self.class.hooking.execute(:post)
382
+ end
381
383
  end
382
384
 
383
385
  def progress_log(method, message)
@@ -1,4 +1,4 @@
1
1
  # encoding: UTF-8
2
2
  module Kafo
3
- VERSION = "0.5.4"
3
+ VERSION = "0.5.5"
4
4
  end
@@ -14,7 +14,7 @@ module Puppet::Parser::Functions
14
14
  order.each do |name|
15
15
  result<< base.delete(name)
16
16
  end
17
- result + base
17
+ (result + base).compact
18
18
  end
19
19
  end
20
20
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kafo
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.4
4
+ version: 0.5.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Marek Hulan
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-04-23 00:00:00.000000000 Z
11
+ date: 2014-05-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler