mdfiller 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7747e80108116cd3b79ce41f6e9f2bd35aa870029d39a1e9a0714be58d95f33
-  data.tar.gz: 4d58a8bf1c29935623873692ff2d981d1091554a9d11d57ee45d8889ac30d2ec
+  metadata.gz: 829fac8da21f190e3b781b09afc6c11c0490b465fd3f1002e36163c0a6e43e6b
+  data.tar.gz: 076afda04c3107d70a7d9481cdf2a2ce7ce41c330d8dc02741217072f5352b42
 SHA512:
-  metadata.gz: d01702b08d4eaec1b6af3aa8b171cd85bef49b7ac6b505224f86bebf7085e55da1f052ad89b9837b99278fb4ef406863db7f2faced32bdd6660515f8dfc5754a
-  data.tar.gz: eac0a9ef52389910cf6c13d88678dc3a4cc5baeb51755bcc45696257215391e6af04b2e4a1c588570ce2f026a55a1254c7346e74180ecfac92c5add484387caf
+  metadata.gz: 6e442c66588c268590759eaa73c0928254d4e4768b981e4680f8b0d06fd2e91ca6530e52709fc27b9b0e58f5b78840237f3ab1a1eada781f3749f6de9c775de9
+  data.tar.gz: ee16e5723cdc6d7b05ec84cfd43d684d0135110d41b5c8e5d3034d5a7bb0e8eda336280d34ef0036ee71992f680d6a6fb8adec35dc1e151bd0c6f3a7b75723b1

data/exe/mdf

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-version = '1.0.0'
+version = '1.0.2'
 ourlib = File.join(ENV['HOME'], '.rvm', 'gems', 'ruby-3.4.0-preview1@mdfiller', 'gems', "mdfiller-#{version}", 'lib')
 $:<< ourlib
 require "mdfiller"

data/lib/mdfiller/fill.rb

@@ -18,19 +18,30 @@ module Mdfiller
         return copy_files
       end
 
+      def empty?
+        return self.files.empty?
+      end
+
     protected
 
       def copy_files
 	      result = ''
 	      self.files.each do
 	        |fname|
-          result += "\n[#{fname}](#{self.dir}/#{fname})\n"
-          result += "```#{self.soft}\n"
-          File.open(File.join(self.dir, fname), 'r') { |fh| result += fh.readlines.join }
-          result += "```\n\n"
+          result += copy_file(fname)
 	      end
 	      return result
       end
+
+      def copy_file(fname)
+	      result = ''
+        result += "\n[#{fname}](#{self.dir}/#{fname})\n"
+        result += "```#{self.soft}\n"
+        File.open(File.join(self.dir, fname), 'r') { |fh| result += fh.readlines.join }
+        result += "```\n\n"
+        return result
+      end
+
   end
 
   class OrcAndScoFill < Base
@@ -60,18 +71,30 @@ module Mdfiller
      result = ''
      self.files.each do
        |fname|
-       pngname = File.basename("#{fname}", ".py") + '.png'
-       result += "\n[#{fname}](#{self.dir}/#{fname})\n```#{self.soft}\n"
-       File.open(File.join(self.dir, fname), 'r') { |fh| result += fh.readlines.join }
-       IO.popen("(cat #{self.dir}/#{fname} | sed -e '/^plt.show()$/d'; echo \"plt.savefig('#{self.dir}/#{pngname}')\") | python3") do
-         |ioh|
-         result += ioh.readlines.join
+       if has_plots?(fname)
+	       pngname = File.basename("#{fname}", ".py") + '.png'
+	       result += "\n[#{fname}](#{self.dir}/#{fname})\n```#{self.soft}\n"
+	       File.open(File.join(self.dir, fname), 'r') { |fh| result += fh.readlines.join }
+	       IO.popen("(cat #{self.dir}/#{fname} | sed -e '/^plt.show()$/d'; echo \"plt.savefig('#{self.dir}/#{pngname}')\") | python3") do
+	         |ioh|
+	         result += ioh.readlines.join
+	       end
+	       result += "```\n\nPlot prodotto:\n\n![#{pngname}](#{self.dir}/#{pngname})\n\n"
+       else
+         result += copy_file(fname)
        end
-       result += "```\n\nPlot prodotto:\n\n![#{pngname}](#{self.dir}/#{pngname})\n\n"
      end
      return result
     end
 
+    def has_plots?(fname)
+      result = false
+      lines = nil
+      File.open(File.join(self.dir, fname), 'r') { |fh| lines = fh.readlines }
+      result = true if !lines.grep(/plt\.show()/).empty?
+      return result
+    end
+
   end
 
   class PngFill < Base
@@ -108,7 +131,7 @@ module Mdfiller
        sleep(1)
        windows_to_shoot = get_windows_to_shoot
        shots = shoot_windows(windows_to_shoot, fname)
-       shots.each { |s| result += "\n![#{s}](#{self.dir}/#{s})\n" }
+       shots.each { |s| result += "\n[#{self.dir}/#{fname}](#{self.dir}/#{fname})\n\n![[#{s}](#{self.dir}/#{fname})](#{self.dir}/#{s})\n" }
        kill_process(pid)
      end
      return result
@@ -130,7 +153,7 @@ module Mdfiller
 
     def get_windows_to_shoot
        result = {}
-       IO.popen("wmctrl -lx | egrep -e '(Gem|.*\.pd )'") do
+       IO.popen("wmctrl -lx | egrep -e '(Gem$|.*\.pd )'") do
          |ioh|
          lines = ioh.readlines
          lines.each do

data/lib/mdfiller/filler.rb

@@ -17,13 +17,17 @@ module Mdfiller
 
     def generate
       result = header
-      result += "\n### Lavagne\n\n"
-      result += self.pngs.fill
-      result += "\n### Codice\n\n"
-      result += self.orcs_and_scos.fill
-      result += self.csds.fill
-      result += self.pys.fill
-      result += self.pds.fill
+      if !self.pngs.empty?
+        result += "\n### Lavagne\n\n"
+        result += self.pngs.fill
+      end
+      if self.has_code?
+	      result += "\n### Codice\n\n"
+	      result += self.orcs_and_scos.fill
+	      result += self.csds.fill
+	      result += self.pys.fill
+	      result += self.pds.fill
+      end
       return result
     end
 
@@ -62,6 +66,15 @@ module Mdfiller
       return Dir.glob(File.join("#{self.dir}", "*#{sfx}")).map { |f| File.basename(f) }
     end
 
+    def has_code?
+      result = false
+      [ self.orcs_and_scos, self.csds, self.pys, self.pds ].each do
+        |code|
+        result |= true unless code.empty?
+      end
+      return result
+    end
+
   end
 
 end

data/lib/mdfiller/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mdfiller
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mdfiller
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Nicola Bernardini
 bindir: exe
 cert_chain: []
-date: 2024-11-13 00:00:00.000000000 Z
+date: 2024-11-21 00:00:00.000000000 Z
 dependencies: []
 description: mdfiller fills the README.md of each lesson with all its details
 email: