LilyPond-Ruby 0.1.5 → 0.1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 162f200f9fd9c6999e2ac87636abde7d74208c865ac7e255b97742b2c8e52ba7
-  data.tar.gz: 7b497c14668f852ada9ffcc2c0a7d359892412b6aa9dd25ca0a3b84f46cbb2b2
+  metadata.gz: 4d54f5369710cc4da48b7114204e186b85edeff67dd1cd8eda50066ff4495b2a
+  data.tar.gz: b3ff051ea699b01fb52c803c7d61159566d0484bb80b29d23f94ac2465f1a8f5
 SHA512:
-  metadata.gz: a563f3505c5f6143583d14a6a5e2a0947f8387235fe1830cb8500deb25463ae0323c10f2dc70411f724355dec4d264bb91ecf1c651f4be5265ca7d11e3f843a2
-  data.tar.gz: 5099230b556aaa98697e9e4619ef97185880942f37dd1962755a4a7224dd0bbc2d763837c415b3ee1fc0031bd884f2ef165d17ad2009a1c7e50d6040c764297c
+  metadata.gz: 4ffb4a7ab0157de96b1a22b5d44cc20288d3a4c874fee6c20784e5187a7437b2a9533e5f6c23ba423ba0ae0abff61054a8193d4fc70c02e635ed09e8c1174dd5
+  data.tar.gz: 1068a3ec0dea29a3a3e874d8f7e7b89c5d963d44224bddea5d4fc51d4cfce63984c3459f4d18db284a738bdf4f6cf271ba5ab495d70a4a45b022e944f00a3cdc

data/lib/lilypond/builder.rb

@@ -1,7 +1,7 @@
 require_relative "../lilypond-ruby.rb"
 
-# The LilyPond class provides an interface for generating LilyPond notation.
-class LilyPond
+# The LilyPond module provides an interface for generating LilyPond notation.
+module LilyPond
   # The Builder class is responsible for building LilyPond notation.
   class Builder
     # Creates a new LilyPond Builder object.

data/lib/lilypond/config.rb

@@ -0,0 +1,23 @@
+require_relative "../lilypond-ruby.rb"
+
+module LilyPond
+  class << self
+    attr_accessor :configuration
+  end
+
+  def self.configuration
+    @configuration ||= Configuration.new
+    yield(@configuration) if block_given?
+    @configuration
+  end
+
+  class Configuration
+    attr_accessor :default_output, :destination_directory, :lilypond_path
+
+    def initialize
+      @default_output = :pdf
+      @destination_directory = "."
+      @lilypond_path = File.expand_path("../../../lilypond-2.24.1/bin/lilypond", __FILE__)
+    end
+  end
+end

data/lib/lilypond-ruby.rb

@@ -1,13 +1,12 @@
 require "open3"
 require "lilypond/builder"
+require "lilypond/config"
 require "guile"
 
-class LilyPond
-  LILYPOND_PATH = File.expand_path("../../lilypond-2.24.1/bin/lilypond", __FILE__)
+module LilyPond
   class << self
-
     def version
-      output, error, status = Open3.capture3(LILYPOND_PATH, "--version")
+      output, error, status = Open3.capture3(path, "--version")
       if status.success?
         puts output
       else
@@ -16,7 +15,7 @@ class LilyPond
     end
 
     def version_number
-      output, error, status = Open3.capture3(LILYPOND_PATH, "--version")
+      output, error, status = Open3.capture3(path, "--version")
       if status.success?
         return output.match(/GNU LilyPond (\d+\.\d+\.\d+)/)[1]
       else
@@ -24,40 +23,58 @@ class LilyPond
       end
     end
 
-    def generate_pdf_with_lilypond(file_name, lilypond_code)
+    # Approved output types: `[:pdf, :svg, :png]` If none is provided, it defaults to
+    # LilyPond.configuration.default_output, which initializes as `:pdf`
+    def generate_with_lilypond(file_name, lilypond_code, output_type = nil)
       tempfile = Tempfile.new(file_name)
       tempfile.write(lilypond_code)
       tempfile.close
-      Open3.popen3(LILYPOND_PATH, "--pdf", tempfile.path) do |stdin, stdout, stderr, wait_thr|
-        # Write the Lilypond code to stdin
-        stdin.write(lilypond_code)
-        stdin.close
-
-        # Wait for the process to complete
-        Process.detach(wait_thr.pid)
-
-        # Read and process the output and error streams
-        loop do
-          # Wait for output to become available for reading
-          ready = IO.select([stdout, stderr])
-          next unless ready
-
-          # Read available data from the streams
-          ready[0].each do |stream|
-            data = stream.read_nonblock(1024)
-            puts data # or process the data as necessary
+      output_type ||= default_output
+      Dir.chdir(destination) do
+        Open3.popen3(path, "--#{output_type}", tempfile.path) do |stdin, stdout, stderr, wait_thr|
+          # Write the Lilypond code to stdin
+          stdin.write(lilypond_code)
+          stdin.close
+
+          # Wait for the process to complete
+          Process.detach(wait_thr.pid)
+
+          # Read and process the output and error streams
+          loop do
+            # Wait for output to become available for reading
+            ready = IO.select([stdout, stderr])
+            next unless ready
+
+            # Read available data from the streams
+            ready[0].each do |stream|
+              data = stream.read_nonblock(1024)
+              puts data # or process the data as necessary
+            end
+          rescue IO::WaitReadable, IO::WaitWritable
+            # Continue waiting if the streams are not yet ready
+            IO.select([stdout, stderr])
+            retry
+          rescue EOFError
+            # Stop waiting if the streams have been closed
+            break
           end
-        rescue IO::WaitReadable, IO::WaitWritable
-          # Continue waiting if the streams are not yet ready
-          IO.select([stdout, stderr])
-          retry
-        rescue EOFError
-          # Stop waiting if the streams have been closed
-          break
         end
       end
       File.delete(tempfile.path)
     end
 
+    private
+      def default_output
+        LilyPond.configuration.default_output
+      end
+
+      def destination
+        LilyPond.configuration.destination_directory
+      end
+
+      def path
+        LilyPond.configuration.lilypond_path.to_s
+      end
+
   end # end self
 end # end LilyPond

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: LilyPond-Ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.5.3
 platform: ruby
 authors:
 - Lee Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -30,9 +30,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.15.5
-description: "This gem provides a library to access and control Lilypond within Ruby.\nIt
-  contains the libraries and binary files for LilyPond 2.24.1 and\nGuile 2.2.3. \n\n\nIt
-  also provides a builder tool for generating LilyPond files dynamically\nwith Ruby.\n"
+description: |
+  This gem provides a library to access and control Lilypond within Ruby.
+  It also provides a builder tool for generating LilyPond files dynamically
+  with Ruby.
 email: whittakerlee81@gmail.com
 executables: []
 extensions: []
@@ -41,6 +42,7 @@ files:
 - lib/guile.rb
 - lib/lilypond-ruby.rb
 - lib/lilypond/builder.rb
+- lib/lilypond/config.rb
 - lilypond-2.24.1/bin/abc2ly
 - lilypond-2.24.1/bin/convert-ly
 - lilypond-2.24.1/bin/etf2ly