stackose 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78e1ae2368a649e93bc733155190ea791acd36ec
-  data.tar.gz: d3e0aec71ec3afbcce1b78b4cbe3c2412d25ae87
+  metadata.gz: 22b99d66e19a7ab647033ea0ed72a00ad021f527
+  data.tar.gz: 0f914ce6c10bc8da80ec51b3688f681a721fe01f
 SHA512:
-  metadata.gz: 0c75721a352ae19820b45e462dbff3c93f17e5f9eba8d79db22245946c222e70728855b428023f16150de96a6e855fba4747b254e3cd824dd3f245c6fe6bd488
-  data.tar.gz: c6358e7705080b4e46d16aa8eea19371851a04332e5ac6576155f68b6c059eedca22d8fc50b419301e2e046b4c3641c10b9c5a4be3054683b698f7434471a0f3
+  metadata.gz: 0ffe9a7d561d71dd6115fd9e785e8e1f8ea83cd142ecb0940b22547c5320877369af13ee4c6927f195d2c43c283ded1ebc932963f2265568b8770fe4285cb591
+  data.tar.gz: 2ea968c5713f3e11e8b83b6adc658a7e042ba71bb0d61bc8d03d4ee97f93d78ef0b2f8be761da31578ba1d9fa0f8c4ff0a1261cda46c46c2f909eb615fb93371

data/README.md

@@ -55,7 +55,8 @@ For custom linking you can provide inside the array a hash with key->value of so
             "/custom_path/#{fetch(:application)}/":"#{fetch(:capose_docker_mount_point)}/log",
            ]
            
-if you need the shared_path url in the key you can set `__shared_path__` as placeholder           
+if you need the shared_path url in the key you can set `__shared_path__` as placeholder     
+or all the other fetch variables can be used inside with `__variable_name__`      
         
 
 

data/lib/stackose.rb

@@ -28,7 +28,7 @@ namespace :stackose do
     fetch(:stackose_linked_folders).each do |f|
 
       if f.is_a? Hash
-        f.each {|k, v| files << ["#{k.to_s.gsub('__shared_path__', shared_path.to_s)}", v]}
+        f.each {|k, v| files << [replace_strings_with_paths(k).to_sym, replace_strings_with_paths(v).to_sym]}
       elsif f.is_a? String
         files << ["#{shared_path}/#{f}", "#{fetch(:stackose_docker_mount_point)}/#{f}"]
       end
@@ -37,6 +37,27 @@ namespace :stackose do
     files.to_h
   end
 
+  ##
+  # Replace string with composer fetch_functions
+  def replace_strings_with_paths(str)
+
+    str_to_replace = str.to_s
+
+    str.to_s.scan(/__([a-z_]*)__/).each do |k|
+      k = k.first
+      case k
+      when 'shared_path'
+        value = shared_path
+      else
+        value = fetch(k.to_sym)
+      end
+      str_to_replace = str_to_replace.gsub("__#{k}__", value.to_s)
+    end
+
+    str_to_replace
+
+  end
+
   # task :command do
   #   _cmd = ENV["STACKOSE_COMMAND"]
   #   if _cmd.nil?
@@ -63,7 +84,7 @@ namespace :stackose do
   desc "check linked dirs, and create this if there are not present"
   task :create_linked_dirs do
     on roles(fetch(:stackose_role)) do
-      execute :mkdir,'-p',normalized_stackose_linked_folders.keys.join(' ')
+      execute :mkdir, '-p', normalized_stackose_linked_folders.keys.join(' ')
     end
   end
 
@@ -158,7 +179,7 @@ namespace :stackose do
     compose_production = {
       version: '3',
       services: {
-        app: {
+        fetch(:stackose_service_to_build, 'app').to_sym => {
           restart: 'unless-stopped',
           environment: {:RAILS_ENV => fetch(:rails_env).to_s,
                         :RAILS_SERVE_STATIC_FILES => 'true',
@@ -196,6 +217,8 @@ namespace :stackose do
         }
       }
 
+      compose_production[:services][fetch(:stackose_service_to_build, 'app').to_sym].merge!({depends_on: ['redis']})
+
       File.open("config/redis.conf", 'w') {|file| file.write("maxmemory 50mb\nmaxmemory-policy allkeys-lfu")}
     end
 

data/stackose.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'stackose'
-  spec.version       = '0.1.0'
+  spec.version       = '0.1.1'
   spec.authors       = ["Marino Bonetti"]
   spec.email         = ["marinobonetti@gmail.com"]
   spec.description   = %q{Docker-Stack support for Capistrano 3.x}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackose
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Marino Bonetti