pult 0.0.2 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd367496b6d462a76af84c19e96ad15319fce3fae5f67d34670d66db4660a118
-  data.tar.gz: 84058482ed79fcad8f7967d98a35b9cd9483e19ac6b618e7c992127fc051f58e
+  metadata.gz: 7a1f2626325d559bee139156bf965999bc5f25c7bcc1982ee89d74542092873f
+  data.tar.gz: 2746f3c883cbf0c5bfb5f8501f2b56d558d283702443bf122560d3f0f1624f1d
 SHA512:
-  metadata.gz: 2704d2fc2c0a748d2a03ae6a045654370da7ff5bee9bf9f5c6a30e63927353c572dd03c5a84b631f02d5986ae02bdbe70b27ca295ffc3bfa9198343604a177c0
-  data.tar.gz: 861c1ab8c9846dfd9586f163f23fa1f2fd6190578a804acd5afd9763bfe63ce9ec9ec4c5d153692bd585025b4e9527f34a00035ffe62db324885c2e0b0264877
+  metadata.gz: d981f88ef4ed8e86f20ec8d20e908b0596111fa9e0dda770ee66b9953554b4669162d1cc8f024d8285364af452d15550f22f2636277423e3abd84d453efe847a
+  data.tar.gz: '08fbc15c24149cd6fdf616d60cfe769fe263585aca4dd663dbc3d4bc888ad44c9120b214adf7b2a2104f456f112ee38f3c092ac5bbd63ffb9c49e0366e411057'

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+# Done
+
+- Ruby/Http interface to yml tasks (only development mode, just playground)
+
+# Fixes and updates
+
+- Fix and refactoring API
+- Add Swagger doc rendering
+- Ruby version req

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pult (0.1.0)
+    pult (0.0.3)
 
 GEM
   remote: https://rubygems.org/
@@ -34,6 +34,8 @@ GEM
       rack (>= 1.3.0)
       rack-accept
       virtus (>= 1.0.0)
+    grape-swagger (0.33.0)
+      grape (>= 0.16.2)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
@@ -62,8 +64,10 @@ DEPENDENCIES
   activesupport (~> 5.2)
   bundler (~> 2.0)
   grape (~> 1.2)
+  grape-swagger (~> 0.33)
   minitest (~> 5.0)
   pult!
+  rack (~> 2.0)
   rake (~> 10.0)
 
 BUNDLED WITH

data/lib/init/req-lib.rb

@@ -1,4 +1,6 @@
 require 'active_job'
 require 'grape'
+require 'grape-swagger'
 require 'open3'
+require 'rack'
 require 'yaml'

data/lib/init/req-proj.rb

@@ -1,12 +1,20 @@
 require_relative '../pult/version'
+
 require_relative '../pult/cli'
-require_relative '../pult/executor'
+
+require_relative '../pult/api'
+require_relative '../pult/api/drawer/helper'
+require_relative '../pult/api/drawer'
+require_relative '../pult/api/server'
+
 require_relative '../pult/executor/enver'
+require_relative '../pult/executor'
 require_relative '../pult/executor/screener'
 require_relative '../pult/executor/terminator'
+
+require_relative '../pult/panel/dot_accessible'
 require_relative '../pult/panel'
 require_relative '../pult/panel/executor'
-require_relative '../pult/panel/dot_accessible'
 require_relative '../pult/panel/injector/app'
 require_relative '../pult/panel/injector/panel'
 require_relative '../pult/panel/injector/runner'

data/lib/init/struct.rb

@@ -1,18 +1,27 @@
 module Pult
+  class Error < StandardError; end
+
   class Cli; end
 
+  module Api 
+    class Drawer < Grape::API
+      module Helper; end
+    end
+    module Server; end
+  end
+
   class Executor
-    class Job < ActiveJob::Base; end
     module Enver; end
+    class Job < ActiveJob::Base; end
     class  Screener; end
     class  Terminator; end
   end
 
   class Panel < Hash
+    module DotAccessible; end
     module Executor
       class Job < ActiveJob::Base; end
     end
-    module DotAccessible; end
     module Injector
       module App; end
       module Panel; end

data/lib/pult.rb

@@ -1,6 +1,8 @@
 require_relative 'init/boot'
 
 module Pult
-  class Error < StandardError; end
-  # Your code goes here...
+
+  def self.new *args
+    Panel.new *args
+  end
 end

data/lib/pult/api.rb

@@ -0,0 +1,10 @@
+module Pult::Api
+
+  def self.init! panel
+    Drawer.draw! panel
+  end
+
+  def self.server! *args
+    Server.run! *args, api: Drawer
+  end
+end

data/lib/pult/api/drawer.rb

@@ -0,0 +1,64 @@
+class Pult::Api::Drawer
+
+  format :json
+
+  PREFIX = ENV['PULT_API_PREFIX'] || 'api'
+
+  prefix PREFIX
+
+  def self.draw! panel
+    @@panel = panel
+
+    for @@app in @@panel._apps
+      resource @@app, & ACTIONS
+    end
+
+    add_swagger_documentation
+  end
+
+  include Helper
+
+  Runner = Pult::Panel::Injector::Runner
+
+  ACTIONS = proc {
+
+    flat_app = @@panel[@@app]._to_flat.merge!(@@panel[@@app])
+
+    for action in flat_app._actions.sort.reverse
+      action_url = action.gsub '.', '/'
+
+      for injection in Runner.read_injections.sort
+        info_get flat_app, action, injection
+        get "#{action_url}_#{injection}" do
+          action route
+        end
+      end
+
+      for injection in Runner.run_injections.sort
+        info_post flat_app, action, injection
+        post "#{action_url}_#{injection}" do
+          action route
+        end
+      end
+
+      info_get flat_app, action
+      get action_url do
+        action route
+      end
+
+      info_post flat_app, action
+      post action_url do
+        action! route
+      end
+    end
+
+    for action in flat_app._actions.sort.reverse
+      action_url = action.gsub '.', '/'
+
+      info_post flat_app, action, job: true
+      post "#{action_url}_job" do
+        action! route
+      end
+    end
+  }
+end

data/lib/pult/api/drawer/helper.rb

@@ -0,0 +1,83 @@
+module Pult::Api::Drawer::Helper
+
+  def self.included base
+    @@base = base
+
+    Grape::API::Instance.extend ClassMethods
+
+    base.helpers do
+      def path
+        route.pattern.origin
+      end
+
+      def panel
+        @@base.class_variable_get :@@panel
+      end
+
+      def action route
+        /^\/(?<path>.+)$/ =~ path.sub(/^\/#{@@base::PREFIX}/, '')
+        panel._apply_path!(path, params)
+      end
+
+      def action! route
+        /^\/(?<path>.+)$/ =~ path.sub(/^\/#{@@base::PREFIX}/, '')
+        panel._apply_path!("#{path}!", params)
+      end
+    end
+  end
+
+  module ClassMethods
+    UI = {
+      red: ->(s){'<span style="color: red;">'+ s +'</span>'},
+      icon: {
+        job: '<b>&#8227; RUN JOB</b>',
+        run: '<b>&#8227; RUN</b>',
+        sep: ' | ',
+      },
+      title: {
+        get:  ->{"#{@@injection}#{@@action_title}"},
+        post: ->{"#{@@injection}#{@@action_title} #{@@icon}"},
+      },
+      detail: {
+        get:  ->{"#{@@injection}#{@@action_title}<br>#{@@command}"},
+        post: ->{"#{@@injection}#{@@action_title}<br>#{UI[:red].(@@command)}"}
+      }
+    }
+
+    def info flat_app, action, injection, job, type:
+      @@action = action
+      @@action_title = flat_app._action_title(action)
+      @@command = flat_app[action].to_s
+      @@icon = job ? UI[:icon][:job] : UI[:icon][:run]
+      @@injection = injection&.sub!('_', '') ? "#{injection}#{UI[:icon][:sep]}" : ''
+
+      desc(UI[:title][type].call){ detail(UI[:detail][type].call) }
+
+      parameters if type == :post
+    end
+
+    def parameters
+      params do
+        optional :screen, type: String
+
+        @@command.scan(/(?<=\$)[^\s()]+/).each do |param|
+          description = { type: String }
+
+          if ! (default = `echo -n $#{param}`).blank?
+            description.merge! default: default
+          end
+
+          requires param.to_sym, description
+        end
+      end
+    end
+
+    def info_get flat_app, action, injection=nil, job: nil
+      info flat_app, action, injection, job, type: :get
+    end
+
+    def info_post flat_app, action, injection=nil, job: nil
+      info flat_app, action, injection, job, type: :post
+    end
+  end
+end

data/lib/pult/api/server.rb

@@ -0,0 +1,8 @@
+module Pult::Api::Server
+
+  PORT = ENV['PULT_API_PORT']&.to_i || 9292
+
+  def self.run! api:, port: PORT
+    Rack::Handler::WEBrick.run api, Port: port
+  end
+end

data/lib/pult/executor.rb

@@ -1,6 +1,5 @@
 class Pult::Executor
 
-  # ActiveJob::Base
   class Job
     def perform *args
       Pult::Executor.run! *args

data/lib/pult/executor/screener.rb

@@ -1,5 +1,3 @@
-require 'open3'
-
 class Pult::Executor::Screener
 
   attr_reader :runner

data/lib/pult/panel.rb

@@ -1,4 +1,3 @@
-# Hash
 class Pult::Panel
 
   include DotAccessible

data/lib/pult/panel/executor.rb

@@ -1,6 +1,5 @@
 module Pult::Panel::Executor
 
-  # ActiveJob::Base
   class Job
     def perform hash_id, action, *args
       hash = ObjectSpace._id2ref hash_id

data/lib/pult/version.rb

@@ -1,3 +1,3 @@
 module Pult
-  VERSION = "0.0.2"
+  VERSION = "0.0.7"
 end

data/pult.gemspec

@@ -1,4 +1,6 @@
 
+RUBY_VERSION_REQ = '>= 2.3.0'
+
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "pult/version"
@@ -13,6 +15,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/dmitryck/pult"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = RUBY_VERSION_REQ
+
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
@@ -39,5 +43,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "activesupport", "~> 5.2"
   spec.add_development_dependency "activejob", "~> 5.2"
+  spec.add_development_dependency "rack", "~> 2.0"
   spec.add_development_dependency "grape", "~> 1.2"
+  spec.add_development_dependency "grape-swagger", "~> 0.33"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pult
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.7
 platform: ruby
 authors:
 - dmitryck
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-04 00:00:00.000000000 Z
+date: 2019-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: grape-swagger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.33'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.33'
 description: 
 email:
 - dmitryck@gmail.com
@@ -103,6 +131,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -116,6 +145,10 @@ files:
 - lib/init/req-proj.rb
 - lib/init/struct.rb
 - lib/pult.rb
+- lib/pult/api.rb
+- lib/pult/api/drawer.rb
+- lib/pult/api/drawer/helper.rb
+- lib/pult/api/server.rb
 - lib/pult/cli.rb
 - lib/pult/executor.rb
 - lib/pult/executor/enver.rb
@@ -145,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="