fulmar 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bebeb9c011e4edea9e286d3c043eda55450a8b0
-  data.tar.gz: ba575c2d25770c7bc6cba9a8c15f109ee0882e53
+  metadata.gz: 94c412b27a13af7d2c5954307361b2afedb2a065
+  data.tar.gz: b1630fd62123dfaeab9167648a07e3af90f8f840
 SHA512:
-  metadata.gz: 50d1eda6ab45889dfb9339c150e341ab7da250fc3d9537c5ccddb21e2e9336348cc85fd0c7bf7e5c79edee432dbe120804066aca15c4333f26f64a8abbde1fae
-  data.tar.gz: ace82db763333502091badee3701645ee686fefa59987dc2b87a84f3a431e316faf4e979155bd1297ca193e18386935723c8884896d84822da0314023b097749
+  metadata.gz: 30f6993150e391316a3a706b45237f271adc249fee20d94fc5fbe44e43edd6f473b9c813dcbd4d9fb651467fe8a49231fd3836e19100c515d208cad89b6e72b7
+  data.tar.gz: 7a94a81d220d6c3536d98291bfa3cdd15af8c0aff7ea3a7db79c612509ce5c6cbfc60717d8dd7b387f46c21ce6ee5648b8ac5de7100ee2496752823a44508a43

data/lib/fulmar/domain/service/helper/vhost_helper.rb

@@ -6,7 +6,7 @@ module Fulmar
         module VhostHelper
           def vhost_name
             branch = git.current_branch
-            match = branch.match(/f\d+_([a-zA-Z0-9]+)/)
+            match = branch.match(/f\d+_([a-zA-Z0-9\_\-]+)/)
             if match
               match[1]
             else

data/lib/fulmar/domain/task/optional/vhost.rb

@@ -49,6 +49,7 @@ namespace :vhost do
     task (vhost_count > 1 ? "list:#{env}" : 'list') do
       configuration.environment = env
       configuration.target      = target
+      configuration.merge(VHOST_DEFAULT_CONFIG)
 
       remote_shell.run 'ls -1'
       remote_shell.last_output.each do |line|
@@ -64,9 +65,11 @@ namespace :vhost do
     task (vhost_count > 1 ? "delete:#{env}" : 'delete'), [:name] do |_t, argv|
       configuration.environment = env
       configuration.target      = target
+      configuration.merge(VHOST_DEFAULT_CONFIG)
 
       remote_shell.run [
                          "rm auto_vhost_#{argv[:name]}.conf",
+                         "rm #{configuration[:sites_enabled_dir]}/auto_vhost_#{argv[:name]}.conf",
                          "service #{configuration[:webserver] || 'nginx'} reload"
                        ]
     end

data/lib/fulmar/version.rb

@@ -1,4 +1,4 @@
 # Provides a global version number
 module Fulmar
-  VERSION = '1.5.1'
+  VERSION = '1.5.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fulmar
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Jonas Siegl