kameleon-builder 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3502f7bd5d33a589f771b80c5e3be99c8c80a800
-  data.tar.gz: 39aab439f0edd4f124ed6497f7bc924b0dfb41a3
+  metadata.gz: 1f207b02d46c496660b255e40159798760304278
+  data.tar.gz: 7f7833890e5fe3a60bf922b99a5e84603cf34ac9
 SHA512:
-  metadata.gz: 4777200f4ef5b2ccae8afc2cb0f5d5d7017921954a204bda4718cc3722424eb53f00fddfc9b8a96bab45cf886a388cb574a48747669d77d23c253b34b6cde802
-  data.tar.gz: 8eb860cbf58b0f43622b26073e0151bab552b0726a25992636839ba42bf3cd6f7a52a6212e208dbac9780cd7b8091c161ec2bf761dd4a6a0585fdb0c331903c9
+  metadata.gz: ad4db58b04ddcd23868e650712603be2345237278b75698062de0c146c3cf54800bb92d97f40b5f71329adba9ad8bc00c26c3fa10ad53df372ab17d42f8df752
+  data.tar.gz: 46e1f4e26176f3658840a46969b78de8ff2646ce595cf937f90296b939d61f4c6ee908edeb9d8531da5f3439ac3efb6514b4eb10d953a11c292676f0bc7d7a7f

data/CHANGELOG.rst

@@ -1,6 +1,14 @@
 Kameleon CHANGELOG
 ==================
 
+version 2.3.3
+-------------
+
+Released on Nov 26th 2014
+
+- Minor improvements
+- Fixed issue with listing the templates avaiable in a repository
+
 version 2.3.2
 -------------
 

data/lib/kameleon/environment.rb

@@ -22,6 +22,7 @@ module Kameleon
         :build_path => Pathname.new(build_path),
         :cache_path => Pathname.new(cache_path),
         :repositories_path => Pathname.new(repositories_path),
+        :root_dir => Pathname.new(workspace),
       }
       options = Kameleon.default_values.merge(options).merge(env_options)
       Kameleon.ui.debug("Environment initialized (#{self})")

data/lib/kameleon/recipe.rb

@@ -38,13 +38,31 @@ module Kameleon
       @files = []
       Kameleon.ui.debug("Initialize new recipe (#{path})")
       @base_recipes_files = [@path]
-      @steps_dirs = [
-        File.expand_path(File.join(Kameleon.env.workspace, 'steps')),
-        File.expand_path(File.join(Kameleon.env.workspace, '.steps')),
-      ]
+      @steps_dirs = []
+      steps_dir = get_default_steps_dir
+      @steps_dirs.push(steps_dir) unless steps_dir.nil?
       load! :strict => false
     end
 
+    def get_default_steps_dir
+      relative_path = @path.to_path.gsub(Kameleon.env.root_dir.to_path + '/', '')
+      last_dir = Kameleon.env.root_dir
+      subdirs = [last_dir]
+      relative_path.split("/")[0...-1].each do |p|
+        subdir = last_dir.join(p)
+        subdirs.push(subdir)
+        last_dir = subdir
+      end
+      steps_dirs = []
+      subdirs.reverse_each do |p|
+        steps_dirs.push(File.expand_path(File.join(p.to_path, 'steps')))
+        steps_dirs.push(File.expand_path(File.join(p.to_path, '.steps')))
+      end
+      steps_dirs.each do |p|
+        return p if File.exist? p
+      end
+    end
+
     def load!(kwargs = {})
       # Find recipe path
       Kameleon.ui.debug("Loading #{@path}")
@@ -61,8 +79,10 @@ module Kameleon
       # Where we can find steps
       @base_recipes_files.each do |recipe_path|
         dirname = File.dirname(recipe_path)
-        @steps_dirs.push(File.expand_path(File.join(dirname, 'steps')))
-        @steps_dirs.push(File.expand_path(File.join(dirname, '.steps')))
+        ['steps', '.steps'].each do |p|
+          dir = File.expand_path(File.join(dirname, p))
+          @steps_dirs.push(dir) if File.exists? dir
+        end
       end
       @steps_dirs.uniq!
 
@@ -86,7 +106,8 @@ module Kameleon
             [File.join(steps_dir, section.name, path),
               File.join(steps_dir, path)]
           end
-        end.flatten
+        end.flatten.select { |x| File.exists? x }
+
         if yaml_recipe.key? section.name
           yaml_section = yaml_recipe.fetch(section.name)
           next unless yaml_section.kind_of? Array
@@ -584,6 +605,11 @@ module Kameleon
   end
 
   class RecipeTemplate < Recipe
+
+    def initialize(path, kwargs = {})
+      super(path, kwargs)
+    end
+
     def relative_path_from_recipe(recipe_path)
       recipe_path = Pathname.new(recipe_path)
       relative_path_tpl_repo = @path.relative_path_from(Kameleon.env.repositories_path)

data/lib/kameleon/utils.rb

@@ -53,6 +53,7 @@ module Kameleon
     end
 
     def self.list_recipes(repository_path, kwargs = {})
+      Kameleon.env.root_dir = repository_path
       catch_exception = kwargs.fetch(:catch_exception, true)
       recipes_hash = []
       recipes_files = get_recipes(repository_path)

data/version.txt

@@ -1 +1 @@
-2.3.2
+2.3.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kameleon-builder
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Salem Harrache
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess