nib-integrate 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e73989921e020f7c4c6d067db840a0995bd39c5a00498c2c02a45d6093b0094
-  data.tar.gz: c59a466ca7da71a0f8b295ea74992d0a21a75516461c318359830dbbe7cdfc9a
+  metadata.gz: f1386d7ff19edc5f38506ff83e7fcfbaa96ed25bd7b1a5b30e920d6b4f727cda
+  data.tar.gz: 306428b15ebf5d930b8a2b40ba7ac53d9d2155a9aa7864bff58fe882766475aa
 SHA512:
-  metadata.gz: 3ebc92e7470cae10c6077a4b4cf387c21552bcade4467041daecd8758be5b5515716eb025d80c96abd8bd557806ac7fc72b0903e6b85205a6161fc9ab88608c2
-  data.tar.gz: 74cb44ad303b7e64d47430739005b5a8d0a0b60289c031a552bebcfcd9aa5edc44060b5b485d0a763723595e80d3d6881497135ab7c93b9a9daa76c0dbacf684
+  metadata.gz: 2e267c1ab97254e3f9e906379c8a3ebdcc76b7e3492828a2a9742a6cf6421ca4adb49b725c5a54418fd946c2c12b7aed2bda1642ac571c0a2765b6f6df1539b3
+  data.tar.gz: dc2dade4cbbd84d37a60c3d5bfb46a1e9b30716cecf2b66f9b08eaa58fa7e5c0a216b7731739c51743cb65841ad71b559736222354622da5f25aea1fd07b1c1d

data/lib/nib/integrate/config_file.rb

@@ -6,7 +6,7 @@ module Nib
     # reads and writes the config file
     class ConfigFile
       PATH = "#{ENV['HOME']}/.nib-integrate-config".freeze
-      DEFAULT_CONFIG = { 'apps' => [] }.freeze
+      DEFAULT_CONFIG = { 'apps' => [], 'initial_port' => 10_000 }.freeze
       class << self
         def write(config, path = PATH)
           # this will write the config file.

data/lib/nib/integrate/integration_file.rb

@@ -1,93 +1,54 @@
+# frozen_string_literal: true
+
 module Nib
   module Integrate
     # dynamically generated network config file
     class IntegrationFile
       class << self
-        def write(app_name)
-          new(app_name).write
+        def write(app_name, port = 10_000)
+          new(app_name, port).write
         end
-      end
 
-      attr_reader :app_name
-
-      def initialize(app_name)
-        @app_name = app_name
-      end
-
-      def write
-        File.open(path, 'w') do |f|
-          f.write(config.to_yaml)
+        def write_empty_config(app_name, port = 10_000)
+          new(app_name, port).write_empty_config
         end
-        path
-      end
-
-      private
-
-      def apps
-        @apps ||= global_config['apps']
-      end
-
-      def app
-        apps.find { |a| a['name'] == app_name }
       end
 
-      def other_apps
-        apps.reject { |a| a['name'] == app_name }
-      end
+      attr_reader :app_name, :current_port
 
-      def path
-        "#{ENV['HOME']}/.nib-integrate-network-config-#{app['name']}"
+      def initialize(app_name, port = 10_000)
+        @current_port = port
+        @app_name = app_name
       end
 
-      def config
-        app_services.each_with_object(network_config) do |elem, acc|
-          acc['services'][elem] = {
-            'external_links' =>  external_links,
-            'networks' => %w[default nib]
-          }
+      def write
+        config.tap do |cfg|
+          File.open(cfg.path, 'w') do |f|
+            f.write(cfg.config.to_yaml)
+          end
         end
       end
 
-      def external_links
-        other_apps.map(&external_link)
-      end
-
-      def external_link
-        lambda do |registration|
-          "#{container_name(registration)}_1:#{container_name(registration)}"
+      def write_empty_config
+        empty_config.tap do |cfg|
+          File.open(cfg.path, 'w') do |f|
+            f.write(cfg.config.to_yaml)
+          end
         end
       end
 
-      def container_name(registration)
-        project_name = registration['path'].split('/').last.gsub(/[ _]/, '')
-        service_name = registration['service']
-        "#{project_name}_#{service_name}"
-      end
-
-      def network_config
-        {
-          'version' => '2',
-          'services' => {},
-          'networks' => {
-            'nib' => { 'external' => { 'name' => 'nib-integrate-network' } }
-          }
-        }
-      end
-
-      def app_docker_compose
-        @app_docker_compose ||= app_compose_contents
-      end
+      private
 
-      def app_compose_contents
-        YAML.load_file("#{app['path']}/#{app['compose_file']}")
+      def config
+        integration_file_config.config
       end
 
-      def app_services
-        app_docker_compose['services'].keys
+      def empty_config
+        integration_file_config.empty_config
       end
 
-      def global_config
-        ConfigFile.read
+      def integration_file_config
+        IntegrationFileConfig.new(app_name, current_port)
       end
     end
   end

data/lib/nib/integrate/integration_file_config.rb

@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+module Nib
+  module Integrate
+    # IntegrationFileConfig creates a proper configuration yaml string
+    # and keeps track of port assignments
+    class IntegrationFileConfig
+      attr_reader :app_name, :current_port
+      def initialize(app_name, current_port)
+        @app_name = app_name
+        @current_port = current_port
+      end
+
+      def config
+        OpenStruct.new(
+          config: config_hash,
+          path: path,
+          port: current_port
+        )
+      end
+
+      def empty_config
+        OpenStruct.new(
+          config: { 'version' => app_compose_contents['version'] },
+          path: empty_path
+        )
+      end
+
+      private
+
+      def config_hash
+        app_services.each_with_object(merged_config) do |elem, acc|
+          service_definition = {
+            'external_links' =>  external_links,
+            'networks' => %w[default nib]
+          }
+          service_definition['ports'] = ports(elem) if ports(elem)
+
+          acc['services'][elem].merge!(service_definition)
+        end
+      end
+
+      def apps
+        @apps ||= global_config['apps']
+      end
+
+      def app
+        apps.find { |a| a['name'] == app_name }
+      end
+
+      def other_apps
+        apps.reject { |a| a['name'] == app_name }
+      end
+
+      def path
+        "#{app['path']}/.nib-integrate-network-config"
+      end
+
+      def empty_path
+        "#{app['path']}/.nib-integrate-empty-config-file"
+      end
+
+      def merged_config
+        app_compose_contents.merge(network_config)
+      end
+
+      def ports(service_definition)
+        ports = app_docker_compose['services'][service_definition]['ports']
+        return unless ports && !ports.empty?
+        ports.map do |port|
+          existing_ports = port.split(':')
+          [next_port, existing_ports[1]].join(':')
+        end
+      end
+
+      def next_port
+        @current_port += 1
+      end
+
+      def external_links
+        other_apps.map(&external_link)
+      end
+
+      def external_link
+        lambda do |registration|
+          "#{container_name(registration)}_1:#{container_name(registration)}"
+        end
+      end
+
+      def container_name(registration)
+        project_name = registration['path'].split('/').last.gsub(/[ _]/, '')
+        service_name = registration['service']
+        "#{project_name}_#{service_name}"
+      end
+
+      def network_config
+        {
+          'networks' => {
+            'nib' => { 'external' => { 'name' => 'nib-integrate-network' } }
+          }
+        }
+      end
+
+      def app_docker_compose
+        @app_docker_compose ||= app_compose_contents
+      end
+
+      def app_compose_contents
+        YAML.load_file("#{app['path']}/#{app['compose_file']}")
+      end
+
+      def app_services
+        app_docker_compose['services'].keys
+      end
+
+      def global_config
+        ConfigFile.read
+      end
+    end
+  end
+end

data/lib/nib/integrate/integrator.rb

@@ -12,16 +12,18 @@ module Nib
         end
       end
 
-      attr_reader :args, :current_arg, :config_path
+      attr_reader :args, :current_arg, :config_path, :current_port
 
       def initialize(args, config_path)
         @args = args
         @config_path = config_path
+        @current_port = initial_port
       end
 
       def up
         args.map do |arg|
           @current_arg = arg
+          @current_port = current_integration_object.port + 1
           command
         end
       end
@@ -40,11 +42,20 @@ module Nib
       end
 
       def apps
-        @apps ||= config_file.read(config_path)['apps']
+        @apps ||= config['apps']
+      end
+
+      def initial_port
+        @initial_port ||= config['initial_port']
       end
 
       def command
-        [cd_command, docker_compose_command].join(' && ')
+        integration_file.write_empty_config(app['name'])
+        [
+          cd_command,
+          docker_compose_command,
+          clean_files_command
+        ].join(' && ')
       end
 
       def down_command
@@ -62,8 +73,12 @@ module Nib
         [run_command, integration_file_flag, up_command].compact.join(' ')
       end
 
+      def clean_files_command
+        'rm .nib-integrate*'
+      end
+
       def run_command
-        "docker-compose -f #{app['compose_file']}"
+        'docker-compose -f .nib-integrate-empty-config-file'
       end
 
       def up_command
@@ -71,11 +86,15 @@ module Nib
       end
 
       def integration_file_flag
-        "-f #{integration_file_path}"
+        "-f #{current_integration_object.path}"
+      end
+
+      def current_integration_object
+        integration_file.write(app['name'], current_port)
       end
 
-      def integration_file_path
-        integration_file.write(app['name'])
+      def config
+        @config ||= config_file.read(config_path)
       end
 
       def config_file

data/lib/nib/integrate/version.rb

@@ -1,5 +1,5 @@
 module Nib
   module Integrate
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

data/lib/nib_integrate_plugin.rb

@@ -1,5 +1,7 @@
+require 'ostruct'
 require 'nib/integrate/config_file'
 require 'nib/integrate/integration_file'
+require 'nib/integrate/integration_file_config'
 require 'nib/integrate/integrator'
 require 'nib/integrate/network_creator'
 require 'nib/integrate/lister'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nib-integrate
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Scott Helm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-07 00:00:00.000000000 Z
+date: 2018-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nib
@@ -91,6 +91,7 @@ files:
 - bin/nib-integrate
 - lib/nib/integrate/config_file.rb
 - lib/nib/integrate/integration_file.rb
+- lib/nib/integrate/integration_file_config.rb
 - lib/nib/integrate/integrator.rb
 - lib/nib/integrate/lister.rb
 - lib/nib/integrate/network_creator.rb