browserify_rb 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dd70243ad4d62334ac69f8efcdc690931ddccf9
-  data.tar.gz: 15b681ba96ed567e57c30e77d3751b5e950aff27
+  metadata.gz: 658dbed00139171d4a384b5b3ff5353dd4dd75a0
+  data.tar.gz: 222af08171c17b78d0820e9f69e8f1b983e21a38
 SHA512:
-  metadata.gz: edfd3ceeb8418deb65fe42e0cfce5204f5f50d9f841473c098dc59016842a29be28ad54142c3e39e7e3d382fcfdcff911605b10a0ef70216433b8ba7e16a03c4
-  data.tar.gz: 12ac708441a7be2315f0cea06a06399d41ccd916e7a6365ad2c78801deb52fb2e1351e156f339502e989eb8f59d3667cba1ddda428019ddd6b29747347c5ab0f
+  metadata.gz: 80f4f97a884698b82ede735bb9429ad724f3a9087b868a99827068b840d63d798981be50c14ff770a874b400fa0a84466ee985106b9bcf97f2908f694482634f
+  data.tar.gz: 9686b3dad5db385021f2ca912a67250b262b9d1b5e23d3cb43b2912e1fcd9d52596ee6ee133e7903930256d5491eedc4c5b989e109ad75604c392decf15db865

data/browserify_rb.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
+    spec.metadata['allowed_push_host'] = "https://rubygems.org"
   else
     raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
   end

data/lib/browserify_rb.rb

@@ -2,31 +2,34 @@ require "browserify_rb/version"
 require "browserify_rb/nvm"
 
 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")
 
   def initialize(
         browserify_opts: "", node_ver: "stable", env: {},
-        nvm_dir: DEFAULT_NVM_DIR, suppress_stderr: false)
+        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
-    cmd = <<-CMD
-      if ! npm ls -g browserify &>/dev/null; then
-        npm install -g browserify >&2
-      fi
-    CMD
+    ms = ["browserify", *@modules].map{|m| %Q!"#{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,
@@ -43,10 +46,7 @@ class BrowserifyRb
 
     out_buf = StringIO.new
     cmd = <<-CMD
-      if ! npm ls -g browserify &>/dev/null; then
-        npm install -g browserify >&2
-      fi
-      browserify #{@browserify_opts} -- -
+      node_modules/.bin/browserify #{@browserify_opts} -- -
     CMD
     stdout_handler = proc {|d| out_buf << d }
     stderr_handler = @suppress_stderr ?

data/lib/browserify_rb/nvm.rb

@@ -1,8 +1,13 @@
 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")
+
     NVM_SH = File.join(__dir__, "nvm.sh")
 
     def initialize nvm_dir = "#{ENV["HOME"]}/.nvm"
@@ -22,8 +27,8 @@ class BrowserifyRb
           env: {})
       new_env = (env).merge(self.env)
       cmd = <<-CMD
-        source "#{NVM_SH}" || {
-          printf "Abort\n" >&2
+        . "#{NVM_SH}" || {
+          printf "Abort\\n" >&2
           exit 1
         }
         if ! nvm use "#{node_ver}" >&2; then
@@ -33,8 +38,10 @@ class BrowserifyRb
         #{cmd}
       CMD
 
+      LOG.debug "run: #{cmd}"
       BrowserifyRb::Popen3.async_exec(
-        input: stdin, env: new_env, cmd: cmd,
+        cmd,
+        input: stdin, env: new_env,
         stdout_handler: stdout_handler,
         stderr_handler: stderr_handler
       )
@@ -44,15 +51,16 @@ class BrowserifyRb
       out = StringIO.new
       err = StringIO.new
       cmd = <<-CMD
-        source "#{NVM_SH}" || {
-          printf "Abort\n" >&2
+        . "#{NVM_SH}" || {
+          printf "Abort\\n" >&2
           exit 1
         }
         nvm --version
       CMD
 
+      LOG.debug "run: #{cmd}"
       st = BrowserifyRb::Popen3.async_exec(
-        cmd: cmd,
+        cmd,
         stdout_handler: proc {|d| out << d },
         stderr_handler: proc {|d| err << d }
       ).value

data/lib/browserify_rb/popen3.rb

@@ -5,30 +5,34 @@ require "logger"
 class BrowserifyRb
   module Popen3
     LOG = Logger.new(STDERR)
+    LOG.level = Logger::Severity.const_get(ENV["LOG"] || "INFO")
 
     CHUNK_SIZE = 2000
-    DEFAULT_STDOUT_HANDLER = proc {|data| STDOUT.print data }
-    DEFAULT_STDERR_HANDLER = proc {|data| STDERR.print data }
+    DEFAULT_STDOUT_HANDLER = proc {|data| STDOUT.write data }
+    DEFAULT_STDERR_HANDLER = proc {|data| STDERR.write data }
 
     def self.async_exec(
+          cmd,
           input: "",
           env: {},
-          cmd: nil,
           stdout_handler: DEFAULT_STDOUT_HANDLER,
           stderr_handler: DEFAULT_STDERR_HANDLER,
           spawn_opts: {},
           chunk_size: CHUNK_SIZE)
-
-      raise ArgumentError, "'cmd' require" if cmd.nil?
-
-      stdin, stdout, stderr, wait_thr = Open3.popen3 env, cmd, spawn_opts
-
-      in_buf = StringIO.new input
-      opened_ins = [stdin]
-      opened_outs = [stdout, stderr]
-
       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)
@@ -37,47 +41,39 @@ class BrowserifyRb
 
             outs, ins, = ios
 
-            unless outs.nil?
-              if outs.include? stdout
-                begin
-                  d = stdout.readpartial CHUNK_SIZE
-                  stdout_handler.yield d
-                rescue EOFError
-                  opened_outs.delete stdout
-                end
-              end
-
-              if outs.include? stderr
-                begin
-                  d = stderr.readpartial CHUNK_SIZE
-                  stderr_handler.yield d
-                rescue EOFError
-                  opened_outs.delete stderr
+            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
 
             if not ins.nil? and ins.include? stdin
-              i = begin
-                    in_buf.readpartial CHUNK_SIZE
-                  rescue EOFError
-                    nil
-                  end
-              if i.nil?
+              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(i)
-                in_buf.seek bytes - i.bytesize, IO::SEEK_CUR
+                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
-
-      wait_thr
     end
   end
 end

data/lib/browserify_rb/version.rb

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

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: browserify_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Keiichiro Ui
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2015-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 description: browserify wrapper with nvm to install node automatically
@@ -59,8 +59,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -77,24 +77,24 @@ homepage: https://github.com/kui/browserify_rb
 licenses:
 - MIT
 metadata:
-  allowed_push_host: 'TODO: Set to ''http://mygemserver.com'''
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: browserify wrapper