docker-stack 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcd36792e8fd4007c8d21e051c7d1752aa4ecbfb3dd98055f4b3914ac24d3799
-  data.tar.gz: 6e87294ea6e21cc4e22e21987c1dfb4285eb790362c3ed4186cb87d86a2c8aca
+  metadata.gz: 459b321cbce7417b7e02f01e338162fabf1a1d9109757feff3d6675821ab17d4
+  data.tar.gz: 15e5832ed64387b472f60e5514171c64d7349daec651423feab004de11287c57
 SHA512:
-  metadata.gz: d42f1ab254370abb44fcaa6b7ce27293d955f82a3a8b8f4b0b45f21a6424aa44892aa3fa4b68205fe8e4f5daa1dfca2a52b65146c022ab646d8f9eae31550e3f
-  data.tar.gz: 87081d43640cc58b2c18bb9401bc51830af3a3b1416f02a72ca76a4de6296079155db4390f97a269b4f68cf287d5d3ceb61563cf7c711a97239c4c63248bd969
+  metadata.gz: 04f40264d833ecfd68f76600b950c814a2c6b4f9e18e07833e5ed14b3226c6e23c155a442dfe08c7cdd33d32e2940c24e039305c7d214e0b603b9dce68a36dc9
+  data.tar.gz: 8a183d19433fae5718292935d0c57140424aefb15a5e4bf6ec1cd34ad7a9b10a92aae6f955a1a0fb795d73fe2b1713b57f0997aec26f50e9e1b46fcb56487eb2

data/.rubocop.yml

@@ -1,5 +1,8 @@
 inherit_from: .rubocop_todo.yml
 
+AllCops:
+  TargetRubyVersion: 2.5
+  
 Lint/NestedMethodDefinition:
   Exclude:
     - 'lib/generators/docker/stack/service.rb'

data/.rubocop_todo.yml

@@ -13,10 +13,12 @@ Style/Documentation:
     - 'lib/docker/stack.rb'
     - 'lib/docker/stack/container.rb'
     - 'lib/docker/stack/controller.rb'
+    - 'lib/docker/stack/localstack/endpoint_stub.rb'
     - 'lib/generators/docker/stack/util.rb'
     - 'lib/generators/docker/stack/service.rb'
     - 'lib/generators/docker/stack/install_generator.rb'
     - 'lib/generators/docker/stack/service/fedora_generator.rb'
+    - 'lib/generators/docker/stack/service/localstack_generator.rb'
     - 'lib/generators/docker/stack/service/postgres_generator.rb'
     - 'lib/generators/docker/stack/service/redis_generator.rb'
     - 'lib/generators/docker/stack/service/solr_generator.rb'

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'engine_cart/rake_task'
 require 'rspec/core/rake_task'

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'docker/stack'

data/config/stack.yml

@@ -0,0 +1,15 @@
+fedora:
+  development: 8984
+  test: 8986
+localstack:
+  development: 0
+  test: 200
+postgres:
+  development: 5433
+  test: 5434
+redis:
+  development: 6380
+  test: 6381
+solr:
+  development: 8983
+  test: 8985

data/docker-stack.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'docker/stack/version'

data/lib/docker/stack.rb

@@ -1,8 +1,22 @@
+# frozen_string_literal: true
+
 require 'docker/stack/container'
 require 'docker/stack/controller'
 require 'docker/stack/version'
 
 module Docker
   module Stack
+    def self.port_for(service, environment = Rails.env)
+      port_map[service.to_s][environment.to_s]
+    end
+
+    def self.port_map
+      return @port_map unless @port_map.nil?
+      config_file = [
+        Rails.root&.join('config', 'stack.yml'),
+        File.expand_path('../../config/stack.yml', __dir__)
+      ].find { |f| File.exist?(f.to_s) }
+      @port_map = YAML.safe_load(File.read(config_file))
+    end
   end
 end

data/lib/docker/stack/container.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'action_view'
 
 module Docker

data/lib/docker/stack/controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'docker/compose'
 require 'docker-api'
 
@@ -23,13 +25,11 @@ module Docker
         down(cleanup: true)
         images = config['services'].values.map { |conf| conf['image'] }
         images.each do |image_name|
-          begin
-            image = ::Docker::Image.get(image_name)
-            result = image.remove(prune: true)
-            yield result if block_given?
-          rescue ::Docker::Error::NotFoundError
-            yield %{[{"Skipped":"#{image_name} (image not present)"}]}
-          end
+          image = ::Docker::Image.get(image_name)
+          result = image.remove(prune: true)
+          yield result if block_given?
+        rescue ::Docker::Error::NotFoundError
+          yield %{[{"Skipped":"#{image_name} (image not present)"}]}
         end
         ::Docker::Image.prune
       end
@@ -37,12 +37,10 @@ module Docker
       def status
         containers = dc.ps.map(&:id)
         containers.map do |c|
-          begin
-            container = Container.new(c)
-            container.to_h
-          rescue StandardError
-            { id: c, service: 'unknown', status: 'unknown', started: 'unknown', running: 'unknown' }
-          end
+          container = Container.new(c)
+          container.to_h
+        rescue StandardError
+          { id: c, service: 'unknown', status: 'unknown', started: 'unknown', running: 'unknown' }
         end
       end
 

data/lib/docker/stack/localstack/endpoint_stub.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'aws-sdk'
+
+module Docker
+  module Stack
+    module Localstack
+      module EndpointStub
+        class Plugin < Seahorse::Client::Plugin
+          PORT_MAP = {
+            'Aws::APIGateway'           => 4567,
+            'Aws::CloudFormation'       => 4581,
+            'Aws::CloudWatch'           => 4582,
+            'Aws::DynamoDB'             => 4569,
+            'Aws::DynamoDBStreams'      => 4570,
+            'Aws::Elasticsearch'        => 4571,
+            'Aws::ElasticsearchService' => 4578,
+            'Aws::Firehose'             => 4573,
+            'Aws::Kinesis'              => 4568,
+            'Aws::Lambda'               => 4574,
+            'Aws::Redshift'             => 4577,
+            'Aws::Route53'              => 4580,
+            'Aws::S3'                   => 4572,
+            'Aws::SES'                  => 4579,
+            'Aws::SNS'                  => 4575,
+            'Aws::SQS'                  => 4576,
+            'Aws::SSM'                  => 4583
+          }.freeze
+
+          def after_initialize(client)
+            client.config.endpoint = endpoint_for(client) || client.config.endpoint
+          end
+
+          private
+
+          def endpoint_for(client)
+            base_port = PORT_MAP[client.class.parent_name]
+            return nil if base_port.nil?
+            base_url = 'http://localhost'
+            offset = Docker::Stack.port_for(:localstack)
+            base_uri = URI.parse(base_url)
+            base_uri.port = base_port + offset
+            base_uri.to_s
+          end
+        end
+
+        def self.stub_endpoints!
+          Aws.config.update(
+            region: 'us-east-1',
+            credentials: Aws::Credentials.new('localstack-key', 'localstack-secret')
+          )
+          Seahorse::Client::Base.add_plugin(Plugin)
+          Aws::S3::Plugins::BucketDns.options.find { |opt| opt.name == :force_path_style }.default = true
+        end
+      end
+    end
+  end
+end

data/lib/docker/stack/rake_task.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'docker/stack'
 
 # rubocop:disable all

data/lib/docker/stack/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Docker
   module Stack
-    VERSION = '0.1.1'.freeze
+    VERSION = '0.2.1'
   end
 end

data/lib/generators/docker/stack/install_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'generators/docker/stack/util'
 require 'active_support/core_ext/hash/keys'
 

data/lib/generators/docker/stack/service.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+require 'docker/stack'
 require 'generators/docker/stack/util'
 require 'active_support/core_ext/hash/deep_merge'
 require 'ostruct'
@@ -32,16 +35,12 @@ module Docker
 
           def service_from_template(service)
             source  = File.expand_path(find_in_source_paths("services/#{service}.yml.erb"))
-            context = OpenStruct.new(env: @env, port_offset: port_offset).instance_eval { binding }
+            context = OpenStruct.new(env: @env, port: Docker::Stack.port_for(service)).instance_eval { binding }
             yaml = Thor::Actions::CapturableERB.new(::File.binread(source), nil, '-', '@output_buffer').tap do |erb|
               erb.filename = source
             end.result(context)
             YAML.safe_load(yaml)
           end
-
-          def port_offset
-            { 'development' => 0, 'test' => 2 }[@env] || 0
-          end
         end
       end
     end

data/lib/generators/docker/stack/service/fedora_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'generators/docker/stack/service'
 
 module Docker

data/lib/generators/docker/stack/service/localstack_generator.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'generators/docker/stack/service'
+
+module Docker
+  module Stack
+    module Service
+      class LocalstackGenerator < Rails::Generators::Base
+        include Docker::Stack::Service
+
+        desc %(This generator makes the following changes to your application:
+       1. Adds a localstack service configuration to the docker-compose.yml files.
+       2. Creates a config/initializers/localstack_stub.rb file pointing to the new service.
+  )
+
+        def install_service
+          copy_file 'config/initializers/localstack_stub.rb', 'config/initializers/localstack_stub.rb'
+          gem 'aws-sdk', '~> 3.0'
+        end
+      end
+    end
+  end
+end

data/lib/generators/docker/stack/service/postgres_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'generators/docker/stack/service'
 
 module Docker

data/lib/generators/docker/stack/service/redis_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'generators/docker/stack/service'
 
 module Docker

data/lib/generators/docker/stack/service/solr_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'generators/docker/stack/service'
 
 module Docker

data/lib/generators/docker/stack/templates/config/database.yml

@@ -1,6 +1,7 @@
 default: &default
   adapter: postgresql
   host: localhost
+  port: <%= Docker::Stack.port_for(:postgres) %>
   encoding: unicode
   pool: 5
   username: docker
@@ -8,12 +9,10 @@ default: &default
 
 development:
   <<: *default
-  port: 5433
   database: docker_dev
 
 test:
   <<: *default
-  port: <%= Rails.env.development? ? 5433 : 5435 %>
   database: docker_test
 
 production:

data/lib/generators/docker/stack/templates/config/fedora.yml

@@ -1,12 +1,12 @@
 development:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: http://127.0.0.1:<%= ENV['FCREPO_DEVELOPMENT_PORT'] || 8984 %>/rest
+  url: http://127.0.0.1:<%= ENV['FCREPO_DEVELOPMENT_PORT'] || Docker::Stack::port_for(:fedora) %>/rest
   base_path: /dev
 test:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: http://127.0.0.1:<%= ENV['FCREPO_TEST_PORT'] || 8986 %>/rest
+  url: http://127.0.0.1:<%= ENV['FCREPO_TEST_PORT'] || Docker::Stack::port_for(:fedora) %>/rest
   base_path: /test
 production:
   user: fedoraAdmin

data/lib/generators/docker/stack/templates/config/initializers/localstack_stub.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require 'docker/stack/localstack/endpoint_stub'
+
+Docker::Stack::Localstack::EndpointStub.stub_endpoints!

data/lib/generators/docker/stack/templates/config/redis.yml

@@ -1,9 +1,9 @@
 development:
   host: localhost
-  port: 6380
+  port: Docker::Stack.port_for(:redis)
 test:
   host: localhost
-  port: 6381
+  port: Docker::Stack.port_for(:redis)
 production:
   host: <%= ENV['REDIS_HOST'] || 'localhost' %>
   port: <%= ENV['REDIS_PORT'] || 6379 %>

data/lib/generators/docker/stack/templates/config/solr.yml

@@ -1,7 +1,7 @@
 # This is a sample config file that points to a solr server for each environment
 development:
-  url: http://127.0.0.1:<%= ENV['SOLR_TEST_PORT'] || 8983 %>/solr/development-core
+  url: http://127.0.0.1:<%= ENV['SOLR_TEST_PORT'] || Docker::Stack.port_for(:solr) %>/solr/development-core
 test:
-  url: http://127.0.0.1:<%= ENV['SOLR_TEST_PORT'] || 8985 %>/solr/test-core
+  url: http://127.0.0.1:<%= ENV['SOLR_TEST_PORT'] || Docker::Stack.port_for(:solr) %>/solr/test-core
 production:
   url: http://127.0.0.1:8983/solr/donut

data/lib/generators/docker/stack/templates/docker.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'docker/stack/rake_task'
 
 def get_named_task(task_name)
@@ -19,7 +21,7 @@ namespace :docker do
       task = get_named_task(ENV['SPEC_TASK']) ||
              get_named_task('spec') ||
              get_named_task('rspec')
-      task.invoke unless task.nil?
+      task&.invoke
     end
   end
 end

data/lib/generators/docker/stack/templates/services/fedora.yml.erb

@@ -6,4 +6,4 @@ services:
     volumes:
       - fedora:/data
     ports:
-      - "<%= 8984 + port_offset %>:8080"
+      - "<%= port %>:8080"

data/lib/generators/docker/stack/templates/services/localstack.yml.erb

@@ -0,0 +1,17 @@
+volumes:
+  localstack:
+services:
+  localstack:
+    image: localstack/localstack
+    ports:
+      - "<%= 4772 + port %>:4572"
+    volumes:
+      - localstack:/data
+    environment:
+      SERVICES: s3
+      DATA_DIR: /data
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:4572/"]
+      interval: 30s
+      timeout: 5s
+      retries: 3

data/lib/generators/docker/stack/templates/services/postgres.yml.erb

@@ -10,4 +10,4 @@ services:
       - POSTGRES_USER=docker
       - POSTGRES_PASSWORD=d0ck3r
     ports:
-      - "<%= 5433 + port_offset %>:5432"
+      - "<%= port %>:5432"

data/lib/generators/docker/stack/templates/services/redis.yml.erb

@@ -2,7 +2,7 @@ services:
   redis:
     image: redis:alpine
     ports:
-      - "<%= 6380 + port_offset %>:6379"
+      - "<%= port %>:6379"
     healthcheck:
       test: ["CMD", "redis-cli", "ping"]
       interval: 30s

data/lib/generators/docker/stack/templates/services/solr.yml.erb

@@ -4,7 +4,7 @@ services:
   solr:
     image: solr:7.2-alpine
     ports:
-      - "<%= 8983 + port_offset %>:8983"
+      - "<%= port %>:8983"
     volumes:
       - solr:/opt/solr/server/solr/mycores
       - ../../solr:/solr_config

data/lib/generators/docker/stack/util.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Docker
   module Stack
     module Util
-      COMPOSE_FILE_VERSION = '3.4'.freeze
+      COMPOSE_FILE_VERSION = '3.4'
 
       def self.included(base)
         base.source_root File.expand_path('templates', __dir__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-stack
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Michael Klein
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-21 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -210,24 +210,29 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- config/stack.yml
 - docker-stack.gemspec
 - lib/docker/stack.rb
 - lib/docker/stack/container.rb
 - lib/docker/stack/controller.rb
+- lib/docker/stack/localstack/endpoint_stub.rb
 - lib/docker/stack/rake_task.rb
 - lib/docker/stack/version.rb
 - lib/generators/docker/stack/install_generator.rb
 - lib/generators/docker/stack/service.rb
 - lib/generators/docker/stack/service/fedora_generator.rb
+- lib/generators/docker/stack/service/localstack_generator.rb
 - lib/generators/docker/stack/service/postgres_generator.rb
 - lib/generators/docker/stack/service/redis_generator.rb
 - lib/generators/docker/stack/service/solr_generator.rb
 - lib/generators/docker/stack/templates/config/database.yml
 - lib/generators/docker/stack/templates/config/fedora.yml
+- lib/generators/docker/stack/templates/config/initializers/localstack_stub.rb
 - lib/generators/docker/stack/templates/config/redis.yml
 - lib/generators/docker/stack/templates/config/solr.yml
 - lib/generators/docker/stack/templates/docker.rake
 - lib/generators/docker/stack/templates/services/fedora.yml.erb
+- lib/generators/docker/stack/templates/services/localstack.yml.erb
 - lib/generators/docker/stack/templates/services/postgres.yml.erb
 - lib/generators/docker/stack/templates/services/redis.yml.erb
 - lib/generators/docker/stack/templates/services/solr.yml.erb