mushy 0.20.0 → 0.21.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbf8fb6716e69283789cab01d8ac6cce819ecb4767f58f419cf789b4df9288d5
-  data.tar.gz: fa02702e5af205ad6cf2ab0a233679532123f619684cfc301ff20fc28612039a
+  metadata.gz: b74a763b3548295aa4227af27f34e3472f057e9091896ecf0afa45a2e0452dfd
+  data.tar.gz: f5a7f830dea50073856eb0ff645f0904e27f04b546fb6ace2b5f6219d94e31c1
 SHA512:
-  metadata.gz: ba22ee6901921c836b9ea8788b517ef149358530670899ab25b4d322d0676570a647eb30e5d18621d05241423bc32b0689ce8dd9cb60bf040ab59ad11cdc3db8
-  data.tar.gz: 05ff96e01b3763fb528357b3fc413c5a847ab08601350841c024b55b4052b1de81a363077fb2f3728ce5fb607e70076002934587b2c1fcea9fd6ca63614e038c
+  metadata.gz: 13a60bf45d09d7d768dab814966301d09ff7156b9c77261af1ec6f27d5e4fb11840f091034be5cd8df2e89e7ef3024503c29640269183e522e75bc8bc1261e5a
+  data.tar.gz: 4fdf85336bcf80cfaf147f2f4e92f1e4a6956ffb9a014b89b04f57faa523c00ec9c7803909b47c10324490d70472b87bcbc063fb0877d6e8d80b333828967d24

data/lib/mushy/fluxs/file_watch.rb

@@ -17,13 +17,19 @@ 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" => {
                              description: 'When a file is added, this type of result will be returned.',
                              result: {
                                        modified: [],
-                                       added: ["/home/pi/Desktop/mushy/bin/hey.txt"],
+                                       added: [ { path: '/home/pi/Desktop/mushy/bin/hey.txt', directory: '/home/pi/Desktop/mushy/bin', name: 'hey.txt' } ],
                                        removed:[]
                                      }
                            },
@@ -32,13 +38,13 @@ module Mushy
                                result: {
                                          modified: [],
                                          added: [],
-                                         removed:["/home/pi/Desktop/mushy/mushy-0.15.3.gem"]
+                                         removed:[{ path: '/home/pi/Desktop/mushy/mushy-0.15.3.gem', directory: '/home/pi/Desktop/mushy', name: 'mushy-0.15.3.gem'} ]
                                        }
                              },
           "Files Modified" => {
                                 description: 'When a file is modified, this type of result will be returned.',
                                 result: {
-                                          modified: ["/home/pi/Desktop/mushy/lib/mushy/fluxs/environment.rb"],
+                                          modified: [ { path: '/home/pi/Desktop/mushy/lib/mushy/fluxs/environment.rb', directory: '/home/pi/Desktop/mushy/lib/mushy/fluxs/environment.rb', name: 'environment.rb' } ],
                                           added: [],
                                           removed:[]
                                         }
@@ -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/mushy.gemspec

@@ -4,7 +4,7 @@ require 'mushy/version'
 
 Gem::Specification.new do |s|
   s.name           = 'mushy'
-  s.version        = '0.20.0'
+  s.version        = '0.21.2'
   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.20.0
+  version: 0.21.2
 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

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": {
-        }
-      }
-    }
-  ]
-}