pult 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a1f2626325d559bee139156bf965999bc5f25c7bcc1982ee89d74542092873f
-  data.tar.gz: 2746f3c883cbf0c5bfb5f8501f2b56d558d283702443bf122560d3f0f1624f1d
+  metadata.gz: 96037cdff4cfc27b119180d4d7945ecd6c822c5d866fbd01f1e324dabd1dcbb8
+  data.tar.gz: 8e8eb4befec919c2dc4df105e27d10ae9015268abc254d00c7d840c4d51a4935
 SHA512:
-  metadata.gz: d981f88ef4ed8e86f20ec8d20e908b0596111fa9e0dda770ee66b9953554b4669162d1cc8f024d8285364af452d15550f22f2636277423e3abd84d453efe847a
-  data.tar.gz: '08fbc15c24149cd6fdf616d60cfe769fe263585aca4dd663dbc3d4bc888ad44c9120b214adf7b2a2104f456f112ee38f3c092ac5bbd63ffb9c49e0366e411057'
+  metadata.gz: 55bfef5c6532e1a3ab763209873dfbecaf44c057cd48c65e21a139da50281392f16715129d6979b2830b9705b35bf20e736bcc9b89aaeb48e2e2f425b48d952d
+  data.tar.gz: 5e43c50166fa7ef2e360d6a516851838a3e7308bc5f193636595ae1a9b7d88004e5ad293eb8c99a130a4c045c36c6c49c32999a0e31137a72b34c94fbcec1b63

data/CHANGELOG.md

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

data/lib/init/req-proj.rb

@@ -3,7 +3,6 @@ require_relative '../pult/version'
 require_relative '../pult/cli'
 
 require_relative '../pult/api'
-require_relative '../pult/api/drawer/helper'
 require_relative '../pult/api/drawer'
 require_relative '../pult/api/server'
 

data/lib/init/struct.rb

@@ -4,9 +4,7 @@ module Pult
   class Cli; end
 
   module Api 
-    class Drawer < Grape::API
-      module Helper; end
-    end
+    class Drawer < Grape::API; end
     module Server; end
   end
 

data/lib/pult/api/drawer.rb

@@ -1,64 +1,123 @@
 class Pult::Api::Drawer
 
-  format :json
-
   PREFIX = ENV['PULT_API_PREFIX'] || 'api'
 
+  format :json
+
   prefix PREFIX
 
-  def self.draw! panel
-    @@panel = panel
+  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)}"}
+    }
+  }
 
-    for @@app in @@panel._apps
-      resource @@app, & ACTIONS
+  helpers do
+    def path
+      route.pattern.origin
     end
 
-    add_swagger_documentation
-  end
+    def action_get
+      /^\/(?<path>.+)$/ =~ path.sub(/^\/#{PREFIX}/, '')
+      @@panel._apply_path!(path, params)
+    end
 
-  include Helper
+    def action_post
+      /^\/(?<path>.+)$/ =~ path.sub(/^\/#{PREFIX}/, '')
+      @@panel._apply_path!("#{path}!", params)
+    end
+  end
 
   Runner = Pult::Panel::Injector::Runner
 
-  ACTIONS = proc {
+  @@self = self
+
+  def self.draw! panel
+    @@panel = panel
 
-    flat_app = @@panel[@@app]._to_flat.merge!(@@panel[@@app])
+    for app in @@panel._apps
 
-    for action in flat_app._actions.sort.reverse
-      action_url = action.gsub '.', '/'
+      resource app do
 
-      for injection in Runner.read_injections.sort
-        info_get flat_app, action, injection
-        get "#{action_url}_#{injection}" do
-          action route
-        end
-      end
+        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.run_injections.sort
-        info_post flat_app, action, injection
-        post "#{action_url}_#{injection}" do
-          action route
+          for injection in Runner.read_injections.sort
+            @@self.info_get flat_app, action, injection
+            get("#{action_url}_#{injection}") { action_get }
+          end
+
+          for injection in Runner.run_injections.sort
+            @@self.info_post flat_app, action, injection
+            post("#{action_url}_#{injection}") { action_post }
+          end
+
+          @@self.info_get flat_app, action
+          get(action_url) { action_get }
+
+          @@self.info_post flat_app, action
+          post(action_url) { action_post }
         end
-      end
 
-      info_get flat_app, action
-      get action_url do
-        action route
-      end
+        for action in flat_app._actions.sort.reverse
+          action_url = action.gsub '.', '/'
 
-      info_post flat_app, action
-      post action_url do
-        action! route
+          @@self.info_post flat_app, action, job: true
+          post("#{action_url}_job") { action_post }
+        end
       end
     end
+  end
+
+  def self.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 self.parameters
+    params do
+      optional :screen, type: String
 
-    for action in flat_app._actions.sort.reverse
-      action_url = action.gsub '.', '/'
+      @@command.scan(/(?<=\$)[^\s()]+/).each do |param|
+        description = { type: String }
 
-      info_post flat_app, action, job: true
-      post "#{action_url}_job" do
-        action! route
+        if ! (default = `echo -n $#{param}`).blank?
+          description.merge! default: default
+        end
+
+        requires param.to_sym, description
       end
     end
-  }
+  end
+
+  def self.info_get flat_app, action, injection=nil, job: nil
+    info flat_app, action, injection, job, type: :get
+  end
+
+  def self.info_post flat_app, action, injection=nil, job: nil
+    info flat_app, action, injection, job, type: :post
+  end
 end

data/lib/pult/api.rb

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

data/lib/pult/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pult
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - dmitryck
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-08 00:00:00.000000000 Z
+date: 2019-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -147,7 +147,6 @@ files:
 - 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

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

@@ -1,83 +0,0 @@
-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