rest-ftp-daemon 1.0.6 → 1.0.7

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.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +21 -22
  3. data/bin/rest-ftp-daemon +5 -5
  4. data/lib/rest-ftp-daemon/notification.rb +1 -1
  5. data/lib/rest-ftp-daemon/views/dashboard_footer.haml +2 -2
  6. data/lib/rest-ftp-daemon/workers/reporter.rb +1 -1
  7. data/rest-ftp-daemon.gemspec +2 -2
  8. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ab5d1f56eb1750be5ce5654332356762813d6085
4
- data.tar.gz: f37f545da0f2ac46bf1796feb17a9ccfeea5c3eb
3
+ metadata.gz: a313838237dedb04fe76812abe6bfe1d5b44ea7a
4
+ data.tar.gz: e7a21c237f53332e452cb5f3d34693a6969ada1f
5
5
  SHA512:
6
- metadata.gz: 90a6670922382dcf0f9ae348edefe9a02265b504efade4a00b5f4df8c5635dca20b19cde6280ae5ccdb07be333e329ea6c6d1cd1429eab32aeb36c561c82b86c
7
- data.tar.gz: 6cbbcd08f9e9312709c6f7d924cb5f85fb963617806ef574d25b19e9d00db1efaafe2078c6d8265754200d8e8f5d00e9b12ef5b4d16516426ed8a4b7af8ee320
6
+ metadata.gz: abeafeb843c4e9e92d0037cae3d16d33294a0b583ab040c6fb386f4310dc0ad69b448150273630d7f5142fdeff180760b27ba4bcf254ff9a79d7caf264d49ac8
7
+ data.tar.gz: 12e005da3e60f4419b18506dc8288f776997e00faa70d58cb3f46ef5d34c1b15ffd2bc2d9c7decbce076f7fe6c2157de094cead99e202f15ae646d03fffc56e4
data/Gemfile.lock CHANGED
@@ -1,11 +1,11 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- rest-ftp-daemon (1.0.6)
4
+ rest-ftp-daemon (1.0.7)
5
5
  activesupport (~> 4.2)
6
6
  api-auth
7
7
  aws-sdk-resources (~> 2)
8
- bmc-daemon-lib (~> 0.9)
8
+ bmc-daemon-lib (~> 0.7)
9
9
  double-bag-ftps
10
10
  facter
11
11
  get_process_mem
@@ -38,17 +38,17 @@ GEM
38
38
  public_suffix (~> 2.0, >= 2.0.2)
39
39
  api-auth (2.1.0)
40
40
  ast (2.3.0)
41
- aws-sdk-core (2.7.11)
41
+ aws-sdk-core (2.6.46)
42
42
  aws-sigv4 (~> 1.0)
43
43
  jmespath (~> 1.0)
44
- aws-sdk-resources (2.7.11)
45
- aws-sdk-core (= 2.7.11)
44
+ aws-sdk-resources (2.6.46)
45
+ aws-sdk-core (= 2.6.46)
46
46
  aws-sigv4 (1.0.0)
47
47
  axiom-types (0.1.1)
48
48
  descendants_tracker (~> 0.0.4)
49
49
  ice_nine (~> 0.11.0)
50
50
  thread_safe (~> 0.3, >= 0.3.1)
51
- bmc-daemon-lib (0.9.0)
51
+ bmc-daemon-lib (0.7.4)
52
52
  chamber (~> 2.9.1)
53
53
  builder (3.2.3)
54
54
  chamber (2.9.1)
@@ -58,8 +58,8 @@ GEM
58
58
  coercible (1.0.0)
59
59
  descendants_tracker (~> 0.0.1)
60
60
  daemons (1.2.4)
61
- declarative (0.0.9)
62
- declarative-option (0.1.0)
61
+ declarative (0.0.8)
62
+ uber (>= 0.0.15)
63
63
  descendants_tracker (0.0.4)
64
64
  thread_safe (~> 0.3, >= 0.3.1)
65
65
  diff-lcs (1.2.5)
@@ -67,8 +67,8 @@ GEM
67
67
  unf (>= 0.0.5, < 1.0.0)
68
68
  double-bag-ftps (0.1.3)
69
69
  equalizer (0.0.11)
70
- eventmachine (1.2.2)
71
- facter (2.4.6-universal-darwin)
70
+ eventmachine (1.2.1)
71
+ facter (2.4.6)
72
72
  CFPropertyList (~> 2.2.6)
73
73
  ffi (1.9.17)
74
74
  get_process_mem (0.2.1)
@@ -85,9 +85,9 @@ GEM
85
85
  grape-entity (0.6.0)
86
86
  activesupport
87
87
  multi_json (>= 1.3.2)
88
- grape-swagger (0.26.1)
88
+ grape-swagger (0.26.0)
89
89
  grape (>= 0.16.2)
90
- grape-swagger-entity (0.1.6)
90
+ grape-swagger-entity (0.1.5)
91
91
  grape-entity
92
92
  grape-swagger (>= 0.20.4)
93
93
  grape-swagger-representable (0.1.3)
@@ -95,7 +95,7 @@ GEM
95
95
  representable
96
96
  haml (4.0.7)
97
97
  tilt
98
- hashie (3.5.3)
98
+ hashie (3.4.6)
99
99
  http (2.1.0)
100
100
  addressable (~> 2.3)
101
101
  http-cookie (~> 1.0)
@@ -105,7 +105,7 @@ GEM
105
105
  domain_name (~> 0.5)
106
106
  http-form_data (1.0.1)
107
107
  http_parser.rb (0.6.0)
108
- i18n (0.8.0)
108
+ i18n (0.7.0)
109
109
  ice_nine (0.11.2)
110
110
  jmespath (1.3.1)
111
111
  json (1.8.6)
@@ -120,9 +120,9 @@ GEM
120
120
  mustermann (= 0.4.0)
121
121
  net-sftp (2.1.2)
122
122
  net-ssh (>= 2.6.5)
123
- net-ssh (4.1.0)
123
+ net-ssh (4.0.1)
124
124
  netrc (0.11.0)
125
- newrelic_rpm (3.18.1.330)
125
+ newrelic_rpm (3.17.2.327)
126
126
  parser (2.3.3.1)
127
127
  ast (~> 2.2)
128
128
  powerpack (0.1.1)
@@ -136,10 +136,9 @@ GEM
136
136
  rack (>= 0.4)
137
137
  rainbow (2.2.1)
138
138
  rake (12.0.0)
139
- representable (3.0.3)
140
- declarative (< 0.1.0)
141
- declarative-option (< 0.2.0)
142
- uber (< 0.2.0)
139
+ representable (3.0.2)
140
+ declarative (~> 0.0.5)
141
+ uber (>= 0.0.15, < 0.2.0)
143
142
  rest-client (1.8.0)
144
143
  http-cookie (>= 1.0.2, < 2.0)
145
144
  mime-types (>= 1.16, < 3.0)
@@ -178,7 +177,7 @@ GEM
178
177
  rack (>= 1, < 3)
179
178
  thor (0.19.4)
180
179
  thread_safe (0.3.5)
181
- tilt (2.0.6)
180
+ tilt (2.0.5)
182
181
  tool (0.2.3)
183
182
  tzinfo (1.2.2)
184
183
  thread_safe (~> 0.1)
@@ -207,4 +206,4 @@ DEPENDENCIES
207
206
  ruby-prof
208
207
 
209
208
  BUNDLED WITH
210
- 1.14.4
209
+ 1.13.5
data/bin/rest-ftp-daemon CHANGED
@@ -47,7 +47,7 @@ begin
47
47
  opts.separator ""
48
48
  opts.on_tail("-h", "--help", "Show this message") do
49
49
  puts opts
50
- puts Conf.generate_config_message unless File.exist?(Conf.generate_config_etc)
50
+ puts Conf.generate(:config_message) unless File.exist?(Conf.generate(:config_etc))
51
51
  exit(0)
52
52
  end
53
53
  #opts.on_tail("-v", "--version", "Show version (#{Conf.app_ver})") { puts(Conf.app_ver) && exit(0) }
@@ -78,7 +78,7 @@ Conf[:port] = cmd_port unless cmd_port.nil?
78
78
  Conf[:user] = cmd_user unless cmd_user.nil?
79
79
  Conf[:group] = cmd_group unless cmd_group.nil?
80
80
  Conf[:pidfile] = cmd_pidfile unless cmd_pidfile.nil?
81
- Conf[:pidfile] ||= Conf.generate_pidfile
81
+ Conf[:pidfile] ||= Conf.generate(:pidfile)
82
82
 
83
83
 
84
84
  # Thin: basic options
@@ -88,7 +88,7 @@ argv = []
88
88
  argv << ["-e", Conf.app_env]
89
89
  argv << ["-p", Conf[:port].to_s]
90
90
  argv << ["--pid", Conf[:pidfile].to_s]
91
- argv << ["--tag", Conf.generate_process_name]
91
+ argv << ["--tag", Conf.generate(:process_name)]
92
92
  argv << ["--daemonize"] if ([1, true].include? Conf[:daemonize])
93
93
  argv << ["--log", thin_logfile] if thin_logfile
94
94
 
@@ -115,8 +115,8 @@ puts "Network port \t #{Conf[:port]}"
115
115
  puts "User:group \t #{Conf[:user]}:#{Conf[:group]}" if Conf[:user] && Conf[:group]
116
116
  puts "PID file \t #{Conf[:pidfile]}"
117
117
  puts
118
- puts "Newrelic \t #{Conf.feature_newrelic? || '-'}"
119
- puts "Rollbar \t #{Conf.feature_rollbar? || '-'}"
118
+ puts "Newrelic \t #{Conf.feature?(:newrelic) || '-'}"
119
+ puts "Rollbar \t #{Conf.feature?(:rollbar) || '-'}"
120
120
  if cmd_dump
121
121
  puts
122
122
  puts Conf.dump
data/lib/rest-ftp-daemon/notification.rb CHANGED
@@ -75,7 +75,7 @@ module RestFtpDaemon
75
75
  headers: {
76
76
  content_type: :json,
77
77
  accept: :json,
78
- user_agent: Conf.generate_user_agent,
78
+ user_agent: Conf.generate(:user_agent),
79
79
  }
80
80
 
81
81
  # Execure request
data/lib/rest-ftp-daemon/views/dashboard_footer.haml CHANGED
@@ -26,8 +26,8 @@
26
26
  .btn-group.btn-group-sm
27
27
  .btn.btn-default.btn-info.disabled Features
28
28
  = dashboard_feature :reload, Conf[:allow_reload], "ACTIVE (config is hot-reloadable)", "changes at startup only"
29
- = dashboard_feature :newrelic, Conf.feature_newrelic?, "ACTIVE (license found)", "disabled"
30
- = dashboard_feature :rollbar, Conf.feature_rollbar?, "ACTIVE (token found)", "disabled"
29
+ = dashboard_feature :newrelic, Conf.feature?(:newrelic), "ACTIVE (license found)", "disabled"
30
+ = dashboard_feature :rollbar, Conf.feature?(:rollbar), "ACTIVE (token found)", "disabled"
31
31
 
32
32
  .btn-group.btn-group-sm
33
33
  .btn.btn-default.btn-info.disabled IP
data/lib/rest-ftp-daemon/workers/reporter.rb CHANGED
@@ -10,7 +10,7 @@ module RestFtpDaemon
10
10
  config_section :reporter
11
11
 
12
12
  # Other configuration options
13
- @feature_newrelic = Conf.feature_newrelic?
13
+ @feature_newrelic = Conf.feature?(:newrelic)
14
14
 
15
15
  # Check that everything is OK
16
16
  return "reporter disabled" if disabled?(@config[:timer])
data/rest-ftp-daemon.gemspec CHANGED
@@ -2,7 +2,7 @@
2
2
  Gem::Specification.new do |spec|
3
3
 
4
4
  # Project version
5
- spec.version = "1.0.6"
5
+ spec.version = "1.0.7"
6
6
 
7
7
  # Project description
8
8
  spec.name = "rest-ftp-daemon"
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
32
32
  spec.add_development_dependency "ruby-prof"
33
33
 
34
34
  # Runtime dependencies
35
- spec.add_runtime_dependency "bmc-daemon-lib", "~> 0.9"
35
+ spec.add_runtime_dependency "bmc-daemon-lib", "~> 0.7"
36
36
  spec.add_runtime_dependency "json", "~> 1.8"
37
37
  spec.add_runtime_dependency "thin", "~> 1.7"
38
38
  spec.add_runtime_dependency "activesupport", "~> 4.2"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rest-ftp-daemon
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.6
4
+ version: 1.0.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Bruno MEDICI
@@ -114,14 +114,14 @@ dependencies:
114
114
  requirements:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: '0.9'
117
+ version: '0.7'
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - "~>"
123
123
  - !ruby/object:Gem::Version
124
- version: '0.9'
124
+ version: '0.7'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: json
127
127
  requirement: !ruby/object:Gem::Requirement