Merge pull request #5 from DimitriosLisenko/hotfix/finalize-for-gem

Hotfix/finalize for gem

fet.gemspec

@@ -24,8 +24,7 @@ Gem::Specification.new do |spec|
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
   end
   spec.bindir = "bin"
-  spec.executables << "fet"
-  spec.executables = spec.files.grep(%r{\Abin/}) { |f| File.basename(f) }
+  spec.executables = ["fet"]
   spec.require_paths = ["lib"]
 
   # Gem runtime dependencies - place development dependencies inside Gemfile

lib/fet.rb

@@ -3,4 +3,8 @@
 require "ice_nine"
 require "ice_nine/core_ext/object"
 
-Dir["lib/fet/**/*.rb"].each { |file| require_relative(file.delete_prefix("lib/")) }
+Dir["#{__dir__}/fet/**/*.rb"].each { |file| require_relative(file.delete_prefix("#{__dir__}/")) }
+
+# Base Gem module
+module Fet
+end

lib/fet/cli/generate/listening.rb

@@ -11,7 +11,7 @@ def self.run(_global_options, options, _args)
             tempo: options[:tempo],
             degrees: options[:degrees],
             all_single_degree: options[:"all-single-degree"],
-            directory_prefix: options[:directory_prefix],
+            directory_prefix: options[:directory_prefix] || "",
           ).generate
         end
       end

lib/fet/cli/generate/singing.rb

@@ -9,7 +9,7 @@ def self.run(_global_options, options, _args)
           Fet::Generator::Singing.new(
             tempo: options[:tempo],
             pause: options[:pause],
-            directory_prefix: options[:directory_prefix],
+            directory_prefix: options[:directory_prefix] || "",
           ).generate
         end
       end

lib/fet/cli/generate/single_note_listening.rb

@@ -8,7 +8,7 @@ module SingleNoteListening
         def self.run(_global_options, options, _args)
           Fet::Generator::SingleNoteListening.new(
             tempo: options[:tempo],
-            directory_prefix: options[:directory_prefix],
+            directory_prefix: options[:directory_prefix] || "",
           ).generate
         end
       end

lib/fet/generator/listening.rb

@@ -85,7 +85,7 @@ def generate_midi_info(key_type, root, chosen_notes)
       end
 
       def full_filename(key_type, root, chosen_notes)
-        result = File.join(directory_prefix, "listening", key_type)
+        result = File.join(*[directory_prefix, "listening", key_type].reject(&:empty?))
         filename = root[0].to_s # note, e.g. Db
         filename += key_type == "major" ? "M" : "m" # type of note, M or m
         filename += "_" # delimiter

lib/fet/generator/singing.rb

@@ -59,7 +59,7 @@ def generate_midi_info(key_type, root_note_name, root_midi_value, note_midi_valu
       end
 
       def full_filename(key_type, root_note_name, root_midi_value, note_midi_value)
-        result = File.join(directory_prefix, "singing", key_type)
+        result = File.join(*[directory_prefix, "singing", key_type].reject(&:empty?))
         filename = root_note_name # note, e.g. Db
         filename += key_type == "major" ? "M" : "m" # type of note, M or m
         filename += "_" # delimiter

lib/fet/generator/single_note_listening.rb

@@ -47,7 +47,7 @@ def generate_midi_info(key_type, root_note_name, root_midi_value)
       end
 
       def full_filename(key_type, root_note_name, root_midi_value)
-        result = File.join(directory_prefix, "listening_single_note", key_type)
+        result = File.join(*[directory_prefix, "listening_single_note", key_type].reject(&:empty?))
         filename = root_note_name # note, e.g. Db
         filename += key_type == "major" ? "M" : "m" # type of note, M or m
         filename += "_" # delimiter