mushy 0.4.0 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fdb340186745a43f2930f3b0e60a6538076593f3cb8cf3464fba209ac90d409
-  data.tar.gz: cbe1b085e5844c4facabd43d5451f6f34b0fc21cba4909460028dd5bab007c5f
+  metadata.gz: 06d11ce2fc1a5da26f1272caf5b4b8a5bc7e8ff110b0169932778b9bdb7bb2bc
+  data.tar.gz: 96b68f95bff616ff46084d97630d0eab8d1496a99e902efae7fad965a16485dd
 SHA512:
-  metadata.gz: 85af2b856ca023cef5a65fba574b615683b9898c20aea0a87f3aa24c2061382ebfb14eb9a7aee40e6267c7cb34666c12f8c1c939f3a4207a8a7fc90c6114817b
-  data.tar.gz: 7f21edc8cd3e5f256dc038e16569a402f4d104a81060e08601b65afd325e7c71f2d22e5bdf39b895121034a8551025cbf7db9da62a6d4af1d2724d1ee706247f
+  metadata.gz: efc7c6b028efa5c75033b92ff9db8b422c6d81aae240a48178371b4208c1231ac63d8a2e437acfaccddb9e8a233c263b0284c85b16678036f99125f6ed757f6c
+  data.tar.gz: 5d19241ba64eddd10937f09aeb19d5c3d809d68e8ca100b7d94e64362e8a1a32fc0da56fabf7aeebd6f6303be5cce00db382333400f8e000c408535f63ad64f1

data/bin/mushy

@@ -10,7 +10,8 @@ class MushyCLI < Thor
 
   desc "start FILE", "Run this workflow file."
   def start
-    Mushy::Builder::Api.start file, values
+    v = values || {}
+    Mushy::Builder::Api.start file, v
   end
 
   desc "build FILE", 'Build a flow.'

data/lib/mushy/builder/api.rb

@@ -93,8 +93,17 @@ module Mushy
                          details[:config][:limit] = { type: 'integer', shrink: true, description: 'Limit the number of events to this number.', default: '' }
                          details[:config][:join] = { type: 'text', shrink: true, description: 'Join all of the events from this flux into one event, under this name.', default: '' }
                          details[:config][:sort] = { type: 'text', shrink: true, description: 'Sort by this key.', default: '' }
+                         details[:config][:ignore] = { type: 'text', shrink: true, description: 'Ignore these keys.', value: '', default: '' }
                          details[:config][:model] = { type: 'keyvalue', shrink: true, description: 'Reshape the outgoing events.', value: {}, default: {} }
 
+                         details[:config][:error_strategy] = {
+                           description: 'Error strategy. (return to return an event with "exception" returning the error, or ignore to ignore the exception)',
+                           type:        'select',
+                           options:     ['', 'return', 'ignore'],
+                           value:       '',
+                           shrink:      true,
+                         }
+
                          details[:config]
                                 .select { |_, v| v[:type] == 'keyvalue' }
                                 .select { |_, v| v[:editors].nil? }

data/lib/mushy/flux.rb

@@ -77,6 +77,10 @@ module Mushy
       
       returned_one_result ? results.first : results
 
+    rescue Exception => e
+      raise e if config[:error_strategy].to_s == ''
+      return [] if config[:error_strategy] == 'ignore'
+      { exception: e.message }
     end
 
     def standardize_these results
@@ -87,7 +91,7 @@ module Mushy
     end
 
     def shape_these results, event, config
-      supported_shaping = [:merge, :outgoing_split, :group, :model, :join, :sort, :limit]
+      supported_shaping = [:merge, :outgoing_split, :group, :model, :ignore, :join, :sort, :limit]
 
       shaping = supported_shaping
       if (config[:shaping])
@@ -132,6 +136,13 @@ module Mushy
       results.map { |x| masher.mash by, x }
     end
 
+    def ignore_these_results results, event, by
+      return results if by.to_s == ''
+      ignore_fields = by.split ','
+      results.each { |r| ignore_fields.each { |f| r.delete f } }
+      results
+    end
+
     def merge_these_results results, event, by
       keys_to_merge = convert_this_to_an_array by
       keys_to_merge = event.keys.map { |x| x.to_s } if (keys_to_merge[0] == '*')

data/lib/mushy/fluxs/bash.rb

@@ -15,6 +15,7 @@ module Mushy
           directory: {
                        description: 'The working directory in which the command will be run.',
                        type:        'text',
+                       shrink:      true,
                        value:       '',
                      },
         },

data/lib/mushy/fluxs/browser.rb

@@ -18,7 +18,7 @@ module Mushy
                       description: 'Run this browser headless.',
                       type:        'boolean',
                       shrink:      true,
-                      value:       'true',
+                      value:       '',
                     },
           timeout: {
                      description: 'The default timeout (in seconds) before closing the browser. Default is 5 seconds.',
@@ -90,7 +90,9 @@ module Mushy
 
       browser.headers.add get_the_headers_from(event, config)
 
+      the_start = Time.now
       browser.goto config[:url]
+      time = Time.now - the_start
 
       browser.execute(config[:execute]) if config[:execute]
 
@@ -102,6 +104,7 @@ module Mushy
         title: browser.frames[0].title,
         cookies: browser.cookies.all.map { |k, v| v.instance_variable_get('@attributes') },
         headers: browser.headers.get,
+        time: time,
         body: browser.body
       }
 

data/lib/mushy/fluxs/document.rb

@@ -0,0 +1,27 @@
+module Mushy
+  
+  class Document < Flux
+
+    def self.details
+      {
+        name: 'Document',
+        description: 'Create a multi-line document.',
+        config: {
+          document: {
+                      description: 'The multi-line document you wish to create.',
+                      type:        'textarea',
+                      value:       '',
+                    },
+        },
+      }
+    end
+
+    def process event, config
+      {
+        document: config[:document],
+      }
+    end
+
+  end
+
+end

data/lib/mushy/fluxs/ls.rb

@@ -14,31 +14,62 @@ module Mushy
                                    shrink:      true,
                                    value:       '',
                                  }
+        c[:config][:path] = {
+                                description: 'Path, used to search for specific files.',
+                                type:        'text',
+                                shrink:      true,
+                                value:       '',
+                              }
       end
     end
 
     def process event, config
+      arguments = build_the_arguments_from config
 
+      config[:command] = build_the_command_from arguments
+      result = super event, config
+
+      things = turn_the_ls_output_to_events result, config, event
+      things
+    end
+
+    def build_the_command_from arguments
+      "ls #{arguments.join(' ')}"
+    end
+
+    def build_the_arguments_from config
       arguments = ['-A', '-l', '--full-time', '-i']
       arguments << '-R' if config[:recursive].to_s == 'true'
-      config[:command] = "ls #{arguments.join(' ')}"
-
-      result = super event, config
+      arguments << '-d' if config[:directory_only].to_s == 'true'
+      arguments << "'#{config[:path]}'" if config[:path].to_s != ''
+      arguments
+    end
 
-      return result unless result[:success]
+    def turn_the_ls_output_to_events result, config, event
 
       lines = result[:text].split("\n")
-      lines.shift
+
+      needs_special_work_for_path = config[:directory_only].to_s != 'true' &&
+                                    config[:path].to_s != '' &&
+                                    lines[0] &&
+                                    lines[0].start_with?('total ')
 
       origin = config[:directory] || Dir.pwd
-      directory = origin
-      lines.map do |x|
+      directory = needs_special_work_for_path ? '||DIRECTORY||' : origin
+
+      things = lines.map do |x|
         segments = x.split ' '
         result = if segments.count > 5
                    pull_file segments, directory
                  elsif segments.count == 1
                    dir_segments = segments[0].split("\/")
-                   dir_segments[0] = origin if dir_segments[0] == '.'
+
+                   if dir_segments[0] == '.'
+                     dir_segments[0] = origin
+                   else
+                     dir_segments.unshift origin
+                   end
+
                    dir_segments[-1] = dir_segments[-1].sub ':', ''
                    directory = dir_segments.join("\/")
                    nil
@@ -47,6 +78,19 @@ module Mushy
                  end
       end.select { |x| x }
 
+      if needs_special_work_for_path
+        config[:directory_only] = true
+        special_name = process(event, config)[0][:name]
+        things.each do |x|
+          [:directory, :path].each do |key|
+            if x[key].include?('||DIRECTORY||')
+              x[key].sub!('||DIRECTORY||', File.join(Dir.pwd, special_name))
+            end
+          end
+        end
+      end
+
+      things
     end
 
     def pull_file segments, directory
@@ -63,7 +107,7 @@ module Mushy
         r[:date] = Time.parse r[:date]
       end
 
-      result[:name] = segments.shift
+      result[:name] = segments.join ' '
 
       result.tap do |r|
         help_segments = r[:help].split ''
@@ -76,10 +120,18 @@ module Mushy
 
       [:hard_links, :size].each { |x| result[x] = result[x].to_i }
 
-      result[:date_parts] = Mushy::DateParts.parse result[:date]
+      result[:date] = Mushy::DateParts.parse result[:date]
 
       result[:directory] = directory
-      result[:path] = File.join result[:directory], result[:name]
+
+      if result[:type] == 'd' && result[:directory] == result[:name]
+        result[:path] = result[:directory]
+        name_segments = result[:name].split "\/"
+        result[:name] = name_segments.pop
+        result[:directory] = name_segments.join "\/"
+      else
+        result[:path] = File.join result[:directory], result[:name]
+      end
 
       result
     end

data/lib/mushy/fluxs/pwd.rb

@@ -18,8 +18,10 @@ module Mushy
 
       return result unless result[:success]
 
+      pwd = result[:text].to_s.strip
+
       {
-        pwd: result[:text].to_s.strip
+        pwd: Mushy::Ls.new.process({}, { path: pwd, directory_only: true })[0]
       }
 
     end

data/lib/mushy/fluxs/screenshot.rb

@@ -7,11 +7,10 @@ module Mushy
       details['name'] = 'Screenshot'
       details['description'] = 'Take a screenshot of the browser.'
 
-      details[:config][:path] = {
-         description: 'The path of the file to save.',
-         type:        'text',
-         value:       'picture.jpg',
-      }
+      details[:config].merge!(Mushy::WriteFile.file_saving_config.tap do |x|
+        x[x.keys.first][:value] = 'file.jpg'
+      end)
+
       details[:config][:quality] = {
          description: 'The quality of the image, a value beteen 0-100. Only applies to jpg.',
          type:        'integer',
@@ -33,15 +32,19 @@ module Mushy
       the_result  = input[:result]
       the_config  = input[:config]
 
+      file = Mushy::WriteFile.get_file_from the_config
       options = {
-          path:    the_config[:path],
+          path:    file,
           full:    ['true', ''].include?(the_config[:full].to_s),
           quality: (the_config[:quality].to_s == '' ? '100' : the_config[:quality]).to_i
       }
 
       the_browser.screenshot options
 
-      options
+      the_result[:options] = options
+      the_result[:file] = Mushy::Ls.new.process({}, { path: file })[0]
+
+      the_result
 
     end
 

data/lib/mushy/fluxs/write_file.rb

@@ -6,34 +6,46 @@ module Mushy
       {
         name: 'WriteFile',
         description: 'Write a file.',
-        config: {
-          name: {
-                  description: 'The name of the file.',
-                  type:        'text',
-                  value:       'file.csv',
-                },
-          directory: {
-                  description: 'The directory in which to write the file. Leave blank for the current directory.',
-                  type:        'text',
-                  value:       '',
-                },
-          data: {
-                  description: 'The text to write. You can use Liquid templating here to pull data from the event, or write hardcoded data.',
-                  type:        'text',
-                  value:       '{{data}}',
-                },
-        },
+        config: file_saving_config.merge({
+                  data: {
+                          description: 'The text to write. You can use Liquid templating here to pull data from the event, or write hardcoded data.',
+                          type:        'text',
+                          value:       '{{data}}',
+                        },
+                }),
       }
     end
 
-    def process event, config
-      file = config[:name]
+    def self.file_saving_config
+      {
+        name: {
+                description: 'The name of the file.',
+                type:        'text',
+                value:       'file.csv',
+              },
+        directory: {
+                     description: 'The directory in which to write the file. Leave blank for the current directory.',
+                     shrink:      true,
+                     type:        'text',
+                     value:       '',
+                   },
+        }
+    end
 
+    def self.get_file_from config
+      file = config[:name]
       file = File.join(config[:directory], file) if config[:directory].to_s != ''
+      file
+    end
+
+    def process event, config
+      file = self.class.get_file_from config
 
       File.open(file, 'w') { |f| f.write config[:data] }
 
-      {}
+      {
+        file: Mushy::Ls.new.process({}, { path: file })[0]
+      }
     end
 
   end

data/mushy.gemspec

@@ -4,7 +4,7 @@ require 'mushy/version'
 
 Gem::Specification.new do |s|
   s.name           = 'mushy'
-  s.version        = '0.4.0'
+  s.version        = '0.5.3'
   s.date           = '2020-11-23'
   s.summary        = 'Process streams of work using common modules.'
   s.description    = 'This tool assists in the creation and processing of workflows.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mushy
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.3
 platform: ruby
 authors:
 - Darren Cauthon
@@ -173,6 +173,7 @@ files:
 - lib/mushy/fluxs/build_csv.rb
 - lib/mushy/fluxs/cli.rb
 - lib/mushy/fluxs/collection.rb
+- lib/mushy/fluxs/document.rb
 - lib/mushy/fluxs/environment.rb
 - lib/mushy/fluxs/filter.rb
 - lib/mushy/fluxs/format.rb