nonnative 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c10339b1e71b31706b70b61c1107c2e1cfef46da91852f3d973065da3ab150c
-  data.tar.gz: '0619ca746648a935a9b3904a5cc33f40bc324d1a66db289ed98466ed2207aa38'
+  metadata.gz: eca9151fff87535cc94a77e24cf243a3d0ed4203dc19c1d8bd5a6e31e604521e
+  data.tar.gz: 4cf14cbb4df0dca0740406c1667742b171238ace67463f51387464cd5f2cf9cd
 SHA512:
-  metadata.gz: dfb30c7fd56bd14dc6d4fb8bddc1770a1afee0feeb79e99992510464401fff9953415433b9b139bb2725a264d6749e9d6eaeb868b7d0f29a7d20656e871eabf8
-  data.tar.gz: d0fd3db73e4b91c419bae57cb76c0d1a10e7d7a17310c16dad6fb82e49eefab87a533ca32c6cfa7cb44ca505742a33c4b83e0bde024d9dcba3457578a6f295c4
+  metadata.gz: 5b90f1d35bfbd4edb311a308d39d20711b3cf53b03101a554a088cac1719f6b53cc57f629f862dae4bd7063e8be5413b948edb5c952ee929ef971cdfce804d4b
+  data.tar.gz: 2df440113fda404d2a140909b8d2b3ae5a37e6c50619f9a6a29e26d5f7cff4abaf84fe7f1e879d5f592d5a353a9281e2612a33c3c28a0227f7658f0153a0d5c6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nonnative (1.0.0)
+    nonnative (1.1.0)
       cucumber
       rspec-expectations
       semantic_logger

data/README.md

@@ -46,15 +46,15 @@ require 'nonnative'
 Nonnative.configure do |config|
   config.strategy = :startup or :before or :manual
 
-  config.definition do |d|
-    d.process = 'features/support/bin/start 12_321'
+  config.process do |d|
+    d.command = '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'
+  config.process do |d|
+    d.command = 'features/support/bin/start 12_322'
     d.timeout = 0.5
     d.port = 12_322
     d.file = 'features/logs/12_322.log'
@@ -67,14 +67,14 @@ end
 ```yaml
 version: 1.0
 strategy: manual
-definitions:
+processes:
   -
-    process: features/support/bin/start 12_321
+    command: features/support/bin/start 12_321
     timeout: 5
     port: 12321
     file: features/logs/12_321.log
   -
-    process: features/support/bin/start 12_322
+    command: features/support/bin/start 12_322
     timeout: 5
     port: 12322
     file: features/logs/12_322.log

data/lib/nonnative.rb

@@ -2,14 +2,15 @@
 
 require 'socket'
 require 'timeout'
+require 'yaml'
 
 require 'nonnative/version'
 require 'nonnative/error'
-require 'nonnative/configuration'
-require 'nonnative/definition'
-require 'nonnative/process'
-require 'nonnative/process_pool'
-require 'nonnative/port'
+require 'nonnative/configuration/object'
+require 'nonnative/configuration/process'
+require 'nonnative/process/system'
+require 'nonnative/process/pool'
+require 'nonnative/process/port'
 require 'nonnative/logger'
 
 module Nonnative
@@ -19,11 +20,11 @@ module Nonnative
     end
 
     def load_configuration(path)
-      @configuration ||= Nonnative::Configuration.load_file(path) # rubocop:disable Naming/MemoizedInstanceVariableName
+      @configuration ||= Nonnative::Configuration::Object.load_file(path) # rubocop:disable Naming/MemoizedInstanceVariableName
     end
 
     def configuration
-      @configuration ||= Nonnative::Configuration.new
+      @configuration ||= NNonnative::Configuration::Object.new
     end
 
     def configure
@@ -33,7 +34,7 @@ module Nonnative
     end
 
     def start
-      @process_pool ||= Nonnative::ProcessPool.new(configuration)
+      @process_pool ||= Nonnative::Process::Pool.new(configuration)
 
       @process_pool.start do |pid, result|
         logger.error('Process has started though did respond in time', pid: pid) unless result

data/lib/nonnative/configuration/object.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Nonnative
+  module Configuration
+    class Object
+      class << self
+        def load_file(path)
+          file = YAML.load_file(path)
+
+          new.tap do |c|
+            c.strategy = file['strategy']
+
+            processes(file, c)
+          end
+        end
+
+        private
+
+        def processes(file, config)
+          file['processes'].each do |fd|
+            config.process do |d|
+              d.command = fd['command']
+              d.timeout = fd['timeout']
+              d.port = fd['port']
+              d.file = fd['file']
+            end
+          end
+        end
+      end
+
+      def initialize
+        self.strategy = :before
+        self.processes = []
+      end
+
+      attr_accessor :strategy
+      attr_accessor :processes
+
+      def process
+        process = Nonnative::Configuration::Process.new
+        yield process
+
+        processes << process
+      end
+    end
+  end
+end

data/lib/nonnative/configuration/process.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Nonnative
+  module Configuration
+    class Process
+      attr_accessor :command
+      attr_accessor :timeout
+      attr_accessor :port
+      attr_accessor :file
+    end
+  end
+end

data/lib/nonnative/process/pool.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Nonnative
+  module Process
+    class Pool
+      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.processes.map do |d|
+          [Nonnative::Process::System.new(d), Nonnative::Process::Port.new(d)]
+        end
+      end
+
+      def yield_results(prs, pos)
+        prs.zip(pos).each do |pid, result|
+          yield pid, result
+        end
+      end
+    end
+  end
+end

data/lib/nonnative/process/port.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Nonnative
+  module Process
+    class Port
+      def initialize(process)
+        @process = process
+      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 :process
+
+      def timeout
+        Timeout.timeout(process.timeout) do
+          yield
+        end
+      rescue Timeout::Error
+        false
+      end
+
+      def open_socket
+        TCPSocket.new('127.0.0.1', process.port).close
+      end
+
+      def sleep_interval
+        sleep 0.01
+      end
+    end
+  end
+end

data/lib/nonnative/process/system.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Nonnative
+  module Process
+    class System
+      def initialize(process)
+        @process = process
+        @started = false
+      end
+
+      def start
+        unless started
+          @pid = spawn(process.command, %i[out err] => [process.file, 'a'])
+          @started = true
+        end
+
+        pid
+      end
+
+      def stop
+        raise Nonnative::Error, "Can't stop a process that has not started" unless started
+
+        ::Process.kill('SIGINT', pid)
+        @started = false
+
+        pid
+      end
+
+      private
+
+      attr_reader :process, :pid, :started
+    end
+  end
+end

data/lib/nonnative/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nonnative
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Alex Falkowski
@@ -158,14 +158,14 @@ files:
 - bin/setup
 - lib/nonnative.rb
 - lib/nonnative/before.rb
-- lib/nonnative/configuration.rb
-- lib/nonnative/definition.rb
+- lib/nonnative/configuration/object.rb
+- lib/nonnative/configuration/process.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/process/pool.rb
+- lib/nonnative/process/port.rb
+- lib/nonnative/process/system.rb
 - lib/nonnative/startup.rb
 - lib/nonnative/version.rb
 - nonnative.gemspec

data/lib/nonnative/configuration.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-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 :strategy
-    attr_accessor :definitions
-
-    def definition
-      definition = Nonnative::Definition.new
-      yield definition
-
-      definitions << definition
-    end
-  end
-end

data/lib/nonnative/definition.rb

@@ -1,10 +0,0 @@
-# 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/port.rb

@@ -1,51 +0,0 @@
-# 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

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Nonnative
-  class Process
-    def initialize(definition)
-      @definition = definition
-      @started = false
-    end
-
-    def start
-      unless started
-        @pid = spawn(definition.process, %i[out err] => [definition.file, 'a'])
-        @started = true
-      end
-
-      pid
-    end
-
-    def stop
-      raise Nonnative::Error, "Can't stop a process that has not started" unless started
-
-      ::Process.kill('SIGINT', pid)
-      @started = false
-
-      pid
-    end
-
-    private
-
-    attr_reader :definition, :pid, :started
-  end
-end

data/lib/nonnative/process_pool.rb

@@ -1,37 +0,0 @@
-# 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