pult 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de6f2c05929b5d4e99b1ce3c73ecd398548d3319d1b82f30279b4265a53db66d
-  data.tar.gz: 2f141819fd1a3d1568e120102c504bddb8165dd70d0cf7307898dde33ee36880
+  metadata.gz: c9f1bcde4e6702f684b1d23bbb99e759027b39de1eac7b04d3a85d55ac16d2fc
+  data.tar.gz: b6ff29cc06748be7f82502506c0f897805a4455d9ac644fe54e6b74a944981b9
 SHA512:
-  metadata.gz: 996dda774d0419509a11f34b12bf0ee18f05134d4adabf62df95fe7e4a11d6921e4f4acd9e4389d1343d4d80126b83680e3b1d95e06fee40811fc7896adbe175
-  data.tar.gz: c59c2d33525f1f80dd9832bb6948962572f9f262f503cf8d652e2af15be6b453361f5af3c9b7d09cc191b13c03f0a5cd81d34711ced1a2dc31f84f0d88958d45
+  metadata.gz: bea18e532c25a0866376ff008d931dd8c2ae63a3df35e6eddadaa758767aed0402bc2b441bfb28cc354500150f21df1bdb4ec98f9918d38a8c5769ff0f4480e1
+  data.tar.gz: 5da5043e7e5acaf42daccb519efbafe58502b75e35b945d5bd9d226781fa6d7c2122318937248fcafb8ed953143cc6aea4f9fa0a07bcc3fc2a2f1052a0c2e7d1

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-22-09
+### Status
+- Dev version
+
+### Updates
+- Providers pattern for comliping panel hash
+- `pult` provider added for `.pult.yml` (was, but not in pattern)
+- `rake` provider added for rake tasks (**new**!)
+- `PULT_RAKEPATH` env is `r` by default (prefix in API)
+
 ## [0.0.16] - 2019-19-09
 ### Status
 - Dev version

data/README.md

@@ -6,6 +6,10 @@ Development progress can be reached at [CHANGELOG](./CHANGELOG.md)
 
 Ruby *>= 2.3.0* require
 
+```diff
+- **TODO**: Refactor README (new concept, new feature)
+```
+
 # What is Pult?
 
 Universal API service for manage your appications and system tasks via Ruby or HTTP.
@@ -39,11 +43,11 @@ Manage many applications is the feature of Pult. But to understand the concept a
 
 ### 1.1. Configure app actions via pult.yml
 
-Put `pult.yml` anywere into your app folder, some kind of `<app>/pult.yml` or `<app>/config/pult.yml`, and create any actions you need for manage your app:
+Put `.pult.yml` into root of your app folder `<app>/.pult.yml` and create any actions you need for manage app:
 ```yaml
-# actions is a simple linux shell commands
-
+---
 appname:
+  # actions is a simple linux shell commands
   test:       'sleep 20 && echo 123'
 
   # can combine actions of the same level

data/lib/init/const.rb

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

data/lib/init/req-proj.rb

@@ -9,6 +9,9 @@ require_relative '../pult/executor'
 require_relative '../pult/executor/screener'
 require_relative '../pult/executor/terminator'
 
+require_relative '../pult/panel/provider'
+require_relative '../pult/panel/provider/pult'
+require_relative '../pult/panel/provider/rake'
 require_relative '../pult/panel/dot_accessible'
 require_relative '../pult/panel/injector'
 require_relative '../pult/panel'

data/lib/init/struct.rb

@@ -16,6 +16,10 @@ module Pult
   end
 
   class Panel < Hash
+    module Provider
+      module Pult; end
+      module Rake; end
+    end
     module App
       module DotAccessible; end
       module Injector; end

data/lib/pult/panel.rb

@@ -6,70 +6,35 @@ class Pult::Panel
   attr_accessor :_file
 
   def initialize auto: true
+    @_file  = Provider::Pult::FILE
     @_root  = Pult::ROOT
-    @_file  = Pult::FILE
 
     init! if auto && allow_init?
   end
 
   def init!
-    if allow_init?
-      to_panel!
-    else
-      raise StandardError, 'Init is not allowed!'
-    end
+    allow_init? ? \
+      to_panel! : raise(StandardError, 'Init is not allowed!')
   end
 
   private
 
-  def allow_init?
-    true_abs_path?(@_file) || (!!@_root && !!@_file)
-  end
-
-  def true_abs_path? path
-    path[0] == '/' && File.exists(path)
-  end
-
   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]
+    Provider::Pult.mixin! self
+    Provider::Rake.mixin! self
 
-      @_apps << app_name
+    Injector.inject! self
 
-      App.to_app! app, self, app_name
-    end
+    App.make_apps! self
   end
 
-  def compile_from_pult_files!
-    scan = @_root + '/**/' + @_file
-
-    Dir[scan].each do |pult_file|
-      pult_hash = YAML.load_file(pult_file)
-
-      dir! pult_hash, pult_file
-
-      merge! pult_hash
-    end
+  def allow_init?
+    true_abs_path?(@_file) || (!!@_root && !!@_file)
   end
 
-  def dir! hash, path
-    app = hash.keys.first
-    dir = Pathname.new(path).dirname.to_s
-
-    config = (hash[app]['config'] ||= {})
-
-    config['dir'] ||= dir
+  def true_abs_path? path
+    path[0] == '/' && File.exists(path)
   end
 end

data/lib/pult/panel/app.rb

@@ -1,22 +1,44 @@
 module Pult::Panel::App
 
-  def self.to_app! hash, panel, app
-    multi_action! hash
+  def self.config_dir! app_hash, path
+    app_name = app_hash.keys.first
 
-    hash.class_eval { include DotAccessible }
+    dir = Pathname.new(path).dirname.to_s
 
-    Injector.inject! hash, panel, app
+    config = (app_hash[app_name]['config'] ||= {})
 
-    hash.values.each do |target|
-      to_app!(target, panel, app) if target.is_a?(Hash)
+    config['dir'] ||= dir
+  end
+
+  def self.make_apps! panel
+    panel.instance_variable_set(:@_apps, [])
+
+    for app_name in panel.keys
+      hash = panel[app_name]
+
+      panel._apps << app_name
+
+      to_app! hash, panel, app_name
+    end
+  end
+
+  def self.to_app! app_hash, panel, app_name
+    multi_action! app_hash
+
+    app_hash.class_eval { include DotAccessible }
+
+    Injector.inject! app_hash, panel, app_name
+
+    app_hash.values.each do |target|
+      to_app!(target, panel, app_name) if target.is_a?(Hash)
     end
 
-    hash
+    app_hash
   end
 
-  def self.multi_action! hash
-    hash.keys.each do |key|
-      value = hash[key]
+  def self.multi_action! app_hash
+    app_hash.keys.each do |key|
+      value = app_hash[key]
 
       case value.class.name
 
@@ -27,13 +49,13 @@ module Pult::Panel::App
         case Pult::MULTIACT
 
         when 'clone'
-          clone hash
+          clone app_hash
           complex = {}
-          value.each{ |elm| complex[elm] = hash[elm] }
-          hash[key] = complex
+          value.each{ |elm| complex[elm] = app_hash[elm] }
+          app_hash[key] = complex
 
         when 'join'
-          hash[key] = '$(' + value.join(') && $(') + ')'
+          app_hash[key] = '$(' + value.join(') && $(') + ')'
         end
       end
     end

data/lib/pult/panel/provider.rb

@@ -0,0 +1,9 @@
+module Pult::Panel::Provider
+
+  #
+  # here logic for multi or single app mode
+  #
+  def self.files file, root
+    root + '/**/' + file
+  end
+end

data/lib/pult/panel/provider/pult.rb

@@ -0,0 +1,21 @@
+module Pult::Panel::Provider::Pult
+
+  FILE = Pult::FILE || '.pult.yml'
+
+  def self.mixin! panel
+    pult_files = Pult::Panel::Provider.files(panel._file, panel._root)
+
+    Dir[pult_files].each do |pult_file|
+
+      hash = pult_hash pult_file
+
+      Pult::Panel::App.config_dir! hash, pult_file
+
+      panel.merge! hash
+    end
+  end
+
+  def self.pult_hash file
+    YAML.load_file(file)
+  end
+end

data/lib/pult/panel/provider/rake.rb

@@ -0,0 +1,49 @@
+module Pult::Panel::Provider::Rake
+
+  FILE    = 'Rakefile'
+  COMMAND = 'rake'
+
+  PATH    = Pult::RAKEPATH || 'r'
+
+  def self.mixin! panel
+    rake_files = Pult::Panel::Provider.files(FILE, panel._root)
+
+    Dir[rake_files].each do |rake_file|
+
+      hash = pult_hash rake_file
+
+      Pult::Panel::App.config_dir! hash, rake_file
+
+      panel.merge! hash
+    end
+  end
+
+  def self.pult_hash file
+    hash  = {}
+    tasks = self.tasks(file)
+
+    for task in tasks
+      count = task.count(':')
+
+      n = -1
+      task.split(':').reduce(hash) do |h, t|
+        (n += 1) && n == count ? h[t] = "#{COMMAND} #{task}" : h[t] = {}
+      end
+    end
+
+    { PATH => hash }
+  end
+
+  def self.tasks file
+    app_dir = Pathname.new(file).dirname.to_s
+
+    runner = Pult::Executor.run! "#{COMMAND} --tasks", app_dir
+
+    tasks = runner[:stdout].split(/\n/).map do |s|
+      s.sub(/^#{COMMAND} (\S+).*/, '\1')
+    end
+
+    # temp ignore params
+    tasks.map{ |t| t.sub /\[.+/, '' }
+  end
+end

data/lib/pult/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pult
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - dmitryck
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-19 00:00:00.000000000 Z
+date: 2019-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,9 @@ files:
 - lib/pult/panel/dot_accessible.rb
 - lib/pult/panel/executor.rb
 - lib/pult/panel/injector.rb
+- lib/pult/panel/provider.rb
+- lib/pult/panel/provider/pult.rb
+- lib/pult/panel/provider/rake.rb
 - lib/pult/panel/runner/dot_accessible.rb
 - lib/pult/panel/runner/injector.rb
 - lib/pult/version.rb