browserify_rb 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c10b3bb45a0008b233976bef7dbd6ff5af6460c1
-  data.tar.gz: ee2cee8d353d0dcc479b2dd4f2f4fece5c3ac22c
+  metadata.gz: d719f31c38f3e7c258bac2a30640ef9d934b7101
+  data.tar.gz: eabc846c29c618278188574cbe7976382032e9dc
 SHA512:
-  metadata.gz: 7914c1a319687911748dbdbef9bfc831b0063207a9d26b8be25d5431f8000b6927ad091f04c669211e2fb297bc0a897a3a2b331ac990d609787eba90556a6334
-  data.tar.gz: 319542416adf75d1278c4ebbc180191a629019ef66034c117bf7b5db93297ef954142316ea87ac8ed2ed60a2558a01ab4d54ca2efa530173de499ce5c5774d5c
+  metadata.gz: 471482ceb0aa270e19f6cdb09e6ca3ba95ef16ea7885dbe185a380d7f0a6bdaa7bf6bf6e643cc451eaea60f84487612dc019a602bbee0c34fc3ff5859f0bd462
+  data.tar.gz: bba717e1bbb0f8b16dbc0bc306feb52d0794a2f3c66ead75d64eaaa8655a449e61132babcfc8778d3e42f51d4ea4e354671882475d890663d264f89cf1244115

data/.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+/.nvm/
+/node_modules/

data/README.md

@@ -1,6 +1,6 @@
 # BrowserifyRb
 
-browserify wrapper with nvm to install node automatically.
+browserify wrapper for ruby.
 
 ## Installation
 
@@ -18,18 +18,45 @@ Or install it yourself as:
 
     $ gem install browserify_rb
 
+
 ## Usage
 
+BrewserifyRb has 2 implementations: `BrowserifyRb::Browserify`, `BrowserifyRb::Nvm::Browserify`
+
+
+### BrowserifyRb::Browserify
+
+`browserify` required:
+
 ```ruby
 require "browserify_rb"
 
-br = BrowserifyRb.new
+# if you install browserify in global
+br = BrowserifyRb::Browserify.new
 puts br.compile("console.log('foo');")
+# or
+puts BrowserifyRb::Browserify.compile("console.log('bar');")
 
-puts BrowserifyRb.compile("console.log('bar');")
+# if you install browserify in ./node_modules
+br = BrowserifyRb::Browserify.new(command: "$(npm bin)/browserify -")
+puts br.compile("console.log('foo');")
+# or
+puts BrowserifyRb::Browserify.compile("console.log('bar');", command: "$(npm bin)/browserify -")
 ```
 
-`node` nor `nvm` are not required.
+
+### BrowserifyRb::Nvm::Browserify
+
+`browserify`, `node` nor `nvm` are not required. These are installed automatically:
+
+```ruby
+require "browserify_rb"
+
+br = BrowserifyRb::Nvm::Browserify.new
+puts br.compile("console.log('foo');")
+# or
+puts BrowserifyRb::Nvm::Browserify.compile("console.log('bar');")
+```
 
 ## Development
 

data/browserify_rb.gemspec

@@ -9,8 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Keiichiro Ui"]
   spec.email         = ["keiichiro.ui@gmail.com"]
 
-  spec.summary       = %q{browserify wrapper}
-  spec.description   = %q{browserify wrapper with nvm to install node automatically}
+  spec.summary       = %q{browserify wrapper for ruby}
   spec.homepage      = "https://github.com/kui/browserify_rb"
   spec.license       = "MIT"
 

data/lib/browserify_rb.rb

@@ -1,80 +1,6 @@
 require "browserify_rb/version"
-require "browserify_rb/nvm"
+require "browserify_rb/nvm/browserify"
+require "browserify_rb/browserify"
 
-require "stringio"
-require "logger"
-
-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: nil, env: {},
-        nvm_dir: DEFAULT_NVM_DIR, suppress_stderr: false,
-        required_modules: nil)
-    @nvm = BrowserifyRb::Nvm.new nvm_dir
-    @node_ver = node_ver
-    @env = env
-    @browserify_opts = browserify_opts
-    @suppress_stderr = suppress_stderr
-    @prepared = false
-    @modules = required_modules
-  end
-
-  def prepare
-    ms = ["browserify", *@modules].map{|m| %!"#{m}"! }.join(" ")
-    cmd = "npm install #{ms}"
-    stdout_handler = proc {|d| }
-    stderr_handler = @suppress_stderr ?
-                       proc {|d| } :
-                       proc {|d| STDERR.print d}
-    LOG.debug "run: #{cmd}"
-    status = @nvm.run(
-      cmd,
-      node_ver: @node_ver,
-      env: @env,
-      stdout_handler: stdout_handler,
-      stderr_handler: stderr_handler
-    ).value
-    raise "non-zero exit status: #{status.to_i}" unless status.success?
-    @prepared = true
-  end
-
-  def compile source
-    prepare unless @prepared
-
-    out_buf = StringIO.new
-    cmd = <<-CMD
-      $(npm bin)/browserify #{@browserify_opts} -- -
-    CMD
-    stdout_handler = proc {|d| out_buf << d }
-    stderr_handler = @suppress_stderr ?
-                       proc {|d| } :
-                       proc {|d| STDERR.print d}
-    status = @nvm.run(
-      cmd,
-      stdin: source,
-      node_ver: @node_ver,
-      env: @env,
-      stdout_handler: stdout_handler,
-      stderr_handler: stderr_handler
-    ).value
-    raise "non-zero exit status: #{status.to_i}" unless status.success?
-
-    return out_buf.string
-  end
-
-  def self.compile(
-        source, browserify_opts: "", node_ver: nil, env: {},
-        nvm_dir: DEFAULT_NVM_DIR, suppress_stderr: false)
-    new(
-      browserify_opts: browserify_opts,
-      node_ver: node_ver,
-      env: env,
-      nvm_dir: nvm_dir,
-      suppress_stderr: suppress_stderr
-    ).compile(source)
-  end
+module BrowserifyRb
 end

data/lib/browserify_rb/browserify.rb

@@ -0,0 +1,36 @@
+require "browserify_rb/popen3"
+
+require "stringio"
+require "logger"
+
+class BrowserifyRb::Browserify
+  LOG = Logger.new(STDERR)
+  LOG.level = Logger::Severity.const_get(ENV["LOG"] || "INFO")
+  LOG.progname = BrowserifyRb::Browserify
+
+  def initialize command: "browserify -", suppress_stderr: false
+    @command = command
+    @suppress_stderr = suppress_stderr
+  end
+
+  def compile source
+    out_buf = StringIO.new
+    stdout_handler = proc {|d| out_buf << d }
+    stderr_handler = @suppress_stderr ? proc { } : proc {|d| STDERR.print d }
+
+    LOG.debug "run: #{@command}"
+    status = BrowserifyRb::Popen3.async_exec(
+      @command,
+      input: source,
+      stdout_handler: stdout_handler,
+      stderr_handler: stderr_handler,
+    ).value
+    raise "non-zero exit status: #{status.to_i}" unless status.success?
+
+    out_buf.string
+  end
+
+  def self.compile source, command: "browserify -", suppress_stderr: false
+    new(command: command, suppress_stderr: suppress_stderr).compile(source)
+  end
+end

data/lib/browserify_rb/nvm.rb

@@ -3,32 +3,31 @@ require "browserify_rb/popen3"
 require "stringio"
 require "logger"
 
-class BrowserifyRb
-  class Nvm
-    LOG = Logger.new(STDERR)
-    LOG.level = Logger::Severity.const_get(ENV["LOG"] || "INFO")
-    LOG.progname = Nvm
+class BrowserifyRb::Nvm
+  LOG = Logger.new(STDERR)
+  LOG.level = Logger::Severity.const_get(ENV["LOG"] || "INFO")
+  LOG.progname = BrowserifyRb::Nvm
 
-    NVM_SH = File.join(__dir__, "nvm.sh")
+  NVM_SH = File.join(__dir__, "nvm.sh")
 
-    def initialize nvm_dir = "#{ENV["HOME"]}/.nvm"
-      @nvm_dir = nvm_dir
-    end
+  def initialize nvm_dir = "#{ENV["HOME"]}/.nvm"
+    @nvm_dir = nvm_dir
+  end
 
-    def env
-      { "NVM_DIR" => @nvm_dir }
-    end
+  def env
+    { "NVM_DIR" => @nvm_dir }
+  end
 
-    def run(
-          cmd,
-          stdin: "",
-          stdout_handler: proc{|d| STDOUT.print d },
-          stderr_handler: proc{|d| STDERR.print d },
-          node_ver: nil,
-          env: {})
-      new_env = (env).merge(self.env)
-      node_ver = node_ver ? %["#{node_ver}"] : ""
-      cmd = <<-CMD
+  def run(
+        cmd,
+        stdin: "",
+        stdout_handler: proc{|d| STDOUT.print d },
+        stderr_handler: proc{|d| STDERR.print d },
+        node_ver: nil,
+        env: {})
+    new_env = (env).merge(self.env)
+    node_ver = node_ver ? %["#{node_ver}"] : ""
+    cmd = <<-CMD
         . "#{NVM_SH}"
         if ! nvm use #{node_ver} >&2; then
           nvm install #{node_ver} >&2
@@ -37,32 +36,31 @@ class BrowserifyRb
         #{cmd}
       CMD
 
-      LOG.debug "run: #{cmd}"
-      BrowserifyRb::Popen3.async_exec(
-        cmd,
-        input: stdin, env: new_env,
-        stdout_handler: stdout_handler,
-        stderr_handler: stderr_handler
-      )
-    end
+    LOG.debug "run: #{cmd}"
+    BrowserifyRb::Popen3.async_exec(
+      cmd,
+      input: stdin, env: new_env,
+      stdout_handler: stdout_handler,
+      stderr_handler: stderr_handler
+    )
+  end
 
-    def self.version
-      out = StringIO.new
-      err = StringIO.new
-      cmd = <<-CMD
+  def self.version
+    out = StringIO.new
+    err = StringIO.new
+    cmd = <<-CMD
         . "#{NVM_SH}"
         nvm --version
       CMD
 
-      LOG.debug "run: #{cmd}"
-      st = BrowserifyRb::Popen3.async_exec(
-        cmd,
-        stdout_handler: proc {|d| out << d },
-        stderr_handler: proc {|d| err << d }
-      ).value
-      raise "non-zero exit status: #{status.to_i}\n#{err}" unless st.success?
+    LOG.debug "run: #{cmd}"
+    st = BrowserifyRb::Popen3.async_exec(
+      cmd,
+      stdout_handler: proc {|d| out << d },
+      stderr_handler: proc {|d| err << d }
+    ).value
+    raise "non-zero exit status: #{status.to_i}\n#{err}" unless st.success?
 
-      out.string.strip
-    end
+    out.string.strip
   end
 end

data/lib/browserify_rb/nvm/browserify.rb

@@ -0,0 +1,79 @@
+require "browserify_rb/nvm"
+
+require "stringio"
+require "logger"
+
+class BrowserifyRb::Nvm::Browserify
+  DEFAULT_NVM_DIR = "#{ENV["HOME"]}/.nvm"
+  LOG = Logger.new(STDERR)
+  LOG.level = Logger::Severity.const_get(ENV["LOG"] || "INFO")
+  LOG.progname = BrowserifyRb::Nvm::Browserify
+
+  def initialize(
+        browserify_opts: "", node_ver: nil, env: {},
+        nvm_dir: DEFAULT_NVM_DIR, suppress_stderr: false,
+        required_modules: nil)
+    @nvm = BrowserifyRb::Nvm.new nvm_dir
+    @node_ver = node_ver
+    @env = env
+    @browserify_opts = browserify_opts
+    @suppress_stderr = suppress_stderr
+    @prepared = false
+    @modules = required_modules
+  end
+
+  def prepare
+    ms = ["browserify", *@modules].map{|m| %!"#{m}"! }.join(" ")
+    cmd = "npm install #{ms}"
+    stdout_handler = proc { }
+    stderr_handler = @suppress_stderr ?
+                       proc { } :
+                       proc {|d| STDERR.print d}
+    LOG.debug "run: #{cmd}"
+    status = @nvm.run(
+      cmd,
+      node_ver: @node_ver,
+      env: @env,
+      stdout_handler: stdout_handler,
+      stderr_handler: stderr_handler
+    ).value
+    raise "non-zero exit status: #{status.to_i}" unless status.success?
+    @prepared = true
+  end
+
+  def compile source
+    prepare unless @prepared
+
+    out_buf = StringIO.new
+    cmd = <<-CMD
+      $(npm bin)/browserify #{@browserify_opts} -- -
+    CMD
+    stdout_handler = proc {|d| out_buf << d }
+    stderr_handler = @suppress_stderr ?
+                       proc {|d| } :
+                       proc {|d| STDERR.print d}
+    status = @nvm.run(
+      cmd,
+      stdin: source,
+      node_ver: @node_ver,
+      env: @env,
+      stdout_handler: stdout_handler,
+      stderr_handler: stderr_handler
+    ).value
+    raise "non-zero exit status: #{status.to_i}" unless status.success?
+
+    return out_buf.string
+  end
+
+  def self.compile(
+        source, browserify_opts: "", node_ver: nil, env: {},
+        nvm_dir: DEFAULT_NVM_DIR, suppress_stderr: false)
+    new(
+      browserify_opts: browserify_opts,
+      node_ver: node_ver,
+      env: env,
+      nvm_dir: nvm_dir,
+      suppress_stderr: suppress_stderr
+    ).compile(source)
+  end
+end

data/lib/browserify_rb/popen3.rb

@@ -2,78 +2,76 @@ require "open3"
 require "stringio"
 require "logger"
 
-class BrowserifyRb
-  module Popen3
-    LOG = Logger.new(STDERR)
-    LOG.level = Logger::Severity.const_get(ENV["LOG"] || "INFO")
-    LOG.progname = Popen3
+module BrowserifyRb::Popen3
+  LOG = Logger.new(STDERR)
+  LOG.level = Logger::Severity.const_get(ENV["LOG"] || "INFO")
+  LOG.progname = BrowserifyRb::Popen3
 
-    CHUNK_SIZE = 2000
-    DEFAULT_STDOUT_HANDLER = proc {|data| STDOUT.write data }
-    DEFAULT_STDERR_HANDLER = proc {|data| STDERR.write data }
+  CHUNK_SIZE = 2000
+  DEFAULT_STDOUT_HANDLER = proc {|data| STDOUT.write data }
+  DEFAULT_STDERR_HANDLER = proc {|data| STDERR.write data }
 
-    def self.async_exec(
-          cmd,
-          input: "",
-          env: {},
-          stdout_handler: DEFAULT_STDOUT_HANDLER,
-          stderr_handler: DEFAULT_STDERR_HANDLER,
-          spawn_opts: {},
-          chunk_size: CHUNK_SIZE)
-      Thread.fork do
-        begin
-          stdin, stdout, stderr, wait_thr = Open3.popen3 env, cmd, spawn_opts
+  def self.async_exec(
+        cmd,
+        input: "",
+        env: {},
+        stdout_handler: DEFAULT_STDOUT_HANDLER,
+        stderr_handler: DEFAULT_STDERR_HANDLER,
+        spawn_opts: {},
+        chunk_size: CHUNK_SIZE)
+    Thread.fork do
+      begin
+        stdin, stdout, stderr, wait_thr = Open3.popen3 env, cmd, spawn_opts
 
-          input = input.is_a?(String) ?
-                     StringIO.new(input) :
-                     iput
-          input_buff = ""
-          opened_ins = [stdin]
-          opened_outs = [stdout, stderr]
-          handlers = {
-            stdout => stdout_handler,
-            stderr => stderr_handler
-          }
-          while not opened_outs.empty?
-            ios = IO.select opened_outs, opened_ins, nil, 1
-            if ios.nil? and Process.waitpid(wait_thr.pid, Process::WNOHANG)
-              break
-            end
-
-            outs, ins, = ios
+        input = input.is_a?(String) ?
+                  StringIO.new(input) :
+                  iput
+        input_buff = ""
+        opened_ins = [stdin]
+        opened_outs = [stdout, stderr]
+        handlers = {
+          stdout => stdout_handler,
+          stderr => stderr_handler
+        }
+        while not opened_outs.empty?
+          ios = IO.select opened_outs, opened_ins, nil, 1
+          if ios.nil? and Process.waitpid(wait_thr.pid, Process::WNOHANG)
+            break
+          end
 
-            if not outs.nil?
-              outs.each do |out|
-                if out.eof?
-                  out.close
-                  opened_outs.delete out
-                else
-                  d = out.readpartial chunk_size
-                  handlers[out].call d
-                end
-              end
-            end
+          outs, ins, = ios
 
-            if not ins.nil? and ins.include? stdin
-              if input.eof?
-                stdin.close
-                opened_ins.delete stdin
-              elsif input_buff.empty?
-                d = input.readpartial(chunk_size)
-                bytes = stdin.write_nonblock(d)
-                input_buff = d[bytes .. -1]
+          if not outs.nil?
+            outs.each do |out|
+              if out.eof?
+                out.close
+                opened_outs.delete out
               else
-                bytes = stdin.write_nonblock(input_buff)
-                input_buff = input_buff[bytes .. -1]
+                d = out.readpartial chunk_size
+                handlers[out].call d
               end
             end
           end
 
-          wait_thr.value
-        rescue => e
-          LOG.error e
-          nil
+          if not ins.nil? and ins.include? stdin
+            if input.eof?
+              stdin.close
+              opened_ins.delete stdin
+            elsif input_buff.empty?
+              d = input.readpartial(chunk_size)
+              bytes = stdin.write_nonblock(d)
+              input_buff = d[bytes .. -1]
+            else
+              bytes = stdin.write_nonblock(input_buff)
+              input_buff = input_buff[bytes .. -1]
+            end
+          end
         end
+
+        wait_thr.value
+      rescue => e
+        LOG.error e
+        nil
       end
     end
   end

data/lib/browserify_rb/version.rb

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

data/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "browserify_rb",
+  "private": true,
+  "devDependencies": {
+    "babel-preset-es2015": "^6.3.13",
+    "babelify": "^7.2.0",
+    "browserify": "^12.0.1"
+  }
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browserify_rb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Keiichiro Ui
@@ -52,7 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-description: browserify wrapper with nvm to install node automatically
+description: 
 email:
 - keiichiro.ui@gmail.com
 executables: []
@@ -69,10 +69,13 @@ files:
 - bin/setup
 - browserify_rb.gemspec
 - lib/browserify_rb.rb
+- lib/browserify_rb/browserify.rb
 - lib/browserify_rb/nvm.rb
 - lib/browserify_rb/nvm.sh
+- lib/browserify_rb/nvm/browserify.rb
 - lib/browserify_rb/popen3.rb
 - lib/browserify_rb/version.rb
+- package.json
 homepage: https://github.com/kui/browserify_rb
 licenses:
 - MIT
@@ -97,5 +100,5 @@ rubyforge_project:
 rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: browserify wrapper
+summary: browserify wrapper for ruby
 test_files: []