nanoc-webpack.rb 0.10.1 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55ecfe50fc13e62efba068b1422e9d7887412d06b5dbf2e9fff646beeb426629
-  data.tar.gz: 54382ce368c006c717c26b95e920e43fb7e348458eb8dc09593f001264e1cd22
+  metadata.gz: c939a1fe4e2fb2f767e80b0fdac38ff132c5beff92aeb46d3019d2b4e5ec12da
+  data.tar.gz: 20b1ef0e1a025de9088dd99bc8047346b51d2f4fcf09fa203b5379c858ca28d4
 SHA512:
-  metadata.gz: 5e375aab35f0f9950729471a4558a228eeafda58866c1cc258e8a032d91b098e44261d2198b9b01464796697f0990d46b69caf59656601170e8285c357f4721a
-  data.tar.gz: e5d4aaf5f4da55489c8d6e7ff4eaabe05c4b2be33037dc16958824decff84a19eb749e17878d186a0715ba6dd1ad26a20261fadb9fd781d2cbea97ff7c054837
+  metadata.gz: d3a31c40abbe1052cd4bdc36ecc11cbefc784b7f97c9733e959837dbe6f88d435b106efccd7337c31ebfa6db06c49e97e23ffc2b6129440081f1ae15f9e581bb
+  data.tar.gz: ce8807fca6f33918d61af7a5df0c1dc0065b51121bf1913d7b60a9be7811b46e4cbf4c6c8267be0ae1d638ec164340c906b22c8303d8d8ecfeaf3247e0ae7e86

data/README.md

@@ -58,10 +58,10 @@ end
 
 **Option: argv**
 
-The `argv` option forwards command-line options directly
+The `argv` option forwards command line arguments directly
 to the webpack executable. <br>
 [Nanoc::Webpack.default_argv](https://0x1eef.github.io/x/nanoc-webpack.rb/Nanoc/Webpack.html#default_argv-class_method)
-returns the default command-line options forwarded to webpack:
+returns the default command line arguments forwarded to webpack:
 
 ```ruby
 # Rules
@@ -76,10 +76,15 @@ end
 
 **Rubygems.org**
 
-nanoc-webpack.rb can be installed via rubygems.org.
+nanoc-webpack.rb can be installed via rubygems.org
 
     gem install nanoc-webpack.rb
 
+## See also
+
+* [0x1eef/terry.reflectslight.io](https://github.com/0x1eef/terry.reflectslight.io) <br>
+  A simple nanoc application that uses nanoc-webpack.rb
+
 ## Sources
 
 * [GitHub](https://github.com/0x1eef/nanoc-webpack.rb#readme)

data/lib/nanoc/webpack/filter.rb

@@ -14,26 +14,28 @@ module Nanoc::Webpack
     type :text
 
     ##
+    # The default argv for webpack
+    #
     # @example
     #   Nanoc::Webpack.default_argv.concat ["--cache-type", "filesystem"]
     #
     # @return [Array<String>]
-    #  The default command-line options forwarded to webpack.
+    #  Default argv for webpack
     def self.default_argv
       @default_argv ||= []
     end
 
     ##
     # @param [String] content
-    #  The contents of a file.
+    #  The contents of a file
     #
     # @param [Hash] options
-    #  A hash of options.
+    #  A hash of options
     #
     # @return [void]
     def run(content, options = {})
       options = Ryo.from(options)
-      path = temporary_file(content).path
+      file = temporary_file(content)
       depend_on dependable(paths: options.depend_on, reject: options.reject)
                   .map { items[_1] }
       argv = [*(options.argv || []), *default_argv]
@@ -42,12 +44,11 @@ module Nanoc::Webpack
             ["./node_modules/webpack/bin/webpack.js",
              *argv,
              "--entry", File.join(Dir.getwd, item.attributes[:content_filename]),
-             "--output-path", File.dirname(path),
-             "--output-filename", File.basename(path)],
-            log: File.join(tmpdir, "webpack.log")
-      File.read(path)
+             "--output-path", File.dirname(file.path),
+             "--output-filename", File.basename(file.path)]
+      File.read(file.path)
     ensure
-      rm(path)
+      file ? file.tap(&:unlink).close : nil
     end
 
     private
@@ -57,20 +58,16 @@ module Nanoc::Webpack
     end
 
     def temporary_file(content)
-      mkdir_p(tmpdir)
+      tmpdir = File.join(Dir.getwd, "tmp", "webpack")
       name = item.identifier.to_s
       file = Tempfile.new(
         [ File.basename(name), File.extname(name).sub(/\A\.(ts|tsx|jsx)\z/, '.js') ],
-        tmpdir
+        mkdir_p(tmpdir).last
       )
       file.write(content)
       file.tap(&:flush)
     end
 
-    def tmpdir
-      File.join(Dir.getwd, "tmp", "webpack")
-    end
-
     def scan(argv)
       options = argv.filter_map { _1.start_with?("-") ? _1 : nil }
       builtins = %w[--entry --output-path --output-filename]

data/lib/nanoc/webpack/spawn.rb

@@ -1,17 +1,30 @@
 module Nanoc::Webpack
   module Spawn
+    require "test-cmd"
     Error = Class.new(RuntimeError)
-    def spawn(exe, argv, log:)
-      Kernel.spawn(
-        exe, *argv, { STDOUT => log, STDERR => log }
-      )
-      Process.wait
-      unless $?.success?
+
+    ##
+    # Spawns a process
+    #
+    # @param [String] exe
+    #  The path to an executable
+    #
+    # @param [Array<String>] argv
+    #  An array of command line arguments
+    #
+    # @return [Integer]
+    #  Returns the exit code of the spawned process
+    def spawn(exe, argv)
+      r = cmd(exe, *argv)
+      if r.success?
+        r.exit_status
+      else
         raise Error,
-              "#{File.basename(exe)} exited unsuccessfully " \
-              "(exit code: #{$?.exitstatus}, " \
-              "item: #{item.identifier}, " \
-              "log: #{log.gsub(Dir.getwd, '')[1..]})",
+              "#{File.basename(exe)} exited unsuccessfully\n" \
+              "(item: #{item.identifier})\n" \
+              "(exit code: #{r.exit_status})\n" \
+              "(stdout: #{r.stdout.gsub(Dir.getwd, '')[1..]&.chomp})\n" \
+              "(stderr: #{r.stderr.gsub(Dir.getwd, '')[1..]&.chomp})\n",
               []
       end
     end

data/lib/nanoc/webpack/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Webpack
-    VERSION = "0.10.1"
+    VERSION = "0.10.3"
   end
 end

data/nanoc-webpack.rb.gemspec

@@ -10,9 +10,10 @@ Gem::Specification.new do |gem|
   gem.licenses = ["0BSD"]
   gem.files = `git ls-files`.split($/)
   gem.require_paths = ["lib"]
-  gem.summary = "nanoc-webpack.rb integrates webpack into nanoc."
+  gem.summary = "nanoc-webpack.rb = nanoc + webpack"
   gem.description = gem.summary
   gem.add_runtime_dependency "ryo.rb", "~> 0.5"
+  gem.add_runtime_dependency "test-cmd.rb", "~> 0.12.2"
   gem.add_development_dependency "yard", "~> 0.9"
   gem.add_development_dependency "redcarpet", "~> 3.5"
   gem.add_development_dependency "rspec", "~> 3.10"

data/spec/filter_spec.rb

@@ -127,33 +127,29 @@ RSpec.describe Nanoc::Webpack::Filter do
       [
         "--entry", File.join(Dir.getwd, "test.ts"),
         "--output-path", instance_of(String),
-        "--output-filename", instance_of(String),
+        "--output-filename", instance_of(String)
       ]
     end
 
     context "with default arguments" do
       it "executes nodejs" do
-        expect(Kernel).to receive(:spawn).with(
+        expect(filter).to receive(:cmd).with(
                             "node",
                             "./node_modules/webpack/bin/webpack.js",
                             *cmdline,
-                            instance_of(Hash)
-                          )
-        expect(Process).to receive(:wait)
+                          ).and_return(Ryo('success?' => true))
         filter.run(item)
       end
     end
 
     context "with --no-cache" do
       it "executes nodejs with an argument" do
-        expect(Kernel).to receive(:spawn).with(
+        expect(filter).to receive(:cmd).with(
                             "node",
                             "./node_modules/webpack/bin/webpack.js",
                             "--no-cache",
                             *cmdline,
-                            instance_of(Hash)
-                          )
-        expect(Process).to receive(:wait)
+                          ).and_return(Ryo('success?' => true))
         filter.run(item, argv: ["--no-cache"])
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-webpack.rb
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.3
 platform: ruby
 authors:
 - '0x1eef'
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-25 00:00:00.000000000 Z
+date: 2024-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ryo.rb
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: test-cmd.rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +108,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
-description: nanoc-webpack.rb integrates webpack into nanoc.
+description: nanoc-webpack.rb = nanoc + webpack
 email:
 - 0x1eef@protonmail.com
 executables: []
@@ -141,5 +155,5 @@ requirements: []
 rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
-summary: nanoc-webpack.rb integrates webpack into nanoc.
+summary: nanoc-webpack.rb = nanoc + webpack
 test_files: []