mushy 0.19.0 → 0.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d783dd461abacb6686c2e131fc228d2640f1dda9836d1c49c1073f7e37054739
-  data.tar.gz: 950f0fd45cb88001fe62d3f1541374c2df5a1f3ff931b19d3a40f4a6fd187fb3
+  metadata.gz: 32b68312119c9602d68480b2c6e3538cce109b048ddeb165f97f14486fd4e9a2
+  data.tar.gz: 9302ac7cdd00849d004c8cb37350b71b92e8fced73622bebfc084070168408ef
 SHA512:
-  metadata.gz: 15b49ebac4c571ab8f2c34450516f0325b70a3e85e7bd909bdd800c29a74ee7377297fa5128f8d7b5458ec278768e92cafbd8af552321f372d26a9a743d8ebb1
-  data.tar.gz: 8041bbd1b4f89af13edc858be699bc3903e4bea680ac68b0b2f26a744adc0b7230572034ade0367851b7f5201e3c51ca9a48095d7afd9300f5185ce2f2c0bd3f
+  metadata.gz: 5a9e8d98c36b36420885b8316064c3310d8138cb27f2997e7bae897e9dd428eb6c039f108c72fb5def15266353e98626457482390aa0c4952b59318d31583f39
+  data.tar.gz: 4ada310e71abae1317ed7ba7421244503f0107e0c751f362ad35c61ac5d20d967b654c666661174ec81e232b40581014529cdb7855647ed5817fc5fef301f338

data/lib/mushy/fluxs/file_watch.rb

@@ -17,6 +17,12 @@ module Mushy
                        shrink:      true,
                        value:       '',
                      },
+          include_all_file_details: {
+                       description: 'If true, returns all details for the file. If false, just path & name are returned',
+                       type:        'boolean',
+                       shrink:      true,
+                       value:       '',
+                     }
         },
         examples: {
           "Files Added" => {
@@ -47,15 +53,14 @@ module Mushy
       }
     end
 
-    def loop &block
-
+    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,
+                      modified: modified.map { |f| get_the_details_for(f) },
+                      added: added.map { |f| get_the_details_for(f) },
+                      removed: removed.map { |f| get_the_details_for(f) }
                     }
         block.call the_event
       end
@@ -70,6 +75,19 @@ module Mushy
       event
     end
 
+    def get_the_details_for(file)
+      if config[:include_all_file_details].to_s == 'true'
+        Mushy::Ls.new.process({}, { path: file })[0]
+      else
+        segments = file.split("\/")
+        {
+          path: file,
+          name: segments.pop,
+          directory: segments.join("\/")
+        }
+      end
+    end
+
   end
 
 end

data/lib/mushy/fluxs/ls.rb

@@ -2,6 +2,24 @@ module Mushy
 
   class Ls < Bash
 
+    def self.the_ls_command
+      @the_ls_command ||= find_the_right_ls_command_to_use
+    end
+
+    def self.find_the_right_ls_command_to_use
+      commands = [
+        'ls', # the normal method used to pull file information
+        'gls' # BSD users don't get the version of ls this needs,
+              # so we might need to use gls after the user runs (brew install coreutils)
+      ]
+
+      the_command_to_use = nil
+      while the_command_to_use.nil? && (command = commands.shift) # keep trying till we find one that works
+        the_command_to_use = command if Mushy::Bash.new.process({}, { command: "#{command} --full-time" })[:success]
+      end
+      the_command_to_use || -1
+    end
+
     def self.details
       {
         name: 'Ls',
@@ -134,6 +152,8 @@ module Mushy
     end
 
     def process event, config
+      raise 'ls is not available' if self.class.the_ls_command == -1
+
       arguments = build_the_arguments_from config
 
       config[:command] = build_the_command_from arguments
@@ -144,7 +164,8 @@ module Mushy
     end
 
     def build_the_command_from arguments
-      "ls #{arguments.join(' ')}"
+      command = self.class.the_ls_command
+      "#{command} #{arguments.join(' ')}"
     end
 
     def build_the_arguments_from config
@@ -232,6 +253,10 @@ module Mushy
 
       result[:date] = Mushy::DateParts.parse result[:date]
 
+      if File.exist?(result[:name]) && result[:name].start_with?(directory)
+        result[:name] = result[:name].split("\/")[-1]
+      end
+
       result[:directory] = directory
 
       if result[:type] == 'd' && result[:directory] == result[:name]

data/lib/mushy/fluxs/regex_matches.rb

@@ -0,0 +1,64 @@
+module Mushy
+  class RegexMatches < Flux
+    def self.details
+      {
+        name: 'RegexMatches',
+        title: 'Find regex matches',
+        description: 'Use a regex to search content.',
+        fluxGroup: { name: 'Regex' },
+        config: {
+          regex: { description: 'The regular expression to use.',
+                   type: 'text',
+                   value: '(\w+)' },
+          value: { description: 'The value against which to use the regular expression.',
+                   type: 'text',
+                   value: '{{value}}' }
+        },
+        examples: {
+          'Simple Example' => {
+                                description: 'The simplest regex.',
+                                input: { text: 'apple orange' },
+                                config: {
+                                  regex: '(\w+)',
+                                  value: 'apple orange'
+                                },
+                                result: [ { match1: 'apple' }, { match2: 'orange' } ]
+                              },
+          'Named Parameters' => {
+                         description: 'Named Parameters.',
+                         input: {
+                                  text: 'apple 1 orange 2'
+                                },
+                         config: {
+                                   regex: '(?&lt;name&gt;\w+) (?&lt;count&gt;\d+)',
+                                   value: '{{text}}'
+                                 },
+                         result: [ { name: 'apple', count: '1' }, { name: 'orange', count: '2' } ]
+                       },
+                  }
+    }
+    end
+
+    def process(_, config)
+      return [] unless config[:value]
+      return [] if (config[:regex] || '').strip == ''
+
+      keys = config[:regex].scan(/\?<(\w+)>/).flatten
+
+      regex = Regexp.new config[:regex]
+
+      config[:value].scan(regex).map do |match|
+        convert_the_match_to_a_hash match, keys
+      end
+    end
+
+    def convert_the_match_to_a_hash(match, keys)
+      {}.tap do |hash|
+        match.each_with_index do |item, index|
+          key = (keys[index] || "match#{index + 1}").to_sym
+          hash[key] = item
+        end
+      end
+    end
+  end
+end

data/mushy.gemspec

@@ -4,7 +4,7 @@ require 'mushy/version'
 
 Gem::Specification.new do |s|
   s.name           = 'mushy'
-  s.version        = '0.19.0'
+  s.version        = '0.21.1'
   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.19.0
+  version: 0.21.1
 platform: ruby
 authors:
 - Darren Cauthon
@@ -172,7 +172,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/mushy
-- hey.mushy
 - lib/mushy.rb
 - lib/mushy/builder/api.rb
 - lib/mushy/builder/axios.rb
@@ -206,6 +205,7 @@ files:
 - lib/mushy/fluxs/read_csv.rb
 - lib/mushy/fluxs/read_file.rb
 - lib/mushy/fluxs/read_json.rb
+- lib/mushy/fluxs/regex_matches.rb
 - lib/mushy/fluxs/screenshot.rb
 - lib/mushy/fluxs/sense_hat_environmental_sensors.rb
 - lib/mushy/fluxs/sense_hat_led_matrix.rb

data/hey.mushy

@@ -1,29 +0,0 @@
-{
-  "fluxs": [
-    {
-      "id": "0294b0c4-296f-44cd-9891-95fe75ebe4d2",
-      "name": "Start it up",
-      "flux": "Cli",
-      "parents": [
-
-      ],
-      "config": {
-        "model": {
-        }
-      }
-    },
-    {
-      "id": "7779dce1-1ce8-4241-8e94-ddcd5cb4f8df",
-      "name": "Output something",
-      "flux": "Stdout",
-      "parents": [
-        "0294b0c4-296f-44cd-9891-95fe75ebe4d2"
-      ],
-      "config": {
-        "message": "Hello.",
-        "model": {
-        }
-      }
-    }
-  ]
-}