fulmar 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0336132e3fcbed16ff2144fe52793cb878a08537dbcd840aa59c63b78f8ac7f1
-  data.tar.gz: 52372491d8131f37d8bd0b5926dd262e17cd4cf0e07acc40fc7965a2b761587d
+  metadata.gz: dcc60c5ada7e7d4fc50db5b9c03271923d7f78672d12f1aed85e22983b386148
+  data.tar.gz: 3a17c4f609b5b85d9348bd18604ea1891ab11ade9006b5a6975201dd3dcb22e5
 SHA512:
-  metadata.gz: 39f7077270b7b6fc4b3a5c487827ec14a548acbc47a7faa525195c59da62e0eb322d31c9eaa0e22cc781b96ff6bfdb50066dbc1960b5abddf419d567bdccdb74
-  data.tar.gz: a4c1faae307fffd31faa4389cbc96dd33831158f30b3e924e15d4f16bf65dca12e3c35796f26d52b3634b279689a43a16dbec7f4aad91b24d214f6b3b79b770f
+  metadata.gz: e63fc9a9a7785ffa6592aaf5abd3ca18c8c6ea4300e45a87a8af0ddb356326d7f43bb7d35f28b3514a6d568df8b4021fa8b885f87acecfaa70ca0c2a198922ba
+  data.tar.gz: e44c0945ca27ce4be7765610c04c5a55a19d36a9751b701f665601ffaeee4ab7231af01499df6c0da67284e17bc6b91cf5eaf11becb9d3ba887eebeaf54c84f3

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

@@ -6,21 +6,20 @@ require 'fulmar/infrastructure/model/transfer/tar'
 module Fulmar
   # Creates the required transfer model from the configuration
   class FileSync
-    def self.get_model(config)
+    def self.get_class(config)
       case config[:type]
       when 'rsync_with_versions'
-        transfer_model = Fulmar::Infrastructure::Model::Transfer::RsyncWithVersions.new(config)
+        transfer_class = Fulmar::Infrastructure::Model::Transfer::RsyncWithVersions
       when 'rsync'
-        transfer_model = Fulmar::Infrastructure::Model::Transfer::Rsync.new(config)
+        transfer_class = Fulmar::Infrastructure::Model::Transfer::Rsync
       when 'tar'
-        transfer_model = Fulmar::Infrastructure::Model::Transfer::Tar.new(config)
+        transfer_class = Fulmar::Infrastructure::Model::Transfer::Tar
       else
         help = config[:type] == '' ? 'Add a "type: " field to your deployment yaml file. ' : ''
-        transfer_model = nil
         raise "Transfer type '#{config[:type]}' is not valid. #{help}Valid values are: rsync, rsync_with_versions."
       end
 
-      transfer_model
+      transfer_class
     end
   end
 end

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

@@ -22,16 +22,20 @@ module Fulmar
 
           # @return [Fulmar::Shell]
           def local_shell
-            storage['local_shell'] ||= new_shell(config[:local_path])
+            cache_id = "local_shell-#{config[:local_path]}"
+            storage[cache_id] ||= new_shell(config[:local_path])
           end
 
           # @return [Fulmar::Shell]
           def remote_shell
-            storage['remote_shell'] ||= new_shell(config[:remote_path], config.ssh_user_and_host)
+            cache_id = "remote_shell-#{config[:remote_path]}-#{config.ssh_user_and_host}"
+            storage[cache_id] ||= new_shell(config[:remote_path], config.ssh_user_and_host)
           end
 
           def file_sync
-            storage['file_sync'] ||= Fulmar::FileSync.get_model config
+            file_sync_model = Fulmar::FileSync.get_class config
+            cache_id = "file_sync-#{file_sync_model.config_hash(config)}"
+            storage[cache_id] ||= file_sync_model.new(config.clone)
           end
 
           def render_templates

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

@@ -1,4 +1,5 @@
 require 'fulmar/shell'
+require 'digest'
 
 module Fulmar
   module Infrastructure
@@ -47,6 +48,13 @@ module Fulmar
             # Placeholder for consistent api, currently only implemented in rsync_with_versions
             true
           end
+
+          # Generate a hash over all relevant config values to allow more precise caching
+          def self.config_hash(config)
+            id_string = self.class.to_s
+            id_string << DEFAULT_CONFIG.keys.map { |key| config[key].to_s }.join('-')
+            Digest::SHA256.hexdigest id_string
+          end
         end
       end
     end

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

@@ -28,7 +28,7 @@ module Fulmar
             },
             symlinks: {},
             limit_releases: 5,
-            version_name: Time.now.strftime('%Y-%m-%d_%H%M%S'),
+            version_name: 'time',
             shared: []
           }.freeze
 
@@ -49,7 +49,9 @@ module Fulmar
             @remote_shell = Fulmar::Shell.new @config[:remote_path], @config.ssh_user_and_host
             @remote_shell.debug = @config[:debug]
 
-            if /^[A-Z][A-Z0-9\-_]+$/ =~ @config[:version_name]
+            if @config[:version_name] == 'time'
+              @config[:version_name] = Time.now.strftime(TIME_FOLDER)
+            elsif /^[A-Z][A-Z0-9\-_]+$/ =~ @config[:version_name]
               @config[:version_name] = ENV[@config[:version_name]].split('/').last
             end
           end

data/lib/fulmar/version.rb

@@ -1,4 +1,4 @@
 # Provides a global version number
 module Fulmar
-  VERSION = '2.2.3'.freeze
+  VERSION = '2.2.4'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fulmar
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Jonas Siegl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-13 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler