depengine 0.0.29 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a793f6bd30b42020eeacc08bb1f76a56e6cb78a
-  data.tar.gz: 56215cc415d5edc6a36911256f49778805fdcfe8
+  metadata.gz: 280bd3b1d544b6894331ff5d350d7ace86147747
+  data.tar.gz: 18cd01f6553ae1789a5ef1a3211f1b39ccdd8504
 SHA512:
-  metadata.gz: 7315b2bc11e4b9b3c1b3c17ca3a4b73ea267dfafafe03932886cfbf8aaca505c03621ad169665654e888bc40a96cf99253e2bb6317b07bcda1cfd313d3e2130a
-  data.tar.gz: 1d1326d109a0fe4301720ea3327ad1f52d42e0ccbd0459be6bdd991c82a2c692c5f050a5043425e30576efa1ae71a6b15c437fc8d8fe550071a8110d0a5dc256
+  metadata.gz: 50c3104804e8638d27a0a0f5ed49884f480502ddca3c1c51b5b79f7c9905e6b25b92c5a8950dd2bfb3a5f2b043dd1283af315f3a473b30f70a2b6eef02784462
+  data.tar.gz: 249fd98e465cd55491a191ec35cc2c013dd2e289214d527d60c5933d71b35158563292bff935164da1338631fd4ab8de78550fe6ffc683fe33234648a976826d

data/lib/depengine/cli.rb

@@ -13,6 +13,9 @@ module Depengine
           o.on('-h', '--deployhome [DIRNAME]', 'Home of deployments.') do |dname|
             set :deploy_home, dname
           end
+          o.on('-b', '--recipe-base-dir [DIRNAME]', 'Home of recipes. This takes precedence over --deployhome for recipe location.') do |dname|
+            set :recipe_base_dir, dname
+          end
           o.on('-r', '--recipe [FILENAME]', 'Filename of the recipe.') do |fname|
             @recipe_name = fname
           end
@@ -32,8 +35,8 @@ module Depengine
         #   return 127
         # end
 
-        recipe_filename = File.join($recipe_config[:deploy_home],  @recipe_name)
-        puts "Using recipe #{recipe_filename}"
+        recipe_filename   = File.join(($recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home]), @recipe_name)
+        puts "Evaluating recipe #{recipe_filename}"
         eval(File.new(recipe_filename).read)
         return 0
       end

data/lib/depengine/provider/cdb_filesystem.rb

@@ -22,8 +22,8 @@ module Provider
     
     
     def read_data(cdb_path, options={})
-      config    = Hash.new
-      basedir   = File.join($recipe_config[:deploy_home],'cdb')
+      config    = Hash.new      
+      basedir   = File.join(($recipe_config[:recipe_base_dir] || $recipe_config[:deploy_home]),'cdb')
       filename  = ''
       if cdb_path.nil? or cdb_path.empty?
         $log.writer.error "Error while talking to configuration database, no cdb path given!"

data/lib/depengine/version.rb

@@ -1,3 +1,3 @@
 module Depengine
-  VERSION = "0.0.29"
+  VERSION = "0.0.30"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: depengine
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
 platform: ruby
 authors:
 - Team Automatisierung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json