rails-blocks-cli 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4f132c448c8e065b701c21e0e5b777d24fea8ab32c32870f51c84d4a68626cc
-  data.tar.gz: 4e703d0337c0a8504773d803afef6b83b6cf6a62ec9dca8a2d048fcd4175bec0
+  metadata.gz: 78febd1a26563e29b3f204eba4637045f7b3d13f1ab71c24087ca3af18f6fcf7
+  data.tar.gz: '03350359aec7aaeb541df9fd8e8517d5db982a66830809223bbb713fc5b17119'
 SHA512:
-  metadata.gz: e616247429678b871ce785aa979b2b5922deaaa153b94f0fefeec5261fa8791318a8938ae67c11a602db1a48f884e794334f3df25dac0a82c2be8fa667ab671a
-  data.tar.gz: d8271aef17019e1244f64fb098bdfbd35ce975f16f5b989143a5ba2df72f4946c121a8dd4e9da48a267bc45c78cb3999e83411f385b9302ee330775b3051ef77
+  metadata.gz: 450da6b723c24f6ad1b06e32509be34b414adc528963c3e7c951195d10869e0f00c82d4e75ebb4f18a546fc86361393bb7bd10378485baa93d40a69a6d8fb692
+  data.tar.gz: fc0de1f135151d6b9e9745b1c0842b116d54241d98a05a203d787b25dea6d0834d6461c5aa9145d0530865abf638159756f1dd906262d5db2bf7031d47ccc665

data/lib/rails_blocks/cli.rb

@@ -2,7 +2,6 @@ require "fileutils"
 require "json"
 require "net/http"
 require "open3"
-require "pathname"
 require "tempfile"
 require "uri"
 require "zip"
@@ -120,11 +119,11 @@ module RailsBlocks
       failures = []
 
       selected_components.each do |component|
-        say_heading("Installing #{component['slug']}#{component['pro'] ? ' (pro)' : ''} as #{implementation}")
+        say_heading("Installing #{component['slug']}#{' (pro)' if component['pro']} as #{implementation}")
         install_component(component, implementation, dry_run: dry_run)
-      rescue StandardError => error
-        failures << [component["slug"], error.message]
-        warn "Failed to install #{component['slug']}: #{error.message}"
+      rescue StandardError => e
+        failures << [component["slug"], e.message]
+        warn "Failed to install #{component['slug']}: #{e.message}"
       end
 
       puts "\nInstalled #{selected_components.size - failures.size} of #{selected_components.size} components."
@@ -172,11 +171,11 @@ module RailsBlocks
       failures = []
 
       selected_components.each do |component|
-        puts "\n#{mode_label(mode)} #{component['slug']}#{component['pro'] ? ' (pro)' : ''} as #{package_implementation}..."
+        puts "\n#{mode_label(mode)} #{component['slug']}#{' (pro)' if component['pro']} as #{package_implementation}..."
         change_component_files(component, mode: mode)
-      rescue StandardError => error
-        failures << [component["slug"], error.message]
-        warn "Failed to #{mode} #{component['slug']}: #{error.message}"
+      rescue StandardError => e
+        failures << [component["slug"], e.message]
+        warn "Failed to #{mode} #{component['slug']}: #{e.message}"
       end
 
       puts "\n#{mode_label(mode)} #{selected_components.size - failures.size} of #{selected_components.size} components."
@@ -284,8 +283,8 @@ module RailsBlocks
       download(response["url"], auth: true)
     end
 
-    def stimulus_package_data
-      type = component_filter == :pro ? "pro" : "free"
+    def stimulus_package_data(type: nil)
+      type ||= component_filter == :pro ? "pro" : "free"
       if type == "free"
         stimulus_artifact = registry["stimulus_controllers"]
         return download(stimulus_artifact["package_url"]) if stimulus_artifact&.dig("package_url")
@@ -298,7 +297,7 @@ module RailsBlocks
       if component["stimulus_package_url"]
         download(component["stimulus_package_url"])
       else
-        stimulus_package_data
+        stimulus_package_data(type: component["pro"] ? "pro" : "free")
       end
     end
 
@@ -320,7 +319,7 @@ module RailsBlocks
 
         destination = stimulus_destination(filename)
         if destination.exist? && !argv.include?("--force")
-          puts "#{muted('Skip')} #{destination} #{muted('(already exists)')}"
+          puts "#{muted('Skip')} #{display_path(destination)} #{muted('(already exists)')}"
           next
         end
 
@@ -329,7 +328,7 @@ module RailsBlocks
     end
 
     def write_file(destination, content, dry_run:)
-      puts "#{dry_run ? muted('Would write') : success('Writing')} #{destination}"
+      puts "#{dry_run ? muted('Would write') : success('Writing')} #{display_path(destination)}"
       return if dry_run
 
       raise "#{destination} already exists. Use --force to overwrite it." if destination.exist? && !argv.include?("--force")
@@ -427,24 +426,28 @@ module RailsBlocks
       old_content = destination.exist? ? File.binread(destination) : ""
       if old_content == new_content
         counts[:unchanged] += 1
-        puts "No changes #{destination}"
+        puts "No changes #{display_path(destination)}"
         return
       end
 
       counts[:changed] += 1
-      puts unified_diff(old_content, new_content, destination.exist? ? destination.to_s : "/dev/null", destination.to_s)
+      puts unified_diff(old_content, new_content, destination.exist? ? display_path(destination) : "/dev/null", display_path(destination))
     end
 
     def update_file(destination, new_content, counts)
       old_content = destination.exist? ? File.binread(destination) : nil
       if old_content == new_content
         counts[:unchanged] += 1
-        puts "Unchanged #{destination}"
+        puts "Unchanged #{display_path(destination)}"
         return
       end
 
       counts[:changed] += 1
-      puts "#{argv.include?('--dry-run') ? 'Would update' : old_content.nil? ? 'Writing' : 'Updating'} #{destination}"
+      puts "#{if argv.include?('--dry-run')
+                'Would update'
+              else
+                old_content.nil? ? 'Writing' : 'Updating'
+              end} #{display_path(destination)}"
       return if argv.include?("--dry-run")
 
       FileUtils.mkdir_p(destination.dirname)
@@ -477,6 +480,13 @@ module RailsBlocks
       mode == :diff ? "Diffing" : "Updating"
     end
 
+    def display_path(path)
+      pathname = Pathname.new(path)
+      pathname.relative_path_from(Pathname.pwd).to_s
+    rescue ArgumentError
+      pathname.to_s
+    end
+
     def components
       registry.fetch("components")
     end
@@ -507,10 +517,10 @@ module RailsBlocks
 
     def registry
       @registry ||= JSON.parse(download(registry_url))
-    rescue DownloadError => error
-      abort "Could not load the Rails Blocks registry from #{registry_url}: #{error.message}"
-    rescue JSON::ParserError => error
-      abort "Could not parse the Rails Blocks registry from #{registry_url}: #{error.message}"
+    rescue DownloadError => e
+      abort "Could not load the Rails Blocks registry from #{registry_url}: #{e.message}"
+    rescue JSON::ParserError => e
+      abort "Could not parse the Rails Blocks registry from #{registry_url}: #{e.message}"
     end
 
     def download(url, auth: false, redirects: 3)
@@ -549,7 +559,7 @@ module RailsBlocks
     end
 
     def api_url_for(path)
-      return path if path.to_s.match?(/\Ahttps?:\/\//)
+      return path if path.to_s.match?(%r{\Ahttps?://})
 
       URI.join(api_url, path).to_s
     end
@@ -578,7 +588,7 @@ module RailsBlocks
       puts bold("Choose an install format")
       puts "  1. ERB partials      #{muted('app/views/shared/<component>/')}"
       puts "  2. ViewComponent     #{muted('app/components/<component>/')}"
-      print "Select an option [1]: "
+      print "Select an option [1 by default]: "
 
       case $stdin.gets&.strip
       when "2", "view_component" then "view_component"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-blocks-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Rails Blocks