capybara_spa 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 255f4a684ee49123f2acbe5abc15309f68f513bcc3ac8186c0bdab0b5b1af330
-  data.tar.gz: 6b942d330af15b3fb6f450c6254498c16e4b5cfffbe836f935d1ac556c9d52c5
+  metadata.gz: 19ed7589902a6d0325189f481b625b7b51c76f69e1db77007908d782ec8f8284
+  data.tar.gz: 5e3812be9fffb593695a0c29b3aa989a9d0930410883bb8040f062a308b41b64
 SHA512:
-  metadata.gz: 3bb18b51fb30a17043685808c1405a0b0ae67b02bd2adfebeca5197376bf7889867b1f991d9b40fa37f01aa6c14a7c6c311945bf72ae107c7a437e22fce9733e
-  data.tar.gz: 0ec570c654aa125d6c2fb1e0aa25a126d09c3950d7d4e11ad4067cdd208ace99502bd23d2d5b7521d20696b5c1e17c9650c17eef91b5ec0c0c3a673a00739a17
+  metadata.gz: 8dfff66e5fd86435ff0daa5f1786d537fb581c55d588923b7d373811d0fa4426567072134d8ad82c621fc5f514ae9b3e8e61fd86f55348b05784f665a7f2c45e
+  data.tar.gz: 9c2b0307ddb544cb7745cc9922ea7ec78a435f1cc4cc9c74bd1a34e480a9faad08ac7561a6d46cf6f608c8e2ac73801e6f04dc082b7e10d408bc100196352d2e

data/.travis.yml

@@ -1,5 +1,62 @@
-sudo: false
-language: ruby
+language: node_js
+sudo: required
+node_js:
+  - '9.11.1'
 rvm:
   - 2.4.1
-before_install: gem install bundler -v 1.16.1
+
+addons:
+  apt:
+    sources:
+      - google-chrome
+    packages:
+      - google-chrome-stable
+
+cache:
+  bundler: true
+  directories:
+    - /home/travis/.rvm/
+    - spec/angular-app
+
+cache: bundler
+
+before_install:
+  - wget http://chromedriver.storage.googleapis.com/2.38/chromedriver_linux64.zip
+  - unzip chromedriver_linux64.zip
+  - rm chromedriver_linux64.zip
+  - sudo mv -f chromedriver /usr/local/bin/
+  - sudo chmod +x /usr/local/bin/chromedriver
+  - google-chrome-stable --headless --no-sandbox
+
+  - gem install bundler -v 1.16.1
+  - ruby --version
+  - rvm --version
+  - bundle --version
+  - gem --version
+
+  - pwd
+  - ls
+
+install:
+
+before_script:
+  - bundle install
+
+  - cd spec/angular-app && npm install && cd ../../
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+  - sleep 1
+
+script:
+  - HEADLESS=true bundle exec rspec spec
+
+after_success:
+
+after_failure:
+
+after_script:
+
+branches:
+
+notifications:
+  email: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capybara_spa (0.1.0)
+    capybara_spa (0.3.0)
       capybara (~> 3.0)
 
 GEM
@@ -11,6 +11,7 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     archive-zip (0.11.0)
       io-like (~> 0.3.0)
+    bump (0.6.0)
     byebug (10.0.2)
     capybara (3.0.3)
       addressable
@@ -75,6 +76,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bump (~> 0.6.0)
   bundler (~> 1.16)
   capybara_spa!
   chromedriver-helper (~> 1.2)

data/capybara_spa.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "capybara", "~> 3.0"
+  spec.add_development_dependency "bump", "~> 0.6.0"
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/capybara_spa.rb

@@ -11,7 +11,7 @@ module CapybaraSpa
   end
 
   self.app_tag = ENV.fetch('NG_APP_TAG', 'app-root')
-  self.log_file = ENV.fetch('NG_LOG_FILE', '/dev/null')
+  self.log_file = ENV.fetch('NG_LOG_FILE', STDOUT)
 
   module Server
   end

data/lib/capybara_spa/server/ng_static_server.rb

@@ -23,8 +23,9 @@ module CapybaraSpa
       attr_accessor :build_path, :http_server_bin_path, :log_file, :pid_file, :port
       attr_accessor :pid
 
-      def initialize(build_path:, http_server_bin_path: nil, log_file: CapybaraSpa.log_file, pid_file: nil, port: nil)
-        @build_path = build_path || ENV.fetch('NG_BUILD_PATH', nil)
+      def initialize(build_path: nil, http_server_bin_path: nil, log_file: CapybaraSpa.log_file, pid_file: nil, port: nil)
+        build_path ||= ENV.fetch('NG_BUILD_PATH', nil)
+        @build_path = File.expand_path(build_path) if build_path
         @http_server_bin_path = http_server_bin_path || ENV.fetch('NG_HTTP_SERVER_BIN') { find_http_server_bin_path }
         @log_file = log_file
         @pid_file = pid_file || ENV.fetch('NG_PID_FILE', '/tmp/angular-process.pid')
@@ -46,7 +47,7 @@ module CapybaraSpa
         check_requirements!
 
         @pid = fork do
-          STDOUT.reopen(@log_file)
+          STDOUT.reopen(@log_file) unless @log_file == STDOUT
           run_server
         end
         File.write(pid_file, pid)
@@ -58,7 +59,7 @@ module CapybaraSpa
       def stop
         if File.exist?(pid_file)
           pid = File.read(pid_file).to_i
-          puts "capybara-angular/angular-http-server:parent#at_exit sending SIGTERM to pid: #{pid}" if ENV['DEBUG']
+          puts "capybara_spa/angular-http-server:parent#at_exit sending SIGTERM to pid: #{pid}" if ENV['DEBUG']
           begin
             Process.kill 'SIGTERM', pid
             Process.wait pid
@@ -66,12 +67,12 @@ module CapybaraSpa
             # no-op, the child process does not exist
           end
 
-          puts "capybara-angular/angular-http-server removing pid_file: #{pid_file}" if ENV['DEBUG']
+          puts "capybara_spa/angular-http-server removing pid_file: #{pid_file}" if ENV['DEBUG']
           FileUtils.rm pid_file
           @started = false
           true
         else
-          puts "capybara-angular/angular-http-server did not find pid_file, no process to SIGHUP: #{pid_file}" if ENV['DEBUG']
+          puts "capybara_spa/angular-http-server did not find pid_file, no process to SIGHUP: #{pid_file}" if ENV['DEBUG']
           false
         end
       end
@@ -85,7 +86,6 @@ module CapybaraSpa
 
       def check_executable_requirements!
         executable_name = File.basename(http_server_bin_path)
-
         if File.exist?(http_server_bin_path)
           if !File.executable?(http_server_bin_path)
             raise NgHttpServerNotExecutable, 'File found, but not executable!'
@@ -125,32 +125,47 @@ module CapybaraSpa
         # if no http-server found in default PATH then try to find it in node_modules
         if http_server_bin_path.length == 0
           http_server_bin_path = File.join(node_modules_path, '.bin', 'angular-http-server')
+        else
         end
 
-        http_server_bin_path
+        File.expand_path(http_server_bin_path) if http_server_bin_path
+      end
+
+      def node_modules_path
+        cwd = ''
+        loop do
+          path = File.expand_path File.join(build_path, cwd, 'node_modules')
+          if Dir.exist?(path)
+            return path
+          elsif File.expand_path(path) == '/node_modules'
+            raise NodeModulesDirectoryNotFound, 'Cannot find "node_modules" directory. Walked all the way to the root "/"!'
+          else
+            cwd = File.join '..', cwd
+          end
+        end
       end
 
       def run_server
         build_dir = File.dirname(build_path)
         Dir.chdir(build_dir) do
           cmd = "#{http_server_bin_path} -p #{port} --path #{File.basename(build_path)}"
-          puts "capybara-angular/angular-http-server is executing command: #{cmd}" # if ENV['DEBUG']
+          puts "capybara_spa/angular-http-server is executing command: #{cmd}" if ENV['DEBUG']
           spawn_cmd(cmd)
         end
       end
 
       def spawn_cmd(cmd)
-        puts "capybara-angular/angular-http-server is executing command: #{cmd}" if ENV['DEBUG']
+        puts "capybara_spa/angular-http-server is executing command: #{cmd}" if ENV['DEBUG']
 
         # use spawn(cmd, arg1, ... ) version to avoid launching a shell that launches the
         # http-server or ng process. We want this pid to be the actual process to kill when
         # this program is done exiting.
         pid = spawn *cmd.split(/\s+/)
 
-        puts "capybara-angular/angular-http-server:forked child with pid: #{pid}" if ENV['DEBUG']
+        puts "capybara_spa/angular-http-server:forked child with pid: #{pid}" if ENV['DEBUG']
 
         at_exit do
-          puts "capybara-angular/angular-http-server:forked#at_exit is sending SIGTERM signal to pid: #{pid}" if ENV['DEBUG']
+          puts "capybara_spa/angular-http-server:forked#at_exit is sending SIGTERM signal to pid: #{pid}" if ENV['DEBUG']
           begin
             Process.kill 'TERM', pid
             Process.wait pid

data/lib/capybara_spa/version.rb

@@ -1,3 +1,3 @@
 module CapybaraSpa
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara_spa
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-07 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement