roda-vite 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51e00d93e8bc7e9056589ba297027ad2cafb51553bd7bcb2d2e558626f545b8c
-  data.tar.gz: 3de2c888fe6852b6ef5d75d6f07b87bff83903469472cbd97ab5f3d49af86462
+  metadata.gz: 6864daee0925a1e81ab534655fa8d1ed70d539be7cbd8e528672960a32c1f099
+  data.tar.gz: ed4f38b88404153306f3286f912374bcd776c46d88f7ba157ff9539b3c95094a
 SHA512:
-  metadata.gz: 747763c56aa86fb1b6c29695aba74c7b0cffbb19143e0116415be6bc30797de4d1dd64bf28b041e971d4eba71270bee136c4c139f54f2a9a0e09d15675c95bfb
-  data.tar.gz: f7d6d5afa2c0d3ed22aafe70ad516f8536209bdbcbf37cdef378f62febc7bc89be8eb1bcf90af8b00fe06666dbb4c03985437e8708778a0ca08ba88aed79ca1e
+  metadata.gz: 2f28f886399c794f6780895f781b34ea93702e932b893d8686a63789b61394c4fbffd38af5055551429be51e947c1d951dfd45dfa1939bd648468767e2110be9
+  data.tar.gz: 5e31e65cd17862fc47a309e54c50989095ca35fb83116a2a6e4c9d665fc89cc5bd6ccd8feca7b88d87f5975e4e4027063f843c891d77c5acf8d1131a23dbeb40

data/lib/version.rb

@@ -1,3 +1,3 @@
 module RodaVite
-  VERSION = "0.2.0"
+  VERSION = "0.4.0"
 end

data/lib/vite_roda/lib/vite_roda/installation.rb

@@ -21,9 +21,14 @@ module ViteRoda::Installation
   #   super
   # end
 
-  def call(package_manager: nil, **)
+  # Add additional options
+  def self.prepended(base)
+    base.option :force, type: :flag, aliases: ['-f'], desc: "Force installation, skip checking that 'plugin :vite' was added."
+  end
+
+  def call(package_manager: nil, **options)
 
-    ensure_roda_plugin_added
+    ensure_roda_plugin_added unless options[:force]
 
     ENV["VITE_RUBY_PACKAGE_MANAGER"] ||= package_manager if package_manager
 
@@ -64,13 +69,26 @@ module ViteRoda::Installation
     POST_INSTALL_MESSAGE
   end
 
-  # Internal: Ensures the Vite plugin is loaded in app.rb
+  # Internal: Ensures the Vite plugin is loaded in app.rb, or [app_name].rb
+  # This check is skipped if the -f or --force flag is passed
   def ensure_roda_plugin_added
-    unless line_with_prefix_exists? root.join("app.rb"), "plugin :vite"
-       abort "Add plugin :vite to your app.rb before installing"
+    unless line_with_prefix_exists?(root.join('app.rb'), 'plugin :vite') ||
+           line_with_prefix_exists?(root.join("#{app_name}.rb"), 'plugin :vite')
+       abort "Add plugin :vite to your Roda app (found in app.rb or #{app_name}.rb) before installing, or pass -f to force."
     end
   end
 
+  # Internal: Get probable app_name for checking if plugin :vite has been loaded.
+  # If this is wrong, the install subcommand can always be forced with -f.
+  def app_name
+
+    # Return the name of current working directory, for now. More complex logic may be added
+    # here, including returning a list of probable app_names for use with #any? like:
+    #   unless files.any? { |file| line_with_prefix_exists?(file, 'plugin :vite') }
+
+    File.basename(Dir.pwd)
+  end
+
   # Using String#lstrip and String#start_with? is supposedly faster than using Regex as:
   # File.readlines(file).any? { |line| line.match?(/^\s*plugin :vite/) } if File.exist?(file)
   def line_with_prefix_exists?(file, string)
@@ -146,6 +164,6 @@ module ViteRoda::Installation
 
 end
 
-puts "VITE RODA CLI"
+puts "VITE RODA CLI" if ARGV.include?('--debug')
 
 ViteRuby::CLI::Install.prepend(ViteRoda::Installation)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roda-vite
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Avi Sternlieb