fulmar 1.4.0 → 1.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 868b4a631f7d6353d760308daccd0457903b21fc
4
- data.tar.gz: 5059427443e582732688fe6d0c722d50bd395058
3
+ metadata.gz: 52617fe8010bc51b880d65e633ffb5c6c3d3bd98
4
+ data.tar.gz: 390d9b696a415bede59ece2b65e7d7eaf64b9aac
5
5
  SHA512:
6
- metadata.gz: eb09328c8bc4ba396c967329787a21a8d0fb7cd5fd8080636c6d105b3edb4902d7358a597c0e5e98d058c0288011c084db6c4b698fcbeb726305954790fbb00f
7
- data.tar.gz: caa5e4392cc720b383e14029e378b01b808181e07e5fe09d5af0cf98d250538f205508ebc72c178d81e91696bdb0637ebc79e87f1b6704287f093827e4dc5749
6
+ metadata.gz: 536f2e948fdd848ddf4c8d8ae0f46948aa004fdd34b1f311ef097b24bd5f64ccbc01aa2f3b35944168dcfd658e55c8566a162262aef46a9c9df700b820ed2b56
7
+ data.tar.gz: 53fa20f8d0f38ae33ada880764a3d7c99c23dd0876bd11f832d6173b0596a780d86c164a799d99b210ce104a2c9ea97cdd002da08a871991e6cf1596e15e693c
@@ -46,6 +46,18 @@ module Fulmar
46
46
  def fulmar_task_dir
47
47
  File.expand_path(File.join(File.dirname(__FILE__), '..', 'task'))
48
48
  end
49
+
50
+ def standard_rake_options
51
+ options = super
52
+ options.reject { |option| option[0] == '--version' }
53
+ options << ['--version', '-V',
54
+ 'Display the program version.',
55
+ lambda { |_value|
56
+ puts "fulmar #{Fulmar::VERSION} (using rake, version #{RAKEVERSION})"
57
+ exit
58
+ }
59
+ ]
60
+ end
49
61
  end
50
62
  end
51
63
  end
@@ -18,8 +18,10 @@ module Fulmar
18
18
 
19
19
  attr_accessor :config
20
20
 
21
+ # @param [Fulmar::Domain::Service::ConfigurationService] config
21
22
  def initialize(config)
22
- @config = DEFAULT_CONFIG.merge(config)
23
+ @config = config
24
+ @config.merge(DEFAULT_CONFIG)
23
25
 
24
26
  # Remove trailing slashes
25
27
  @config[:local_path] = @config[:local_path].chomp('/') if @config[:local_path]
@@ -18,8 +18,10 @@ module Fulmar
18
18
  }
19
19
  }
20
20
 
21
+ # @param [Fulmar::Domain::Service::ConfigurationService] config
21
22
  def initialize(config)
22
- @config = DEFAULT_CONFIG.deep_merge(config)
23
+ @config = config
24
+ @config.merge(DEFAULT_CONFIG)
23
25
 
24
26
  if @config[:rsync][:exclude_file].blank? && File.exist?(@config[:local_path] + '/.rsyncignore')
25
27
  @config[:rsync][:exclude_file] = @config[:local_path] + '/.rsyncignore'
@@ -31,8 +31,10 @@ module Fulmar
31
31
  shared: []
32
32
  }
33
33
 
34
+ # @param [Fulmar::Domain::Service::ConfigurationService] config
34
35
  def initialize(config)
35
- @config = DEFAULT_CONFIG.deep_merge(config)
36
+ @config = config
37
+ @config.merge(DEFAULT_CONFIG)
36
38
  super(@config)
37
39
 
38
40
  if @config[:rsync][:exclude_file].blank? && File.exist?(@config[:local_path] + '/.rsyncignore')
@@ -26,7 +26,7 @@ module Fulmar
26
26
  end
27
27
 
28
28
  def remote_shell
29
- storage['remote_shell'] ||= new_shell(configuration[:remote_path], (configuration[:user] ? configuration[:user]+'@' : '')+configuration[:hostname])
29
+ storage['remote_shell'] ||= new_shell(configuration[:remote_path], configuration.ssh_user_and_host)
30
30
  end
31
31
 
32
32
  def file_sync
@@ -1,4 +1,4 @@
1
1
  # Provides a global version number
2
2
  module Fulmar
3
- VERSION = '1.4.0'
3
+ VERSION = '1.4.1'
4
4
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fulmar
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.0
4
+ version: 1.4.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonas Siegl