fulmar 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 868b4a631f7d6353d760308daccd0457903b21fc
-  data.tar.gz: 5059427443e582732688fe6d0c722d50bd395058
+  metadata.gz: 52617fe8010bc51b880d65e633ffb5c6c3d3bd98
+  data.tar.gz: 390d9b696a415bede59ece2b65e7d7eaf64b9aac
 SHA512:
-  metadata.gz: eb09328c8bc4ba396c967329787a21a8d0fb7cd5fd8080636c6d105b3edb4902d7358a597c0e5e98d058c0288011c084db6c4b698fcbeb726305954790fbb00f
-  data.tar.gz: caa5e4392cc720b383e14029e378b01b808181e07e5fe09d5af0cf98d250538f205508ebc72c178d81e91696bdb0637ebc79e87f1b6704287f093827e4dc5749
+  metadata.gz: 536f2e948fdd848ddf4c8d8ae0f46948aa004fdd34b1f311ef097b24bd5f64ccbc01aa2f3b35944168dcfd658e55c8566a162262aef46a9c9df700b820ed2b56
+  data.tar.gz: 53fa20f8d0f38ae33ada880764a3d7c99c23dd0876bd11f832d6173b0596a780d86c164a799d99b210ce104a2c9ea97cdd002da08a871991e6cf1596e15e693c

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

@@ -46,6 +46,18 @@ module Fulmar
         def fulmar_task_dir
           File.expand_path(File.join(File.dirname(__FILE__), '..', 'task'))
         end
+
+        def standard_rake_options
+          options = super
+          options.reject { |option| option[0] == '--version' }
+          options << ['--version', '-V',
+              'Display the program version.',
+              lambda { |_value|
+              puts "fulmar #{Fulmar::VERSION} (using rake, version #{RAKEVERSION})"
+              exit
+            }
+          ]
+        end
       end
     end
   end

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

@@ -18,8 +18,10 @@ module Fulmar
 
           attr_accessor :config
 
+          # @param [Fulmar::Domain::Service::ConfigurationService] config
           def initialize(config)
-            @config = DEFAULT_CONFIG.merge(config)
+            @config = config
+            @config.merge(DEFAULT_CONFIG)
 
             # Remove trailing slashes
             @config[:local_path] = @config[:local_path].chomp('/') if @config[:local_path]

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

@@ -18,8 +18,10 @@ module Fulmar
             }
           }
 
+          # @param [Fulmar::Domain::Service::ConfigurationService] config
           def initialize(config)
-            @config = DEFAULT_CONFIG.deep_merge(config)
+            @config = config
+            @config.merge(DEFAULT_CONFIG)
 
             if @config[:rsync][:exclude_file].blank? && File.exist?(@config[:local_path] + '/.rsyncignore')
               @config[:rsync][:exclude_file] = @config[:local_path] + '/.rsyncignore'

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

@@ -31,8 +31,10 @@ module Fulmar
             shared: []
           }
 
+          # @param [Fulmar::Domain::Service::ConfigurationService] config
           def initialize(config)
-            @config = DEFAULT_CONFIG.deep_merge(config)
+            @config = config
+            @config.merge(DEFAULT_CONFIG)
             super(@config)
 
             if @config[:rsync][:exclude_file].blank? && File.exist?(@config[:local_path] + '/.rsyncignore')

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

@@ -26,7 +26,7 @@ module Fulmar
           end
 
           def remote_shell
-            storage['remote_shell'] ||= new_shell(configuration[:remote_path], (configuration[:user] ? configuration[:user]+'@' : '')+configuration[:hostname])
+            storage['remote_shell'] ||= new_shell(configuration[:remote_path], configuration.ssh_user_and_host)
           end
 
           def file_sync

data/lib/fulmar/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fulmar
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Jonas Siegl