rbcm 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba856611e3af9f4f13e7ed546987c0033ec5a4fb0155a68a9a6edbe4a4f68c60
-  data.tar.gz: 42545b973f0eff3689e807898579ceda9c62b3a362a9e1ad4b7e9f2a81d1e221
+  metadata.gz: d9edabb3d5cffb1432c1a69c840e0c1a51fc3f5303c746cc1dcfa5ed08973f21
+  data.tar.gz: aff2d28a1feccb2bfca5e173e09e082e4e41944b994b7138e1ffb22127269bf9
 SHA512:
-  metadata.gz: edfdafa164f3c571b0262620c462837dfd3b9d9029667ff4ed4596284107a586775238d25ab92a5f0a6535d4e9007645c65cafaecccbc18578eeee43de367eae
-  data.tar.gz: 6e5f2a500540299697e2a8becb9630551a04587283f0a51b72fc0b169106a2c83429b409965e85038a8ffe9cd4a5cf183daa6c01d023007da5945f368d41bef0
+  metadata.gz: e3d3455d8aea26ff4cdc0d8fd20eb099cbd0deabf304af6fbba79d14e1e761f25688be0abce0892d287676827814e41c525bf4f80a94e07561ecba2de0192ea3
+  data.tar.gz: 4ca7161c7075c30824ef18a9bf8e5731260fd51e1f1943ccd303d99707ed2cf086fa05212356e7727ad232bdbd7c5b5134a9d13d2f96b7bdbfd5b89c94054a38

data/app/cli.rb

@@ -1,8 +1,8 @@
 class CLI
   def initialize argv
-    args = Hash[ argv.join(' ').scan(/--?([^=\s]+)(?:[=\s](\S+))?/) ]
-    puts "ARGS #{args}"
     render section: "RBCM starting", first: true
+    args = Hash[ argv.join(' ').scan(/--?([^=\s]+)(?:[=\s](\S+))?/) ]
+    render :args, content: args
     # bootstrap
     @rbcm = rbcm = RBCM.new argv[0] || `pwd`.chomp
     render :project
@@ -38,7 +38,11 @@ class CLI
 
   def check action
     @action = action
-    render checking: action.check.join("; ")
+    if action.class == Action::Command
+      render checking: action.check.join("; ") if action.checkable?
+    elsif action.class == Action::File
+      render checking: action.job.params[0]
+    end
     action.check!
   end
 
@@ -46,7 +50,6 @@ class CLI
     [actions].flatten(1).each do |action|
       @action = action
       render :title, color: (action.obsolete ? :green : :yellow)
-      #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?
@@ -71,21 +74,27 @@ class CLI
     end
   end
 
-  def render element=nil, section: nil, color: nil, first: false, response: nil, checking: nil
+  def render element=nil, section: nil, color: nil, first: false, response: nil, checking: nil, content: nil
     prefix = "┃   "
     if section
       out "#{first ? nil : "┗━━──"}\n\n┏━━#{format :invert, :bold}#{" "*16}#{section}#{" "*16}#{format}━──\n┃"
+    elsif element == :args
+      out "#{prefix}ARGUMENTS #{content.to_s}"
     elsif element == :title
       triggerd_by = "#{format :trigger, :bold} #{@action.triggered_by.join(", ")} " if @action.triggered_by.any?
       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
-      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"
+      ([@rbcm.project] + @rbcm.project.all_addons).each do |project|
+        out "┣━  #{project.class}#{" #{project.type}: #{project.name}" if project.class == Addon}"
+        out prefix + "#{project.files.count} ruby files, #{project.templates.count} templates #{project.directories.count} directories, #{project.other.count} other files"
+        out prefix + "capabilities: #{project.capabilities.join(", ")}"
+        out prefix + "templates: #{project.templates.each.clean_path.join(", ")}"
+      end
     elsif element == :nodes
+      out "┣━  NODES #{@rbcm.nodes.count}"
       out prefix + @rbcm.nodes.values.collect{ |node|
         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, " ")
@@ -110,7 +119,7 @@ class CLI
         "triggered: #{format :trigger} #{@action.triggered.join(", ")} \e[0m;" +
         " again: #{@action.trigger.-(@action.triggered).join(", ")}"
     elsif element == :diff
-      out prefix[0..-2] + Diffy::Diff.new(
+      out prefix + Diffy::Diff.new(
         @action.job.node.files[@action.path].content,
         @action.content
       ).to_s(:color).split("\n").join("\n#{prefix[0..-2]}")

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..60].to_s.gsub("\n"," \\ ")}#{"\e[2m\e[1m…\e[21m\e[22m" if v.length > 60}"
+        "\e[2m\e[1m#{k}:\e[21m\e[22m #{v.to_s[0..54].gsub("\n"," \\ ")}#{"\e[2m\e[1m…\e[21m\e[22m" if v.to_s.length > 54}"
       }
     ].flatten(1).join("\e[2m\e[1m, \e[21m\e[22m")
   end

data/app/node/file.rb

@@ -8,7 +8,7 @@ class Node::NodeFile
 
   def content
     @content ||= (
-      log "DOWNLOADING #{@filesystem.node.name}: '#{@path}'"
+      # log "DOWNLOADING #{@filesystem.node.name}: '#{@path}'"
       response = @filesystem.node.remote.execute("cat '#{@path}'")
       response = "" if response.exitstatus != 0
       response

data/app/node/sandbox.rb

@@ -106,6 +106,8 @@ class Node::Sandbox
         params: Params.new([path], named),
         state: @cache.collect{|k,v| [k, v.dup]}.to_h
       )
+      run "chmod #{named[:mode]} #{path}",
+        check: "stat -c '%a' * #{path} | grep -q #{named[:mode]}" if named[:mode]
     end
   end
 

data/app/project/project.rb

@@ -62,7 +62,6 @@ class Project
           @other << file_path.sub(@path, "")
         end
       end
-      log "templates: #{@templates.each.path}"
     else
       @files = [
         Project::ProjectFile.new(

data/app/rbcm.rb

@@ -60,13 +60,13 @@ class RBCM
   end
 
   def parse
-    log "parsing nodes"
+    # parsing nodes
     nodes.values.each.parse
-    log "parsing additions"
+    # parsing additions
     nodes.values.each do |node|
       node.sandbox.evaluate node.additions
     end
-    log "parsing 'cap!'"
+    # parsing 'cap!'
     nodes.values.each do |node|
       node.capabilities.each{|capability| node.sandbox.send "#{capability.name}!"}
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbcm
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Martin Wiegand