fulmar 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 357303751bffb6928eeef9a6ede80d964c80e7d4
-  data.tar.gz: 1000737110dfedacbed455ae92ecc2557f014fa1
+  metadata.gz: 6bebeb9c011e4edea9e286d3c043eda55450a8b0
+  data.tar.gz: ba575c2d25770c7bc6cba9a8c15f109ee0882e53
 SHA512:
-  metadata.gz: fcda7ec398917e283da2cfdeb71149f5d0d8c8ea6461a64bb324155653e31e51feca87a04a61a7bcf48ca52a08531fc4a3565c9de872d0b7f74965734560111b
-  data.tar.gz: ad6e857457b377865895199132479c49fdd602fee73e6e2e4c600c4df0a11749fd508f293c4ab4355c98ad07289840a224836d5fe3170247a81152ec747d39d7
+  metadata.gz: 50d1eda6ab45889dfb9339c150e341ab7da250fc3d9537c5ccddb21e2e9336348cc85fd0c7bf7e5c79edee432dbe120804066aca15c4333f26f64a8abbde1fae
+  data.tar.gz: ace82db763333502091badee3701645ee686fefa59987dc2b87a84f3a431e316faf4e979155bd1297ca193e18386935723c8884896d84822da0314023b097749

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

@@ -0,0 +1,21 @@
+module Fulmar
+  module Domain
+    module Service
+      module Helper
+        # Provides access helper to the database service from within a task
+        module VhostHelper
+          def vhost_name
+            branch = git.current_branch
+            match = branch.match(/f\d+_([a-zA-Z0-9]+)/)
+            if match
+              match[1]
+            else
+              error "Cannot deploy branch '#{branch}'"
+              fail 'Branch must match specification for feature branches (f1234_name)'
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fulmar/domain/task/base.rake

@@ -1,16 +1,21 @@
+require 'fulmar/domain/service/helper/common_helper'
 include Fulmar::Domain::Service::Helper::CommonHelper
 
 if configuration.feature? :database
-  require 'fulmar/service/helper/database_helper'
+  require 'fulmar/domain/service/helper/database_helper'
   include Fulmar::Domain::Service::Helper::DatabaseHelper
 end
 
 if configuration.feature? :flow
-  require 'fulmar/service/helper/flow_helper'
+  require 'fulmar/domain/service/helper/flow_helper'
   include Fulmar::Domain::Service::Helper::FlowHelper
 end
 
 if full_configuration[:dependencies].any?
-  require 'fulmar/service/helper/dependencies_helper'
+  require 'fulmar/domain/service/helper/dependencies_helper'
   include Fulmar::Domain::Service::Helper::DependenciesHelper
+end
+
+if configuration.feature?(:vhost) && configuration.any? { |data| !data[:vhost_template].blank? }
+  require 'fulmar/domain/task/optional/vhost'
 end

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

@@ -0,0 +1,74 @@
+require 'fulmar/domain/service/helper/vhost_helper'
+include Fulmar::Domain::Service::Helper::VhostHelper
+
+VHOST_DEFAULT_CONFIG = {
+  webserver: 'nginx',
+  sites_enabled_dir: '../sites-enabled',
+
+}
+
+vhost_count = 0
+configuration.each { |_env, _target, data| vhost_count += 1 unless data[:vhost_template].blank? }
+
+namespace :vhost do
+  configuration.each do |env, target, data|
+    next if data[:vhost_template].blank?
+
+    desc "Create a vhost for #{env}"
+    task (vhost_count > 1 ? "create:#{env}" : 'create') do
+      configuration.environment = env
+      configuration.target      = target
+      configuration.merge(VHOST_DEFAULT_CONFIG)
+
+      # Store remote_path for recovery
+      remote_path = configuration[:remote_path]
+
+      # Set some default variables:
+      configuration[:sites_available_dir] ||= "/etc/#{configuration[:webserver]}/sites-available"
+      configuration[:remote_path] = configuration[:sites_available_dir]
+      configuration[:vhost_name] = vhost_name
+
+      render_templates
+      rendered_vhost_config = File.dirname(configuration[:local_path] + '/' + configuration[:vhost_template]) + \
+                              '/' + File.basename(configuration[:vhost_template], '.erb')
+      config_file_name = "#{File.dirname(rendered_vhost_config)}/auto_vhost_#{configuration[:vhost_name]}.conf"
+      FileUtils.mv rendered_vhost_config, config_file_name
+      upload config_file_name
+      config_remote_path = configuration[:sites_available_dir] + '/' + File.basename(config_file_name)
+      remote_shell.run [
+                         "rm -f #{configuration[:sites_enabled_dir]}/#{File.basename(config_file_name)}", # remove any existing link
+                         "ln -s #{config_remote_path} #{configuration[:sites_enabled_dir]}/#{File.basename(config_file_name)}",
+                         "service #{configuration[:webserver]} reload"
+                       ]
+
+      # recover remote path
+      configuration[:remote_path] = remote_path
+    end
+
+    desc "List existing vhosts for #{env}"
+    task (vhost_count > 1 ? "list:#{env}" : 'list') do
+      configuration.environment = env
+      configuration.target      = target
+
+      remote_shell.run 'ls -1'
+      remote_shell.last_output.each do |line|
+        match = line.match(/auto_vhost_(.*)\.conf/)
+        if match
+          name = match[1]
+          puts "- #{name}, delete via 'fulmar vhost:delete[#{name}]'"
+        end
+      end
+    end
+
+    desc "Delete a vhost for #{env}"
+    task (vhost_count > 1 ? "delete:#{env}" : 'delete'), [:name] do |_t, argv|
+      configuration.environment = env
+      configuration.target      = target
+
+      remote_shell.run [
+                         "rm auto_vhost_#{argv[:name]}.conf",
+                         "service #{configuration[:webserver] || 'nginx'} reload"
+                       ]
+    end
+  end
+end

data/lib/fulmar/infrastructure/service/copy_service.rb

@@ -9,7 +9,7 @@ module Fulmar
         # @param [String] remote_host SSH hostname
         # @param [String] remote_dir remote directory
         def self.upload(shell, local_file, remote_host, remote_dir)
-          if shell.run "scp #{local_file} #{remote_host}:#{remote_dir.chomp('/')}/"
+          if shell.run "scp -r #{local_file} #{remote_host}:#{remote_dir.chomp('/')}/"
             "#{remote_dir.chomp('/')}/#{File.basename(local_file)}"
           end
         end
@@ -20,7 +20,7 @@ module Fulmar
         # @param [String] remote_file remote directory
         # @param [String] local_dir local filename, should be absolute
         def self.download(shell, remote_host, remote_file, local_dir = '.')
-          if shell.run "scp #{remote_host}:#{remote_file} #{local_dir.chomp('/')}/"
+          if shell.run "scp -r #{remote_host}:#{remote_file} #{local_dir.chomp('/')}/"
             "#{local_dir.chomp('/')}/#{File.basename(remote_file)}"
           end
         end

data/lib/fulmar/infrastructure/service/git_service.rb

@@ -29,7 +29,7 @@ module Fulmar
                                      end
           end
 
-          @git = Rugged::Repository.new(@config[:local_path]) # :log => Logger.new(STDOUT)
+          @git = Rugged::Repository.new(@config[:git_path].blank? ? @config[:local_path] : @config[:git_path]) # :log => Logger.new(STDOUT)
         end
 
         def branches

data/lib/fulmar/task_manager.rb

@@ -8,8 +8,6 @@ require 'fulmar/domain/service/initialization_service'
 require 'fulmar/domain/service/application_service'
 require 'fulmar/domain/service/configuration_service'
 require 'fulmar/domain/service/config_rendering_service'
-
-require 'fulmar/service/helper/common_helper'
 require 'fulmar/domain/service/file_sync_service'
 
 require 'fulmar/infrastructure/service/composer_service'

data/lib/fulmar/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fulmar
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Jonas Siegl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,13 +142,18 @@ files:
 - lib/fulmar/domain/service/configuration_service.rb
 - lib/fulmar/domain/service/dependency_service.rb
 - lib/fulmar/domain/service/file_sync_service.rb
+- lib/fulmar/domain/service/helper/common_helper.rb
+- lib/fulmar/domain/service/helper/database_helper.rb
+- lib/fulmar/domain/service/helper/dependencies_helper.rb
+- lib/fulmar/domain/service/helper/flow_helper.rb
+- lib/fulmar/domain/service/helper/vhost_helper.rb
 - lib/fulmar/domain/service/initialization_service.rb
 - lib/fulmar/domain/task/base.rake
 - lib/fulmar/domain/task/console.rake
 - lib/fulmar/domain/task/database_sync.rake
 - lib/fulmar/domain/task/environment.rake
+- lib/fulmar/domain/task/optional/vhost.rb
 - lib/fulmar/domain/task/versions.rake
-- lib/fulmar/domain/task/vhost.rake
 - lib/fulmar/infrastructure/service/composer_service.rb
 - lib/fulmar/infrastructure/service/copy_service.rb
 - lib/fulmar/infrastructure/service/database/database_service.rb
@@ -161,10 +166,6 @@ files:
 - lib/fulmar/infrastructure/service/transfer/tar.rb
 - lib/fulmar/infrastructure/service/tunnel_service.rb
 - lib/fulmar/service/bootstrap_service.rb
-- lib/fulmar/service/helper/common_helper.rb
-- lib/fulmar/service/helper/database_helper.rb
-- lib/fulmar/service/helper/dependencies_helper.rb
-- lib/fulmar/service/helper/flow_helper.rb
 - lib/fulmar/service/helper_service.rb
 - lib/fulmar/service/logger_service.rb
 - lib/fulmar/task_manager.rb

data/lib/fulmar/domain/task/vhost.rake

@@ -1,55 +0,0 @@
-if configuration.any? { |data| data[:type] == 'vhost' }
-  namespace :vhost do
-    configuration.each do |env, target, data|
-      next if data[:type] != 'vhost'
-
-      desc "Create a vhost for #{env}"
-      task :create do
-        configuration.environment = env
-        configuration.target      = target
-        branch = git.current_branch
-        match = branch.match(/f\d+_([a-zA-Z0-9]+)/)
-        unless match
-          STDERR.puts "Cannot deploy branch '#{branch}'"
-          return
-        end
-        configuration[:branch_name] = branch
-        configuration[:vhost_name] = match[1]
-        render_templates
-        upload configuration[:vhost_template]
-        sites_enabled_dir = configuration[:sites_enabled_dir] || '../sites_enabled'
-        remote_shell.run [
-                           "ln -s #{configuration[:vhost_template]} #{sites_enabled_dir}/#{configuration[:vhost_template]}",
-                           "service #{configuration[:webserver] || 'nginx'} reload"
-                         ]
-      end
-
-      desc "List existing vhosts for #{env}"
-      task :list do
-        configuration.environment = env
-        configuration.target      = target
-
-        remote_shell.run 'ls -1'
-        remote_shell.last_output.each do |line|
-          match = line.match(/auto_vhost_(.*)\.conf/)
-          if match
-            name = match[1]
-            puts "- #{name}, delete via 'fulmar vhost:delete[#{name}]'"
-          end
-        end
-      end
-
-      desc "Delete a vhost for #{env}"
-      task :delete, [:name] do |_t, argv|
-        configuration.environment = env
-        configuration.target      = target
-
-        remote_shell.run [
-                           "rm auto_vhost_#{argv[:name]}.conf",
-                           "service #{configuration[:webserver] || 'nginx'} reload"
-                         ]
-      end
-    end
-  end
-
-end