rbcm 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 697605d1f72f7a26bebd85a9b5f6013156a1f2421c40705911bbf8135ae49f3f
-  data.tar.gz: 9b978a43781d5cfc5037e21e2ed6fc2e5d661c3664390f9c40b307c438180bd6
+  metadata.gz: cb945c84ce8cafd1cd3e604049885d5a306cc5ad2c7b7a9b9e3fff3e3a91bd3d
+  data.tar.gz: 8427fb88c352244a6168eec50e234d43bcd1557dcb9281c6883d1c1c92e9bf0d
 SHA512:
-  metadata.gz: c76ae5d7963c9a398acd4da2157aa50684e141bdd3573fbc3dee1f0781250a3950eae5a855efe00258d6f903c1c7480d45600b312ba6327b7897497d77e82f32
-  data.tar.gz: a097963a15df265a58fe846e3200cc77477eead26ae64f18d217ad4d29cb2419d0b325ba9866c9fcd73ca1341fcbe98de54182dddb6e8774b2a4d80f6882754d
+  metadata.gz: 1743ddf1827c4b10afd779ade73711959b6f680c35d35a46287866812023ae9150a0200282ffd591e7167f67abc3507d5259df333da383da7b0ee90b046c1db1
+  data.tar.gz: 705a679fed8af59bf5330d0a285232d49743ecae299572ab859d902ac1878f8d1ad17b9419fa28ead1d7c1d5c64902d6bb7790750fcbb518c6f37adfc6ea23f5

data/app/action/action.rb

@@ -1,28 +1,36 @@
 class Action
   attr_accessor :approved, :applied
-  attr_reader   :node, :triggered_by, :trigger, :chain, :dependencies,
-                :capability, :obsolete, :job, :check, :triggered, :result,
-                :source, :path, :tags
+  attr_reader   :triggered_by, :trigger, :chain, :dependencies,
+                :obsolete, :job, :check, :triggered, :result,
+                :source, :path, :line, :state, :tags, :working_dir
 
-  def initialize job:, chain:, path: nil, params: nil, line: nil, check: nil,
-                 dependencies: nil, trigger: nil, triggered_by: nil,
-                 source: nil, tags: nil, node:
-    @dependencies = [:file] + [dependencies].flatten - [chain.last]
-    @trigger = [trigger, chain.last].flatten.compact
-    @triggered_by = [triggered_by].flatten.compact
-    @triggered = [];              @source = source
-    @node = node;                 @job = job
-    @chain = chain;               @capability = chain.last
-    @obsolete = nil;              @approved = nil
-    @tags = tags.compact.flatten
+  def initialize job:, params: nil, line: nil, check: nil,
+                 dependencies: nil, state:
+    @job = job
+    @triggered = []
+    @obsolete = nil
+    @approved = nil
     # command specific
-    @line = line;                @check = check
+    @line = line
     # file specific
-    @path = path;                @params = params
+    @params = params
+    @path = params.first if job.capability.name == :file
+    # extract state
+    [:chain, :trigger, :triggered_by, :check, :source, :tags, :working_dirs].each do |key|
+      instance_variable_set "@#{key}", state[key]
+    end
+    @working_dir = @working_dirs.last
+    @dependencies = [:file] + [dependencies].flatten - [@chain.last]
+  end
+
+  def project_file
+    @chain.reverse.find{ |element|
+      defined?(element.project_file) and element.project_file
+    }.project_file
   end
 
   def checkable?
-    true if @check or self.class == Action::File
+    @check.any? or self.class == Action::File
   end
 
   def neccessary?
@@ -43,9 +51,9 @@ class Action
   end
 
   def triggered?
-    triggered_by.empty? or triggered_by.one? do |triggered_by|
-      @node.triggered.flatten.include? triggered_by
-    end
+    triggered_by.empty? or triggered_by.one?{ |triggered_by|
+      @job.node.triggered.flatten.include? triggered_by
+    }
   end
 
   def applied?
@@ -63,11 +71,11 @@ class Action
 
   def approve! input=:y
     if [:a, :y].include? input
-      @node.files[@path].content = content if self.class == Action::File
+      @job.node.files[@path].content = content if self.class == Action::File
       @approved = true
       siblings.each.approve! if input == :a
-      @node.triggered << @trigger
-      @triggered = @trigger.compact - @node.triggered
+      @job.node.triggered << @trigger
+      @triggered = @trigger.compact - @job.node.triggered
     else
       @approved = false
     end

data/app/action/command.rb

@@ -4,8 +4,10 @@ class Action::Command < Action
   # determine wether the command is neccessary
   def check!
     return if @obsolete != nil
-    if @check
-      @obsolete = @node.remote.execute(@check).exitstatus == 0
+    if @check.any?
+      @obsolete = @check.all? do |check|
+        @job.node.remote.execute(check).exitstatus == 0
+      end
     else
       @obsolete = false
     end
@@ -13,7 +15,7 @@ class Action::Command < Action
 
   # matching commands on  other nodes to be approved at once
   def siblings
-    @node.rbcm.actions.select{ |action|
+    @job.node.rbcm.actions.select{ |action|
       action.chain[1..-1] == @chain[1..-1] and action.line == @line
     } - [self]
   end
@@ -21,6 +23,6 @@ class Action::Command < Action
   # execute the command remote
   def apply!
     @applied = true
-    @result = @node.remote.execute(@line)
+    @result = @job.node.remote.execute(@line)
   end
 end

data/app/action/file.rb

@@ -4,11 +4,11 @@ class Action::File < Action
 
   def check!
     # compare
-    @node.files[path].content
+    @job.node.files[path].content
   end
 
   def obsolete
-    @node.files[path].content.chomp.chomp == content.chomp.chomp
+    @job.node.files[path].content.chomp.chomp == content.chomp.chomp
   end
 
   def siblings
@@ -17,22 +17,26 @@ class Action::File < Action
 
   def apply!
     @applied = true
-    @result = @node.remote.execute("echo #{Shellwords.escape content} > #{path}")
+    @result = @job.node.remote.execute("echo #{Shellwords.escape content} > #{path}")
   end
 
   def content
     @content ||= if @params[:content]
       @params[:content].to_s
     elsif @params[:template]
-      Node::Template.new(
-        name: @params[:template],
-        capability: @chain[-1],
+      # @node.rbcm.project.templates.find_for(
+      #  @params[:template]
+      # ).render context: @params[:context]
+      # Node::Template.new(
+      #   name: @params[:template]
+      # ).render context: @params[:context]
+      project_file.project.templates_.for(self).render(
         context: @params[:context]
-      ).render
+      )
     end
   end
 
   def same_file
-    @node.actions.file(path) - [self]
+    @job.node.actions.file(path) - [self]
   end
 end

data/app/action/list.rb

@@ -65,7 +65,7 @@ class ActionList < Array
 
   def resolve_action_dependencies this
     self.select{ |action|
-      this.dependencies.include? action.capability
+      this.dependencies.include? action.job.capability
     }.each{ |action|
       resolve_action_dependencies action
     }

data/app/cli.rb

@@ -38,7 +38,7 @@ class CLI
 
   def check action
     @action = action
-    render checking: action.check
+    render checking: action.check.join("; ")
     action.check!
   end
 
@@ -49,10 +49,12 @@ class CLI
       render :command if action.class == Action::Command
       next if not action.approvable?
       render :siblings if action.siblings.any?
-      render :source if action.source.any?
+      render :source if action.source.flatten.compact.any?
       render :diff if action.class == Action::File
       render :prompt
-      sleep 0.25 unless [:a,:y,:n].include? r = STDIN.getch.to_sym # avoid 'ctrl-c'-trap
+      sleep 0.25 unless [:a,:y,:n,:i].include? r = STDIN.getch.to_sym # avoid 'ctrl-c'-trap
+      (binding.pry; sleep 1) if r == :i
+      (puts; exit) if r == :q
       action.approve! r
       render :approved
       render :triggered if action.triggered.any?
@@ -64,7 +66,7 @@ class CLI
       @action = action
       response = action.apply!
       render :title, color: response.exitstatus == 0 ? :green : :red
-      render :command if response.exitstatus != 0
+      render :command if action.class == Action::Command and response.exitstatus != 0
       render response: response if response.length > 0
     end
   end
@@ -75,22 +77,23 @@ class CLI
       out "#{first ? nil : "┗━━──"}\n\n┏━━#{format :invert, :bold}#{" "*16}#{section}#{" "*16}#{format}━──\n┃"
     elsif element == :title
       triggerd_by = "#{format :trigger, :bold} #{@action.triggered_by.join(", ")} " if @action.triggered_by.any?
-        out "┣━ #{triggerd_by}#{format color, :bold} #{(@action.chain).join(" > ")} " +
+        out "┣━ #{triggerd_by}#{format color, :bold} #{@action.chain.flatten.compact.join(" > ")} " +
         "#{format} #{format :params}#{@action.job.params if @action.job}#{format}" +
         " #{format :tag}#{"tags: " if @action.tags.any?}#{@action.tags.join(", ")}#{format}"
     elsif element == :capabilities
       out prefix + "capabilities: #{Node::Sandbox.capabilities.join(", ")}"
     elsif element == :project
-      out prefix + "project: #{@rbcm.project.files.count} ruby files"
+      out prefix + "project: #{@rbcm.project.files.count} ruby files, #{@rbcm.project.templates.count} templates"
+      out prefix + "  #{@rbcm.project.directories.count} directories, #{@rbcm.project.other.count} other files"
     elsif element == :nodes
       out prefix + @rbcm.nodes.values.collect{ |node|
-        name = node.name.+(":").ljust(@rbcm.nodes.keys.each.length.max+1, " ")
+        name = node.name.to_s.+(":").ljust(@rbcm.nodes.keys.each.length.max+1, " ")
         jobs = node.jobs.count.to_s.rjust(@rbcm.nodes.values.collect{|node| node.jobs.count}.max.digits.count, " ")
         actions = node.actions.count.to_s.rjust(@rbcm.nodes.values.collect{|node| node.actions.count}.max.digits.count, " ")
         "#{name} #{jobs} jobs, #{actions} actions"
       }.flatten(1).join("\n#{prefix}")
     elsif element == :command
-      check_string = " UNLESS #{@action.check}" if @action.check
+      check_string = " UNLESS #{@action.check.join("; ")}" if @action.check.any?
       out prefix + "$> #{@action.line}\e[2m#{check_string}\e[0m"
     elsif element == :siblings
       string = @action.siblings.collect do |sibling|
@@ -98,17 +101,17 @@ class CLI
       end.join
       out prefix + "#{format :siblings}siblings:#{format} #{string}"
     elsif element == :source
-      out prefix + "source: #{format :bold}#{@source.join("#{format}, #{format :bold}")}#{format}"
+      out prefix + "source: #{format :bold}#{@action.source.join("#{format}, #{format :bold}")}#{format}"
     elsif element == :prompt
       color = @action.siblings.any? ? :siblings : :light
-      print prefix + "APPROVE? #{format color}[a]ll#{format}, [y]es, [N]o: "
+      print prefix + "APPROVE? #{format color}[a]ll#{format}, [y]es, [N]o, [i]nteractive, [q]uit: "
     elsif element == :triggered
       out prefix +
         "triggered: #{format :trigger} #{@action.triggered.join(", ")} \e[0m;" +
         " again: #{@action.trigger.-(@action.triggered).join(", ")}"
     elsif element == :diff
       out prefix[0..-2] + Diffy::Diff.new(
-        @action.node.files[@action.path].content,
+        @action.job.node.files[@action.path].content,
         @action.content
       ).to_s(:color).split("\n").join("\n#{prefix[0..-2]}")
     elsif element == :approved
@@ -117,7 +120,7 @@ class CLI
     elsif element.class == String
       out prefix + "#{element}"
     elsif checking
-      out prefix + "CHECKING #{@action.node.name}: #{checking}"
+      out prefix + "CHECKING #{@action.job.node.name}: #{checking}"
     elsif response
       out prefix + response.to_s.chomp.split("\n").join("\n#{prefix}")
     elsif element == :applied

data/app/node/file.rb

@@ -4,7 +4,7 @@ class Node::NodeFile
     @filesystem = filesystem
   end
 
-  attr_writer :content, :mode 
+  attr_writer :content, :user, :group, :mode
 
   def content
     @content ||= (
@@ -15,9 +15,27 @@ class Node::NodeFile
     )
   end
 
+  def diffable # TODO?
+    "#{content}" +
+    "\\" +
+    "PERMISSIONS #{user}:#{group} #{mode}"
+  end
+
+  def user
+    @user ||= @filesystem.node.remote.execute(
+      "stat -c '%U' '#{@path}'"
+    ).chomp.chomp
+  end
+
+  def group
+    @group ||= @filesystem.node.remote.execute(
+      "stat -c '%G' '#{@path}'"
+    ).chomp.chomp
+  end
+
   def mode
     @mode ||= @filesystem.node.remote.execute(
-      "stat -c \"%a\" * '#{@path}'"
+      "stat -c '%a' * '#{@path}'"
     ).chomp.chomp.to_i
   end
 end

data/app/node/job.rb

@@ -4,7 +4,7 @@
 class Node::Job
   attr_reader :capability, :params, :node
 
-  def initialize node, capability, params
+  def initialize node:, capability:, params:
     @node = node
     @capability = capability
     @params = params

data/app/node/job_search.rb

@@ -0,0 +1,8 @@
+class JobSearch
+  def initialize result
+
+  end
+
+  def []
+  end
+end

data/app/node/node.rb

@@ -1,10 +1,12 @@
 class Node
-  attr_reader   :jobs, :definitions, :files, :name, :remote, :rbcm, :sandbox
+  attr_reader   :jobs, :definitions, :files, :name, :remote, :rbcm, :sandbox,
+                :path
   attr_accessor :actions, :memberships, :triggered
 
-  def initialize rbcm, name
+  def initialize rbcm, name, path
     @rbcm = rbcm
     @name = name
+    @path = path
     @definitions = []
     @sandbox = Node::Sandbox.new self
     @remote = Node::Remote.new self
@@ -33,4 +35,8 @@ class Node
       memberships.include? group
     }.values.flatten(1)
   end
+
+  def to_str
+    name.to_s
+  end
 end

data/app/node/remote.rb

@@ -1,13 +1,13 @@
 class Node::Remote
-  attr_reader :files
-
   def initialize node
-    @host = node.name
+    @node = node
     @files = Node::NodeFilesystem.new node
   end
 
+  attr_reader :node, :files
+
   def execute action
-    @session ||= Net::SSH.start @host, 'root'
+    @session ||= Net::SSH.start @node.name, 'root'
     @session.exec! action
   end
 end

data/app/node/sandbox.rb

@@ -9,8 +9,8 @@ class Node::Sandbox
     @name = node.name
     @dependency_cache = []
     @cache = {
-      chain: [@node.name], trigger: [], triggered_by: [], check: [],
-      source: [], tag: []
+      chain: [@node], trigger: [], triggered_by: [], check: [],
+      source: [], tags: [], working_dirs: []
     }
     # define in instance, otherwise method-binding will be wrong (to class)
     @@capabilities = @node.rbcm.project.capabilities.each.name
@@ -21,21 +21,22 @@ class Node::Sandbox
     [:file, :run].each do |base_capability|
       __add_capability Project::Capability.new(
         name: base_capability,
-        content: method(base_capability).unbind
+        content: method(base_capability).unbind,
+        project_file: false
       )
     end
   end
 
   def evaluate definitions
     [definitions].flatten.each do |definition|
-      __cache chain: definition.origin do
+      __cache chain: definition do
         instance_eval &definition.content
       end
     end
   end
 
   def tag name, &block
-    __cache tag: name, chain: "tag:#{name}" do
+    __cache tags: name, chain: "tag:#{name}" do
       instance_eval &block
     end
   end
@@ -81,36 +82,59 @@ class Node::Sandbox
   end
 
   def run action, check: nil, tags: nil, trigger: nil, triggered_by: nil
-    @node.actions << Action::Command.new(
-      node: @node,
-      line: action,
-      check: check,
-      chain: @cache[:chain].dup.flatten(1),
-      dependencies: @dependency_cache.dup,
-      tags: [tags] + @cache[:tag].dup,
-      trigger: [@cache[:trigger].dup, trigger].flatten(1),
-      triggered_by: [triggered_by, @cache[:triggered_by].dup].flatten(1),
-      job: @node.jobs.last,
-      source: @cache[:source].dup.flatten, # information from other nodes
-    )
-  end
-
-  def file path, trigger: nil, **named
-     raise "RBCM: invalid file paramteres '#{named}'" if (
-       named.keys - [:exists, :includes_line, :after, :mode, :content,
-         :template, :context, :tags]
-     ).any?
-     @node.actions << Action::File.new(
-       node: @node,
-       path: path,
-       params: Params.new([path], named),
-       chain: [@cache[:chain].dup].flatten(1),
-       tags: [named[:tags]] + @cache[:tag].dup,
-       trigger: [@cache[:trigger].dup, trigger].flatten(1),
-       triggered_by: @cache[:triggered_by].dup,
-       job: @node.jobs.last,
-       source: @cache[:source].dup.flatten, # information from other nodes
-     )
+    __cache check: check, tags: tags, trigger: trigger, triggered_by: triggered_by, working_dirs: working_dir do
+      @node.actions << Action::Command.new(
+        job: @node.jobs.last,
+        line: action,
+        dependencies: @dependency_cache.dup,
+        state: @cache.collect{|k,v| [k, v.dup]}.to_h,
+      )
+    end
+  end
+
+  def file path, tags: nil, trigger: nil, triggered_by: nil, **named
+    raise "RBCM: invalid file paramteres '#{named}'" if (
+      named.keys - [:exists, :includes_line, :after, :mode, :content,
+        :template, :context, :tags, :user, :group]
+    ).any?
+    job = @node.jobs.last
+    run "mkdir -p #{File.dirname path}",
+      check: "ls #{File.dirname path}"
+    __cache tags: tags, trigger: trigger, triggered_by: triggered_by, working_dirs: working_dir do
+      @node.actions << Action::File.new(
+        job: job,
+        params: Params.new([path], named),
+        state: @cache.collect{|k,v| [k, v.dup]}.to_h
+      )
+    end
+  end
+
+  def dir path="", templates:, context: {}, tags: nil, trigger: nil, triggered_by: nil
+    __cache tags: tags, trigger: trigger, triggered_by: triggered_by, working_dirs: working_dir do
+      @node.rbcm.project.templates_.under("#{working_dir}/#{templates}").each do |template|
+        # binding.pry
+        # sleep 1
+        file template.clean_full_path.gsub(/#{working_dir}/),
+          template: template.clean_path,
+          context: context
+      end
+
+      # @node.rbcm.project.templates.select{ |template|
+      #   /^#{working_dir}/.match? template
+      # }.each do |template|
+      #   file path + template.gsub(/^#{working_dir}\/#{templates}/,"").gsub(".erb", "").gsub(".mustache", ""),
+      #     template: template,
+      #     context: context
+      # end
+    end
+  end
+
+  def working_dir
+    @cache[:chain].select{ |i|
+      i.class == Project::Definition or (
+        i.class == Project::Capability and not [:file, :run].include? i.name
+      )
+    }.last.project_file.path.split("/")[0..-2].join("/")
   end
 
   def decrypt secret
@@ -164,24 +188,27 @@ class Node::Sandbox
     end
     return r.collect &block if block_given? # no-each-syntax
     return r
+    JobSearch.new r
   end
 
   def __cache trigger: nil, triggered_by: nil, params: nil, check: nil,
-      chain: [], source: nil, reset: nil, tag: nil
+      chain: nil, source: nil, reset: nil, tags: nil, working_dirs: nil
     @cache[:source].append []             if chain
     @cache[:source].last  << source       if source
     @cache[:chain]        << chain        if chain
-    @cache[:tag]          << tag          if tag
+    @cache[:tags]         << tags         if tags
     @cache[:trigger]      << trigger      if trigger
     @cache[:triggered_by] << triggered_by if triggered_by
     @cache[:check]        << check        if check
+    @cache[:working_dirs] << working_dirs if working_dirs
     r = yield if block_given?
     @cache[:source].pop                   if chain
     @cache[:chain].pop                    if chain
-    @cache[:tag].pop                      if tag
+    @cache[:tags].pop                     if tags
     @cache[:trigger].pop                  if trigger
     @cache[:triggered_by].pop             if triggered_by
     @cache[:check].pop                    if check
+    @cache[:working_dirs].pop             if working_dirs
     @cache[reset]         =  []           if reset
     r
   end
@@ -194,25 +221,32 @@ class Node::Sandbox
     if capability.type == :regular
       define_singleton_method capability.name do |*ordered, **named|
         params = Params.new ordered, named
-        @node.jobs.append Node::Job.new @node, capability.name, params
+        @node.jobs.append Node::Job.new(
+          node: @node,
+          capability: capability,
+          params: params
+        )
         @node.triggered.append capability.name
         r = __cache trigger: params[:trigger],
               triggered_by: params[:triggered_by],
-              chain: capability.name do
+              chain: capability do
           send "__#{__method__}", *params.delete(:trigger, :triggered_by).sendable
         end
         @dependency_cache = [:file]
         r
       end
-    else # capability.type == :final
+    elsif capability.type == :final
       define_singleton_method capability.name do
-        r = __cache chain: __method__ do
+        r = __cache chain: capability do
           send "__#{__method__}"
         end
         @dependency_cache = [:file]
         r
       end
+    else
+      raise "unknown capability type #{capability.type}"
     end
+    # return JobSearch.new r
   end
 
   def self.capabilities

data/app/project/addon.rb

@@ -0,0 +1,27 @@
+class Addon < Project
+  def initialize type:, name:
+    @type, @name = type, name
+    if [:file, :dir].include? type
+      super name
+    elsif type == :github
+      super load_from_github name
+    end
+  end
+
+  attr_reader :project, :type, :name, :repo
+
+  def load_from_github repo
+    addon_dir =  "/tmp/rbcm-addons/"
+    dir = "#{addon_dir}#{repo}"
+    repo = if Dir.exist? dir
+      Git.open dir
+    else
+      Git.clone "https://github.com/#{repo}.git",
+        repo,
+        path: addon_dir
+    end
+    repo.checkout "master"
+    repo.pull
+    return dir
+  end
+end

data/app/project/capability.rb

@@ -1,16 +1,22 @@
 # holds a capability in form of an unbound method, extracted from
 # Project::Sandbox module
+# type - regular: 'cap', final: 'cap!'
 
 class Project::Capability
-  def initialize name:, content:
+  def initialize name:, content:, project_file:
     @name = name
     @content = content
     @type = type
+    @project_file = project_file
   end
 
-  attr_reader :name, :content
+  attr_reader :name, :content, :project_file
 
   def type
     @name[-1] == "!" ? :final : :regular
   end
+
+  def to_str
+    name.to_s
+  end
 end

data/app/project/definition.rb

@@ -1,13 +1,13 @@
 # holds a definition on form of a proc to be executed in a nodes sandbox
 
 class Project::Definition
-  def initialize type:, name:, content:
-    @type, @name, @content = type, name, content
+  def initialize type:, name:, content:, project_file:
+    @type, @name, @content, @project_file = type, name, content, project_file
   end
 
-  attr_reader :type, :name, :content
+  attr_reader :type, :name, :content, :project_file
 
-  def origin
+  def to_str
     "#{type}:#{name}"
   end
 end

data/app/project/file.rb

@@ -1,42 +1,61 @@
 # extracts capabilities and definitions from project files
 
 class Project::ProjectFile
-  def initialize project_file_path
-    @path = project_file_path
+  def initialize project:, path:
+    @project = project
+    @path = path
     @definitions = []
     @capabilities = []
-    file = File.read project_file_path
+    @addons = []
+    file = File.read path
     method_names_cache = methods(false)
     instance_eval file
     sandbox = Project::Sandbox.dup
     sandbox.module_eval(file)
     sandbox.instance_methods.each do |name|
+      raise "ERROR: capability name '#{name}' not allowed" if [:node, :group].include? name
       @capabilities.append Project::Capability.new(
-        name:    name,
-        content: sandbox.instance_method(name)
+        name:         name,
+        content:      sandbox.instance_method(name),
+        project_file: self
       )
     end
   end
 
-  attr_reader :capabilities, :definitions, :path
+  attr_reader :project, :capabilities, :definitions, :addon_names, :path, :addons
 
   private
 
+  def addon branch: "master", **named
+    raise "illegal project source: #{keys}" if (
+      keys = named.keys - [:github, :dir, :file]
+    ).any?
+    named.each do |type, name|
+      @addons.append Addon.new type: type, name: name
+    end
+  end
+
   def group name=nil
     @definitions.append Project::Definition.new(
       type:    :group,
       name:    name,
-      content: Proc.new
+      content: Proc.new,
+      project_file: self
     )
   end
 
   def node names=nil
     [names].flatten(1).each do |name|
       @definitions.append Project::Definition.new(
-        type:    name.class == Regexp ? :pattern : :node,
-        name:    name,
-        content: Proc.new
+        type:         name.class == Regexp ? :pattern : :node,
+        name:         name,
+        content:      Proc.new,
+        project_file: self
       )
     end
   end
+
+  def relative_path
+    @path.gsub /^#{@project.path}/, ""
+  end
 end

data/app/project/project.rb

@@ -1,25 +1,73 @@
 class Project
-  def initialize path
+  def initialize path, template_engines: [:mustache, :erb], addon: false
     @path = path
-    if File.directory? path
-      @files = Dir["#{path}/**/*.rb"].collect{ |project_file_path|
-        Project::ProjectFile.new project_file_path
-      }
-    else
-      @files = [Project::ProjectFile.new(path)]
-    end
+    @files = []
+    @templates = []
+    @templates_ = Project::TemplateList.new
+    @other = []
+    @directories = []
+    @template_engines = template_engines
+    load_files path
   end
 
-  attr_reader :path, :files
+  attr_reader :path, :files, :templates, :other, :directories, :templates_
 
   def capabilities
-    @files.each.capabilities.flatten(1).compact
+    files.each.capabilities.flatten.compact
   end
 
   def definitions type=nil
-    with @files.each.definitions.flatten(1) do
+    with files.each.definitions.flatten do
       return select{|definition| definition.type == type} if type
       return self
     end
   end
+
+  def files
+    (@files + all_addons.each.files).flatten
+  end
+
+  def addons
+    @files.each.addons.flatten
+  end
+
+  # collect addons recursively
+  def all_addons project=self
+    ( project.addons + project.addons.collect{|project| all_addons project}
+    ).flatten
+  end
+
+  #TODO?
+  def template name
+    # @templates.find{|name| name...}
+  end
+
+  private
+
+  def load_files path
+    if File.directory? path
+      Dir["#{path}/**/*"].each do |file_path|
+        if file_path.end_with? ".rb"
+          @files.append Project::ProjectFile.new(
+            project: self,
+            path:    file_path
+          )
+        elsif @template_engines.include? file_path.split(".").last.to_sym
+          @templates << file_path.sub(@path, "")
+          @templates_.append Project::Template.new(
+            project: self,
+            path:    file_path
+          )
+        elsif File.directory? path
+          @directories << file_path.sub(@path, "")
+        else
+          @other << file_path.sub(@path, "")
+        end
+      end
+      log "templates: #{@templates}"
+    else
+      @files = [Project::ProjectFile.new(@path)]
+    end
+    raise "ERROR: empty project" unless @files.any?
+  end
 end

data/app/project/template.rb

@@ -0,0 +1,50 @@
+class Project::Template
+  @@engines = [:erb, :mustache]
+
+  def initialize project:, path:
+    @project = project
+    @path    = path
+    @content = File.read path
+  end
+
+  attr_accessor :project, :path
+
+  def render context: {}
+    cache = @content
+    engine_names.each do |layer|
+      if layer == :mustache
+        require "mustache"
+        cache = Mustache.render(@content, **context)
+      elsif layer == :erb
+        # https://zaiste.net/rendering_erb_template_with_bindings_from_hash/
+        require "ostruct"; require "erb"
+        cache = ERB.new(@content).result(
+          OpenStruct.new(context).instance_eval{binding}
+        )
+      end
+    end
+    return cache
+  end
+
+  def clean_full_path
+    path.gsub(
+      /#{engine_names.reverse.collect{|e| ".#{e}"}.join}$/, ''
+    )
+  end
+
+  def clean_path
+    path.gsub(/^#{project.path}/, '').gsub(
+      /#{engine_names.reverse.collect{|e| ".#{e}"}.join}$/, ''
+    )
+  end
+
+  def clean_filename 
+    File.basename(clean_path)
+  end
+
+  def engine_names
+    path.split(".").reverse.collect{ |layer|
+      layer.to_sym if @@engines.include? layer.to_sym
+    }.compact
+  end
+end

data/app/project/template_list.rb

@@ -0,0 +1,19 @@
+class Project::TemplateList < Array
+  def for file_action
+    template_name = file_action.job.params[:template]
+    if template_name.start_with? "/" # `/template.txt`
+      find{|template| template.clean_path == template_name}
+    else # `template.txt`
+      find{ |template|
+        template.path.start_with? File.dirname(file_action.project_file.path) and
+        template.clean_filename == template_name
+      }
+    end
+  end
+
+  def under path
+    find_all{ |template|
+      template.path.start_with? path
+    }
+  end
+end

data/app/rbcm.rb

@@ -2,20 +2,23 @@ require "net/ssh"
 require "fileutils"
 require "shellwords"
 require "diffy"
+require "pry"
+require "git"
 
 APPDIR = File.expand_path File.dirname(__FILE__)
-[ "action/action",   "action/command",
-  "action/file",     "action/list",
-  "node/node",       "node/file",
-  "node/job",        "node/filesystem",
-  "node/remote",     "node/sandbox",
-  "node/template",
-  "lib/lib",         "lib/array_hash",
-  "lib/options",     "lib/quick_each",
-  "lib/params",      "lib/aescrypt",
-  "project/project", "project/definition",
-  "project/file",    "project/capability",
-  "project/sandbox",
+[ "action/action",    "action/command",
+  "action/file",      "action/list",
+  "node/node",        "node/file",
+  "node/job",         "node/filesystem",
+  "node/remote",      "node/sandbox",
+  "node/job_search",
+  "lib/lib",          "lib/array_hash",
+  "lib/options",      "lib/quick_each",
+  "lib/params",       "lib/aescrypt",
+  "project/project",  "project/definition",
+  "project/file",     "project/capability",
+  "project/sandbox",  "project/addon",
+  "project/template", "project/template_list",
   "cli"
 ].each{|requirement| require "#{APPDIR}/#{requirement}.rb"}
 
@@ -27,7 +30,11 @@ class RBCM
     @group_additions = ArrayHash.new
     @nodes = {}
     @project.definitions(:node).each do |node_definition|
-      @nodes[node_definition.name] ||= Node.new self, node_definition.name
+      @nodes[node_definition.name] ||= Node.new(
+        self,
+        node_definition.name,
+        node_definition.project_file.path
+      )
       @nodes[node_definition.name] << node_definition
       # apply pattern definitions to node
       @nodes[node_definition.name] << @project.definitions(:pattern).collect do |pattern_definition|
@@ -39,9 +46,6 @@ class RBCM
     @project.definitions(:group).each do |group_definition|
       @groups[group_definition.name] << group_definition
     end
-    # else
-    # tell project path to template class
-    Node::Template.project_path = @project.path
   end
 
   attr_reader   :nodes, :groups, :project, :actions
@@ -64,7 +68,7 @@ class RBCM
     end
     log "parsing 'cap!'"
     nodes.values.each do |node|
-      node.capabilities.each{|capability| node.sandbox.send "#{capability}!"}
+      node.capabilities.each{|capability| node.sandbox.send "#{capability.name}!"}
     end
   end
 
@@ -77,7 +81,9 @@ class RBCM
         end
       end
       actions.checkable.each do |action|
-        session.with(action.node.name.to_sym).exec action.check &block
+        actions.check.each do |check|
+          session.with(action.job.node.name.to_sym).exec check &block
+        end
       end
       session.loop
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbcm
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Martin Wiegand
@@ -52,6 +52,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.2.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.11.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.11.3
 description: manage your servers via simple config-files
 email: martin@wiegand.tel
 executables:
@@ -73,15 +87,18 @@ files:
 - app/node/file.rb
 - app/node/filesystem.rb
 - app/node/job.rb
+- app/node/job_search.rb
 - app/node/node.rb
 - app/node/remote.rb
 - app/node/sandbox.rb
-- app/node/template.rb
+- app/project/addon.rb
 - app/project/capability.rb
 - app/project/definition.rb
 - app/project/file.rb
 - app/project/project.rb
 - app/project/sandbox.rb
+- app/project/template.rb
+- app/project/template_list.rb
 - app/rbcm.rb
 - bin/rbcm
 homepage: https://github.com/CroneKorkN/rbcm

data/app/node/template.rb

@@ -1,49 +0,0 @@
-class Node::Template
-  @@engines = [:erb, :mustache]
-
-  def initialize name:, capability: nil, context: {}
-    @name = name
-    @capability = capability
-    @context = context
-  end
-
-  def render
-    content = File.read path
-    layers.each do |layer|
-      if layer == :mustache
-        require "mustache"
-        content = Mustache.render(content, **@context)
-      elsif layer == :erb
-        # https://zaiste.net/rendering_erb_template_with_bindings_from_hash/
-        require "ostruct"; require "erb"
-        content = ERB.new(content).result(
-          OpenStruct.new(@context).instance_eval{binding}
-        )
-      end
-    end
-    return content
-  end
-
-  private
-
-  def path
-    @path ||= Dir["#{@@project_path}/**/#{@name}*"].first
-  end
-
-  def filename
-    File.basename(path)
-  end
-
-  def layers
-    @layers = []
-    filename.split(".").reverse.each.to_sym.each do |layer|
-      break unless @@engines.include? layer
-      @layers << layer
-    end
-    return @layers
-  end
-
-  def self.project_path= path
-    @@project_path = path
-  end
-end