depengine 0.0.29 → 0.0.30

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: 8a793f6bd30b42020eeacc08bb1f76a56e6cb78a
4
- data.tar.gz: 56215cc415d5edc6a36911256f49778805fdcfe8
3
+ metadata.gz: 280bd3b1d544b6894331ff5d350d7ace86147747
4
+ data.tar.gz: 18cd01f6553ae1789a5ef1a3211f1b39ccdd8504
5
5
  SHA512:
6
- metadata.gz: 7315b2bc11e4b9b3c1b3c17ca3a4b73ea267dfafafe03932886cfbf8aaca505c03621ad169665654e888bc40a96cf99253e2bb6317b07bcda1cfd313d3e2130a
7
- data.tar.gz: 1d1326d109a0fe4301720ea3327ad1f52d42e0ccbd0459be6bdd991c82a2c692c5f050a5043425e30576efa1ae71a6b15c437fc8d8fe550071a8110d0a5dc256
6
+ metadata.gz: 50c3104804e8638d27a0a0f5ed49884f480502ddca3c1c51b5b79f7c9905e6b25b92c5a8950dd2bfb3a5f2b043dd1283af315f3a473b30f70a2b6eef02784462
7
+ data.tar.gz: 249fd98e465cd55491a191ec35cc2c013dd2e289214d527d60c5933d71b35158563292bff935164da1338631fd4ab8de78550fe6ffc683fe33234648a976826d
data/lib/depengine/cli.rb CHANGED
@@ -13,6 +13,9 @@ module Depengine
13
13
  o.on('-h', '--deployhome [DIRNAME]', 'Home of deployments.') do |dname|
14
14
  set :deploy_home, dname
15
15
  end
16
+ o.on('-b', '--recipe-base-dir [DIRNAME]', 'Home of recipes. This takes precedence over --deployhome for recipe location.') do |dname|
17
+ set :recipe_base_dir, dname
18
+ end
16
19
  o.on('-r', '--recipe [FILENAME]', 'Filename of the recipe.') do |fname|
17
20
  @recipe_name = fname
18
21
  end
@@ -32,8 +35,8 @@ module Depengine
32
35
  # return 127
33
36
  # end
34
37
 
35
- recipe_filename = File.join($recipe_config[:deploy_home], @recipe_name)
36
- puts "Using recipe #{recipe_filename}"
38
+ recipe_filename = File.join(($recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home]), @recipe_name)
39
+ puts "Evaluating recipe #{recipe_filename}"
37
40
  eval(File.new(recipe_filename).read)
38
41
  return 0
39
42
  end
@@ -22,8 +22,8 @@ module Provider
22
22
 
23
23
 
24
24
  def read_data(cdb_path, options={})
25
- config = Hash.new
26
- basedir = File.join($recipe_config[:deploy_home],'cdb')
25
+ config = Hash.new
26
+ basedir = File.join(($recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home]),'cdb')
27
27
  filename = ''
28
28
  if cdb_path.nil? or cdb_path.empty?
29
29
  $log.writer.error "Error while talking to configuration database, no cdb path given!"
@@ -1,3 +1,3 @@
1
1
  module Depengine
2
- VERSION = "0.0.29"
2
+ VERSION = "0.0.30"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: depengine
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.29
4
+ version: 0.0.30
5
5
  platform: ruby
6
6
  authors:
7
7
  - Team Automatisierung
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-04-08 00:00:00.000000000 Z
11
+ date: 2014-04-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: json