nonnative 0.8.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8928eb7a827f2a160e04c23364ee50004d1ee643b9fc1b46b4bdd17ef882388
-  data.tar.gz: efc2aef3d031abe3edabef19c48db62a400506f4431af16cc55c21e3d49b47d8
+  metadata.gz: 9c10339b1e71b31706b70b61c1107c2e1cfef46da91852f3d973065da3ab150c
+  data.tar.gz: '0619ca746648a935a9b3904a5cc33f40bc324d1a66db289ed98466ed2207aa38'
 SHA512:
-  metadata.gz: 70d457b4ab3b4c7427ce93155bc26da56e0a32c90a2568ad738aa53b1a871bde52f363b01f48fc4194c5908c3ea76e7f6cc74845de8a9860f3b41986e01b709d
-  data.tar.gz: 88a31eea446d14d0e9271501aa5997832e023235ff0b6f282d237c9796c01732993e961c46c0bed7f281be31f926554ac72a755393b99ce36fcb047d10b49e6d
+  metadata.gz: dfb30c7fd56bd14dc6d4fb8bddc1770a1afee0feeb79e99992510464401fff9953415433b9b139bb2725a264d6749e9d6eaeb868b7d0f29a7d20656e871eabf8
+  data.tar.gz: d0fd3db73e4b91c419bae57cb76c0d1a10e7d7a17310c16dad6fb82e49eefab87a533ca32c6cfa7cb44ca505742a33c4b83e0bde024d9dcba3457578a6f295c4

data/.circleci/config.yml

@@ -20,3 +20,6 @@ jobs:
             - vendor/bundle
       - run: make features
       - run: make analysis
+      - run: make audit
+      - store_artifacts:
+          path: features/logs

data/.gitignore

@@ -8,4 +8,4 @@
 /tmp/
 vendor
 coverage
-logs
+features/logs/*.log

data/.rubocop.yml

@@ -2,7 +2,7 @@ AllCops:
   TargetRubyVersion: 2.6
   DisplayCopNames: true
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
 
 Style/Documentation:

data/.ruby-version

@@ -1 +1 @@
-ruby-2.6.3
+ruby-2.6.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nonnative (0.8.0)
+    nonnative (1.0.0)
       cucumber
       rspec-expectations
       semantic_logger
@@ -10,10 +10,15 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
-    backport (1.1.2)
-    backports (3.15.0)
-    builder (3.2.3)
-    concurrent-ruby (1.1.5)
+    backports (3.16.1)
+    benchmark-malloc (0.1.0)
+    benchmark-perf (0.5.0)
+    benchmark-trend (0.3.0)
+    builder (3.2.4)
+    bundler-audit (0.6.1)
+      bundler (>= 1.2.0, < 3)
+      thor (~> 0.18)
+    concurrent-ruby (1.1.6)
     cucumber (3.1.2)
       builder (>= 2.1.2)
       cucumber-core (~> 3.2.0)
@@ -33,67 +38,62 @@ GEM
     diff-lcs (1.3)
     docile (1.3.2)
     gherkin (5.1.0)
-    htmlentities (4.3.4)
-    jaro_winkler (1.5.3)
-    json (2.2.0)
-    mini_portile2 (2.4.0)
-    multi_json (1.13.1)
+    jaro_winkler (1.5.4)
+    multi_json (1.14.1)
     multi_test (0.1.2)
-    nokogiri (1.10.4)
-      mini_portile2 (~> 2.4.0)
-    parallel (1.17.0)
-    parser (2.6.4.0)
+    parallel (1.19.1)
+    parser (2.7.0.2)
       ast (~> 2.4.0)
     rainbow (3.0.0)
-    rake (12.3.3)
-    reverse_markdown (1.2.0)
-      nokogiri
-    rspec-expectations (3.8.4)
+    rake (13.0.1)
+    rexml (3.2.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-benchmark (0.5.1)
+      benchmark-malloc (~> 0.1.0)
+      benchmark-perf (~> 0.5.0)
+      benchmark-trend (~> 0.3.0)
+      rspec (>= 3.0.0, < 4.0.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.74.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    rubocop (0.80.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
-    semantic_logger (4.5.0)
+    semantic_logger (4.6.0)
       concurrent-ruby (~> 1.0)
-    simplecov (0.17.0)
+    simplecov (0.18.2)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    solargraph (0.37.2)
-      backport (~> 1.1)
-      bundler (>= 1.17.2)
-      htmlentities (~> 4.3, >= 4.3.4)
-      jaro_winkler (~> 1.5)
-      nokogiri (~> 1.9, >= 1.9.1)
-      parser (~> 2.3)
-      reverse_markdown (~> 1.0, >= 1.0.5)
-      rubocop (~> 0.52)
-      thor (~> 0.19, >= 0.19.4)
-      tilt (~> 2.0)
-      yard (~> 0.9)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.0)
     thor (0.20.3)
-    tilt (2.0.9)
-    unicode-display_width (1.6.0)
-    yard (0.9.20)
+    unicode-display_width (1.6.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler
+  bundler-audit
   nonnative!
   rake
+  rspec-benchmark
   rubocop
   simplecov
-  solargraph
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

data/Makefile

@@ -3,8 +3,21 @@
 dependencies:
 	bin/setup
 
+outdated-dependencies:
+	bundle outdated --only-explicit
+
 features:
-	bundle exec cucumber
+	bundle exec cucumber $(feature)
 
 analysis:
 	bundle exec rubocop
+
+audit:
+	bundle exec bundle-audit update
+	bundle exec bundle-audit
+
+cleanup-analysis:
+	bundle exec rubocop -a
+
+cleanup-logs:
+	rm -rf features/logs/*.log

data/README.md

@@ -10,7 +10,7 @@ Well so do I. The issue is that most languages the cucumber implementation is no
 
 So why not test the way you want and build the microservice how you want. These kind of tests will make sure your application is tested properly by going end-to-end.
 
-The way it works is it spawns the process you configure and waits for it to start. Then you communicate with your microservice however you like (TCP, HTTP, gRPC, etc)
+The way it works is it spawns the processes you configure and waits for it to start. Then you communicate with your microservice however you like (TCP, HTTP, gRPC, etc)
 
 ## Installation
 
@@ -38,14 +38,52 @@ Configure nonnative with the following:
 - The file you want STDOUT to be logged to.
 - The strategy (Startup will start the process once and before will hook into cucumbers Before and After).
 
+### Ruby
+
 ```ruby
 require 'nonnative'
 
 Nonnative.configure do |config|
-  config.process = 'features/support/bin/start'
-  config.timeout = 0.5
-  config.port = 12_321
-  config.file = 'logs/output'
-  config.strategy = :startup or :before
+  config.strategy = :startup or :before or :manual
+
+  config.definition do |d|
+    d.process = 'features/support/bin/start 12_321'
+    d.timeout = 0.5
+    d.port = 12_321
+    d.file = 'features/logs/12_321.log'
+  end
+
+  config.definition do |d|
+    d.process = 'features/support/bin/start 12_322'
+    d.timeout = 0.5
+    d.port = 12_322
+    d.file = 'features/logs/12_322.log'
+  end
 end
 ```
+
+### YAML
+
+```yaml
+version: 1.0
+strategy: manual
+definitions:
+  -
+    process: features/support/bin/start 12_321
+    timeout: 5
+    port: 12321
+    file: features/logs/12_321.log
+  -
+    process: features/support/bin/start 12_322
+    timeout: 5
+    port: 12322
+    file: features/logs/12_322.log
+```
+
+Then load the file with
+
+```ruby
+require 'nonnative'
+
+Nonnative.load_configuration('configuration.yml')
+```

data/bin/setup

@@ -4,5 +4,6 @@ IFS=$'\n\t'
 set -vx
 
 gem install bundler
-bundle check --path vendor/bundle || bundle install --path vendor/bundle
-bundle clean
+bundle config set path 'vendor/bundle'
+bundle check || bundle install
+bundle clean --force

data/lib/nonnative/configuration.rb

@@ -2,14 +2,44 @@
 
 module Nonnative
   class Configuration
+    class << self
+      def load_file(path)
+        file = YAML.load_file(path)
+
+        new.tap do |c|
+          c.strategy = file['strategy']
+
+          definitions(file, c)
+        end
+      end
+
+      private
+
+      def definitions(file, config)
+        file['definitions'].each do |fd|
+          config.definition do |d|
+            d.process = fd['process']
+            d.timeout = fd['timeout']
+            d.port = fd['port']
+            d.file = fd['file']
+          end
+        end
+      end
+    end
+
     def initialize
       self.strategy = :before
+      self.definitions = []
     end
 
-    attr_accessor :process
-    attr_accessor :timeout
-    attr_accessor :port
-    attr_accessor :file
     attr_accessor :strategy
+    attr_accessor :definitions
+
+    def definition
+      definition = Nonnative::Definition.new
+      yield definition
+
+      definitions << definition
+    end
   end
 end

data/lib/nonnative/definition.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Nonnative
+  class Definition
+    attr_accessor :process
+    attr_accessor :timeout
+    attr_accessor :port
+    attr_accessor :file
+  end
+end

data/lib/nonnative/manual.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+# Do nothing as it's manual

data/lib/nonnative/port.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Nonnative
+  class Port
+    def initialize(definition)
+      @definition = definition
+    end
+
+    def open?
+      timeout do
+        open_socket
+        true
+      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+        sleep_interval
+        retry
+      end
+    end
+
+    def closed?
+      timeout do
+        open_socket
+        raise Nonnative::Error
+      rescue Nonnative::Error
+        sleep_interval
+        retry
+      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ECONNRESET
+        true
+      end
+    end
+
+    private
+
+    attr_reader :definition
+
+    def timeout
+      Timeout.timeout(definition.timeout) do
+        yield
+      end
+    rescue Timeout::Error
+      false
+    end
+
+    def open_socket
+      TCPSocket.new('127.0.0.1', definition.port).close
+    end
+
+    def sleep_interval
+      sleep 0.01
+    end
+  end
+end

data/lib/nonnative/process.rb

@@ -2,65 +2,31 @@
 
 module Nonnative
   class Process
-    def initialize(configuration)
-      @configuration = configuration
+    def initialize(definition)
+      @definition = definition
+      @started = false
     end
 
     def start
-      @pid = if configuration.file
-               spawn(configuration.process, %i[out err] => [configuration.file, 'a'])
-             else
-               spawn(configuration.process)
-             end
+      unless started
+        @pid = spawn(definition.process, %i[out err] => [definition.file, 'a'])
+        @started = true
+      end
 
-      [port_open?, pid]
+      pid
     end
 
     def stop
-      ::Process.kill('SIGINT', pid)
-      [port_closed?, pid]
-    end
-
-    private
-
-    attr_reader :configuration, :pid
-
-    def port_open?
-      timeout do
-        open_socket
-        true
-      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
-        sleep_interval
-        retry
-      end
-    end
+      raise Nonnative::Error, "Can't stop a process that has not started" unless started
 
-    def port_closed?
-      timeout do
-        open_socket
-        raise Nonnative::Error
-      rescue Nonnative::Error
-        sleep_interval
-        retry
-      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
-        true
-      end
-    end
+      ::Process.kill('SIGINT', pid)
+      @started = false
 
-    def timeout
-      Timeout.timeout(configuration.timeout) do
-        yield
-      end
-    rescue Timeout::Error
-      false
+      pid
     end
 
-    def open_socket
-      TCPSocket.new('127.0.0.1', configuration.port).close
-    end
+    private
 
-    def sleep_interval
-      sleep 0.01
-    end
+    attr_reader :definition, :pid, :started
   end
 end

data/lib/nonnative/process_pool.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Nonnative
+  class ProcessPool
+    def initialize(configuration)
+      @configuration = configuration
+    end
+
+    def start(&block)
+      prs = processes.map { |p, _| p.start }
+      pos = processes.map { |_, p| Thread.new { p.open? } }.map(&:value)
+
+      yield_results(prs, pos, &block)
+    end
+
+    def stop(&block)
+      prs = processes.map { |p, _| p.stop }
+      pos = processes.map { |_, p| Thread.new { p.closed? } }.map(&:value)
+
+      yield_results(prs, pos, &block)
+    end
+
+    private
+
+    attr_reader :configuration
+
+    def processes
+      @processes ||= configuration.definitions.map { |d| [Nonnative::Process.new(d), Nonnative::Port.new(d)] }
+    end
+
+    def yield_results(prs, pos)
+      prs.zip(pos).each do |pid, result|
+        yield pid, result
+      end
+    end
+  end
+end

data/lib/nonnative/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nonnative
-  VERSION = '0.8.0'
+  VERSION = '1.0.0'
 end

data/lib/nonnative.rb

@@ -6,7 +6,10 @@ require 'timeout'
 require 'nonnative/version'
 require 'nonnative/error'
 require 'nonnative/configuration'
+require 'nonnative/definition'
 require 'nonnative/process'
+require 'nonnative/process_pool'
+require 'nonnative/port'
 require 'nonnative/logger'
 
 module Nonnative
@@ -15,6 +18,10 @@ module Nonnative
       @logger ||= Nonnative::Logger.create
     end
 
+    def load_configuration(path)
+      @configuration ||= Nonnative::Configuration.load_file(path) # rubocop:disable Naming/MemoizedInstanceVariableName
+    end
+
     def configuration
       @configuration ||= Nonnative::Configuration.new
     end
@@ -26,18 +33,17 @@ module Nonnative
     end
 
     def start
-      @process ||= Nonnative::Process.new(configuration)
-      result, pid = @process.start
-      return if result
+      @process_pool ||= Nonnative::ProcessPool.new(configuration)
 
-      logger.error('Process has started though did respond in time', pid: pid)
+      @process_pool.start do |pid, result|
+        logger.error('Process has started though did respond in time', pid: pid) unless result
+      end
     end
 
     def stop
-      result, pid = @process.stop
-      return if result
-
-      logger.error('Process has stopped though did respond in time', pid: pid)
+      @process_pool.stop do |pid, result|
+        logger.error('Process has stopped though did respond in time', pid: pid) unless result
+      end
     end
   end
 end

data/nonnative.gemspec

@@ -29,8 +29,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'semantic_logger'
 
   spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'bundler-audit'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec-benchmark'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'solargraph'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nonnative
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Alex Falkowski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-31 00:00:00.000000000 Z
+date: 2020-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler-audit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec-benchmark
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: solargraph
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -145,9 +159,13 @@ files:
 - lib/nonnative.rb
 - lib/nonnative/before.rb
 - lib/nonnative/configuration.rb
+- lib/nonnative/definition.rb
 - lib/nonnative/error.rb
 - lib/nonnative/logger.rb
+- lib/nonnative/manual.rb
+- lib/nonnative/port.rb
 - lib/nonnative/process.rb
+- lib/nonnative/process_pool.rb
 - lib/nonnative/startup.rb
 - lib/nonnative/version.rb
 - nonnative.gemspec