rbcm 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb945c84ce8cafd1cd3e604049885d5a306cc5ad2c7b7a9b9e3fff3e3a91bd3d
-  data.tar.gz: 8427fb88c352244a6168eec50e234d43bcd1557dcb9281c6883d1c1c92e9bf0d
+  metadata.gz: ba856611e3af9f4f13e7ed546987c0033ec5a4fb0155a68a9a6edbe4a4f68c60
+  data.tar.gz: 42545b973f0eff3689e807898579ceda9c62b3a362a9e1ad4b7e9f2a81d1e221
 SHA512:
-  metadata.gz: 1743ddf1827c4b10afd779ade73711959b6f680c35d35a46287866812023ae9150a0200282ffd591e7167f67abc3507d5259df333da383da7b0ee90b046c1db1
-  data.tar.gz: 705a679fed8af59bf5330d0a285232d49743ecae299572ab859d902ac1878f8d1ad17b9419fa28ead1d7c1d5c64902d6bb7790750fcbb518c6f37adfc6ea23f5
+  metadata.gz: edfdafa164f3c571b0262620c462837dfd3b9d9029667ff4ed4596284107a586775238d25ab92a5f0a6535d4e9007645c65cafaecccbc18578eeee43de367eae
+  data.tar.gz: 6e5f2a500540299697e2a8becb9630551a04587283f0a51b72fc0b169106a2c83429b409965e85038a8ffe9cd4a5cf183daa6c01d023007da5945f368d41bef0

data/app/action/file.rb

@@ -24,13 +24,7 @@ class Action::File < Action
     @content ||= if @params[:content]
       @params[:content].to_s
     elsif @params[:template]
-      # @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(
+      project_file.project.templates.for(self).render(
         context: @params[:context]
       )
     end

data/app/action/list.rb

@@ -25,6 +25,11 @@ class ActionList < Array
     ActionList.new select{|action| action.path == path}
   end
 
+  def node node_name
+    return self unless node_name
+    ActionList.new select{|action| action.job.node.name == node_name}
+  end
+
   def checkable
     ActionList.new select.checkable?
   end

data/app/cli.rb

@@ -1,9 +1,10 @@
 class CLI
-  def initialize params
-    options = Options.new params
+  def initialize argv
+    args = Hash[ argv.join(' ').scan(/--?([^=\s]+)(?:[=\s](\S+))?/) ]
+    puts "ARGS #{args}"
     render section: "RBCM starting", first: true
     # bootstrap
-    @rbcm = rbcm = RBCM.new params[0] || `pwd`.chomp
+    @rbcm = rbcm = RBCM.new argv[0] || `pwd`.chomp
     render :project
     render :capabilities
     # parse
@@ -11,13 +12,13 @@ class CLI
     render :nodes
     # check
     render section: "CHECKING #{rbcm.actions.checkable.count} actions on #{rbcm.nodes.count} nodes"
-    rbcm.actions.each do |action|
+    rbcm.actions.node(args["node"]).each do |action|
       check action
     end
     # approve
     render section: "APPROVING #{rbcm.actions.approvable.count}/#{rbcm.actions.unneccessary.count} actions"
     approve rbcm.actions.unneccessary.resolve_triggers
-    while action = rbcm.actions.approvable.resolve_triggers.first
+    while action = rbcm.actions.node(args["node"]).approvable.resolve_triggers.first
       approve action
       if action.approved?
         approve action.siblings
@@ -31,7 +32,6 @@ class CLI
     end
     # finish
     render :applied
-    puts "┗━━──"
   end
 
   private
@@ -46,7 +46,7 @@ class CLI
     [actions].flatten(1).each do |action|
       @action = action
       render :title, color: (action.obsolete ? :green : :yellow)
-      render :command if action.class == Action::Command
+      #render :command if action.class == Action::Command
       next if not action.approvable?
       render :siblings if action.siblings.any?
       render :source if action.source.flatten.compact.any?
@@ -77,9 +77,9 @@ 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.flatten.compact.join(" > ")} " +
-        "#{format} #{format :params}#{@action.job.params if @action.job}#{format}" +
-        " #{format :tag}#{"tags: " if @action.tags.any?}#{@action.tags.join(", ")}#{format}"
+      tags = "#{format :tag}#{"tags: " if @action.tags.any?}#{@action.tags.join(", ")}#{format}"
+        out "┣━ #{triggerd_by}#{format color, :bold} #{@action.chain.flatten.compact.join(" > ")} #{format} #{tags}" +
+        "\n#{prefix}#{format}#{format :params}#{@action.job.params if @action.job}#{format}"
     elsif element == :capabilities
       out prefix + "capabilities: #{Node::Sandbox.capabilities.join(", ")}"
     elsif element == :project
@@ -116,7 +116,7 @@ class CLI
       ).to_s(:color).split("\n").join("\n#{prefix[0..-2]}")
     elsif element == :approved
       string = @action.approved? ? "#{format :green} APPROVED" : "#{format :red} DECLINED"
-      puts "#{string} #{format}"
+      out "#{prefix} #{string} #{format}                                                 "
     elsif element.class == String
       out prefix + "#{element}"
     elsif checking
@@ -126,7 +126,9 @@ class CLI
     elsif element == :applied
       out prefix
       out "┣━\ #{format :green, :bold} #{@rbcm.actions.succeeded.count} secceeded #{format}"
-      out "┣━\ #{format :red, :bold} #{@rbcm.actions.failed.count} failed #{format}"
+      out "┣━\ #{format :red, :bold} #{@rbcm.actions.failed.count} failed #{format}" if @rbcm.actions.failed.any?
+      out "┗━━──"
+
     else
     end
   end

data/app/lib/params.rb

@@ -20,7 +20,7 @@ class Params
         "#{param}"
       },
       named.collect{ |k, v|
-        "\e[2m\e[1m#{k}:\e[21m\e[22m #{v[0..40].to_s.gsub("\n"," \\ ")}#{"\e[2m\e[1m…\e[21m\e[22m" if v.length > 40}"
+        "\e[2m\e[1m#{k}:\e[21m\e[22m #{v[0..60].to_s.gsub("\n"," \\ ")}#{"\e[2m\e[1m…\e[21m\e[22m" if v.length > 60}"
       }
     ].flatten(1).join("\e[2m\e[1m, \e[21m\e[22m")
   end

data/app/node/sandbox.rb

@@ -111,21 +111,11 @@ class Node::Sandbox
 
   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
+      @node.rbcm.project.templates.under("#{working_dir}/#{templates}").each do |template|
         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
 

data/app/project/project.rb

@@ -2,15 +2,14 @@ class Project
   def initialize path, template_engines: [:mustache, :erb], addon: false
     @path = path
     @files = []
-    @templates = []
-    @templates_ = Project::TemplateList.new
+    @templates = Project::TemplateList.new
     @other = []
     @directories = []
     @template_engines = template_engines
     load_files path
   end
 
-  attr_reader :path, :files, :templates, :other, :directories, :templates_
+  attr_reader :path, :files, :templates, :other, :directories, :templates
 
   def capabilities
     files.each.capabilities.flatten.compact
@@ -53,8 +52,7 @@ class Project
             path:    file_path
           )
         elsif @template_engines.include? file_path.split(".").last.to_sym
-          @templates << file_path.sub(@path, "")
-          @templates_.append Project::Template.new(
+          @templates.append Project::Template.new(
             project: self,
             path:    file_path
           )
@@ -64,9 +62,14 @@ class Project
           @other << file_path.sub(@path, "")
         end
       end
-      log "templates: #{@templates}"
+      log "templates: #{@templates.each.path}"
     else
-      @files = [Project::ProjectFile.new(@path)]
+      @files = [
+        Project::ProjectFile.new(
+          project: self,
+          path:    path
+        )
+      ]
     end
     raise "ERROR: empty project" unless @files.any?
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbcm
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Martin Wiegand
@@ -52,6 +52,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.2.0
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement