fulmar 1.9.2 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c0254651c027ef775ad9e568f66d86aad0ae858
-  data.tar.gz: eaac4a6a2a32db19ce421432f4151bac017ba12f
+  metadata.gz: 375aee75cd020abdfdefb0622dd2f90e547c31c0
+  data.tar.gz: 8b8ae5c411d00386e02ad4be9ef1d515d0f541b1
 SHA512:
-  metadata.gz: c3a2380798df491fc87e15ceb44d7d48576df1c98d015c91101f35ae86878e32424395098d48cfd1c322fc2a1a9b18d60b9802671ee84bc0e3324b4135d0c314
-  data.tar.gz: 89334e747f73215ec35e5b7f733c5f6dbfe9d89815bcd72987beb0bb7fdff2c1dafc5720dbc6f84b0948ca887a0b07339de5932627d095bca7c6be1bf899350c
+  metadata.gz: 44e7234acfce670e208e86ca23f299b31488049f0d9578e0ba252806d0a329c5c17b205b8a3c42f3567ed73519d9cf939f89c3270ffba1e651e3e313e84dbeda
+  data.tar.gz: 0d0c3b6b2e6501f5c2a2df70f017147622f420f0c6ea909903515aa36c2689fd2c9d17914aa482983352ef978afd1826767821f0ccc485a1e5267d02b31f4862

data/README.md

@@ -15,6 +15,14 @@ compatible (i.e. database).
 It has (yet limited) support for MySQL / MariaDB and git. Remote databases can be accessed
 through an ssh tunnel.
 
+## 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 currently requires the [mysql2](https://github.com/brianmario/mysql2) gem which
@@ -24,7 +32,8 @@ libmariadbclient-dev/libmysqlclient-dev or similar.
 You also need cmake and pkg-config to build the dependencies.
 
 - OSX: brew install mariadb cmake pkg-config
-- Ubuntu: apt-get install libmariadbclient-dev build-essential cmake
+- Ubuntu: apt-get install libmariadb-client-lgpl-dev build-essential cmake
+- Ubuntu (pre-xenial): apt-get install libmariadbclient-dev build-essential cmake
 
 ## Installation
 
@@ -55,7 +64,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/fulmar.gemspec

@@ -21,8 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.7'
 
   spec.add_runtime_dependency 'rake', '~>10'
-  spec.add_runtime_dependency 'rugged', '~> 0.23.0'
-  spec.add_runtime_dependency 'mysql2', '~>0.3'
   spec.add_runtime_dependency 'fulmar-shell', '~>1', '>=1.7.0'
   spec.add_runtime_dependency 'ruby_wings', '~>0.1', '>=0.1.1'
   spec.add_runtime_dependency 'colorize', '~>0'

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

@@ -1,6 +1,7 @@
 require 'yaml'
 require 'pp'
 require 'fulmar/domain/model/project'
+require 'singleton'
 
 module Fulmar
   module Domain
@@ -22,7 +23,7 @@ module Fulmar
           dependencies: { all: {} }
         }
 
-        include Singleton
+        include ::Singleton
 
         attr_reader :environment, :target
         attr_accessor :load_user_config
@@ -216,7 +217,7 @@ module Fulmar
         def check_version
           return if @config[:project][:fulmar_version].nil?
           unless  Gem::Dependency.new('', @config[:project][:fulmar_version]).match?('', Fulmar::VERSION)
-            fail "Project requires a newer version of fulmar: #{@config[:project][:fulmar_version]}"
+            fail "Project requires another version of fulmar: #{@config[:project][:fulmar_version]}"
           end
         end
       end

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

@@ -10,12 +10,3 @@ if configuration.feature? :flow
   require 'fulmar/domain/service/helper/flow_helper'
   include Fulmar::Domain::Service::Helper::FlowHelper
 end
-
-if full_configuration[:dependencies].any?
-  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/infrastructure/service/database/database_service.rb

@@ -1,6 +1,3 @@
-require 'mysql2'
-require 'fulmar/infrastructure/service/tunnel_service'
-
 module Fulmar
   module Infrastructure
     module Service
@@ -25,55 +22,14 @@ module Fulmar
           def initialize(config)
             @config = config
             @config.merge DEFAULT_CONFIG
-            @tunnel = nil
-            @client = nil
             initialize_shell
             config_test
           end
 
-          def connect
-            options = compile_options
-
-            unless local?
-              tunnel.open
-              options[:port] = tunnel.local_port
-            end
-
-            # Wait max 3 seconds for the tunnel to establish
-            6.times do |i|
-              break if try_connect(options, i)
-            end
-
-            @connected = true
-            query("USE #{@config[:maria][:database]}")
-          end
-
-          def disconnect
-            @connected = false
-            @client.close
-            @tunnel.close if @tunnel # using the variable directly avoids creating a tunnel instance when closing the database connection
-          end
-
           def local?
             @config[:hostname] == 'localhost'
           end
 
-          def tunnel
-            @tunnel ||= Fulmar::Infrastructure::Service::TunnelService.new(@config.ssh_user_and_host, @config[:maria][:port], @config[:maria][:hostname])
-          end
-
-          # shortcut for DatabaseService.client.query
-          def query(*arguments)
-            @client.query(*arguments)
-          end
-
-          def create(name)
-            state_before = connected?
-            connect unless connected?
-            @client.query "CREATE DATABASE IF NOT EXISTS `#{name}`"
-            disconnect unless state_before
-          end
-
           def command(binary)
             command = binary
             command << " -h #{@config[:maria][:host]}" unless @config[:maria][:host].blank?
@@ -106,34 +62,8 @@ module Fulmar
             end
           end
 
-          def clear
-            clear_statements = <<-EOD.gsub(/^\s+\|/, '')
-              |SET FOREIGN_KEY_CHECKS = 0;
-              |SET GROUP_CONCAT_MAX_LEN=32768;
-              |SET @tables = NULL;
-              |SELECT GROUP_CONCAT('`', table_name, '`') INTO @tables
-              |FROM information_schema.tables
-              |WHERE table_schema = (SELECT DATABASE());
-              |SELECT IFNULL(@tables,'dummy') INTO @tables;
-              |
-              |SET @tables = CONCAT('DROP TABLE IF EXISTS ', @tables);
-              |PREPARE stmt FROM @tables;
-              |EXECUTE stmt;
-              |DEALLOCATE PREPARE stmt;
-              |SET FOREIGN_KEY_CHECKS = 1;
-            EOD
-            @client.query clear_statements
-          end
-
           protected
 
-          def try_connect(options, i)
-            @client = Mysql2::Client.new options
-          rescue Mysql2::Error => e
-            sleep 1 if i < 5
-            raise e.message if i == 5
-          end
-
           # Return mysql command line options to ignore specific tables
           def ignore_tables
             @config[:maria][:ignore_tables] = [*@config[:maria][:ignore_tables]]

data/lib/fulmar/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fulmar
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.10.0
 platform: ruby
 authors:
 - Jonas Siegl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,34 +39,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
-- !ruby/object:Gem::Dependency
-  name: rugged
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.23.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.23.0
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: fulmar-shell
   requirement: !ruby/object:Gem::Requirement
@@ -146,11 +118,9 @@ files:
 - lib/fulmar/domain/service/config_rendering_service.rb
 - lib/fulmar/domain/service/config_test_service.rb
 - 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
@@ -159,7 +129,6 @@ files:
 - lib/fulmar/domain/task/database_sync.rake
 - lib/fulmar/domain/task/environment.rake
 - lib/fulmar/domain/task/initialization/base.rake
-- lib/fulmar/domain/task/optional/vhost.rb
 - lib/fulmar/domain/task/versions.rake
 - lib/fulmar/infrastructure/service/composer_service.rb
 - lib/fulmar/infrastructure/service/copy_service.rb

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

@@ -1,106 +0,0 @@
-require 'rugged'
-
-module Fulmar
-  module Domain
-    module Service
-      # Manages dependencies to subrepositories
-      class DependencyService
-        def initialize(config)
-          @config = config
-        end
-
-        def setup(env = @config.environment)
-          shell = Fulmar::Infrastructure::Service::ShellService.new(@config[:local_path])
-          @config.dependencies(env).each_pair do |_key, data|
-            next unless data[:type].blank? || data[:type] == 'git'
-            shell.quiet = true
-
-            if Dir.exist? "#{data[:path]}/.git"
-              shell.run 'git fetch -q', in: data[:path]
-            else
-              shell.run "git clone \"#{data[:source]}\" \"#{data[:path]}\" -q"
-              shell.last_error.each do |line|
-                puts line unless line.include? 'already exists and is not an empty directory'
-              end
-            end
-
-            git = Rugged::Repository.new(data[:path])
-            checkout(git, data)
-          end
-        end
-
-        def update(env = @config.environment)
-          @config.dependencies(env).each_pair do |_key, data|
-            next unless data[:type].blank? || data[:type] == 'git'
-            git = Rugged::Repository.new(data[:path])
-
-            handle_uncommitted_changes(git, data)
-
-            # Pull
-            shell = Fulmar::Infrastructure::Service::ShellService.new data[:path]
-            unless shell.run 'git pull --rebase -q'
-              fail "Cannot update repository #{data[:path]}. Please update manually."
-            end
-          end
-        end
-
-        protected
-
-        ##
-        # Runs a defined update policy to avoid git conflicts
-        # @param git [Rugged::Repository]
-        # @param dependency [Hash]
-        def handle_uncommitted_changes(git, dependency)
-          policy = dependency[:update_policy] || ''
-
-          case policy
-          when 'reset'
-            reset(git)
-          when -> (p) { p.nil? || p.empty? }
-            puts 'No update policy configured' if @config[:debug]
-          else
-            puts "Unexpected update policy #{policy}"
-          end
-        end
-
-        ##
-        # Reset changes
-        # @param git [Rugged::Repository]
-        def reset(git)
-          head = git.head
-          git.reset(head.target_id, :hard) unless head.nil?
-        end
-
-        def checkout(git, dependency)
-          handle_uncommitted_changes(git, dependency)
-
-          # Switch to the configured branch/tag/commit
-          if git.branches.select { |b| b.name.split('/').last == dependency[:ref] }.any?
-            checkout_branch(git, dependency[:ref])
-          elsif git.tags.map(&:name).include?(dependency[:ref])
-            git.checkout("refs/tags/#{dependency[:ref]}")
-          elsif dependency[:ref].match(/^[a-zA-Z0-9]{40}$/) && git.exists?(dependency[:ref])
-            git.checkout(dependency[:ref])
-          else
-            fail "Cannot find ref #{dependency[:ref]} in repo #{dependency[:path]}"
-          end
-        end
-
-        def checkout_branch(git, branch, remote = 'origin')
-          if git.branches.collect(&:name).include? branch
-            git.checkout(branch)
-          else
-            remote_branch = git.branches.find do |b|
-              b.name == "#{remote}/#{branch}"
-            end
-
-            new_branch = git.branches.create(branch, remote_branch.name)
-            new_branch.upstream=(remote_branch)
-
-            git.checkout(new_branch)
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,16 +0,0 @@
-require 'fulmar/domain/service/dependency_service'
-
-module Fulmar
-  module Domain
-    module Service
-      module Helper
-        # Provides access helper to the database service from within a task
-        module DependenciesHelper
-          def dependencies
-            storage['dependecies'] ||= Fulmar::Domain::Service::DependencyService.new configuration
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,80 +0,0 @@
-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?
-
-    task_environment = vhost_count > 1 ? ":#{env}" : ''
-
-    desc "Create a vhost for #{env}"
-    task "create#{task_environment}" 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"
-      ]
-
-      FileUtils.rm config_file_name
-
-      # recover remote path
-      configuration[:remote_path] = remote_path
-    end
-
-    desc "List existing vhosts for #{env}"
-    task "list#{task_environment}" do
-      configuration.environment = env
-      configuration.target      = target
-      configuration.merge(VHOST_DEFAULT_CONFIG)
-
-      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#{task_environment}", [: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
-  end
-end