mushy 0.5.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8d94c18f18225b3d7b04d1c78731a2d1211e444f8685a4c812368b8025b4357
-  data.tar.gz: 9df6cbd619217e2d24e8495ad104f49ddb5fc0e68d22ce5098f9a5e39067f85c
+  metadata.gz: 3310d89eada814ea6146a796ad78267d592b81b2cf7bdc002e765dfb9eb35e20
+  data.tar.gz: 7e2aa3b6a63d8e0f4d9c7291e1c1eecb7103374fa87302c5c4ad4ff1498f05a0
 SHA512:
-  metadata.gz: 77474ee6b3b8ef571cd3283896c2c9a30bb2b245cc07ad357f2128ab82d5eec3092ae4eb374111b0baffa061b14257ad6daacd9adadf7fb00185c94c032b7bf3
-  data.tar.gz: 1a5019513bd3223d4106938518026e1790764bf927e14a776b4d9c42889e1b1e380973efe61fb93e81d25db200ba53bffc51dacb8f571c711e646e7b80edf078
+  metadata.gz: ff438b38489fc1d26111448873640973e25a9ffb02b4e498bff78919eb4d21bf3a954729c2296f673df218b324c07cc9d9635a0d24081f9b0bef1aa12cd04895
+  data.tar.gz: c5d9e71047c5bbced7129b429144ff9b5b110083e84c5efe8681920b6c0d20948f1445162708e2ba658b9d86ac8a2abb1734a4cd73b4a08e2ec5bd65212f4832

data/lib/mushy/builder/api.rb

@@ -23,15 +23,15 @@ module Mushy
 
       def self.save file, data
 
-        file = "#{file}.json" unless file.downcase.end_with?('.json')
+        file = "#{file}.mushy" unless file.downcase.end_with?('.mushy')
 
         data = SymbolizedHash.new JSON.parse(data)
-        Mushy::WriteFile.new.process( {}, { name: file, data: data.to_json })
+        Mushy::WriteFile.new.process( {}, { name: file, data: JSON.pretty_generate(data) })
 
       end
 
       def self.start file, event
-        file = "#{file}.json" unless file.downcase.end_with?('.json')
+        file = "#{file}.mushy" unless file.downcase.end_with?('.mushy')
         flow = File.open(file).read
         flow = Mushy::Flow.parse flow
 
@@ -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,14 +68,17 @@ 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
 
       def self.get_flow file
         puts "trying to get: #{file}"
-        file = "#{file}.json" unless file.downcase.end_with?('.json')
+        file = "#{file}.mushy" unless file.downcase.end_with?('.mushy')
         data = JSON.parse File.open(file).read
         data['fluxs']
           .reject { |x| x['parents'] }
@@ -93,6 +105,7 @@ 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] = {
@@ -103,6 +116,16 @@ module Mushy
                            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? }
@@ -114,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/flow.rb

@@ -17,6 +17,12 @@ module Mushy
         .flatten
     end
 
+    def adjust_data data
+      fluxs
+        .select { |x| x.respond_to? :adjust_data }
+        .reduce(data) { |t, i| i.adjust_data t }
+    end
+
     def self.build_flux record
       type = record[:type] || record['type'] || record[:flux] || record['flux'] || 'Flux'
       flux = Object.const_get("Mushy::#{type}").new

data/lib/mushy/flux.rb

@@ -39,20 +39,18 @@ module Mushy
 
       incoming_event = SymbolizedHash.new(incoming_event) if incoming_event.is_a?(Hash)
 
-      event = incoming_event
-
-      incoming_split = masher.mash(config, event)[:incoming_split]
+      incoming_split = masher.mash(config, incoming_event)[:incoming_split]
       config_considering_an_imcoming_split = config
                                                .reject { |x, _| incoming_split && x.to_s == 'join' }
                                                .reduce({}) { |t, i| t[i[0]] = i[1]; t }
 
-      events = incoming_split ? incoming_event[incoming_split] : [event]
+      events = incoming_split ? incoming_event[incoming_split] : [incoming_event]
 
       results = events.map { |e| execute_single_event e, config_considering_an_imcoming_split }
 
       return results.first unless incoming_split
 
-      results = join_these_results([results].flatten, event, config[:join]) if config[:join]
+      results = join_these_results([results].flatten, incoming_event, config[:join]) if config[:join]
 
       results.flatten
     end
@@ -91,7 +89,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])
@@ -136,6 +134,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/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/global_variables.rb

@@ -0,0 +1,39 @@
+module Mushy
+  
+  class GlobalVariables < Flux
+
+    attr_accessor :state
+
+    def self.details
+      {
+        name: 'GlobalVariables',
+        description: 'Add global variables.',
+        config: {
+          values: {
+                    description: 'Provide key/value pairs that will be set as global variables.',
+                    label:       'Variables',
+                    type:        'keyvalue',
+                    value:       {},
+                  },
+        },
+      }
+    end
+
+    def initialize
+      super
+      self.state = SymbolizedHash.new
+    end
+
+    def adjust_data data
+      state.merge data
+    end
+
+    def process event, config
+      values = config[:values] || SymbolizedHash.new
+      state.merge! values
+      event
+    end
+
+  end
+
+end

data/lib/mushy/fluxs/ls.rb

@@ -41,7 +41,7 @@ module Mushy
       arguments = ['-A', '-l', '--full-time', '-i']
       arguments << '-R' if config[:recursive].to_s == 'true'
       arguments << '-d' if config[:directory_only].to_s == 'true'
-      arguments << config[:path] if config[:path].to_s != ''
+      arguments << "'#{config[:path]}'" if config[:path].to_s != ''
       arguments
     end
 
@@ -107,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 ''

data/lib/mushy/fluxs/pdf.rb

@@ -4,8 +4,8 @@ module Mushy
 
     def self.details
       details = Browser.details
-      details['name'] = 'Pdf'
-      details['description'] = 'Turn a URL into a PDF.'
+      details[:name] = 'Pdf'
+      details[:description] = 'Turn a URL into a PDF.'
 
       details[:config][:path] = {
          description: 'The path of the PDF file to save.',
@@ -37,7 +37,10 @@ module Mushy
 
       the_browser.pdf options
 
-      options
+      {
+        options: options,
+        file: Mushy::Ls.new.process({}, { path: options[:path] })[0]
+      }
 
     end
 

data/lib/mushy/fluxs/smtp.rb

@@ -1,8 +1,50 @@
 require 'pony'
 
 module Mushy
+
+  class EmailBase < Flux
+
+    def process event, config
+      options = adjust(cleanup({
+          from: config[:from],
+          to: config[:to],
+          subject: config[:subject],
+          body: config[:body],
+          html_body: config[:html_body],
+          via_options: get_via_options_from(config)
+      }))
+
+      if (config[:attachment_file].to_s != '')
+        options[:attachments] = { config[:attachment_file].split("\/")[-1] => File.read(config[:attachment_file]) }
+      end
+
+      result = Pony.mail options
+      options.tap { |x| x.delete(:via_options) }
+    end
+
+    def adjust options
+    end
+
+    def cleanup options
+      options.tap do |hash|
+        hash.delete_if { |_, v| v.to_s == '' }
+      end
+    end
+
+    def get_via_options_from config
+      {
+        address:              config[:address],
+        port:                 config[:port].to_s,
+        user_name:            config[:username],
+        password:             config[:password],
+        domain:               config[:domain],
+        authentication:       :plain,
+        enable_starttls_auto: true,
+      }
+    end
+  end
   
-  class Smtp < Flux
+  class Smtp < EmailBase
 
     def self.details
       {
@@ -70,46 +112,10 @@ module Mushy
       }
     end
 
-    def process event, config
-      options = adjust(cleanup({
-          from: config[:from],
-          to: config[:to],
-          subject: config[:subject],
-          body: config[:body],
-          html_body: config[:html_body],
-          via_options: get_via_options_from(config)
-      }))
-
-      if (config[:attachment_file].to_s != '')
-        options[:attachments] = { config[:attachment_file].split("\/")[-1] => File.read(config[:attachment_file]) }
-      end
-
-      result = Pony.mail options
-      options.tap { |x| x.delete(:via_options) }
-    end
-
     def adjust options
       options.tap { |x| x[:via] = 'smtp' }
     end
 
-    def cleanup options
-      options.tap do |hash|
-        hash.delete_if { |_, v| v.to_s == '' }
-      end
-    end
-
-    def get_via_options_from config
-      {
-        address:              config[:address],
-        port:                 config[:port].to_s,
-        user_name:            config[:username],
-        password:             config[:password],
-        domain:               config[:domain],
-        authentication:       :plain,
-        enable_starttls_auto: true,
-      }
-    end
-
   end
 
 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/masher.rb

@@ -45,7 +45,15 @@ module Mushy
       segments = key.split '.'
 
       segments.each do |segment|
-        data = data.is_a?(Hash) ? (data[segment] || data[segment.to_sym]) : (data ? data.send(segment.to_sym) : nil)
+        if segment.include?('[') && segment.include?(']')
+          the_splits = segment.split('[')
+          segment = the_splits[0]
+          index = the_splits[1].sub(']', '')
+          data = data.is_a?(Hash) ? (data[segment] || data[segment.to_sym]) : (data ? data.send(segment.to_sym) : nil)
+          data = data[index.to_i]
+        else
+          data = data.is_a?(Hash) ? (data[segment] || data[segment.to_sym]) : (data ? data.send(segment.to_sym) : nil)
+        end
       end
 
       data

data/lib/mushy/runner.rb

@@ -12,7 +12,7 @@ module Mushy
       run = find_run flux, flow
       starting_event = build_event event_data, flow.id, run.id, flux.id
 
-      events = run_event_with_flux starting_event, flux
+      events = run_event_with_flux starting_event, flux, flow
 
       while events.any?
         events = events.map { |e| runner.run_event_in_flow e, flow }.flatten
@@ -23,12 +23,14 @@ module Mushy
 
     def run_event_in_flow event, flow
       flow.fluxs_for(event)
-        .map { |s| runner.run_event_with_flux event, s }
+        .map { |s| runner.run_event_with_flux event, s, flow }
         .flatten
     end
 
-    def run_event_with_flux event, flux
-      [flux.execute(event.data)]
+    def run_event_with_flux event, flux, flow
+      data = event.data
+      data = flow.adjust_data data
+      [flux.execute(data)]
         .flatten
         .reject { |x| x.nil? }
         .map { |x| x.is_a?(Hash) ? build_event(x, event.flow_id, event.run_id, flux.id) : x }

data/lib/site.rb

@@ -2,7 +2,7 @@ require 'sinatra'
 
 require_relative 'mushy'
 
-the_file = 'hey.json'
+the_file = 'hey.mushy'
 
 get '/' do
   Mushy::Builder::Index.file

data/mushy.gemspec

@@ -4,7 +4,7 @@ require 'mushy/version'
 
 Gem::Specification.new do |s|
   s.name           = 'mushy'
-  s.version        = '0.5.2'
+  s.version        = '0.9.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.'
@@ -16,14 +16,15 @@ Gem::Specification.new do |s|
   s.homepage       = 'https://cauthon.com'
   s.license        = 'MIT'
 
-  s.add_development_dependency 'minitest'
-  s.add_runtime_dependency 'sinatra'
-  s.add_runtime_dependency 'symbolized'
-  s.add_runtime_dependency 'thor'
-  s.add_runtime_dependency 'liquid'
-  s.add_runtime_dependency 'ferrum'
-  s.add_runtime_dependency 'nokogiri'
-  s.add_runtime_dependency 'faraday'
-  s.add_runtime_dependency 'pony'
-  s.add_runtime_dependency 'daemons'
+  s.add_development_dependency 'minitest', '~> 5'
+  s.add_runtime_dependency 'sinatra', '~> 2.1'
+  s.add_runtime_dependency 'symbolized', '~> 0.0.1'
+  s.add_runtime_dependency 'thor', '~> 1.1'
+  s.add_runtime_dependency 'liquid', '~> 5'
+  s.add_runtime_dependency 'ferrum','~> 0.11'
+  s.add_runtime_dependency 'nokogiri', '~> 1'
+  s.add_runtime_dependency 'faraday', '~> 1'
+  s.add_runtime_dependency 'pony', '~> 1.13'
+  s.add_runtime_dependency 'daemons', '~> 1'
+  s.add_runtime_dependency 'listen', '~> 3.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mushy
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Darren Cauthon
@@ -14,142 +14,156 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: symbolized
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: ferrum
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: pony
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
 description: This tool assists in the creation and processing of workflows.
 email: darren@cauthon.com
 executables:
@@ -175,10 +189,12 @@ files:
 - 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
 - lib/mushy/fluxs/git_log.rb
+- lib/mushy/fluxs/global_variables.rb
 - lib/mushy/fluxs/interval.rb
 - lib/mushy/fluxs/ls.rb
 - lib/mushy/fluxs/parse_html.rb
@@ -189,6 +205,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