hauler 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cd675c7de6a613d2c1f6c3acd43a769701f22a1
-  data.tar.gz: 01f5153a0f2f3e3a50078a5088c66a8335d95569
+  metadata.gz: c6cb5e994895c6ec1f1fd43894c85b5b8b4dbfa3
+  data.tar.gz: ca388ac352dc98f86929f93d9a85021c355040ec
 SHA512:
-  metadata.gz: 13b60c5957883730a2f676251cbfd1837828d052fed55d4f9ef916df6037726824a23c08ea8d2ffe9fa5b1e9dcd98357b8d159fdda471e194ae6e57cb073eb48
-  data.tar.gz: fedbb6e8a610c293f5371b8aca4665044be4b43345f40dea11fb5455b96f453a23e2d5ced148075edb5e4321df3b6419f1ae497a0a87ccdb7ee04754453ee1e8
+  metadata.gz: 43cced488b291575b476f790b99d54a7ac4f16c15eed7d441892396b3a5ebc272e17e4042cb4731d20e8e10ed5e08d7a27d9666407dde6cda32eeca3d453ab8a
+  data.tar.gz: 4b96959984b6372ed7534ffc20db343b69c31abe0095b687d5c62d36ef0d2df4d315571926adb5723895c92fa89f48e76847c9bd8427c9230995d078d1cf05a5

data/lib/generators/hauler/install_generator.rb

@@ -32,7 +32,7 @@ module Hauler
       end
 
       def add_node_modules_to_gitignore
-        has_gitignore = File.exist?(Rails.root.join('package.json'))
+        has_gitignore = File.exist?(Rails.root.join('.gitignore'))
         return if !has_gitignore
 
         has_node_modules = IO.read('.gitignore').include? 'node_modules'
@@ -48,6 +48,12 @@ module Hauler
       def install_npm
         generate 'hauler:install_npm'
       end
+
+      private
+
+      def rails_app_name
+        Rails.application.class.parent.name
+      end
     end
   end
 end

data/lib/generators/hauler/install_npm_generator.rb

@@ -15,7 +15,7 @@ module Hauler
         css-loader@0.23.1
         extract-text-webpack-plugin@2.0.0-beta.3
         file-loader@0.9.0
-        hauler@0.3.2
+        hauler@0.3.3
         image-webpack-loader@2.0.0
         immutable-devtools@0.0.7
         style-loader@0.13.1

data/lib/generators/hauler/templates/package.json

@@ -1,4 +1,5 @@
 {
+  "name": "<%= rails_app_name.underscore %>",
   "private": true,
   "scripts": {
   },

data/lib/hauler/version.rb

@@ -1,6 +1,6 @@
 # :nodoc:
 module Hauler
-  VERSION = '0.3.2'.freeze
+  VERSION = '0.3.3'.freeze
 
   def self.version
     VERSION

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hauler",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "NodeJS binary for the hauler gem",
   "author": "Arturo Guzman @guzart",
   "license": "MIT",
@@ -8,11 +8,11 @@
     "type": "git",
     "url": "https://github.com/guzart/hauler.git"
   },
-  "main": "src/index.js",
+  "main": "dist/index.js",
   "bin": {
-    "hauler-read-config": "src/bin/read-config.js",
-    "hauler-server": "src/bin/dev-server.js",
-    "hauler-update-scripts": "src/bin/update-scripts.js"
+    "hauler-read-config": "dist/bin/read-config.js",
+    "hauler-server": "dist/bin/dev-server.js",
+    "hauler-update-scripts": "dist/bin/update-scripts.js"
   },
   "scripts": {
     "build": "npm-run-all clean generate_package compile",

data/src/bin/dev-server.js

@@ -1,14 +1,16 @@
 #!/usr/bin/env node
+// @flow
 
-const hauler = require('../index');
-const webpack = require('webpack');
-const WebpackDevServer = require('webpack-dev-server');
+import webpack from 'webpack';
+import WebpackDevServer from 'webpack-dev-server';
+import { getAppName, getCompilerConfig, getDevServerConfig, getEnvName } from '../index';
 
-const env = hauler.getEnvName();
-const railsRoot = process.argv[2];
+const env = getEnvName();
+const railsRoot = process.argv[2] || process.cwd();
+const appName = process.argv[3] || getAppName(railsRoot);
 
-const devServerConfig = hauler.getDevServerConfig(env, railsRoot);
-const compilerConfig = hauler.getCompilerConfig(env, railsRoot);
+const devServerConfig = getDevServerConfig(env, railsRoot, appName);
+const compilerConfig = getCompilerConfig(env, railsRoot, appName);
 
 // console.log(devServerConfig);
 // console.log(compilerConfig);

data/src/bin/read-config.js

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 // @flow
-'use strict';
 
-const railsRoot = process.argv[2];
+import { getAppName, getCompilerConfig, getDevServerConfig, getEnvName } from '../index';
 
-const hauler = require('../index');
-const env = hauler.getEnvName();
+const env = getEnvName();
+const railsRoot = process.argv[2] || process.cwd();
+const appName = process.argv[3] || getAppName(railsRoot);
 
-const devServerConfig = hauler.getDevServerConfig(env, railsRoot);
-const compilerConfig = hauler.getCompilerConfig(env, railsRoot);
+const devServerConfig = getDevServerConfig(env, railsRoot, appName);
+const compilerConfig = getCompilerConfig(env, railsRoot, appName);
 const config = { devServerConfig, compilerConfig };
 const output = JSON.stringify(config);
 

data/src/defaults/compiler_config_factory.js

@@ -10,7 +10,6 @@ export default function defaultConfigFactory(env: string): WebpackConfig {
     resolve: {
       modules: [
         'node_modules',
-        '~app/assets',
         '~lib/assets',
       ],
       extensions: ['.js', '.json', '.jsx']

data/src/index.js

@@ -1,5 +1,7 @@
 // @flow
 
+import fs from 'fs';
+import path from 'path';
 import * as utils from './utils';
 
 function getProjectConfig(env: string): ProjectConfig {
@@ -51,3 +53,9 @@ export function getCompilerConfig(
 }
 
 export { getEnvName } from './utils';
+
+export function getAppName(railsRoot: string): string {
+  const contents = fs.readFileSync(path.join(railsRoot, 'package.json'));
+  const pkg = JSON.parse(contents.toString());
+  return pkg.name;
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hauler
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Arturo Guzman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler