mushy 0.4.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78f078fac4fc19b1ee58323ce2ceaed770613dd8c71901a8a9a7f4ba03c5b413
-  data.tar.gz: f19bde198e025b8478400fd33bbd8471b688b33b6caac27ae1f78441441bd895
+  metadata.gz: dcfab01a12d0d1a59c024265891b2851943755a0cdb9468768dd71c3fbcc1c63
+  data.tar.gz: ed387d7e22cc0368e1d309326dd646cb284256b030ced1da44106a6dad3f1979
 SHA512:
-  metadata.gz: 6aff2c9d3d21517c385a5d1f5d0464ae37c77f281c32ef3a5f520cd667ad6354399f3be8e589dcd5883e4a8c0c60d321709373dd174dcd27813c77cb99c1958f
-  data.tar.gz: cc0c2218bc455af76721edf9f9358828a21a45635c31e4f5b6a049b03c98ba7f83ea2212567426fad6114042d29ccc0a02251ee502be69c16eeeca0763c9cb16
+  metadata.gz: d633be32aec24e036a0c8b6ffc185b743f95d78a9b986304dabaff72a642fdfe09a48ca86d3753b1e1dfb722347cccf33392fb651befbae28177e9dcc9889808
+  data.tar.gz: 0d54c907f8ec088f928fc0cd4ca88c72203e6080e0ccb5bc96b23b31dca329fa673b84168017effdc19a33dd8f5598100039675b34db20adfb7ee5c282cc7cd7

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

@@ -40,16 +40,25 @@ module Mushy
         pwd = Dir.pwd
 
         if service_fluxes.any?
-          calls = service_fluxes
+
+          things = service_fluxes
              .map { |s| { flux: s, proc: ->(e) do
                                                  Dir.chdir pwd
                                                  Mushy::Runner.new.start e, s, flow
-                                               end } }
+                                               end,
+                          run_method: (s.config[:run_strategy] == 'daemon' ? :run_this_as_a_daemon : :run_this_inline),
+                        }
+                  }.group_by { |x| x[:run_method] }
+
+          calls = (things[:run_this_as_a_daemon] || [])
              .map { |p| ->() { p[:flux].loop &p[:proc] } }
              .map { |x| ->() { loop &x } }
-             .map { |x| run_as_a_daemon &x }
+             .map { |x| run_this_as_a_daemon &x }
 
-          puts calls.inspect
+          (things[:run_this_inline] || [])
+             .map { |p| ->() { p[:flux].loop &p[:proc] } }
+             .map { |x| ->() { loop &x } }
+             .map { |x| run_this_inline &x }
 
           exit
         end
@@ -59,8 +68,11 @@ module Mushy
         Mushy::Runner.new.start event, cli_flux, flow
       end
 
-      def self.run_as_a_daemon &block
-        #block.call
+      def self.run_this_inline &block
+        block.call
+      end
+
+      def self.run_this_as_a_daemon &block
         Daemons.call(&block).pid.pid
       end
 
@@ -93,8 +105,27 @@ 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,
+                         }
+
+                         if flux.new.respond_to? :loop
+                           details[:config][:run_strategy] = {
+                             description: 'Run this using this strategy. (select "daemon" if this should be run in the background)',
+                             type:        'select',
+                             options:     ['', 'inline', 'daemon'],
+                             value:       '',
+                             shrink:      true,
+                           }
+                         end
+
                          details[:config]
                                 .select { |_, v| v[:type] == 'keyvalue' }
                                 .select { |_, v| v[:editors].nil? }
@@ -106,7 +137,7 @@ module Mushy
                                   end
 
                          details
-                 end
+                 end.sort_by { |x| x[:name] }
         }
       end
 

data/lib/mushy/date_parts.rb

@@ -22,6 +22,8 @@ module Mushy
         method = i[1] || i[0]
         t[i[0]] = now.send method
         t
+      end.tap do |hash|
+        hash[:seconds_ago] = Time.now - now
       end
     end
 

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

@@ -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/file_watch.rb

@@ -0,0 +1,46 @@
+require 'listen'
+
+module Mushy
+
+  class FileWatch < Flux
+
+    def self.details
+      {
+        name: 'FileWatch',
+        description: 'Watch for file changes.',
+        config: {
+          directory: {
+                       description: 'The directory to watch.',
+                       type:        'text',
+                       value:       '',
+                     },
+        },
+      }
+    end
+
+    def loop &block
+
+      directory = config[:directory].to_s != '' ? config[:directory] : Dir.pwd
+
+      listener = Listen.to(directory) do |modified, added, removed|
+        the_event = {
+                      modified: modified,
+                      added: added,
+                      removed: removed,
+                    }
+        block.call the_event
+      end
+
+      listener.start
+
+      sleep
+
+    end
+
+    def process event, config
+      event
+    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

@@ -32,7 +32,7 @@ module Mushy
       the_result  = input[:result]
       the_config  = input[:config]
 
-      file = Mushy::WriteFile.get_file_from config
+      file = Mushy::WriteFile.get_file_from the_config
       options = {
           path:    file,
           full:    ['true', ''].include?(the_config[:full].to_s),
@@ -41,7 +41,10 @@ module Mushy
 
       the_browser.screenshot options
 
-      options.merge the_result
+      the_result[:options] = options
+      the_result[:file] = Mushy::Ls.new.process({}, { path: file })[0]
+
+      the_result
 
     end
 

data/lib/mushy/fluxs/times.rb

@@ -0,0 +1,29 @@
+module Mushy
+
+  class Times < Flux
+
+    def self.details
+      {
+        name: 'Times',
+        description: 'Return the event passed to it, X times.',
+        config: {
+          times: {
+                   description: 'The number of times this event should be returned.',
+                   type:        'integer',
+                   value:       '1',
+                 },
+        }
+      }
+    end
+
+    def process event, config
+      config[:times]
+        .to_i
+        .times
+        .each_with_index
+        .map { |x, i| event.dup.tap { |e| e[:index] = i } }
+    end
+
+  end
+
+end

data/lib/mushy/fluxs/write_file.rb

@@ -43,7 +43,9 @@ module Mushy
 
       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.1'
+  s.version        = '0.6.0'
   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.'
@@ -26,4 +26,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'faraday'
   s.add_runtime_dependency 'pony'
   s.add_runtime_dependency 'daemons'
+  s.add_runtime_dependency 'listen'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mushy
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Darren Cauthon
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This tool assists in the creation and processing of workflows.
 email: darren@cauthon.com
 executables:
@@ -173,7 +187,9 @@ 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/file_watch.rb
 - lib/mushy/fluxs/filter.rb
 - lib/mushy/fluxs/format.rb
 - lib/mushy/fluxs/get.rb
@@ -188,6 +204,7 @@ files:
 - lib/mushy/fluxs/read_file.rb
 - lib/mushy/fluxs/screenshot.rb
 - lib/mushy/fluxs/smtp.rb
+- lib/mushy/fluxs/times.rb
 - lib/mushy/fluxs/write_file.rb
 - lib/mushy/masher.rb
 - lib/mushy/run.rb