docker-stack 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e492af35d1ce50eaa5346aa56b90cec9b79f0567
-  data.tar.gz: 1c905f18ff4d3c95802434d940ff26dbc6cf1517
+SHA256:
+  metadata.gz: 80302c5dd736c970690c1aa29ceb94d79daf73724ed027e0dde75547816e4d24
+  data.tar.gz: 950a262dbff162954772b7087b174f8fe1fcabcfb98abd5e10ab188e26dd760c
 SHA512:
-  metadata.gz: c91d0f8a28881d050c8cffbeffc40b60f83c59debe277cb97f38ca060bd2eaa6a6333da671d241a4a5bc6d149444927aba2b70631f42e2abe00caef326241265
-  data.tar.gz: 424e6200e0f054ee9fb0189cbbf4d3bc22b3f3a85e9901690de122ea8c449195a7eec5c176cbe46816f0f3c97948dd53356849a9c7b1cd606a2a2aa28af93417
+  metadata.gz: f5917fd1f09b87b401841f1c618584ddcf135bf768ee83412a3b9a213aa13acad9d7e9acd89fc190b6b3a616624ecdad2110e79093ce9a35fed63e8fbba03313
+  data.tar.gz: 2b1dce9db080d99cc8edb6d46b990d02db0c402d3cbafc523ccd2442a5e72eecba3ba67cbef421fd8309e9af768c4a86003e845e9ce2e7736194547d954361cd

data/docker-stack.gemspec

@@ -22,10 +22,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'actionview'
+  spec.add_dependency 'activesupport'
   spec.add_dependency 'docker-api'
   spec.add_dependency 'docker-compose'
-  spec.add_dependency 'rails', '~> 5.0'
 
+  spec.add_development_dependency 'aws-sdk-core'
   spec.add_development_dependency 'bixby'
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'byebug'
@@ -33,6 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'engine_cart'
   spec.add_development_dependency 'mocha'
   spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'railties', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop'

data/lib/docker/stack.rb

@@ -6,17 +6,43 @@ 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
+    class << self
+      def port_for(service, environment = env)
+        port_map[service.to_s][environment.to_s]
+      end
+
+      def port_map
+        return @port_map unless @port_map.nil?
+        config_file = [
+          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
+
+      def env
+        @env ||= begin
+          ((rails? && Rails.env))
+        rescue NoMethodError
+          ActiveSupport::StringInquirer.new(
+            ENV['RAILS_ENV'].presence || ENV['RACK_ENV'].presence || 'development'
+          )
+        end
+      end
+
+      def root
+        @root ||= begin
+          ((rails? && Rails.root) || Pathname.pwd)
+        rescue NoMethodError
+          Pathname.pwd
+        end
+      end
+
+      private
 
-    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))
+      def rails?
+        defined?(Rails)
+      end
     end
   end
 end

data/lib/docker/stack/controller.rb

@@ -10,12 +10,14 @@ module Docker
 
       def self.default_project_name
         Rails.application.class.parent_name.underscore
+      rescue NoMethodError
+        Docker::Stack.root.basename.to_s
       end
 
       def initialize(project: self.class.default_project_name, env: nil, cleanup: false, daemon: false)
-        env = Rails.env if env.nil?
+        env = Docker::Stack.env if env.nil?
         project_and_env = [project, env].join('-')
-        @workdir = Rails.root.join('.docker-stack', project_and_env)
+        @workdir = Docker::Stack.root.join('.docker-stack', project_and_env)
         @dc = ::Docker::Compose::Session.new(dir: @workdir)
         @cleanup = cleanup
         @daemon = daemon

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'aws-sdk'
+require 'aws-sdk-core'
 
 module Docker
   module Stack
@@ -49,7 +49,9 @@ module Docker
             region: 'us-east-1',
             credentials: Aws::Credentials.new('localstack-key', 'localstack-secret')
           )
-          Seahorse::Client::Base.add_plugin(Plugin)
+          Seahorse::Client::Base.add_plugin(Plugin) unless Seahorse::Client::Base.plugins.include?(Plugin)
+
+          return unless defined?(Aws::S3)
           Aws::S3::Plugins::BucketDns.options.find { |opt| opt.name == :force_path_style }.default = true
         end
       end

data/lib/docker/stack/version.rb

@@ -2,6 +2,6 @@
 
 module Docker
   module Stack
-    VERSION = '0.2.5'
+    VERSION = '0.2.6'
   end
 end

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

@@ -13,7 +13,7 @@ development:
 
 test:
   <<: *default
-  port: <%%= Rails.env.development? ? <%= Docker::Stack.port_for(:postgres, 'development') %> : <%= Docker::Stack.port_for(:postgres, 'test') %> %>
+  port: <%%= Docker::Stack.env.development? ? <%= Docker::Stack.port_for(:postgres, 'development') %> : <%= Docker::Stack.port_for(:postgres, 'test') %> %>
   database: docker_test
 
 production:

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: docker-stack
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Michael Klein
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: actionview
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bixby
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -273,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Support code and rake tasks for running Rails on top of Dockerized services.