fulmar 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ddda32a4d9e3c7843c763f983ceb4e0aba8dcb1
-  data.tar.gz: af45f53450e669157ba9a389c3b73d0f7df096e0
+  metadata.gz: 4b677f5683a979d761f27915ec1181cf120f9e57
+  data.tar.gz: 4af0a8618226dd09f4deda014c8fa0151e1d4841
 SHA512:
-  metadata.gz: 7b11cf1ec6da68384117a78f4a143a2d49edfc7227a1e42f928ba4a2b3d1b9c408f714e65231b5bfba866d6de2052770d577c68341edab8e3adf899e8fbc52aa
-  data.tar.gz: 4819b51d5fc2b07adc59729f0e34ef521251108cd1dd846fbe3257825ca85d380e5de2951b7af78d4d4950e1ad1f5f682a56464898cae690e08c001fea551a4c
+  metadata.gz: 2037bd7be61b50fea042250a59b639c8dc85876039dd9bb3ade4804f9d128ee7d4b5eedf774a4308184270af5972cbe053245d3c6eeeb2feb826e406478dbbde
+  data.tar.gz: aa06a04c726ae5f7588bc0b655639af26f78eac65afd74800167840483efd8b17d94396b114eaf66b8302cd1faea24a330dada3957e3fdc773718e7450b31a87

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

@@ -12,6 +12,13 @@ module Fulmar
         FULMAR_CONFIGURATION_DIR = 'Fulmar'
         DEPLOYMENT_CONFIG_FILE = 'deployment.yml'
 
+        BLANK_CONFIG = {
+          environments: {},
+          features: {},
+          hosts: {},
+          dependencies: { all: {} }
+        }
+
         include Singleton
 
         attr_reader :environment, :target
@@ -60,6 +67,10 @@ module Fulmar
           @target = target ? target.to_sym : nil
         end
 
+        def dependencies(env = nil)
+          env.nil? ? @config[:dependencies][:all] : @config[:dependencies][:all].deep_merge(@config[:dependencies][env])
+        end
+
         def ready?
           return false if @environment.nil? || @target.nil?
           fail 'Environment is invalid' if configuration[:environments][@environment].nil?
@@ -104,7 +115,9 @@ module Fulmar
         end
 
         def config_files
-          Dir.glob(File.join(base_path, FULMAR_CONFIGURATION_DIR, '*.config.yml')).sort
+          files = Dir.glob(File.join(base_path, FULMAR_CONFIGURATION_DIR, '*.config.yml')).sort
+          files << "#{ENV['HOME']}/.fulmar.yml" if File.exist? "#{ENV['HOME']}/.fulmar.yml"
+          files
         end
 
         protected
@@ -139,7 +152,7 @@ module Fulmar
 
         # Loads the configuration from the YAML file and populates all targets
         def load_configuration
-          @config = { environments: {}, features: {}, hosts: {} }
+          @config = BLANK_CONFIG
           config_files.each do |config_file|
             @config = @config.deep_merge((YAML.load_file(config_file) || {}).symbolize)
           end

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

@@ -1,6 +1,7 @@
 
 require 'fulmar/infrastructure/service/transfer/rsync'
 require 'fulmar/infrastructure/service/transfer/rsync_with_versions'
+require 'fulmar/infrastructure/service/transfer/tar'
 
 module Fulmar
   # Creates the required transfer model from the configuration
@@ -11,6 +12,8 @@ module Fulmar
         transfer_model = Fulmar::Infrastructure::Service::Transfer::RsyncWithVersions.new(config)
       when 'rsync'
         transfer_model = Fulmar::Infrastructure::Service::Transfer::Rsync.new(config)
+      when 'tar'
+        transfer_model = Fulmar::Infrastructure::Service::Transfer::Tar.new(config)
       else
         help = config[:type] == '' ? 'Add a "type: " field to your deployment yaml file. ' : ''
         transfer_model = nil

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

@@ -1,5 +1,3 @@
-require 'pp'
-
 db_configs = []
 configuration.each do |env, target, data|
   db_configs << [env, target] if data[:type] == 'maria'

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

@@ -12,26 +12,33 @@ namespace :versions do
   end
 
   unless @versioned_servers.empty?
-    namespace :list do
-      @versioned_servers.each_key do |env|
-        desc "List available versions for environment \"#{env}\""
-        task env do
+
+    @versioned_servers.each_key do |env|
+      target_count = @versioned_servers.keys.reduce(0) { |sum, target| sum + 1 if target.split(':').first == env.split(':').first }
+      namespace :list 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 work in most cases.
+
+        desc "List available versions for environment/target \"#{env}\""
+        task (target_count > 1 ? env : env.split(':').first) do
           configuration.environment = env.split(':').first
           configuration.target = env.split(':').last
           file_sync.list_releases(false).each { |item| puts item }
         end
       end
-    end
 
-    namespace :clean do
-      @versioned_servers.each_key do |env|
+
+      namespace :clean do
         desc "Delete obsolete versions for target \"#{env}\""
-        task env do
+        task (target_count > 1 ? env : env.split(':').first) do
           configuration.environment = env.split(':').first
           configuration.target = env.split(':').last
           file_sync.cleanup
         end
       end
     end
+
   end
 end

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

@@ -8,8 +8,8 @@ module Fulmar
           @path = custom_path
         end
 
-        def execute(command, arguments = [])
-          @local_shell.run "#{@path} #{command} #{arguments.join(' ')} > /dev/null"
+        def execute(command, arguments = %w(--no-dev -q))
+          @local_shell.run "#{@path} #{command} #{arguments.join(' ')}"
         end
       end
     end

data/lib/fulmar/infrastructure/service/transfer/tar.rb

@@ -0,0 +1,62 @@
+
+require 'fulmar/infrastructure/service/transfer/base'
+
+module Fulmar
+  module Infrastructure
+    module Service
+      module Transfer
+        # Implements the rsync transfer
+        class Tar < Base
+          DEFAULT_CONFIG = {
+            tar: {
+              format: 'gz', # 'bz2'
+              file_base: nil,
+              # exclude: "*.bak",
+              # filename: "site.tar.gz"
+            }
+          }
+
+          def initialize(config)
+            @config = DEFAULT_CONFIG.deep_merge(config)
+
+            @config[:tar][:file_base] = File.basename(@config[:local_path]) if @config[:tar][:file_base].nil?
+
+            super(@config)
+          end
+
+          def transfer
+            prepare unless @prepared
+            @local_shell.run tar_command
+            filename
+          end
+
+          # Build the rsync command from the given options
+          def tar_command
+            "tar #{tar_command_options} '#{filename}' '#{config[:local_path]}'"
+          end
+
+          protected
+
+          def filename
+            return @config[:tar][:filename] unless @config[:tar][:filename].blank?
+            @config[:tar][:file_base] + '_' + Time.now.strftime('%Y-%m-%d') + extension
+          end
+
+          def extension
+            @config[:tar][:format].blank? ? '.tar' : '.tar.' + @config[:tar][:format]
+          end
+
+          # Assembles all rsync command line parameters from the configuration options
+          def tar_command_options
+            options = ['-c']
+            options << '-j' if @config[:tar][:format] == 'bz2'
+            options << '-z' if @config[:tar][:format] == 'gz'
+            options << "--exclude #{@config[:tar][:exclude]}" if @config[:tar][:exclude]
+            options << '-f'
+            options.join(' ')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fulmar/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fulmar
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Jonas Siegl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -155,6 +155,7 @@ files:
 - 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/common_helper.rb