fulmar 1.10.1 → 2.0.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fulmar
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Jonas Siegl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '11'
 - !ruby/object:Gem::Dependency
   name: fulmar-shell
   requirement: !ruby/object:Gem::Requirement
@@ -60,39 +60,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.7.0
 - !ruby/object:Gem::Dependency
-  name: ruby_wings
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 description: Fulmar is a task manager for deployments.
 email:
 - j.siegl@core4.de
@@ -113,42 +107,42 @@ files:
 - Rakefile
 - bin/fulmar
 - fulmar.gemspec
+- lib/fulmar/domain/model/application.rb
+- lib/fulmar/domain/model/configuration.rb
 - lib/fulmar/domain/model/project.rb
-- lib/fulmar/domain/service/application_service.rb
-- lib/fulmar/domain/service/config_rendering_service.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
 - 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/flow_helper.rb
-- lib/fulmar/domain/service/helper/vhost_helper.rb
 - lib/fulmar/domain/service/initialization_service.rb
+- lib/fulmar/domain/service/plugin_service.rb
+- lib/fulmar/domain/service/template_rendering_service.rb
 - lib/fulmar/domain/task/configuration.rake
 - lib/fulmar/domain/task/console.rake
-- lib/fulmar/domain/task/database_sync.rake
 - lib/fulmar/domain/task/environment.rake
 - lib/fulmar/domain/task/initialization/base.rake
 - lib/fulmar/domain/task/versions.rake
-- lib/fulmar/infrastructure/service/composer_service.rb
+- lib/fulmar/infrastructure/default_files/Fulmar/project.config.yml
+- lib/fulmar/infrastructure/default_files/Fulmarfile
+- lib/fulmar/infrastructure/model/transfer/base.rb
+- lib/fulmar/infrastructure/model/transfer/rsync.rb
+- lib/fulmar/infrastructure/model/transfer/rsync_with_versions.rb
+- lib/fulmar/infrastructure/model/transfer/tar.rb
 - lib/fulmar/infrastructure/service/copy_service.rb
-- lib/fulmar/infrastructure/service/database/database_service.rb
-- lib/fulmar/infrastructure/service/flow_service.rb
-- lib/fulmar/infrastructure/service/shell_service.rb
 - lib/fulmar/infrastructure/service/ssh_config_service.rb
-- lib/fulmar/infrastructure/service/transfer/base.rb
-- lib/fulmar/infrastructure/service/transfer/rsync.rb
-- lib/fulmar/infrastructure/service/transfer/rsync_with_versions.rb
-- lib/fulmar/infrastructure/service/transfer/tar.rb
 - lib/fulmar/infrastructure/service/tunnel_service.rb
 - lib/fulmar/service/bootstrap_service.rb
 - lib/fulmar/service/helper_service.rb
-- lib/fulmar/service/logger_service.rb
 - lib/fulmar/task_manager.rb
 - lib/fulmar/version.rb
+- spec/lib/fulmar/model/configuration_spec.rb
 - spec/lib/fulmar/service/helper_service_spec.rb
+- spec/lib/fulmar/service/plugin_service_spec.rb
 - spec/spec_helper.rb
-- test/rsync_with_versions.rb
 homepage: https://github.com/CORE4/fulmar
 licenses:
 - MIT
@@ -169,11 +163,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A deployment task manager.
 test_files:
+- spec/lib/fulmar/model/configuration_spec.rb
 - spec/lib/fulmar/service/helper_service_spec.rb
+- spec/lib/fulmar/service/plugin_service_spec.rb
 - spec/spec_helper.rb
-- test/rsync_with_versions.rb

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

@@ -1,14 +0,0 @@
-module Fulmar
-  module Domain
-    module Service
-      module Helper
-        # Provides access helper to the database service from within a task
-        module DatabaseHelper
-          def database
-            storage['database'] ||= Fulmar::Infrastructure::Service::Database::DatabaseService.new configuration
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,16 +0,0 @@
-require 'fulmar/infrastructure/service/flow_service'
-
-module Fulmar
-  module Domain
-    module Service
-      module Helper
-        # Provides access helper to the flow service from within a task
-        module FlowHelper
-          def flow
-            storage['flow'] ||= Fulmar::Infrastructure::Service::FlowService.new remote_shell, configuration
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,21 +0,0 @@
-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/database_sync.rake

@@ -1,63 +0,0 @@
-db_configs = []
-configuration.each do |env, target, data|
-  db_configs << [env, target] if data[:type] == 'maria'
-end
-
-# Expects two hashes as parameters each with { :environment, :target, :name } set
-# :name is either environment:target or just the environment, if the is only one target
-def create_update_task(from, to)
-  namespace to[:name] do
-    task "from_#{from[:name]}" do
-      configuration.environment = from[:environment]
-      configuration.target = from[:target]
-      puts 'Getting dump...'
-      sql_dump = database.download_dump
-      if sql_dump == ''
-        puts 'Cannot create sql dump'
-      else
-        configuration.environment = to[:environment]
-        configuration.target = to[:target]
-        puts 'Sending dump...'
-        remote_sql_dump = upload(sql_dump)
-        database.load_dump(remote_sql_dump)
-      end
-    end
-  end
-end
-
-def name(env, target, counts)
-  counts[env] > 1 ? "#{env}:#{target}" : env
-end
-
-def create_update_tasks(db_configs)
-  counts = Hash.new(0)
-  db_configs.each do |config|
-    counts[config.first] += 1
-  end
-
-  namespace :update do
-    db_configs.each do |from_db|
-      db_configs.each do |to_db|
-        next if from_db == to_db # no need to sync a database to itself
-        next if from_db.last != to_db.last # sync only matching target names
-        from = {
-          environment: from_db.first,
-          target: from_db.last,
-          name: name(from_db.first, from_db.last, counts)
-        }
-        to = {
-          environment: to_db.first,
-          target: to_db.last,
-          name: name(to_db.first, to_db.last, counts)
-        }
-        create_update_task(from, to)
-      end
-    end
-  end
-end
-
-if configuration.feature?(:database) && db_configs.any?
-  namespace :database do
-    create_update_tasks(db_configs) if db_configs.count > 1
-  end
-end

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

@@ -1,22 +0,0 @@
-module Fulmar
-  module Infrastructure
-    module Service
-      # Provides access to composer
-      class ComposerService
-        DEFAULT_PARAMS = ['--no-dev']
-
-        attr_accessor :shell
-
-        def initialize(shell, custom_path = '/usr/bin/env composer')
-          @shell = shell
-          @shell.quiet = true
-          @path = custom_path
-        end
-
-        def execute(command, arguments = DEFAULT_PARAMS)
-          @shell.run "#{@path} #{command} #{arguments.join(' ')}"
-        end
-      end
-    end
-  end
-end

data/lib/fulmar/infrastructure/service/database/database_service.rb

@@ -1,118 +0,0 @@
-module Fulmar
-  module Infrastructure
-    module Service
-      module Database
-        # Provides basic methods common to all database services
-        class DatabaseService
-          attr_accessor :client
-          attr_reader :shell, :connected
-          alias_method :connected?, :connected
-
-          DEFAULT_CONFIG = {
-            maria: {
-              host: '127.0.0.1',
-              port: 3306,
-              user: 'root',
-              password: '',
-              encoding: 'utf8',
-              ignore_tables: []
-            }
-          }
-
-          def initialize(config)
-            @config = config
-            @config.merge DEFAULT_CONFIG
-            initialize_shell
-            config_test
-          end
-
-          def local?
-            @config[:hostname] == 'localhost'
-          end
-
-          def command(binary)
-            command = binary
-            command << " -h #{@config[:maria][:host]}" unless @config[:maria][:host].blank?
-            command << " -u #{@config[:maria][:user]}" unless @config[:maria][:user].blank?
-            command << " --password='#{@config[:maria][:password]}'" unless @config[:maria][:password].blank?
-            command
-          end
-
-          def dump(filename = backup_filename)
-            filename = "#{@config[:remote_path]}/#{filename}" unless filename[0, 1] == '/'
-
-            @shell.run "#{command('mysqldump')} #{@config[:maria][:database]} --single-transaction #{diffable} #{ignore_tables} -r \"#{filename}\""
-
-            filename
-          end
-
-          def load_dump(dump_file, database = @config[:maria][:database])
-            @shell.run "#{command('mysql')} -D #{database} < #{dump_file}"
-          end
-
-          def download_dump(filename = backup_filename)
-            local_path = filename[0, 1] == '/' ? filename : @config[:local_path] + '/' + filename
-            remote_path = dump
-            copy = system("scp -Cq #{@config.ssh_user_and_host}:#{remote_path} #{local_path}")
-            @shell.run "rm -f \"#{remote_path}\"" # delete temporary file
-            if copy
-              local_path
-            else
-              ''
-            end
-          end
-
-          protected
-
-          # Return mysql command line options to ignore specific tables
-          def ignore_tables
-            @config[:maria][:ignore_tables] = [*@config[:maria][:ignore_tables]]
-            @config[:maria][:ignore_tables].map do |table|
-              "--ignore-table=#{@config[:maria][:database]}.#{table}"
-            end.join(' ')
-          end
-
-          # Return the mysql configuration options to make a dump diffable
-          def diffable
-            @config[:maria][:diffable_dump] ? '--skip-comments --skip-extended-insert ' : ''
-          end
-
-          # Test configuration
-          def config_test
-            fail 'Configuration option "database" missing.' unless @config[:maria][:database]
-          end
-
-          # Builds the filename for a new database backup file
-          # NOTE: The file might already exist, for example if this is run at the same
-          # time from to different clients. I won't handle this as it is unlikely and
-          # would result in more I/O
-          def backup_filename
-            "#{@config[:maria][:database]}_#{Time.now.strftime('%Y-%m-%dT%H%M%S')}.sql"
-          end
-
-          def initialize_shell
-            path = local? ? @config[:local_path] : @config[:remote_path]
-            @shell = Fulmar::Infrastructure::Service::ShellService.new(path , @config.ssh_user_and_host)
-            @shell.debug = true if @config[:debug]
-            @shell.strict = true
-          end
-
-          # Compiles a mysql config hash from valid options of the fulmar config
-          def compile_options
-            possible_options = [:host, :username, :password, :port, :encoding, :socket, :read_timeout, :write_timeout,
-                                :connect_timeout, :reconnect, :local_infile, :secure_auth, :default_file, :default_group,
-                                :init_command
-                               ]
-            options = { host: '127.0.0.1', username: @config[:maria][:user] }
-
-            possible_options.each do |option|
-              options[option] = @config[:maria][option] unless @config[:maria][option].nil?
-            end
-
-            options
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,47 +0,0 @@
-module Fulmar
-  module Infrastructure
-    module Service
-      # Implements Flow commands
-      class FlowService
-        # @param [Fulmar::Infrastructure::Service::ShellService] shell
-        # @param [Hash] config
-        def initialize(shell, config)
-          @remote_shell = shell
-          @config = config
-          test_config
-        end
-
-        def cache_clear
-          execute('flow:cache:flush --force')
-        end
-
-        def cache_warmup
-          execute('flow:cache:warmup')
-        end
-
-        def site_export(filename = export_filename)
-          execute("typo3.neos:site:export --filename \"#{filename}\"")
-          filename
-        end
-
-        def site_import(filename)
-          execute("./flow typo3.neos:site:import --filename \"#{filename}\"")
-        end
-
-        def execute(command)
-          @remote_shell.run "FLOW_CONTEXT=\"#{@config[:neos][:environment]}\" ./flow #{command}"
-        end
-
-        protected
-
-        def export_filename
-          "export_#{Time.now.strftime('%Y-%m-%dT%H%M%S')}.xml"
-        end
-
-        def test_config
-          fail 'Neos environment is not set.' unless @config[:neos] && @config[:neos][:environment]
-        end
-      end
-    end
-  end
-end

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

@@ -1,10 +0,0 @@
-require 'fulmar/shell'
-
-module Fulmar
-  module Infrastructure
-    module Service
-      # This is only a wrapper to fit the shell into the naming scheme
-      class ShellService < Fulmar::Shell; end
-    end
-  end
-end

data/lib/fulmar/service/logger_service.rb

@@ -1,7 +0,0 @@
-require 'logger'
-
-module Fulmar
-  module Service
-    class LoggerService < Logger; end
-  end
-end

data/test/rsync_with_versions.rb

@@ -1,20 +0,0 @@
-require 'minitest/autorun'
-require 'fulmar/infrastructure/service/transfer/rsync_with_versions'
-
-# Tests RsyncWithVersions
-class RsyncWithVersionsTest < MiniTest::Unit::TestCase
-  def setup
-    @transfer = Fulmar::Infrastructure::Service::Transfer::RsyncWithVersions.new(
-      host: 'example.com',
-      remote_dir: '/tmp',
-      rsync: {
-        exclude: 'foo'
-      },
-      type: :rsync_with_versions
-    )
-  end
-
-  def test_release_dir_contains_current_date
-    assert_match(/\/#{Time.now.strftime('%Y-%m-%d')}_/, @transfer.release_dir)
-  end
-end