rest-ftp-daemon 0.221.1 → 0.221.2

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 (11) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +1 -1
  3. data/lib/rest-ftp-daemon/api/root.rb +1 -1
  4. data/lib/rest-ftp-daemon/constants.rb +2 -2
  5. data/lib/rest-ftp-daemon/views/dashboard.haml +2 -24
  6. data/lib/rest-ftp-daemon/views/dashboard_footer.haml +32 -0
  7. data/lib/rest-ftp-daemon/views/dashboard_header.haml +39 -0
  8. data/lib/rest-ftp-daemon/views/dashboard_jobs.haml +1 -1
  9. metadata +3 -3
  10. data/lib/rest-ftp-daemon/views/dashboard_infos.haml +0 -19
  11. data/lib/rest-ftp-daemon/views/dashboard_status.haml +0 -29
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ce65a20b09296045699bc719c74f6e4982427238
4
- data.tar.gz: b92e66df1a341fa14798138b32a2605aa5ed9f8d
3
+ metadata.gz: bdc16a74492b064c924b9f5ac608126589cc2213
4
+ data.tar.gz: 30129774da9a18a550d037fd761de1a6cf591b43
5
5
  SHA512:
6
- metadata.gz: b2de9e872d5bea59c321d017331adbfb00ae59712f8b4abe23f4a2895a0bc3eb6f6f7a508b20b42df67bc684497bb2a033afc4bddfc44f77d04b96a7442e9cfb
7
- data.tar.gz: 7623cde2c659d870b3e47f73d5b04014cea03d07be9ce44860d1661e3e736b40a8209295aa72c3c68cd6055d108f69205659811a3ffa10fb70c5b7f5113f91cd
6
+ metadata.gz: 3efbf3bc680333aee3ecfdfe7e77d0b36903223346ddb5187d2901adb38e12c4d903e17503072fd42cf0e40fe32dd15d0ff14dd1fad62226826fae50ea6bb41e
7
+ data.tar.gz: ad84a8fca0122e29380f9be435bcc235be4d5a57c0679d84d31edfbb0676bf58eaf1133e41c80fe9cac1b457462807bc4e39bcf2596784c50e8cff7b52990f41
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- rest-ftp-daemon (0.221.1)
4
+ rest-ftp-daemon (0.221.2)
5
5
  double-bag-ftps
6
6
  facter
7
7
  get_process_mem
data/lib/rest-ftp-daemon/api/root.rb CHANGED
@@ -45,7 +45,7 @@ module RestFtpDaemon
45
45
  def api_error exception
46
46
  {
47
47
  :error => exception.message,
48
- :message => exception.backtrace.first,
48
+ #:message => exception.backtrace.first,
49
49
  }
50
50
  end
51
51
 
data/lib/rest-ftp-daemon/constants.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # Terrific constants
2
2
  APP_NAME = "rest-ftp-daemon"
3
3
  APP_NICK = "rftpd"
4
- APP_VER = "0.221.1"
4
+ APP_VER = "0.221.2"
5
5
 
6
6
 
7
7
  # Jobs and workers
@@ -49,7 +49,7 @@ WORKER_STYLES = {
49
49
  :done => :success,
50
50
  :dead => :danger
51
51
  }
52
- PAGINATE_MAX = 40
52
+ PAGINATE_MAX = 30
53
53
 
54
54
 
55
55
  # Configuration defaults
data/lib/rest-ftp-daemon/views/dashboard.haml CHANGED
@@ -11,18 +11,8 @@
11
11
 
12
12
  .navbar.navbar-default.navbar-fixed
13
13
  .container-fluid
14
+ = render :dashboard_header
14
15
 
15
- .navbar-header
16
- %h1
17
- = APP_NAME
18
- %small
19
- = "v#{APP_VER}"
20
- = "[#{Settings.namespace}]"
21
-
22
- .navbar-header.pull-right
23
- .header-indicators
24
- =# render :dashboard_indicators
25
- = render :dashboard_status
26
16
 
27
17
  .container-fluid
28
18
 
@@ -45,17 +35,5 @@
45
35
 
46
36
  .footer
47
37
  .container-fluid
48
-
49
- .footer-signature.pull-left
50
-
51
- © 2014
52
- ·
53
- %a{href: "http://bmconseil.com"}Bruno Medici Consultant
54
- ·
55
- %a{href: "http://github.com/bmedici/rest-ftp-daemon"} GitHub project page
56
-
57
- .footer-indicators.pull-right
58
- = render :dashboard_infos
59
- =# render :dashboard_status
60
-
38
+ = render :dashboard_footer
61
39
 
data/lib/rest-ftp-daemon/views/dashboard_footer.haml ADDED
@@ -0,0 +1,32 @@
1
+ - trans = $queue.counter_get :transferred
2
+ - info_procs = (Facter.value :processorcount).to_i
3
+
4
+
5
+ .footer-signature.pull-left
6
+
7
+ © 2014
8
+ ·
9
+ %a{href: "http://bmconseil.com"}Bruno Medici Consultant
10
+ ·
11
+ %a{href: "http://github.com/bmedici/rest-ftp-daemon"} GitHub project page
12
+
13
+
14
+ .footer-indicators.pull-right
15
+
16
+ .btn-group.btn-group-sm
17
+ .btn.btn-default.btn-info Host
18
+ .btn.btn-default= Settings.host
19
+
20
+ .btn-group.btn-group-sm
21
+ .btn.btn-default.btn-info IP
22
+ .btn.btn-default= Facter.value(:ipaddress)
23
+
24
+ .btn-group.btn-group-sm
25
+ .btn.btn-default.btn-info Cores
26
+ .btn.btn-default= info_procs
27
+
28
+ .btn-group.btn-group-sm
29
+ .btn.btn-default.btn-info Started
30
+ .btn.btn-default= Helpers.datetime_short(APP_STARTED)
31
+
32
+
data/lib/rest-ftp-daemon/views/dashboard_header.haml ADDED
@@ -0,0 +1,39 @@
1
+ - trans = $queue.counter_get :transferred
2
+ - info_procs = (Facter.value :processorcount).to_i
3
+ - info_load = Sys::CPU.load_avg.first.to_f
4
+ - info_norm = info_procs.zero? ? "N/A" : (100 * info_load / info_procs).round(1)
5
+ - info_processed = $queue.counter_get(:jobs_processed)
6
+ - mem = GetProcessMem.new
7
+
8
+
9
+ .navbar-header
10
+
11
+ %h1
12
+ = APP_NAME
13
+ %small
14
+ = "v#{APP_VER} [#{Settings.namespace}]"
15
+
16
+
17
+ .header-indicators.navbar-header.pull-right
18
+
19
+ .btn-group.btn-group-sm
20
+ .btn.btn-default.btn-warning Load
21
+ .btn.btn-default= info_load.round(1)
22
+
23
+ .btn-group.btn-group-sm
24
+ .btn.btn-default.btn-warning CPU
25
+ .btn.btn-default= "#{info_norm} %"
26
+
27
+ .btn-group.btn-group-sm
28
+ .btn.btn-default.btn-warning Mem
29
+ .btn.btn-default= Helpers.format_bytes(mem.bytes, "B")
30
+
31
+ .btn-group.btn-group-sm
32
+ .btn.btn-default.btn-success Processed
33
+ .btn.btn-default= info_processed.to_i
34
+
35
+ .btn-group.btn-group-sm
36
+ .btn.btn-default.btn-success Transferred
37
+ .btn.btn-default= Helpers.format_bytes(trans, "B", 1)
38
+
39
+
data/lib/rest-ftp-daemon/views/dashboard_jobs.haml CHANGED
@@ -19,7 +19,7 @@
19
19
  .btn-group.btn-group-sm
20
20
  = @paginate.browser
21
21
 
22
-
22
+ %br
23
23
 
24
24
  .row
25
25
  #box-jobs.col-md-12
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: 0.221.1
4
+ version: 0.221.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Bruno MEDICI
@@ -246,9 +246,9 @@ files:
246
246
  - lib/rest-ftp-daemon/uri.rb
247
247
  - lib/rest-ftp-daemon/views/dashboard.haml
248
248
  - lib/rest-ftp-daemon/views/dashboard_counters.haml
249
- - lib/rest-ftp-daemon/views/dashboard_infos.haml
249
+ - lib/rest-ftp-daemon/views/dashboard_footer.haml
250
+ - lib/rest-ftp-daemon/views/dashboard_header.haml
250
251
  - lib/rest-ftp-daemon/views/dashboard_jobs.haml
251
- - lib/rest-ftp-daemon/views/dashboard_status.haml
252
252
  - lib/rest-ftp-daemon/views/dashboard_table.haml
253
253
  - lib/rest-ftp-daemon/views/dashboard_tokens.haml
254
254
  - lib/rest-ftp-daemon/views/dashboard_workers.haml
data/lib/rest-ftp-daemon/views/dashboard_infos.haml DELETED
@@ -1,19 +0,0 @@
1
- - trans = $queue.counter_get :transferred
2
- - info_procs = (Facter.value :processorcount).to_i
3
-
4
-
5
- .btn-group.btn-group-sm
6
- .btn.btn-default.btn-info Host
7
- .btn.btn-default= Settings.host
8
-
9
- .btn-group.btn-group-sm
10
- .btn.btn-default.btn-info IP
11
- .btn.btn-default= Facter.value(:ipaddress)
12
-
13
- .btn-group.btn-group-sm
14
- .btn.btn-default.btn-info Cores
15
- .btn.btn-default= info_procs
16
-
17
- .btn-group.btn-group-sm
18
- .btn.btn-default.btn-info Started
19
- .btn.btn-default= Helpers.datetime_short(APP_STARTED)
data/lib/rest-ftp-daemon/views/dashboard_status.haml DELETED
@@ -1,29 +0,0 @@
1
- - trans = $queue.counter_get :transferred
2
- - info_procs = (Facter.value :processorcount).to_i
3
- - info_load = Sys::CPU.load_avg.first.to_f
4
- - info_norm = info_procs.zero? ? "N/A" : (100 * info_load / info_procs).round(1)
5
- - info_processed = $queue.counter_get(:jobs_processed)
6
- - mem = GetProcessMem.new
7
-
8
-
9
- .btn-group.btn-group-sm
10
- .btn.btn-default.btn-warning Load
11
- .btn.btn-default= info_load.round(1)
12
-
13
- .btn-group.btn-group-sm
14
- .btn.btn-default.btn-warning CPU
15
- .btn.btn-default= "#{info_norm} %"
16
-
17
- .btn-group.btn-group-sm
18
- .btn.btn-default.btn-warning Mem
19
- .btn.btn-default= Helpers.format_bytes(mem.bytes, "B")
20
-
21
- .btn-group.btn-group-sm
22
- .btn.btn-default.btn-success Processed
23
- .btn.btn-default= info_processed.to_i
24
-
25
- .btn-group.btn-group-sm
26
- .btn.btn-default.btn-success Transferred
27
- .btn.btn-default= Helpers.format_bytes(trans, "B", 1)
28
-
29
-