webpack_driver 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d7a3afee77099a6ef19d926eaadc31999071f6e
-  data.tar.gz: 14c9d043282e752f1bb0fb517df7bb6e4c4b9448
+  metadata.gz: 2f323c56cf0e293177fec824035df08310a3ee7c
+  data.tar.gz: d4c5a165ca89887ee598ff1d7cf30fe299e7c94b
 SHA512:
-  metadata.gz: a579d61d73775944319200da678cbdd9a0bd0ff668c9c736f3a8e8f4b38a0aa20f8e54b729b8f27eab21ab1cef7f14f932d224286d49e4a8d287786398f0ac83
-  data.tar.gz: df3cc01ef4950b7d48e27edd87df7471e386a84f98b60e3b7d42184bef3699ebcf7f4f874c6613fb2d9238693e1ce1f3a4ffae77120ecbe39128fd1e0f04bbdf
+  metadata.gz: 9b08b2724c2db81e8c84a88d8389951be28d6dfb7b60e090a40ec70339a813f9070f3495cc2ace7827ffcfa643c924c82deaeaad4340a22490795115089d7a54
+  data.tar.gz: fe31afa752611b232bf55b1ea5cbd49cc8ec1a1703ac60e0a409b50c6b9b1600cb2b6858182d1619f998f7b2a8d1e7169e30f5daad32eab079d9bf2596178d3d

data/.gitignore

@@ -1,3 +1,7 @@
+index.js
+node_modules
+package.json
+yarn.lock
 /.bundle/
 /.yardoc
 /Gemfile.lock

data/README.md

@@ -13,7 +13,7 @@ It runs the dev server in the background using the `childprocess` gem and monito
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'ruby_pack'
+gem 'webpack_driver'
 ```
 
 And then execute:
@@ -22,17 +22,18 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install ruby_pack
+    $ gem install webpack_driver
 
 ## Usage
 
-Initialization, will create a `package.json`, `yarn.lock`, a bare-bones `webpack.config.js` and then run yarn install (via the [Knitter](https://github.com/nathanstitt/knitter) gem).
+Initialization will create a `package.json`, `yarn.lock`, a bare-bones `webpack.config.js` and then run yarn install (via the [Knitter](https://github.com/nathanstitt/knitter) gem).
 
 ```ruby
-WebpackDriver.config do | config |
-  config.directory = '/tmp/test'
-end
-WebpackDriver::Configuration.generate
+
+config = WebpackDriver::Configuration.new(
+    WebpackDriver::Configuration.new('/path/to/my/webpack.config.js')
+)
+config.generate!
 ```
 
 Production compilation (TODO):

data/lib/status-plugin.js

@@ -0,0 +1,78 @@
+"use strict";
+
+var webpack = require("webpack");
+
+function WebpackDriverStatusPlugin(options) {
+    this.options = options;
+}
+
+function log(type, value) {
+    console.log('STATUS:', JSON.stringify({type, value}));
+}
+
+WebpackDriverStatusPlugin.prototype.apply = function(compiler) {
+    var timer;
+
+    if ( compiler.options.devServer ) {
+        let {port, host, outputPath} = compiler.options.devServer;
+        log("dev-server", { port, host, outputPath });
+    }
+
+    // compiler.apply(new webpack.ProgressPlugin(function (percent, msg) {
+    //     log("compile", {
+    //         "progress":  percent,
+    //         "operation": msg,
+    //         "ms": Date.now() - timer
+    //     });
+    // }));
+
+    compiler.plugin("compile", function() {
+        timer = Date.now();
+        log("compile", {
+            "progress":  0,
+            "operation": "idle"
+        })
+    });
+
+    compiler.plugin("invalid", function() {
+        log("status", "invalid");
+    });
+
+    compiler.plugin("failed-module", function(module) {
+        log("failed-module", module);
+    });
+    compiler.plugin("done", function(stats) {
+        if (stats.compilation.errors && stats.compilation.errors.length){
+            log("status", "invalid");
+            for(var i = 0; i < stats.compilation.errors.length; i++){
+                var err = stats.compilation.errors[i];
+                log("error", {
+                    name: err.name, message: err.message,
+                    resource: err.module ? err.module.resource : ''
+                });
+            }
+        } else {
+            log("status", "success");
+        }
+    });
+
+    compiler.plugin("failed", function() {
+        log("status", "failed");
+    });
+
+    compiler.plugin("valid", function() {
+        log("status", "valid");
+    });
+
+    compiler.plugin("after-emit", function(compilation, callback) {
+        for (var k in compilation.assets){
+            if(!compilation.assets[k].parents){
+                log("asset", {name: k, size: compilation.assets[k].size()});
+            }
+        }
+        callback();
+    });
+
+}
+
+module.exports = WebpackDriverStatusPlugin;

data/lib/webpack_driver/compile.rb

@@ -2,8 +2,9 @@ module WebpackDriver
 
     class Compile < Process
 
-        def initialize(*flags)
-            super(WebpackDriver.config.compile_script, *flags)
+        def initialize(config)
+            config.environment ||= { NODE_ENV: 'production' }
+            super('webpack', config)
         end
 
         def valid?

data/lib/webpack_driver/configuration/{base.rb → example.rb}

@@ -3,23 +3,28 @@ require 'knitter'
 
 module WebpackDriver
 
-    module Configuration
+    class Configuration
 
-        class Base < Thor::Group
+        class Example < Thor::Group
             include Thor::Actions
 
+            class_option :config
+
+            attr_reader :yarn
+
             def self.source_root
-                Pathname.new(__FILE__).dirname.join("..","..","..","templates")
+                Pathname.new(__FILE__)
+                        .dirname.join('..', '..', '..', 'templates')
             end
 
             def set_destination_root
-                self.destination_root = WebpackDriver.config.directory
+                self.destination_root = options[:config].file.dirname
+                @yarn = Knitter::Yarn.new(destination_root)
             end
 
             def install_using_yarn
-                yarn = Knitter::Yarn.new(WebpackDriver.config.directory)
                 yarn.init unless yarn.valid?
-                %w{webpack webpack-dev-server}.each do | package |
+                %w(webpack webpack-dev-server).each do |package|
                     package = Knitter::Package.new(package, yarn: yarn)
                     unless package.installed?
                         package.dependency_type = :development
@@ -30,11 +35,8 @@ module WebpackDriver
 
             def generate
                 template("webpack.config.js", verbose: false)
-                template("status-plugin.js", verbose: false, force: true)
                 template("index.js", verbose: false, force: true)
             end
         end
-
     end
-
 end

data/lib/webpack_driver/configuration/generated.rb

@@ -0,0 +1,22 @@
+require "thor"
+
+module WebpackDriver
+
+    class Configuration
+
+        class Generated < Thor::Group
+            include Thor::Actions
+
+            class_option :config
+
+            def self.source_root
+                Pathname.new(__FILE__).dirname.join("..","..","..","templates")
+            end
+
+            def output
+                template("generated.config.js", options[:config].path,  verbose: false, force: true)
+            end
+
+        end
+    end
+end

data/lib/webpack_driver/configuration.rb

@@ -1,15 +1,60 @@
-require_relative 'configuration/base'
+require_relative 'configuration/generated'
+require_relative 'configuration/example'
 
 module WebpackDriver
 
-    module Configuration
+    class Configuration
 
-        class << self
+        attr_accessor :port
+        attr_accessor :logger
+        attr_accessor :compile_script
+        attr_accessor :directory
+        attr_accessor :cmd_line_flags
+        attr_writer   :environment
 
-            def generate
-                Base.start
-            end
+        attr_reader :file
+        attr_reader :generated
+        attr_accessor :logger
 
+        ROOT = Pathname.new(__FILE__).dirname.join('..', '..')
+
+        def initialize(file = './webpack.config.js', options = {})
+            options.each { |k, v| send("#{k}=", v) }
+            @directory ||= '.'
+            @file = Pathname.new(file)
+            @generated = Tempfile.new(['webpack.config', '.js'])
+            Generated.new([], config: self).invoke_all
+        end
+
+        def generate!
+            Example.new([], config: self).invoke_all
+        end
+
+        def present?
+            file.exist?
+        end
+
+        def path
+            @generated.path
+        end
+
+        def gem_root
+            ROOT
+        end
+
+        def environment
+            @environment ||= { NODE_ENV: 'development' }
+        end
+
+        def flags
+            opts = ['--config', path]
+            opts += ['--port', port] if port
+            opts += cmd_line_flags if cmd_line_flags
+            opts
+        end
+
+        def logger
+            @logger ||= Logger.new(STDOUT)
         end
 
     end

data/lib/webpack_driver/dev_server.rb

@@ -1,35 +1,18 @@
 module WebpackDriver
 
-
+    # A wrapper around an instance of `webpak-dev-server`
     class DevServer < Process
 
         attr_reader :port, :host, :path
 
-#        URL = /(https?:\/\/)([\da-z\.-]+)\:(\d+)\/([\da-z\.-]+\/)?/
-
-        def initialize(*flags)
-
-            config = WebpackDriver.config
-            flags = ['--port', config.port] if config.port
-            super(config.dev_server_script, *flags)
+        def initialize(config)
+            super('webpack-dev-server', config)
         end
 
-
         def valid?
             alive? && super
         end
 
-        # def detected_url
-        #     match = URL.match(output)
-        #     match ? match[0] : nil
-        # end
-
-        # def detected_port
-
-        #     match = URL.match(output)
-        #     match ? match[3].to_i : nil
-        # end
-
         private
 
         def record_message(msg)
@@ -41,5 +24,4 @@ module WebpackDriver
             super
         end
     end
-
 end

data/lib/webpack_driver/process.rb

@@ -10,18 +10,24 @@ module WebpackDriver
 
         extend Forwardable
 
-        attr_reader :assets, :buffer
+        def_delegators :@proc, :alive?, :environment, :wait
 
-        def initialize(*flags)
+        attr_reader :assets, :messages
+        attr_reader :config
+
+        def initialize(script, config)
             self.reset!
-            args = ["node"] + flags
+            @config = config
+            args = ["./node_modules/.bin/#{script}"] + config.flags
+
             @proc = ::ChildProcess.build(*args)
-            @proc.environment['NODE_ENV'] = WebpackDriver.config.environment
-            @proc.cwd = WebpackDriver.config.directory
-        end
 
-        def alive?
-            @proc.alive?
+            @proc.environment.merge!(
+                config.environment
+            )
+            puts "ENV"
+            p config.environment
+            @proc.cwd = config.directory
         end
 
         def start
@@ -34,8 +40,8 @@ module WebpackDriver
         end
 
         def stop
-            @output.close unless @output.closed?
             @proc.stop
+            @output.close unless @output.closed?
             @listener.join
         end
 
@@ -47,28 +53,44 @@ module WebpackDriver
 
         def reset!
             @assets = Concurrent::Map.new
-            @buffer = Concurrent::Array.new
+            @messages = Concurrent::Array.new
         end
 
         def last_compilation_message
-            msg = @buffer.reverse_each.detect{ |l| l['type'] == 'compile' }
+            msg = @messages.reverse_each.detect{ |l| l['type'] == 'compile' }
             msg ? msg['value'] : {}
         end
 
+        def record_error(error)
+            config.logger.error(
+                "#{error['name']}: #{error['resource']}\n#{error['message']}"
+            )
+        end
+
         def record_message(msg)
-            if msg['type'] == 'asset'
+            case msg['type']
+            when 'asset'
                 name = msg['value']['name']
                 @assets[name] = Asset.new(name, msg['value']['size'])
+            when 'error'
+                record_error(msg['value'])
+            else
+                config.logger.debug(msg)
             end
-            @buffer << msg
+            @messages << msg
         end
 
 
         def listen_for_status_updates
             Thread.new do
                 @output.each_line do | l |
-                    match = l.match(/STATUS: (.*)/)
-                    record_message(JSON.parse(match[1])) if match
+                    match = l.match(/^STATUS: (.*)/)
+                    if match
+                        record_message(JSON.parse(match[1]))
+                        config.logger.debug(l.chomp)
+                    else
+                        config.logger.info(l.chomp)
+                    end
                 end
             end
         end

data/lib/webpack_driver/version.rb

@@ -1,3 +1,3 @@
 module WebpackDriver
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/webpack_driver.rb

@@ -1,21 +1,7 @@
 require_relative "webpack_driver/version"
-require_relative "webpack_driver/config_options"
 require_relative "webpack_driver/configuration"
 require_relative "webpack_driver/asset"
 require_relative 'webpack_driver/process'
 require_relative "webpack_driver/dev_server"
 require_relative "webpack_driver/compile"
 require_relative "webpack_driver/errors"
-
-module WebpackDriver
-
-    def self.config
-        @config ||= WebpackDriver::ConfigOptions.new
-        if block_given?
-            yield @config
-            @config.after_configuration
-        end
-        @config
-    end
-
-end

data/templates/generated.config.js.tt

@@ -0,0 +1,10 @@
+var config = require('<%= options[:config].file %>');
+var WebpackDriverStatusPlugin = require('<%= options[:config].gem_root %>/lib/status-plugin.js');
+
+config.plugins = (config.plugins || []);
+
+config.plugins.push(
+  new WebpackDriverStatusPlugin()
+);
+
+module.exports = config;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webpack_driver
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Nathan Stitt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-14 00:00:00.000000000 Z
+date: 2017-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knitter
@@ -141,16 +141,18 @@ files:
 - bin/console
 - bin/setup
 - lib/config.rb
+- lib/status-plugin.js
 - lib/webpack_driver.rb
 - lib/webpack_driver/asset.rb
 - lib/webpack_driver/compile.rb
-- lib/webpack_driver/config_options.rb
 - lib/webpack_driver/configuration.rb
-- lib/webpack_driver/configuration/base.rb
+- lib/webpack_driver/configuration/example.rb
+- lib/webpack_driver/configuration/generated.rb
 - lib/webpack_driver/dev_server.rb
 - lib/webpack_driver/errors.rb
 - lib/webpack_driver/process.rb
 - lib/webpack_driver/version.rb
+- templates/generated.config.js.tt
 - templates/index.js.tt
 - templates/status-plugin.js.tt
 - templates/webpack.config.js.tt
@@ -176,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Run webpack-dev-server in a sub process

data/lib/webpack_driver/config_options.rb

@@ -1,23 +0,0 @@
-module WebpackDriver
-
-    class ConfigOptions
-
-        attr_accessor :port
-        attr_accessor :directory
-        attr_accessor :environment
-        attr_accessor :compile_script
-        attr_accessor :dev_server_script
-
-        def initialize
-            @directory = Pathname.new(Dir.pwd)
-            @environment = 'development'
-            @compile_script = 'node_modules/webpack/bin/webpack.js'
-            @dev_server_script = 'node_modules/webpack-dev-server/bin/webpack-dev-server.js'        end
-
-        def after_configuration
-            @directory = Pathname.new(@directory)
-        end
-
-    end
-
-end