pult 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a39fbcaf3eda478ae7480a5e792c31ec0f4a01f4ee3b5dedfddb8791e868781
-  data.tar.gz: dc9bd252985efbd8b3f027ef66d1f83230ea993009618b760f3752674bb2ffb2
+  metadata.gz: 5bfca2fba5db79bb8b9c88ea72819ae2e28524c95a245f8cfe5312496b32ca59
+  data.tar.gz: c7be9aeac950d548b2ba917b36fb5ef16095f8c346ce018ae2ef524209caf874
 SHA512:
-  metadata.gz: 6672fc57572bcd811ed3228393705b3cab9dd84a044a4ff3179d90316f692370eb385177dbc2c2fd3cfeaf569ddb1d693debcf78f021a56025d53984ff33f920
-  data.tar.gz: 4aee322a1a980181f47f8c718c655a21104a88974f0beb365ad58361951c3077548d06752fd799add3ced09412859d5a6d2389a0251ad8191bbc3300d0e74d36
+  metadata.gz: 45a20a0843ef79d94d5e066e95bbe45a1c69db1bdd1dee17db47d083eb0f7eb1fc3bbbdb236d3b99795b877be7915f9b73dbb6d6f99b9f7577b1c253e482c409
+  data.tar.gz: 5bc0c40f1c4f51623d722332af50e5ce0d7e28f145c5529d0c55a9bc495b685eaced4a65e1e8f9e20af070e9942482f7d9eb707072331c197aa4e62055a6f397

data/CHANGELOG.md

@@ -4,6 +4,13 @@ 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.20] - 2019-26-09
+### Status
+- Dev version
+
+### Updates
+- Fix/Ref `rake` provider, add `rails` command for `<command> --tasks`
+
 ## [0.0.19] - 2019-23-09
 ### Status
 - Dev version

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

@@ -1,58 +1,54 @@
 module Pult::Panel::Provider::Rake
 
   FILE    = 'Rakefile'
-  COMMAND = 'rake'
+  COMMAND = %w{rake rails}
 
   PATH    = Pult::RAKEPATH || 'r'
 
   def self.mixin! panel
-    rake_files = Pult::Panel::Provider.files(FILE, panel._root)
+    app_dirs = Pult::Panel::Provider.app_dirs(panel)
 
-    Dir[rake_files].each do |rake_file|
+    app_dirs.map{|a, d| [a, "#{d}/#{FILE}"] }.each do |app, rake_file|
       hash = pult_hash rake_file
 
-      # merge in app
-      panel[app_name(rake_file)]&.merge! hash
+      panel[app]&.merge! hash
     end
   end
 
   def self.pult_hash file
     hash  = {}
-    tasks = self.tasks(file)
-
-    for task in tasks.sort.reverse
-      count = task.count(':')
 
+    maker = lambda do |task, command, count|
       n = -1
       task.split(':').reduce(hash) do |h, t|
-        (n += 1) && n == count ? h[t] = "#{COMMAND} #{task}" : h[t] ||= {}
+        (n += 1) && n == count ? h[t] = "#{command} #{task}" : h[t] ||= {}
+      end
+    end
+
+    for command in COMMAND
+      tasks = self.tasks command, file
+
+      for task in tasks.sort.reverse
+        count = task.count(':')
+        maker.(task, command, count)
       end
+
+      break if hash.any?
     end
 
     { PATH => hash }
   end
 
-  def self.tasks file
+  def self.tasks command, file
     app_dir = Pathname.new(file).dirname.to_s
 
-    runner = Pult::Executor.run! "#{COMMAND} --tasks", app_dir
+    runner = Pult::Executor.run! "#{command} --tasks", app_dir
 
     tasks = runner[:stdout].split(/\n/).map do |s|
-      s.sub(/^#{COMMAND} (\S+).*/, '\1')
+      s.sub(/^#{command} (\S+).*/, '\1')
     end
 
     # temp ignore params
     tasks.map{ |t| t.sub /\[.+/, '' }
   end
-
-  # tmp; await for refactoring mixins in panel.rb
-  def self.app_name file
-    app_dir   = Pathname.new(file).dirname.to_s
-    pult_file = Pult::Panel::Provider::Pult::FILE
-
-    pult_hash = \
-      Pult::Panel::Provider::Pult.pult_hash("#{app_dir}/#{pult_file}")
-
-    pult_hash.keys&.first
-  end
 end

data/lib/pult/panel/provider.rb

@@ -6,4 +6,10 @@ module Pult::Panel::Provider
   def self.files file, root
     root + '/**/' + file
   end
+
+  def self.app_dirs panel
+    arr = []
+    panel.each{|app, h| arr << [app, h.dig(*%w{config dir})] }
+    arr
+  end
 end

data/lib/pult/version.rb

@@ -1,3 +1,3 @@
 module Pult
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pult
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - dmitryck
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2019-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler