browserify_rb 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 658dbed00139171d4a384b5b3ff5353dd4dd75a0
-  data.tar.gz: 222af08171c17b78d0820e9f69e8f1b983e21a38
+  metadata.gz: c10b3bb45a0008b233976bef7dbd6ff5af6460c1
+  data.tar.gz: ee2cee8d353d0dcc479b2dd4f2f4fece5c3ac22c
 SHA512:
-  metadata.gz: 80f4f97a884698b82ede735bb9429ad724f3a9087b868a99827068b840d63d798981be50c14ff770a874b400fa0a84466ee985106b9bcf97f2908f694482634f
-  data.tar.gz: 9686b3dad5db385021f2ca912a67250b262b9d1b5e23d3cb43b2912e1fcd9d52596ee6ee133e7903930256d5491eedc4c5b989e109ad75604c392decf15db865
+  metadata.gz: 7914c1a319687911748dbdbef9bfc831b0063207a9d26b8be25d5431f8000b6927ad091f04c669211e2fb297bc0a897a3a2b331ac990d609787eba90556a6334
+  data.tar.gz: 319542416adf75d1278c4ebbc180191a629019ef66034c117bf7b5db93297ef954142316ea87ac8ed2ed60a2558a01ab4d54ca2efa530173de499ce5c5774d5c

data/Rakefile

@@ -7,4 +7,4 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :spec
+task :default => :test

data/lib/browserify_rb/nvm.rb

@@ -7,6 +7,7 @@ class BrowserifyRb
   class Nvm
     LOG = Logger.new(STDERR)
     LOG.level = Logger::Severity.const_get(ENV["LOG"] || "INFO")
+    LOG.progname = Nvm
 
     NVM_SH = File.join(__dir__, "nvm.sh")
 
@@ -23,17 +24,15 @@ class BrowserifyRb
           stdin: "",
           stdout_handler: proc{|d| STDOUT.print d },
           stderr_handler: proc{|d| STDERR.print d },
-          node_ver: "stable",
+          node_ver: nil,
           env: {})
       new_env = (env).merge(self.env)
+      node_ver = node_ver ? %["#{node_ver}"] : ""
       cmd = <<-CMD
-        . "#{NVM_SH}" || {
-          printf "Abort\\n" >&2
-          exit 1
-        }
-        if ! nvm use "#{node_ver}" >&2; then
-          nvm install "#{node_ver}" >&2
-          nvm use "#{node_ver}" >&2
+        . "#{NVM_SH}"
+        if ! nvm use #{node_ver} >&2; then
+          nvm install #{node_ver} >&2
+          nvm use #{node_ver} >&2
         fi
         #{cmd}
       CMD
@@ -51,10 +50,7 @@ class BrowserifyRb
       out = StringIO.new
       err = StringIO.new
       cmd = <<-CMD
-        . "#{NVM_SH}" || {
-          printf "Abort\\n" >&2
-          exit 1
-        }
+        . "#{NVM_SH}"
         nvm --version
       CMD
 

data/lib/browserify_rb/popen3.rb

@@ -6,6 +6,7 @@ class BrowserifyRb
   module Popen3
     LOG = Logger.new(STDERR)
     LOG.level = Logger::Severity.const_get(ENV["LOG"] || "INFO")
+    LOG.progname = Popen3
 
     CHUNK_SIZE = 2000
     DEFAULT_STDOUT_HANDLER = proc {|data| STDOUT.write data }

data/lib/browserify_rb/version.rb

@@ -1,3 +1,3 @@
 class BrowserifyRb
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/browserify_rb.rb

@@ -8,9 +8,10 @@ class BrowserifyRb
   DEFAULT_NVM_DIR = "#{ENV["HOME"]}/.nvm"
   LOG = Logger.new(STDERR)
   LOG.level = Logger::Severity.const_get(ENV["LOG"] || "INFO")
+  LOG.progname = BrowserifyRb
 
   def initialize(
-        browserify_opts: "", node_ver: "stable", env: {},
+        browserify_opts: "", node_ver: nil, env: {},
         nvm_dir: DEFAULT_NVM_DIR, suppress_stderr: false,
         required_modules: nil)
     @nvm = BrowserifyRb::Nvm.new nvm_dir
@@ -23,7 +24,7 @@ class BrowserifyRb
   end
 
   def prepare
-    ms = ["browserify", *@modules].map{|m| %Q!"#{m}"! }.join(" ")
+    ms = ["browserify", *@modules].map{|m| %!"#{m}"! }.join(" ")
     cmd = "npm install #{ms}"
     stdout_handler = proc {|d| }
     stderr_handler = @suppress_stderr ?
@@ -46,7 +47,7 @@ class BrowserifyRb
 
     out_buf = StringIO.new
     cmd = <<-CMD
-      node_modules/.bin/browserify #{@browserify_opts} -- -
+      $(npm bin)/browserify #{@browserify_opts} -- -
     CMD
     stdout_handler = proc {|d| out_buf << d }
     stderr_handler = @suppress_stderr ?
@@ -66,7 +67,7 @@ class BrowserifyRb
   end
 
   def self.compile(
-        source, browserify_opts: "", node_ver: "stable", env: {},
+        source, browserify_opts: "", node_ver: nil, env: {},
         nvm_dir: DEFAULT_NVM_DIR, suppress_stderr: false)
     new(
       browserify_opts: browserify_opts,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browserify_rb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Keiichiro Ui
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-26 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler