pult 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 308b0fe9ee50de08f18432fac828b5ae189dfed04ca360b7c8b11603cc19c1bc
-  data.tar.gz: 605d8aad93efe084bedeb919c2e4375ca6948a73bd2bfe2b3274ab95351e4a76
+  metadata.gz: de6f2c05929b5d4e99b1ce3c73ecd398548d3319d1b82f30279b4265a53db66d
+  data.tar.gz: 2f141819fd1a3d1568e120102c504bddb8165dd70d0cf7307898dde33ee36880
 SHA512:
-  metadata.gz: c226cd807dc31fa6b21dd95dc225cb4a7139359c7be7bfb510a1e7f89e356f0ea86dfff7fe2ab38f98417ea13ad268fae37536b99173ec2a8ffba267150a40c9
-  data.tar.gz: d5045206075175c80afe8448dd5d6d4462efecc60e80572d0c42340f9271f49ae2539433b9bae2ddd93ccf6a8b1d58c142b64f5f44c46874c0ce2221e56742eb
+  metadata.gz: 996dda774d0419509a11f34b12bf0ee18f05134d4adabf62df95fe7e4a11d6921e4f4acd9e4389d1343d4d80126b83680e3b1d95e06fee40811fc7896adbe175
+  data.tar.gz: c59c2d33525f1f80dd9832bb6948962572f9f262f503cf8d652e2af15be6b453361f5af3c9b7d09cc191b13c03f0a5cd81d34711ced1a2dc31f84f0d88958d45

data/CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.0.16] - 2019-19-09
+### Status
+- Dev version
+
+### Updates
+- Pattern `.pult.yml` in root of project
+- Refactoring `Panel` obj (separated `App`, `Runner` modules with `Injector` and `DotAccessible`)
+- Simplify `PULT_<name>` envs;
+- Add `PULT_MULTIACT` env (types of multi action in panel `join` or `clone`)
+
 ## [0.0.15] - 2019-15-09
 ### Status
 - Dev version

data/README.md

@@ -75,9 +75,9 @@ List of this new Pult API actions, that do some things:
 - `<action>_job` to run action in a backround
 - `<action>_out` to get STDOUT of action
 - `<action>_err` to get STDERR of action
-- `<action>_suc` to get STDERR of action
+- `<action>_suc` to get success status of action (true or false)
 
-### 1.2. Start Pult HTTP server and manage your app via API
+### 1.3. Start Pult HTTP server and manage your app via API
 
 Main principle of interact with API is:
 - `GET` method is used for **view** something

data/example/{pult.yml → .pult.yml}

@@ -1,6 +1,6 @@
-# actions is a simple linux shell commands
-
+---
 appname:
+  # actions is a simple linux shell commands
   test:       'sleep 20 && echo 123'
 
   # allow combine actions of the same level

data/lib/init/const.rb

@@ -1,3 +1,9 @@
 module Pult
 
+  ROOT        = ENV['PULT_ROOT']        || Dir.pwd
+  FILE        = ENV['PULT_FILE']        || '.pult.yml'
+
+  PORT        = ENV['PULT_PORT']        || 7070
+
+  MULTIACT    = ENV['PULT_MULTIACT']    || 'join' # 'clone'
 end

data/lib/init/req-proj.rb

@@ -1,6 +1,4 @@
-require_relative '../pult/version'
-
-require_relative '../pult/cli'
+require_relative 'const'
 
 require_relative '../pult/api'
 require_relative '../pult/api/drawer'
@@ -12,8 +10,11 @@ require_relative '../pult/executor/screener'
 require_relative '../pult/executor/terminator'
 
 require_relative '../pult/panel/dot_accessible'
+require_relative '../pult/panel/injector'
 require_relative '../pult/panel'
+require_relative '../pult/panel/app/dot_accessible'
+require_relative '../pult/panel/app/injector'
+require_relative '../pult/panel/app'
+require_relative '../pult/panel/runner/dot_accessible'
+require_relative '../pult/panel/runner/injector'
 require_relative '../pult/panel/executor'
-require_relative '../pult/panel/injector/app'
-require_relative '../pult/panel/injector/panel'
-require_relative '../pult/panel/injector/runner'

data/lib/init/struct.rb

@@ -16,14 +16,18 @@ module Pult
   end
 
   class Panel < Hash
+    module App
+      module DotAccessible; end
+      module Injector; end
+    end
+    module Runner
+      module DotAccessible; end
+      module Injector; end
+    end
     module DotAccessible; end
+    module Injector; end
     module Executor
       class Job < ActiveJob::Base; end
     end
-    module Injector
-      module App; end
-      module Panel; end
-      module Runner; end
-    end
   end
 end

data/lib/pult/api/drawer.rb

@@ -1,15 +1,10 @@
 class Pult::Api::Drawer
 
-  PREFIX = ENV['PULT_API_PREFIX'] || 'api'
-
   format :json
 
-  # TODO, temp turn off
-  # prefix PREFIX
-
   ENV_VAR = /[A-Z][A-Z0-9]*/
 
-  Runner = Pult::Panel::Injector::Runner
+  RunnerInjector = Pult::Panel::Runner::Injector
 
   @@self = self
 
@@ -39,12 +34,12 @@ class Pult::Api::Drawer
     end
 
     def action_get
-      /^\/(?<path>.+)$/ =~ path.sub(/^\/#{PREFIX}/, '')
+      /^\/(?<path>.+)$/ =~ path
       @@panel._apply_path!(path, params)
     end
 
     def action_post
-      /^\/(?<path>.+)$/ =~ path.sub(/^\/#{PREFIX}/, '')
+      /^\/(?<path>.+)$/ =~ path
       @@panel._apply_path!("#{path}!", params)
     end
   end
@@ -61,12 +56,12 @@ class Pult::Api::Drawer
         for action in flat_app._actions.sort.reverse
           action_url = action.gsub '.', '/'
 
-          for injection in Runner.read_injections.sort
+          for injection in RunnerInjector.read_injections.sort
             @@self.info_get flat_app, action, injection
             get("#{action_url}_#{injection}") { action_get }
           end
 
-          for injection in Runner.run_injections.sort
+          for injection in RunnerInjector.run_injections.sort
             @@self.info_post flat_app, action, injection
             post("#{action_url}_#{injection}") { action_post }
           end

data/lib/pult/api/server.rb

@@ -1,12 +1,10 @@
 module Pult::Api::Server
 
-  PORT = ENV['PULT_API_PORT']&.to_i || 7070
-
   # temp fix curl -d ''
   METHS = WEBrick::HTTPRequest::BODY_CONTAINABLE_METHODS
   WEBrick::HTTPRequest::BODY_CONTAINABLE_METHODS = METHS - ['POST']
 
-  def self.run! api:, port: PORT
+  def self.run! api:, port: Pult::PORT
     Rack::Handler::WEBrick.run api, Port: port
   end
 end

data/lib/pult/panel.rb

@@ -1,117 +1,75 @@
 class Pult::Panel
 
-  include DotAccessible
-
-  CONFIG_ROOT  = ENV['PULT_CONFIG_ROOT'] || Dir.pwd
-  CONFIG_FILE  = ENV['PULT_CONFIG_FILE'] || 'pult.yml'
-
   SYS_KEYS = %w{ config }
 
-  attr_accessor :_config_root
-  attr_accessor :_config_file
+  attr_accessor :_root
+  attr_accessor :_file
 
   def initialize auto: true
-    @_config_root  = CONFIG_ROOT
-    @_config_file  = CONFIG_FILE
+    @_root  = Pult::ROOT
+    @_file  = Pult::FILE
 
     init! if auto && allow_init?
   end
 
   def init!
     if allow_init?
-
-      panel_hash!
+      to_panel!
     else
       raise StandardError, 'Init is not allowed!'
     end
   end
 
-  def self.app_hash! hash, panel, app
-    array_node! hash
-
-    hash.class_eval { include DotAccessible }
-
-    Injector::App.inject! hash, panel, app
-
-    hash.values.each do |target|
-      app_hash!(target, panel, app) if target.is_a?(Hash)
-    end
-
-    hash
-  end
-
-  def self.array_node! hash
-    hash.keys.each do |key|
-      value = hash[key]
-
-      case value.class.name
-      when "Hash" then array_node! value
-      when "Array"
-        # clone hash
-        # complex = {}
-        # value.each{ |elm| complex[elm] = hash[elm] }
-        # hash[key] = complex
-
-        # combine commands
-        hash[key] = '$(' + value.join(') && $(') + ')'
-      end
-    end
-  end
-
   private
 
   def allow_init?
-    true_abs_path?(@_config_file) || (!!@_config_root && !!@_config_file)
+    true_abs_path?(@_file) || (!!@_root && !!@_file)
   end
 
   def true_abs_path? path
     path[0] == '/' && File.exists(path)
   end
 
-  def panel_hash!
-    compile_hash_from_configs!
+  def to_panel!
+    compile_from_pult_files!
 
+    class_eval { include DotAccessible }
+
+    Injector.inject! self
+
+    make_apps!
+  end
+
+  def make_apps!
     @_apps = []
 
     for app_name in keys
       app = self[app_name]
+
       @_apps << app_name
 
-      app_hash! app, self, app_name
+      App.to_app! app, self, app_name
     end
-
-    class_eval { include DotAccessible }
-
-    Injector::Panel.inject! self
   end
 
-  def compile_hash_from_configs!
-    scan = @_config_root + '/**/' + @_config_file
+  def compile_from_pult_files!
+    scan = @_root + '/**/' + @_file
 
-    Dir[scan].each do |path|
-      config_file = YAML.load_file(path)
+    Dir[scan].each do |pult_file|
+      pult_hash = YAML.load_file(pult_file)
 
-      dir! config_file, path
+      dir! pult_hash, pult_file
 
-      merge! config_file
+      merge! pult_hash
     end
   end
 
   def dir! hash, path
     app = hash.keys.first
+    dir = Pathname.new(path).dirname.to_s
 
     config = (hash[app]['config'] ||= {})
 
-    dir = Pathname.new(path).dirname.to_s.gsub(/\/config$/, '')
-
     config['dir'] ||= dir
   end
-
-  def app_hash! *args
-    self.class.app_hash! *args
-  end
-
-  def array_node! *args
-    self.class.array_node *args
-  end
 end

data/lib/pult/panel/app.rb

@@ -0,0 +1,41 @@
+module Pult::Panel::App
+
+  def self.to_app! hash, panel, app
+    multi_action! hash
+
+    hash.class_eval { include DotAccessible }
+
+    Injector.inject! hash, panel, app
+
+    hash.values.each do |target|
+      to_app!(target, panel, app) if target.is_a?(Hash)
+    end
+
+    hash
+  end
+
+  def self.multi_action! hash
+    hash.keys.each do |key|
+      value = hash[key]
+
+      case value.class.name
+
+      when "Hash"
+        multi_action! value
+
+      when "Array"
+        case Pult::MULTIACT
+
+        when 'clone'
+          clone hash
+          complex = {}
+          value.each{ |elm| complex[elm] = hash[elm] }
+          hash[key] = complex
+
+        when 'join'
+          hash[key] = '$(' + value.join(') && $(') + ')'
+        end
+      end
+    end
+  end
+end

data/lib/pult/panel/app/dot_accessible.rb

@@ -0,0 +1,59 @@
+module Pult::Panel::App::DotAccessible
+
+  RunnerInjector = Pult::Panel::Runner::Injector
+
+  JOB_KEY = '_job'
+
+  class Job < ActiveJob::Base
+    def perform block_id
+      ObjectSpace._id2ref(block_id).call
+    end
+  end
+
+  def method_missing meth, *args
+    /(?<action>[^\!]+)(?<need_execute>\!?)/ =~ meth.to_s
+
+    for injection in [JOB_KEY] + RunnerInjector.read_injections
+      action.gsub! /#{injection}$/, ''
+      break if $&
+    end
+
+    value = self[action]
+
+    if !need_execute.blank?
+      if value.respond_to? :app?
+        with_job? $& do
+          for sub_action in value.keys
+            value.send "#{sub_action}!", *args
+          end
+        end
+      else
+        return execute!(action, $&, *args)
+      end
+    end
+
+    $& ? nil : value
+  end
+
+  private
+
+  def with_job? injection, &block
+    job?(injection) ? Job.perform_later(block.object_id) : block.call
+  end
+
+  def execute! action, injection=nil, *args
+    job = job?(injection) ? injection : nil
+
+    runner = Pult::Panel::Executor.send "run#{job}!", self, action, *args
+
+    if injection && !job
+      return send("#{action}#{injection}")
+    else
+      return runner
+    end
+  end
+
+  def job? str
+    str == JOB_KEY
+  end
+end

data/lib/pult/panel/{injector/app.rb → app/injector.rb}

@@ -1,4 +1,4 @@
-module Pult::Panel::Injector::App
+module Pult::Panel::App::Injector
 
   SYS_KEYS = Pult::Panel::SYS_KEYS
 
@@ -25,7 +25,7 @@ module Pult::Panel::Injector::App
             : a.merge("#{prefix}#{k}" => v)
         end
 
-        Pult::Panel.app_hash! hash, _panel, _app
+        Pult::Panel::App.to_app! hash, _panel, _app
       end
 
       def _config

data/lib/pult/panel/dot_accessible.rb

@@ -1,65 +1,6 @@
 module Pult::Panel::DotAccessible
 
-  Runner = Pult::Panel::Injector::Runner
-
-  JOB_KEY = '_job'
-
-  module Basic
-    def method_missing meth, *args
-      self[meth]
-    end
-  end
-
-  class Job < ActiveJob::Base
-    def perform block_id
-      ObjectSpace._id2ref(block_id).call
-    end
-  end
-
   def method_missing meth, *args
-    /(?<action>[^\!]+)(?<need_execute>\!?)/ =~ meth.to_s
-
-    for injection in [JOB_KEY] + Runner.read_injections
-      action.gsub! /#{injection}$/, ''
-      break if $&
-    end
-
-    value = self[action]
-
-    if !need_execute.blank?
-      if value.respond_to? :app?
-        with_job? $& do
-          for sub_action in value.keys
-            value.send "#{sub_action}!", *args
-          end
-        end
-      else
-        return execute!(action, $&, *args)
-      end
-    end
-
-    $& ? nil : value
-  end
-
-  private
-
-  def with_job? injection, &block
-    job?(injection) ? Job.perform_later(block.object_id) : block.call
-  end
-
-  def execute! action, injection=nil, *args
-    job = job?(injection) ? injection : nil
-
-    runner = Pult::Panel::Executor.send "run#{job}!", self, action, *args
-
-    if injection && !job
-      return send("#{action}#{injection}")
-    else
-      return runner
-    end
-  end
-
-  def job? str
-    str == JOB_KEY
+    self[meth.to_s]
   end
 end

data/lib/pult/panel/executor.rb

@@ -12,9 +12,9 @@ module Pult::Panel::Executor
 
     runner = Pult::Executor.run! command, hash._config.dir, *args
 
-    runner.class_eval { include Pult::Panel::DotAccessible::Basic }
+    runner.class_eval { include Pult::Panel::Runner::DotAccessible }
 
-    Pult::Panel::Injector::Runner.inject! hash, action, runner
+    Pult::Panel::Runner::Injector.inject! hash, action, runner
 
     runner
   end

data/lib/pult/panel/{injector/panel.rb → injector.rb}

@@ -1,6 +1,6 @@
-module Pult::Panel::Injector::Panel
+module Pult::Panel::Injector
 
-  Runner = Pult::Panel::Injector::Runner
+  RunnerInjector = Pult::Panel::Runner::Injector
 
   def self.inject! panel
     panel.class_eval do
@@ -44,7 +44,7 @@ module Pult::Panel::Injector::Panel
       def _apply_path! path, params=nil
         params = params&.any? ? params : nil
 
-        for postfix in _exec_flags + Runner.injections
+        for postfix in _exec_flags + RunnerInjector.injections
           regexp = Regexp.new("\/([^\/]+" + Regexp.escape(postfix) + ")$")
 
           path.gsub!(regexp, '')

data/lib/pult/panel/runner/dot_accessible.rb

@@ -0,0 +1,6 @@
+module Pult::Panel::Runner::DotAccessible
+
+  def method_missing meth, *args
+    self[meth]
+  end
+end

data/lib/pult/panel/{injector/runner.rb → runner/injector.rb}

@@ -1,4 +1,4 @@
-module Pult::Panel::Injector::Runner
+module Pult::Panel::Runner::Injector
 
   def self.injections
     read_injections + run_injections

data/lib/pult/version.rb

@@ -1,3 +1,3 @@
 module Pult
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pult
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - dmitryck
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-16 00:00:00.000000000 Z
+date: 2019-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,7 +140,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- example/pult.yml
+- example/.pult.yml
 - exe/pult
 - lib/init/boot.rb
 - lib/init/const.rb
@@ -158,11 +158,14 @@ files:
 - lib/pult/executor/terminator.rb
 - lib/pult/executor/xscreen
 - lib/pult/panel.rb
+- lib/pult/panel/app.rb
+- lib/pult/panel/app/dot_accessible.rb
+- lib/pult/panel/app/injector.rb
 - lib/pult/panel/dot_accessible.rb
 - lib/pult/panel/executor.rb
-- lib/pult/panel/injector/app.rb
-- lib/pult/panel/injector/panel.rb
-- lib/pult/panel/injector/runner.rb
+- lib/pult/panel/injector.rb
+- lib/pult/panel/runner/dot_accessible.rb
+- lib/pult/panel/runner/injector.rb
 - lib/pult/version.rb
 - pult.gemspec
 homepage: https://github.com/dmitryck/pult