fulmar 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8d6270f2a2b407f32d9419cd4bb55c228138b8e
-  data.tar.gz: 2c820de490c174e1c7a0df5db92434fe1a3f3302
+  metadata.gz: b109fec07e1c8f289643c435c31842bb97e844ee
+  data.tar.gz: 1464b61a64c4688257d3a8bf31a43a0c530d0c29
 SHA512:
-  metadata.gz: 308c77aa59ef61e622a7988c5bbafb86b76694408d5d6b112e311813a9175c34260aff4954449f358e3722de481ff3570ac79c3e21d6c3ef904be72fbab9ada9
-  data.tar.gz: ae114e84ce4907f2feefe402f1409cbbfe76497c3e47dc15dbe676964df877150bf22f14dd7c763963fe4be954e9997e571c32979a7457c7d067a0ceb7255966
+  metadata.gz: 3aa757adae168d75ca1aea2bb8db89469ff8efe355e4ec52a9e9f97aac505d2b8f4b7485ac311039022893f5a5d5562c2d006174cf6db2fd753ac15aa2692679
+  data.tar.gz: b1da4f12f9971c59c6d4bae2cd08ce234714ff9abfca5d3b1d01d15ea92b38b84d4dd634d3710a174d3c164ba4431e7b628bf1616e52d5136120bb4360361344

data/README.md

@@ -14,6 +14,14 @@ compatible (i.e. database).
 
 It has (yet limited) support for MySQL / MariaDB and git.
 
+## Warning
+
+Version 1.10.0 of Fulmar removes some features that we (CORE4) rarely used and which
+caused the deployments to slow down the gems needed to be compiled against the
+installed libraries. If you need support to query databases (more than just dumps)
+or use dependencies, you will need to explicitly specify version `~> 1.9.0`.
+Fulmar 2.0 will support these features via plugins.
+
 ## Prerequisites
 
 Fulmar 2.0 runs with Ruby >= 2.2.2. Plugins like [mariadb](https://github.com/CORE4/fulmar-plugin-mariadb) might have
@@ -50,7 +58,7 @@ several files.
     $ mkdir Fulmar
     $ touch Fulmar/project.config.yml
 
-You can now now test your configuration.
+You can now test your configuration.
 
     $ fulmar test:config
 

data/lib/fulmar/domain/service/configuration_service.rb

@@ -23,7 +23,7 @@ module Fulmar
           hosts: {},
         }
 
-        include Singleton
+        include ::Singleton
 
         attr_reader :environment, :target
         attr_accessor :load_user_config, :debug
@@ -99,7 +99,7 @@ module Fulmar
         def check_version(version)
           return if version.nil?
           unless  Gem::Dependency.new('', version).match?('', Fulmar::VERSION)
-            fail "Project requires a newer version of fulmar: #{version}"
+            fail "Project requires another version of fulmar: #{version}"
           end
         end
       end

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

@@ -3,4 +3,4 @@ include Fulmar::Domain::Service::Helper::CommonHelper
 
 Fulmar::Domain::Service::PluginService.instance.helpers.each do |helper|
   include helper
-end
+end

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

@@ -1,46 +1,50 @@
 include Fulmar::Domain::Service::Helper::CommonHelper
 
-namespace :versions do
-  @versioned_servers = {}
+@versioned_servers = {}
 
-  config.each do |env, target, config|
-    @versioned_servers["#{env}:#{target}"] = config if config[:type].to_s == 'rsync_with_versions'
-  end
+config.each do |env, target, config|
+  @versioned_servers["#{env}:#{target}"] = config if config[:type].to_s == 'rsync_with_versions'
+end
 
-  unless @versioned_servers.empty?
+unless @versioned_servers.empty?
 
-    @versioned_servers.each_key do |env|
-      target_count = @versioned_servers.keys.reduce(0) { |a, e| e.split(':').first == env.split(':').first ? a + 1 : a }
+  @versioned_servers.each_key do |env|
+    target_count = @versioned_servers.keys.reduce(0) { |a, e| e.split(':').first == env.split(':').first ? a + 1 : a }
 
-      task_environment = (target_count > 1 ? env : env.split(':').first)
+    task_environment = (target_count > 1 ? env : env.split(':').first)
 
-      namespace :list do
+    namespace :list do
+      namespace :versions do
         # Count of there are multiple targets within the environment
         # if not, we can omit the target name in the task and shorten it a bit
         # This should apply for almost all cases.
 
         desc "List available versions for environment/target \"#{env}\""
         task task_environment do
-          config.environment = env.split(':').first
-          config.target = env.split(':').last
+          config.environment = env.split(':').first.to_sym
+          config.target = env.split(':').last.to_sym
           file_sync.list_releases(false).each { |item| puts item }
         end
       end
+    end
 
-      namespace :clean do
+    namespace :clean do
+      namespace :versions do
         desc "Delete obsolete versions for target \"#{env}\""
         task task_environment do
-          config.environment = env.split(':').first
-          config.target = env.split(':').last
+          config.environment = env.split(':').first.to_sym
+          config.target = env.split(':').last.to_sym
           file_sync.cleanup
         end
       end
+    end
 
-      namespace :revert do
+    namespace :revert do
+      namespace :versions do
         desc "Revert to the previous version for \"#{env}\""
         task task_environment do
-          config.environment = env.split(':').first
-          config.target = env.split(':').last
+          config.environment = env.split(':').first.to_sym
+          config.target = env.split(':').last.to_sym
           error 'Cannot revert to previous version.' unless file_sync.revert
         end
       end

data/lib/fulmar/infrastructure/model/transfer/rsync_with_versions.rb

@@ -24,7 +24,7 @@ module Fulmar
               exclude_file: nil,
               chown: nil,
               chmod: nil,
-              delete: true
+              delete:  true
             },
             symlinks: {},
             limit_releases: 5,
@@ -56,7 +56,10 @@ module Fulmar
           def transfer
             prepare unless @prepared
 
-            create_paths && @local_shell.run(rsync_command) && copy_temp_to_release && add_shared
+            fail 'Deployment failed when trying to prepare remote directories for sync.' unless create_paths
+            fail 'Deployment failed. Cannot sync files.' unless @local_shell.run(rsync_command)
+            fail 'Deployment failed when trying to move file from temporary upload dir.' unless copy_temp_to_release
+            fail 'Deployment failed when creating symlinks for shared folders' unless add_shared
           end
 
           # Publishes the current release (i.e. sets the 'current' symlink)
@@ -153,7 +156,7 @@ module Fulmar
           # Builds the rsync command
           # @return [String] the command
           def rsync_command
-            options = ['-rl']
+            options = %w(-rl --delete-excluded)
             options << rsync_excludes if rsync_excludes
             options << "--exclude-from='#{@config[:rsync][:exclude_file]}'" if @config[:rsync][:exclude_file]
             options << "--chown='#{@config[:rsync][:chown]}'" if @config[:rsync][:chown]
@@ -166,7 +169,7 @@ module Fulmar
           # Copies the data from the sync temp to the actual release directory
           # @return [true, false] success
           def copy_temp_to_release
-            @remote_shell.run "cp -pr #{@config[:temp_dir]} #{release_dir}"
+            @remote_shell.run "cp -pR #{@config[:temp_dir]} #{release_dir}"
           end
 
           # Set the symlink to the given release or the return value of release_dir() otherwise
@@ -187,24 +190,23 @@ module Fulmar
           # @return [true, false] success
           def add_shared
             commands = [] # Collect all remote commands first, then execute them in one step to avoid reconnecting very often
-            @config[:shared].each do |dir|
-              commands << "mkdir -p \"#{release_dir}/#{dir}\""
+            @config[:shared].each do |path|
+              commands << "mkdir -p \"#{release_dir}/#{File.dirname(path)}\""
 
-              unless remote_dir_exists?("#{@config[:shared_dir]}/#{dir}")
-                commands << "mkdir -p \"#{@config[:shared_dir]}/#{File.dirname(dir)}\""
-                commands << "cp -pr \"#{release_dir}/#{dir}\" \"#{@config[:shared_dir]}/#{File.dirname(dir)}\""
+              unless remote_path_exists?("#{@config[:shared_dir]}/#{path}")
+                commands << "mkdir -p \"#{@config[:shared_dir]}/#{path}\""
               end
 
-              commands << "rm -fr \"#{release_dir}/#{dir}\""
-              commands << "mkdir -p \"#{release_dir}/#{File.dirname(dir)}\""
-              commands << "ln -s \"#{@config[:remote_path]}/#{@config[:shared_dir]}/#{dir}\" \"#{release_dir}/#{dir}\""
+              commands << "rm -fr \"#{release_dir}/#{path}\""
+              commands << "mkdir -p \"#{release_dir}/#{File.dirname(path)}\""
+              commands << "ln -s \"#{@config[:remote_path]}/#{@config[:shared_dir]}/#{path}\" \"#{release_dir}/#{path}\""
             end
 
             @remote_shell.run commands if commands.length > 0
           end
 
-          def remote_dir_exists?(dir)
-            @remote_shell.run "test -d \"#{dir}\""
+          def remote_path_exists?(dir)
+            @remote_shell.run "test -e \"#{dir}\""
           end
         end
       end

data/lib/fulmar/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fulmar
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Jonas Siegl
@@ -112,7 +112,6 @@ files:
 - lib/fulmar/domain/model/project.rb
 - lib/fulmar/domain/service/config_test_service.rb
 - lib/fulmar/domain/service/config_tests/hosts.rb
-- lib/fulmar/domain/service/config_tests/mariadb.rb
 - lib/fulmar/domain/service/config_tests/paths.rb
 - lib/fulmar/domain/service/config_tests/project.rb
 - lib/fulmar/domain/service/configuration_service.rb

data/lib/fulmar/domain/service/config_tests/mariadb.rb

@@ -1,19 +0,0 @@
-# Move this file into the plugin
-
-target_test 'mariadb is loaded' do |config|
-  if config[:type] == :mariadb && !config.plugins.include?(:mariadb)
-    next {
-      severity: :warning,
-      message: 'config uses mysql/mariadb but your config is missing the maria plugin'
-    }
-  end
-end
-
-target_test 'database name exists' do |config|
-  if config.plugins.include?(:mariadb) && config[:maria] && config[:maria][:database].blank?
-    next {
-      severity: :error,
-      message: 'config is missing a database name in maria:database'
-    }
-  end
-end