rest-ftp-daemon 0.302.0 → 0.302.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7a1b9e5ed6fac0ec90833a3fbb68442a4a780acf
4
- data.tar.gz: c87259dbeb55f4ec01bdd252d7e0141938b58941
3
+ metadata.gz: 3766feac01d5115b1e615dcfd0b33a44aeb773b8
4
+ data.tar.gz: 5061bfa049efea386dd1ca0b64aed77047cbe751
5
5
  SHA512:
6
- metadata.gz: 309ccbf778b739bf66c2b2008c659865fe80e6a56400b6713c77f846aa6c121c6ad760fa54c7af2db67ad745708be02337cd10a92ef593ca95580b8ad5f5282b
7
- data.tar.gz: 12140ba5f1314819d8a0638af66b91ca4c0aac8752885a40b9a0b387574f3d986ce62e51767a03c4ed9336c1f31f5406626654b3ca4dff24389643f60564232c
6
+ metadata.gz: 208bfb1f1d9314312d9a704f29bd22da11c21038994ffc6ab0e85ce27a8f9c028bf5fa3f4ee2d3c1660d34b60616737499d7c126257118b89302c84d860b4369
7
+ data.tar.gz: c50f0fb68c7715b02909254d71b9ac4ff9cd8454cb6856fe2dd0b90284519539714a50a21125a1aea8a5599a6b7802e7f3e69a2a52b4fcc44e6e617beb72c90d
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- rest-ftp-daemon (0.302.0)
4
+ rest-ftp-daemon (0.302.1)
5
5
  api-auth
6
6
  chamber
7
7
  double-bag-ftps
@@ -22,11 +22,10 @@ GEM
22
22
  remote: http://rubygems.org/
23
23
  specs:
24
24
  CFPropertyList (2.2.8)
25
- activesupport (4.2.6)
25
+ activesupport (5.0.0)
26
+ concurrent-ruby (~> 1.0, >= 1.0.2)
26
27
  i18n (~> 0.7)
27
- json (~> 1.7, >= 1.7.7)
28
28
  minitest (~> 5.1)
29
- thread_safe (~> 0.3, >= 0.3.4)
30
29
  tzinfo (~> 1.1)
31
30
  api-auth (2.0.0)
32
31
  ast (2.3.0)
@@ -43,6 +42,7 @@ GEM
43
42
  coderay (1.1.1)
44
43
  coercible (1.0.0)
45
44
  descendants_tracker (~> 0.0.1)
45
+ concurrent-ruby (1.0.2)
46
46
  daemons (1.2.3)
47
47
  descendants_tracker (0.0.4)
48
48
  thread_safe (~> 0.3, >= 0.3.1)
@@ -77,7 +77,7 @@ GEM
77
77
  domain_name (~> 0.5)
78
78
  i18n (0.7.0)
79
79
  ice_nine (0.11.2)
80
- json (1.8.3)
80
+ json (2.0.0)
81
81
  method_source (0.8.2)
82
82
  mime-types (2.99.2)
83
83
  minitest (5.9.0)
data/bin/rest-ftp-daemon CHANGED
@@ -31,7 +31,7 @@ begin
31
31
  # Parse options and check compliance
32
32
  parser = OptionParser.new do |opts|
33
33
  opts.banner = "Usage: #{File.basename $PROGRAM_NAME} [options] start|stop"
34
- opts.on("-c", "--config CONFIGFILE") { |value| cmd_config = File.expand_path(value)}
34
+ opts.on("-c", "--config CONFIGFILE") { |value| cmd_config = File.expand_path(value.to_s)}
35
35
  opts.on("-e", "--environment ENV") { |value| Conf.app_env = value }
36
36
  opts.on("", "--dev") { Conf.app_env = "development" }
37
37
  opts.on("-p", "--port PORT", "use PORT") { |value| cmd_port = value.to_i }
@@ -17,9 +17,13 @@ require_relative "shared/conf"
17
17
  require_relative "shared/worker_base"
18
18
 
19
19
 
20
+ # HAML and Array monkey-patching
21
+ require_relative "rest-ftp-daemon/patch_array"
22
+ require_relative "rest-ftp-daemon/patch_haml"
23
+
24
+
20
25
  # Project's libs
21
26
  require_relative "rest-ftp-daemon/constants"
22
- require_relative "rest-ftp-daemon/array"
23
27
  require_relative "rest-ftp-daemon/exceptions"
24
28
  require_relative "rest-ftp-daemon/helpers"
25
29
  require_relative "rest-ftp-daemon/logger_pool"
@@ -48,5 +52,3 @@ require_relative "rest-ftp-daemon/api/config"
48
52
  require_relative "rest-ftp-daemon/api/debug"
49
53
  require_relative "rest-ftp-daemon/api/root"
50
54
 
51
- # Haml monkey-patching
52
- require_relative "rest-ftp-daemon/patch_haml"
@@ -34,7 +34,7 @@ module RestFtpDaemon
34
34
  return nil unless Conf[:logs].is_a?(Hash)
35
35
 
36
36
  # Compute logfile and check if we can write there
37
- logfile = File.expand_path(Conf[:logs][pipe], Conf[:logs][:path])
37
+ logfile = File.expand_path(Conf[:logs][pipe].to_s, Conf[:logs][:path].to_s)
38
38
 
39
39
  # Check that we'll be able to create logfiles
40
40
  if File.exists?(logfile)
File without changes
data/lib/shared/conf.rb CHANGED
@@ -77,7 +77,7 @@ module Shared
77
77
  Encoding.default_external = "utf-8"
78
78
 
79
79
  # Init New Relic
80
- newrelic_logfile = File.expand_path(Conf[:logs][:newrelic], Conf[:logs][:path])
80
+ newrelic_logfile = File.expand_path(Conf[:logs][:newrelic].to_s, Conf[:logs][:path].to_s)
81
81
  prepare_newrelic self[:newrelic], newrelic_logfile
82
82
 
83
83
  # Try to access any key to force parsing of the files
@@ -2,7 +2,7 @@
2
2
  Gem::Specification.new do |spec|
3
3
 
4
4
  # Project version
5
- spec.version = "0.302.0"
5
+ spec.version = "0.302.1"
6
6
 
7
7
  # Project description
8
8
  spec.name = "rest-ftp-daemon"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rest-ftp-daemon
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.302.0
4
+ version: 0.302.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Bruno MEDICI
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-06-30 00:00:00.000000000 Z
11
+ date: 2016-07-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -318,7 +318,6 @@ files:
318
318
  - lib/rest-ftp-daemon/api/jobs.rb
319
319
  - lib/rest-ftp-daemon/api/root.rb
320
320
  - lib/rest-ftp-daemon/api/status.rb
321
- - lib/rest-ftp-daemon/array.rb
322
321
  - lib/rest-ftp-daemon/constants.rb
323
322
  - lib/rest-ftp-daemon/counters.rb
324
323
  - lib/rest-ftp-daemon/exceptions.rb
@@ -330,6 +329,7 @@ files:
330
329
  - lib/rest-ftp-daemon/metrics.rb
331
330
  - lib/rest-ftp-daemon/notification.rb
332
331
  - lib/rest-ftp-daemon/paginate.rb
332
+ - lib/rest-ftp-daemon/patch_array.rb
333
333
  - lib/rest-ftp-daemon/patch_haml.rb
334
334
  - lib/rest-ftp-daemon/path.rb
335
335
  - lib/rest-ftp-daemon/remote.rb