rbcm 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9edabb3d5cffb1432c1a69c840e0c1a51fc3f5303c746cc1dcfa5ed08973f21
-  data.tar.gz: aff2d28a1feccb2bfca5e173e09e082e4e41944b994b7138e1ffb22127269bf9
+  metadata.gz: 96bce981ffdae8328626cf5a431989237b2a852ad5cf99f1fe41b72cd8b07316
+  data.tar.gz: a56eb30ae086b3ac75ab71d149d2dc660dd02a3932dd26f81d1dd70e9e21ae92
 SHA512:
-  metadata.gz: e3d3455d8aea26ff4cdc0d8fd20eb099cbd0deabf304af6fbba79d14e1e761f25688be0abce0892d287676827814e41c525bf4f80a94e07561ecba2de0192ea3
-  data.tar.gz: 4ca7161c7075c30824ef18a9bf8e5731260fd51e1f1943ccd303d99707ed2cf086fa05212356e7727ad232bdbd7c5b5134a9d13d2f96b7bdbfd5b89c94054a38
+  metadata.gz: a45f56bec3da7c49f4f48450cd04b1cbe93593e72533f9981782c0a9da4524491628ba853dede679e3e24ed24744240e02d7a2c69924e59c77f5f862817e2ee2
+  data.tar.gz: d70b4ac03aa966e51798c6ec16e3fcfd486b1fc37cf2d4f639b4a2c402ca2c52701ff5f3f54d82a764fed1ce204d59e01f546751372a7e8cfe7f106c81c0ed7c

data/app/action/action.rb

@@ -1,4 +1,4 @@
-class Action
+class RBCM::Action
   attr_accessor :approved, :applied
   attr_reader   :triggered_by, :trigger, :chain, :dependencies,
                 :obsolete, :job, :check, :triggered, :result,
@@ -30,7 +30,7 @@ class Action
   end
 
   def checkable?
-    @check.any? or self.class == Action::File
+    @check.any? or self.class == RBCM::Action::File
   end
 
   def neccessary?
@@ -71,7 +71,7 @@ class Action
 
   def approve! input=:y
     if [:a, :y].include? input
-      @job.node.files[@path].content = content if self.class == Action::File
+      @job.node.files[@path].content = content if self.class == RBCM::Action::File
       @approved = true
       siblings.each.approve! if input == :a
       @job.node.triggered << @trigger

data/app/action/command.rb

@@ -1,4 +1,4 @@
-class Action::Command < Action
+class RBCM::Action::Command < RBCM::Action
   attr_reader :line
 
   # determine wether the command is neccessary

data/app/action/file.rb

@@ -1,5 +1,5 @@
 # ToDo: approve all changes to a spicific file at once
-class Action::File < Action
+class RBCM::Action::File < RBCM::Action
   attr_reader :path, :content
 
   def check!
@@ -8,7 +8,7 @@ class Action::File < Action
   end
 
   def obsolete
-    @job.node.files[path].content.chomp.chomp == content.chomp.chomp
+    @job.node.files[path].content == content
   end
 
   def siblings
@@ -17,7 +17,12 @@ class Action::File < Action
 
   def apply!
     @applied = true
-    @result = @job.node.remote.execute("echo #{Shellwords.escape content} > #{path}")
+    #@result = @job.node.remote.execute("echo #{Shellwords.escape content} > #{path}")
+    @result = Net::SCP::upload!(@job.node.name, nil, StringIO.new(content), @params[0])
+    def @result.exitstatus
+      self.class == TrueClass ? 0 : 1
+    end
+    @result
   end
 
   def content

data/app/action/list.rb

@@ -1,4 +1,4 @@
-class ActionList < Array
+class RBCM::ActionList < Array
   def initialize array=[]
     array.each do |element|
       insert -1, element
@@ -10,7 +10,7 @@ class ActionList < Array
     self.each do |action|
       resolve_action_dependencies action
     end
-    ActionList.new @actions
+    RBCM::ActionList.new @actions
   end
 
   def resolve_triggers
@@ -18,52 +18,52 @@ class ActionList < Array
     self.each do |action|
       resolve_action_triggers action
     end
-    ActionList.new @actions
+    RBCM::ActionList.new @actions
   end
 
   def file path
-    ActionList.new select{|action| action.path == path}
+    RBCM::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}
+    RBCM::ActionList.new select{|action| action.job.node.name == node_name}
   end
 
   def checkable
-    ActionList.new select.checkable?
+    RBCM::ActionList.new select.checkable?
   end
 
   def unneccessary
-    ActionList.new (self - neccessary)
+    RBCM::ActionList.new (self - neccessary)
   end
 
   def neccessary
-    ActionList.new select.neccessary?
+    RBCM::ActionList.new select.neccessary?
   end
 
   def approvable
-    ActionList.new select.approvable?
+    RBCM::ActionList.new select.approvable?
   end
 
   def approved
-    ActionList.new select.approved?
+    RBCM::ActionList.new select.approved?
   end
 
   def applyable
-    ActionList.new select.applyable?
+    RBCM::ActionList.new select.applyable?
   end
 
   def applied
-    ActionList.new select.applied?
+    RBCM::ActionList.new select.applied?
   end
 
   def succeeded
-    ActionList.new applied.select.succeeded?
+    RBCM::ActionList.new applied.select.succeeded?
   end
 
   def failed
-    ActionList.new applied.select.failed?
+    RBCM::ActionList.new applied.select.failed?
   end
 
   private

data/app/cli.rb

@@ -1,10 +1,10 @@
-class CLI
+class RBCM::CLI
   def initialize argv
     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
+    @rbcm = rbcm = RBCM::Core.new argv[0] || `pwd`.chomp
     render :project
     render :capabilities
     # parse
@@ -22,7 +22,7 @@ class CLI
       approve action
       if action.approved?
         approve action.siblings
-        approve action.same_file if action.class == Action::File
+        approve action.same_file if action.class == RBCM::Action::File
       end
     end
     # apply
@@ -38,9 +38,9 @@ class CLI
 
   def check action
     @action = action
-    if action.class == Action::Command
+    if action.class == RBCM::Action::Command
       render checking: action.check.join("; ") if action.checkable?
-    elsif action.class == Action::File
+    elsif action.class == RBCM::Action::File
       render checking: action.job.params[0]
     end
     action.check!
@@ -53,7 +53,7 @@ class CLI
       next if not action.approvable?
       render :siblings if action.siblings.any?
       render :source if action.source.flatten.compact.any?
-      render :diff if action.class == Action::File
+      render :diff if action.class == RBCM::Action::File
       render :prompt
       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
@@ -69,8 +69,7 @@ class CLI
       @action = action
       response = action.apply!
       render :title, color: response.exitstatus == 0 ? :green : :red
-      render :command if action.class == Action::Command and response.exitstatus != 0
-      render response: response if response.length > 0
+      render response: response if response.to_s.length > 0 and action.class == RBCM::Action::Command
     end
   end
 
@@ -88,7 +87,7 @@ class CLI
     elsif element == :capabilities
     elsif element == :project
       ([@rbcm.project] + @rbcm.project.all_addons).each do |project|
-        out "┣━  #{project.class}#{" #{project.type}: #{project.name}" if project.class == Addon}"
+        out "┣━  #{project.class}#{" #{project.type}: #{project.name}" if project.class == RBCM::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(", ")}"
@@ -122,14 +121,14 @@ class CLI
       out prefix + Diffy::Diff.new(
         @action.job.node.files[@action.path].content,
         @action.content
-      ).to_s(:color).split("\n").join("\n#{prefix[0..-2]}")
+      ).to_s(:color).split("\n").join("\n#{prefix}")
     elsif element == :approved
       string = @action.approved? ? "#{format :green} APPROVED" : "#{format :red} DECLINED"
       out "#{prefix} #{string} #{format}                                                 "
     elsif element.class == String
       out prefix + "#{element}"
     elsif checking
-      out prefix + "CHECKING #{@action.job.node.name}: #{checking}"
+      out prefix + "#{@action.job.node.name}: #{checking}"
     elsif response
       out prefix + response.to_s.chomp.split("\n").join("\n#{prefix}")
     elsif element == :applied
@@ -143,6 +142,7 @@ class CLI
   end
 
   def out line
+    # `tput cols`
     puts "\r#{line}"
   end
 

data/app/lib/aescrypt.rb

@@ -55,7 +55,7 @@ module AESCrypt
   #:arg: iv => String
   #:arg: cipher_type => String
   def self.decrypt_data(encrypted_data, key, iv, cipher_type)
-    aes = OpenSSL::Cipher.new(cipher_type)
+    aes = RBCM::OpenSSL::Cipher.new(cipher_type)
     aes.decrypt
     aes.key = key
     aes.iv = iv if iv != nil
@@ -74,7 +74,7 @@ module AESCrypt
   #:arg: iv => String
   #:arg: cipher_type => String
   def self.encrypt_data(data, key, iv, cipher_type)
-    aes = OpenSSL::Cipher.new(cipher_type)
+    aes = RBCM::OpenSSL::Cipher.new(cipher_type)
     aes.encrypt
     aes.key = key
     aes.iv = iv if iv != nil

data/app/lib/array_hash.rb

@@ -1,7 +1,7 @@
 # a hash which keys are initiated as arrays
-# default values via `Hash.new []` are inadequate for being volatile 
+# default values via RBCM::`Hash.new []` are inadequate for being volatile
 
-class ArrayHash < Hash
+class RBCM::ArrayHash < Hash
   def [] key
     store key, [] unless has_key? key
     super

data/app/lib/lib.rb

@@ -36,13 +36,3 @@ class Integer
     end
   end
 end
-
-# a hash which keys are initiated as arrays
-# default values via `Hash.new []` are inadequate for being volatile
-
-class ArrayHash < Hash
-  def [] key
-    store key, [] unless has_key? key
-    super
-  end
-end

data/app/lib/options.rb

@@ -1,6 +1,6 @@
 # https://docs.ruby-lang.org/en/2.1.0/OptionParser.html
 
-class Options
+class RBCM::Options
   def initialize params
   end
 end

data/app/lib/params.rb

@@ -1,4 +1,4 @@
-class Params
+class RBCM::Params
   attr_reader :ordered, :named
 
   def initialize ordered, named

data/app/node/file.rb

@@ -1,4 +1,4 @@
-class Node::NodeFile
+class RBCM::Node::NodeFile
   def initialize path:, filesystem:
     @path       = path
     @filesystem = filesystem
@@ -7,12 +7,11 @@ class Node::NodeFile
   attr_writer :content, :user, :group, :mode
 
   def content
-    @content ||= (
-      # log "DOWNLOADING #{@filesystem.node.name}: '#{@path}'"
-      response = @filesystem.node.remote.execute("cat '#{@path}'")
-      response = "" if response.exitstatus != 0
-      response
-    )
+    @content ||= begin
+      result = Net::SCP::download!(@filesystem.node.name, nil, @path)
+    rescue Net::SCP::Error
+      result = ""
+    end
   end
 
   def diffable # TODO?

data/app/node/filesystem.rb

@@ -1,4 +1,4 @@
-class Node::NodeFilesystem
+class RBCM::Node::NodeFilesystem
   def initialize node, overlays: false
     @node = node
     @underlying = overlays
@@ -11,7 +11,7 @@ class Node::NodeFilesystem
     if @underlying
       @files[path] || @underlying[path]
     else
-      @files[path] ||= Node::NodeFile.new path: path, filesystem: self
+      @files[path] ||= RBCM::Node::NodeFile.new path: path, filesystem: self
     end
   end
 end

data/app/node/job.rb

@@ -1,7 +1,7 @@
 # contains parameters send to capabilities
 # used to read configuration via "?"-suffix methods
 
-class Node::Job
+class RBCM::Node::Job
   attr_reader :capability, :params, :node
 
   def initialize node:, capability:, params:

data/app/node/job_search.rb

@@ -1,4 +1,4 @@
-class JobSearch
+class RBCM::JobSearch
   def initialize result
 
   end

data/app/node/node.rb

@@ -1,4 +1,4 @@
-class Node
+class RBCM::Node
   attr_reader   :jobs, :definitions, :files, :name, :remote, :rbcm, :sandbox,
                 :path
   attr_accessor :actions, :memberships, :triggered
@@ -8,10 +8,10 @@ class Node
     @name = name
     @path = path
     @definitions = []
-    @sandbox = Node::Sandbox.new self
-    @remote = Node::Remote.new self
-    @files = Node::NodeFilesystem.new self, overlays: @remote.files
-    @actions = ActionList.new
+    @sandbox = RBCM::Node::Sandbox.new self
+    @remote = RBCM::Node::Remote.new self
+    @files = RBCM::Node::NodeFilesystem.new self, overlays: @remote.files
+    @actions = RBCM::ActionList.new
     @memberships = []
     @jobs = []
     @blocked_jobs = []

data/app/node/remote.rb

@@ -1,16 +1,16 @@
-class Node::Remote
+class RBCM::Node::Remote
   def initialize node
     @node = node
-    @files = Node::NodeFilesystem.new node
+    @files = RBCM::Node::NodeFilesystem.new node
   end
 
   attr_reader :node, :files
 
   def execute action
-    @session ||= Net::SSH.start @node.name, 'root'
+    @session ||= Net::SSH.start @node.name
     @session.exec! action
   end
 end
 
-# @session = Net::SSH.start 'test.ckn.li', 'root'
+# @session = Net::SSH.start 'test.ckn.li'
 # @session.exec!("ls").class

data/app/node/sandbox.rb

@@ -1,7 +1,7 @@
 # runs a definition and catches jobs
 # accepts definition-Proc and provides definition-Proc and job list
 
-class Node::Sandbox
+class RBCM::Node::Sandbox
   attr_reader :content, :jobs
 
   def initialize node
@@ -19,7 +19,7 @@ class Node::Sandbox
     end
     # wrap base_capabilities
     [:file, :run].each do |base_capability|
-      __add_capability Project::Capability.new(
+      __add_capability RBCM::Project::Capability.new(
         name: base_capability,
         content: method(base_capability).unbind,
         project_file: false
@@ -81,9 +81,13 @@ class Node::Sandbox
     end
   end
 
+  def localhost
+    # mark node as local
+  end
+
   def run action, check: nil, tags: nil, trigger: nil, triggered_by: nil
     __cache check: check, tags: tags, trigger: trigger, triggered_by: triggered_by, working_dirs: working_dir do
-      @node.actions << Action::Command.new(
+      @node.actions << RBCM::Action::Command.new(
         job: @node.jobs.last,
         line: action,
         dependencies: @dependency_cache.dup,
@@ -101,20 +105,25 @@ class Node::Sandbox
     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(
+      @node.actions << RBCM::Action::File.new(
         job: job,
-        params: Params.new([path], named),
+        params: RBCM::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 if named.keys.include? :content or named.keys.include? :template
+    run "chmod #{named[:mode]} '#{path}'",
+      check: "stat -c '%a' * #{path} | grep -q #{named[:mode]}" if named[:mode]
+    run "chown #{named[:user]} '#{path}'",
+      check: "stat -c '%U' * #{path} | grep -q #{named[:user]}" if named[:user]
+    run "chown :#{named[:group]} '#{path}'",
+      check: "stat -c '%G' * #{path} | grep -q #{named[:group]}" if named[:group]
   end
 
   def dir path="", templates:, context: {}, tags: nil, trigger: nil, triggered_by: nil
+    templates.gsub! /!^/, ''
     __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|
-        file template.clean_full_path.gsub(/#{working_dir}/),
+        file template.clean_full_path.gsub(/^#{working_dir}/, '').gsub(/^\/#{templates}/, ''),
           template: template.clean_path,
           context: context
       end
@@ -123,8 +132,8 @@ class Node::Sandbox
 
   def working_dir
     @cache[:chain].select{ |i|
-      i.class == Project::Definition or (
-        i.class == Project::Capability and not [:file, :run].include? i.name
+      i.class == RBCM::Project::Definition or (
+        i.class == RBCM::Project::Capability and not [:file, :run].include? i.name
       )
     }.last.project_file.path.split("/")[0..-2].join("/")
   end
@@ -137,7 +146,7 @@ class Node::Sandbox
   def method_missing name, *named, **ordered, &block
     #log "method #{name} missing on #{@name}"
     capability_name = name[0..-2].to_sym
-    params = Params.new named, ordered
+    params = RBCM::Params.new named, ordered
     if not @@capabilities.include? capability_name
       super
     elsif name =~ /\!$/
@@ -180,7 +189,7 @@ class Node::Sandbox
     end
     return r.collect &block if block_given? # no-each-syntax
     return r
-    JobSearch.new r
+    RBCM::JobSearch.new r
   end
 
   def __cache trigger: nil, triggered_by: nil, params: nil, check: nil,
@@ -212,8 +221,8 @@ class Node::Sandbox
     # define wrapper method
     if capability.type == :regular
       define_singleton_method capability.name do |*ordered, **named|
-        params = Params.new ordered, named
-        @node.jobs.append Node::Job.new(
+        params = RBCM::Params.new ordered, named
+        @node.jobs.append RBCM::Node::Job.new(
           node: @node,
           capability: capability,
           params: params
@@ -238,7 +247,7 @@ class Node::Sandbox
     else
       raise "unknown capability type #{capability.type}"
     end
-    # return JobSearch.new r
+    # return RBCM::JobSearch.new r
   end
 
   def self.capabilities

data/app/pool.rb

@@ -0,0 +1,8 @@
+class RBCM::Worker
+  def initialize
+
+  end
+
+  def <<
+  end
+end

data/app/project/addon.rb

@@ -1,4 +1,4 @@
-class Addon < Project
+class RBCM::Addon < RBCM::Project
   def initialize type:, name:
     @type, @name = type, name
     if [:file, :dir].include? type

data/app/project/capability.rb

@@ -2,7 +2,7 @@
 # Project::Sandbox module
 # type - regular: 'cap', final: 'cap!'
 
-class Project::Capability
+class RBCM::Project::Capability
   def initialize name:, content:, project_file:
     @name = name
     @content = content

data/app/project/definition.rb

@@ -1,6 +1,6 @@
 # holds a definition on form of a proc to be executed in a nodes sandbox
 
-class Project::Definition
+class RBCM::Project::Definition
   def initialize type:, name:, content:, project_file:
     @type, @name, @content, @project_file = type, name, content, project_file
   end

data/app/project/file.rb

@@ -1,6 +1,6 @@
 # extracts capabilities and definitions from project files
 
-class Project::ProjectFile
+class RBCM::Project::ProjectFile
   def initialize project:, path:
     @project = project
     @path = path
@@ -10,11 +10,11 @@ class Project::ProjectFile
     file = File.read path
     method_names_cache = methods(false)
     instance_eval file
-    sandbox = Project::Sandbox.dup
+    sandbox = RBCM::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(
+      @capabilities.append RBCM::Project::Capability.new(
         name:         name,
         content:      sandbox.instance_method(name),
         project_file: self
@@ -31,12 +31,12 @@ class Project::ProjectFile
       keys = named.keys - [:github, :dir, :file]
     ).any?
     named.each do |type, name|
-      @addons.append Addon.new type: type, name: name
+      @addons.append RBCM::Addon.new type: type, name: name
     end
   end
 
   def group name=nil
-    @definitions.append Project::Definition.new(
+    @definitions.append RBCM::Project::Definition.new(
       type:    :group,
       name:    name,
       content: Proc.new,
@@ -46,7 +46,7 @@ class Project::ProjectFile
 
   def node names=nil
     [names].flatten(1).each do |name|
-      @definitions.append Project::Definition.new(
+      @definitions.append RBCM::Project::Definition.new(
         type:         name.class == Regexp ? :pattern : :node,
         name:         name,
         content:      Proc.new,

data/app/project/project.rb

@@ -1,8 +1,8 @@
-class Project
+class RBCM::Project
   def initialize path, template_engines: [:mustache, :erb], addon: false
     @path = path
     @files = []
-    @templates = Project::TemplateList.new
+    @templates = RBCM::Project::TemplateList.new
     @other = []
     @directories = []
     @template_engines = template_engines
@@ -47,12 +47,12 @@ class Project
     if File.directory? path
       Dir["#{path}/**/*"].each do |file_path|
         if file_path.end_with? ".rb"
-          @files.append Project::ProjectFile.new(
+          @files.append RBCM::Project::ProjectFile.new(
             project: self,
             path:    file_path
           )
         elsif @template_engines.include? file_path.split(".").last.to_sym
-          @templates.append Project::Template.new(
+          @templates.append RBCM::Project::Template.new(
             project: self,
             path:    file_path
           )
@@ -64,7 +64,7 @@ class Project
       end
     else
       @files = [
-        Project::ProjectFile.new(
+        RBCM::Project::ProjectFile.new(
           project: self,
           path:    path
         )

data/app/project/sandbox.rb

@@ -1,4 +1,4 @@
-module Project::Sandbox
+module RBCM::Project::Sandbox
   def self.method_missing *params, &block
     # do nothing
   end

data/app/project/template.rb

@@ -1,4 +1,4 @@
-class Project::Template
+class RBCM::Project::Template
   @@engines = [:erb, :mustache]
 
   def initialize project:, path:
@@ -38,7 +38,7 @@ class Project::Template
     )
   end
 
-  def clean_filename 
+  def clean_filename
     File.basename(clean_path)
   end
 

data/app/project/template_list.rb

@@ -1,4 +1,4 @@
-class Project::TemplateList < Array
+class RBCM::Project::TemplateList < Array
   def for file_action
     template_name = file_action.job.params[:template]
     if template_name.start_with? "/" # `/template.txt`

data/app/rbcm.rb

@@ -1,91 +1,94 @@
-require "net/ssh"
-require "fileutils"
-require "shellwords"
-require "diffy"
-require "pry"
-require "git"
+module RBCM
+  require "net/ssh"
+  require "net/scp"
+  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/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"}
+  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/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"}
 
-class RBCM
-  def initialize project_path
-    # initialize project
-    @project = Project.new project_path
-    # create nodes
-    @group_additions = ArrayHash.new
-    @nodes = {}
-    @project.definitions(:node).each do |node_definition|
-      @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|
-         pattern_definition if node_definition.name =~ /#{pattern_definition.name}/
+  class Core
+    def initialize project_path
+      # initialize project
+      @project = RBCM::Project.new project_path
+      # create nodes
+      @group_additions = RBCM::ArrayHash.new
+      @nodes = {}
+      @project.definitions(:node).each do |node_definition|
+        @nodes[node_definition.name] ||= RBCM::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|
+           pattern_definition if node_definition.name =~ /#{pattern_definition.name}/
+        end
+      end
+      # create groups
+      @groups = RBCM::ArrayHash.new
+      @project.definitions(:group).each do |group_definition|
+        @groups[group_definition.name] << group_definition
       end
     end
-    # create groups
-    @groups = ArrayHash.new
-    @project.definitions(:group).each do |group_definition|
-      @groups[group_definition.name] << group_definition
-    end
-  end
 
-  attr_reader   :nodes, :groups, :project, :actions
-  attr_accessor :group_additions
+    attr_reader   :nodes, :groups, :project, :actions
+    attr_accessor :group_additions
 
-  def actions
-    ActionList.new nodes.values.each.actions.flatten(1)
-  end
-
-  def jobs
-    nodes.values.each.jobs.flatten(1)
-  end
+    def actions
+      RBCM::ActionList.new nodes.values.each.actions.flatten(1)
+    end
 
-  def parse
-    # parsing nodes
-    nodes.values.each.parse
-    # parsing additions
-    nodes.values.each do |node|
-      node.sandbox.evaluate node.additions
+    def jobs
+      nodes.values.each.jobs.flatten(1)
     end
-    # parsing 'cap!'
-    nodes.values.each do |node|
-      node.capabilities.each{|capability| node.sandbox.send "#{capability.name}!"}
+
+    def parse
+      # parsing nodes
+      nodes.values.each.parse
+      # parsing additions
+      nodes.values.each do |node|
+        node.sandbox.evaluate node.additions
+      end
+      # parsing 'cap!'
+      nodes.values.each do |node|
+        node.capabilities.each{|capability| node.sandbox.send "#{capability.name}!"}
+      end
     end
-  end
 
-  def check! &block
-    Net::SSH::Multi.start do |session|
-      session.via 'gateway', 'gateway-user'
-      @nodes.each do |name, node|
-        session.group name.to_sym do
-          session.use "root@#{name}"
+    def check! &block
+      Net::SSH::Multi.start do |session|
+        session.via 'gateway', 'gateway-user'
+        @nodes.each do |name, node|
+          session.group name.to_sym do
+            session.use "#{name}"
+          end
         end
-      end
-      actions.checkable.each do |action|
-        actions.check.each do |check|
-          session.with(action.job.node.name.to_sym).exec check &block
+        actions.checkable.each do |action|
+          actions.check.each do |check|
+            session.with(action.job.node.name.to_sym).exec check &block
+          end
         end
+        session.loop
       end
-      session.loop
     end
   end
 end

data/bin/rbcm

@@ -2,4 +2,4 @@
 
 require 'rbcm'
 
-CLI.new ARGV
+RBCM::CLI.new ARGV

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbcm
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Martin Wiegand
@@ -52,6 +52,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.2.0
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.2.rc2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.2.rc2
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +119,7 @@ files:
 - app/node/node.rb
 - app/node/remote.rb
 - app/node/sandbox.rb
+- app/pool.rb
 - app/project/addon.rb
 - app/project/capability.rb
 - app/project/definition.rb