nonnative 1.45.0 → 1.46.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85f5fe8fb5f61dce67f48ddf86ea0d2b76a6446e0e249af0f5afd22229bf3d3d
-  data.tar.gz: 178d46b667d50d4f8b68b0e18946ca2aa265e41fd3f8c869229a6e464ddf6e41
+  metadata.gz: 5ab3f3907cd50fe1984cc57c28da9a17612beba23d73e8e82111ab133569a082
+  data.tar.gz: 71601b678ec6a2dbf53a1a2347955c691619dcf7310224d974d0b84bdc4de922
 SHA512:
-  metadata.gz: 782d41b50946ad3741bdf1deedaff39c47db9d890d00f6e2d3ea854c8dff0a9ca3e96d3960f6e2c9d8776b41f4dc6170ca7d0fd65fb86fb65809922258b9f2df
-  data.tar.gz: 317a75048db20140a4cd99dfc87ab8001fa4bcbfda7fc750fc3fb00ab8bfb7f7e25e16a38be17faff2c100c683281fac4f1fa9054cc4a39f510baabf6f174bb6
+  metadata.gz: 0bcee6e1dfcba57e0a6be43cff1be649f9fcff7c1ec94a26cca48e47b1ae0d734a279ff61464acdca5e531ba4abfb79479a9f473bd893f63d97efa575b7387e4
+  data.tar.gz: 91d0a695d1d2efc013af95e4a10db2637c8d47dfa21ab49a0765098f7f69c34520e514598aadca2652d69610b7baeea76822388c6030f33b3f0c78c33ec039ea

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.46.0](https://github.com/alexfalkowski/nonnative/compare/v1.45.0...v1.46.0) (2021-05-10)
+
+
+### Features
+
+* add loading config through configure ([#87](https://github.com/alexfalkowski/nonnative/issues/87)) ([a95e8b6](https://github.com/alexfalkowski/nonnative/commit/a95e8b6817380afd732d0aefb170726f905548cb))
+
 ## [1.45.0](https://github.com/alexfalkowski/nonnative/compare/v1.44.1...v1.45.0) (2021-05-10)
 
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nonnative (1.45.0)
+    nonnative (1.46.0)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       cucumber (>= 6, < 7)
       grpc (>= 1, < 2)

data/README.md

@@ -108,7 +108,9 @@ Then load the file with
 ```ruby
 require 'nonnative'
 
-Nonnative.load_configuration('configuration.yml')
+Nonnative.configure do |config|
+  config.load_file('configuration.yml')
+end
 ```
 
 ### Servers
@@ -189,7 +191,9 @@ Then load the file with:
 ```ruby
 require 'nonnative'
 
-Nonnative.load_configuration('configuration.yml')
+Nonnative.configure do |config|
+  config.load_file('configuration.yml')
+end
 ```
 
 #### HTTP
@@ -255,7 +259,9 @@ Then load the file with:
 ```ruby
 require 'nonnative'
 
-Nonnative.load_configuration('configuration.yml')
+Nonnative.configure do |config|
+  config.load_file('configuration.yml')
+end
 ```
 
 #### gRPC
@@ -317,7 +323,9 @@ Then load the file with:
 ```ruby
 require 'nonnative'
 
-Nonnative.load_configuration('configuration.yml')
+Nonnative.configure do |config|
+  config.load_file('configuration.yml')
+end
 ```
 
 ### Services
@@ -363,7 +371,9 @@ Then load the file with
 ```ruby
 require 'nonnative'
 
-Nonnative.load_configuration('configuration.yml')
+Nonnative.configure do |config|
+  config.load_file('configuration.yml')
+end
 ```
 
 #### Proxies

data/lib/nonnative.rb

@@ -60,10 +60,6 @@ module Nonnative
       Nonnative::GoCommand.new(exec, output).executable(cmd, params)
     end
 
-    def load_configuration(path)
-      @configuration ||= Nonnative::Configuration.load_file(path) # rubocop:disable Naming/MemoizedInstanceVariableName
-    end
-
     def configuration
       @configuration ||= Nonnative::Configuration.new
     end

data/lib/nonnative/configuration.rb

@@ -2,87 +2,6 @@
 
 module Nonnative
   class Configuration
-    class << self
-      def load_file(path)
-        file = YAML.load_file(path)
-
-        new.tap do |c|
-          c.strategy = file['strategy']
-
-          processes(file, c)
-          servers(file, c)
-          services(file, c)
-        end
-      end
-
-      private
-
-      def processes(file, config)
-        processes = file['processes'] || []
-        processes.each do |fd|
-          config.process do |d|
-            d.name = fd['name']
-            d.command = command(fd)
-            d.timeout = fd['timeout']
-            d.port = fd['port']
-            d.log = fd['log']
-            d.signal = fd['signal']
-
-            proxy d, fd['proxy']
-          end
-        end
-      end
-
-      def command(process)
-        go = process['go']
-        if go
-          Nonnative.go_executable(go['output'], go['executable'], go['command'], *go['parameters'])
-        else
-          process['command']
-        end
-      end
-
-      def servers(file, config)
-        servers = file['servers'] || []
-        servers.each do |fd|
-          config.server do |s|
-            s.name = fd['name']
-            s.klass = Object.const_get(fd['class'])
-            s.timeout = fd['timeout']
-            s.port = fd['port']
-            s.log = fd['log']
-
-            proxy s, fd['proxy']
-          end
-        end
-      end
-
-      def services(file, config)
-        services = file['services'] || []
-        services.each do |fd|
-          config.service do |s|
-            s.name = fd['name']
-            s.timeout = fd['timeout']
-            s.port = fd['port']
-            s.log = fd['log']
-
-            proxy s, fd['proxy']
-          end
-        end
-      end
-
-      def proxy(server, proxy)
-        return unless proxy
-
-        server.proxy = {
-          type: proxy['type'],
-          port: proxy['port'],
-          log: proxy['log'],
-          options: proxy['options']
-        }
-      end
-    end
-
     def initialize
       @strategy = Strategy.new
       @processes = []
@@ -93,6 +12,16 @@ module Nonnative
     attr_accessor :processes, :servers, :services
     attr_reader :strategy
 
+    def load_file(path)
+      file = YAML.load_file(path)
+
+      self.strategy = file['strategy']
+
+      add_processes(file)
+      add_servers(file)
+      add_services(file)
+    end
+
     def strategy=(value)
       @strategy = Strategy.new(value)
     end
@@ -117,5 +46,73 @@ module Nonnative
 
       services << service
     end
+
+    private
+
+    def add_processes(file)
+      processes = file['processes'] || []
+      processes.each do |fd|
+        process do |d|
+          d.name = fd['name']
+          d.command = command(fd)
+          d.timeout = fd['timeout']
+          d.port = fd['port']
+          d.log = fd['log']
+          d.signal = fd['signal']
+
+          proxy d, fd['proxy']
+        end
+      end
+    end
+
+    def command(process)
+      go = process['go']
+      if go
+        params = go['parameters'] || []
+        Nonnative.go_executable(go['output'], go['executable'], go['command'], *params)
+      else
+        process['command']
+      end
+    end
+
+    def add_servers(file)
+      servers = file['servers'] || []
+      servers.each do |fd|
+        server do |s|
+          s.name = fd['name']
+          s.klass = Object.const_get(fd['class'])
+          s.timeout = fd['timeout']
+          s.port = fd['port']
+          s.log = fd['log']
+
+          proxy s, fd['proxy']
+        end
+      end
+    end
+
+    def add_services(file)
+      services = file['services'] || []
+      services.each do |fd|
+        service do |s|
+          s.name = fd['name']
+          s.timeout = fd['timeout']
+          s.port = fd['port']
+          s.log = fd['log']
+
+          proxy s, fd['proxy']
+        end
+      end
+    end
+
+    def proxy(runner, proxy)
+      return unless proxy
+
+      runner.proxy = {
+        type: proxy['type'],
+        port: proxy['port'],
+        log: proxy['log'],
+        options: proxy['options']
+      }
+    end
   end
 end

data/lib/nonnative/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nonnative
 version: !ruby/object:Gem::Version
-  version: 1.45.0
+  version: 1.46.0
 platform: ruby
 authors:
 - Alejandro Falkowski