frachtraum 0.0.7 → 0.0.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/lib/frachtraum/cli.rb +3 -1
- data/lib/frachtraum.rb +10 -2
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
MTUwNTRmNWM3NzQ4NGY4MTc2MmRiM2RhYzdlNmUyMTRlZWNlYzkwZg==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
MTU0YjY5NTQ4MzA5MzgwNTgxMTMzY2QzZWU1ZGNkYTlhMTExMjVlNA==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
YjVlNTZkZmVkOGNiOTFmNjUwNTBkYTI4OWEwZTVhOTEwMjU4NjhjNTJlNDM5
|
10
|
+
MzkxNzkyMjlhNDY5NDYwYzhhZGYwOWFmZTkyYTk0OGE1NzI1ZTQ5N2NkNTA1
|
11
|
+
MWZmNjNlOTI5YTZhZTJiYWNjZmM2NzU5NDgxYWFhMzdjYjM0YTI=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
NDVlNGJjZDZiMzZhMWFhZjIzZTc2MDhjMmNlYTFkYjkwZDE1MTM2OTFjNjA0
|
14
|
+
ZWE1MTQ1N2QzMTYzMzc1YzZhNTZmY2ZjZmQ1Zjk0MWIwNjY3Y2E4YzRkMzc1
|
15
|
+
ZGMwODM2MGVlMGEwNmM4YzU5OTgxM2JjMTY4ZjhlNTBmMGVlYTM=
|
data/lib/frachtraum/cli.rb
CHANGED
@@ -134,17 +134,19 @@ module Frachtraum
|
|
134
134
|
Frachtraum.pretty_SI_bytes(volume_h[:used].to_i),
|
135
135
|
available_str, #Frachtraum.pretty_SI_bytes(volume_h[:available].to_i),
|
136
136
|
Frachtraum.pretty_SI_bytes(volume_h[:total].to_i),
|
137
|
+
volume_h[:usage], # usage = used / total
|
137
138
|
volume_h[:compression],
|
138
139
|
volume_h[:compressratio]
|
139
140
|
]
|
140
141
|
end
|
141
142
|
|
142
143
|
# TODO
|
143
|
-
table = Terminal::Table.new :headings => ["VOLUMES", "USED", "AVAILABLE", "TOTAL", "COMPRESSION", "COMPRESSRATIO"], :rows => report_rows
|
144
|
+
table = Terminal::Table.new :headings => ["VOLUMES", "USED", "AVAILABLE", "TOTAL", "USAGE", "COMPRESSION", "COMPRESSRATIO"], :rows => report_rows
|
144
145
|
|
145
146
|
table.align_column(1, :right)
|
146
147
|
table.align_column(2, :right)
|
147
148
|
table.align_column(3, :right)
|
149
|
+
table.align_column(4, :right)
|
148
150
|
|
149
151
|
puts table
|
150
152
|
self.capacity
|
data/lib/frachtraum.rb
CHANGED
@@ -14,7 +14,7 @@ require 'frachtraum/osx'
|
|
14
14
|
|
15
15
|
module Frachtraum
|
16
16
|
|
17
|
-
VERSION = '0.0.
|
17
|
+
VERSION = '0.0.8'.freeze
|
18
18
|
|
19
19
|
# Kibibyte, Mebibyte, Gibibyte, etc... all the IEC sizes
|
20
20
|
BYTES_IN_KiB = 2**10
|
@@ -30,7 +30,6 @@ module Frachtraum
|
|
30
30
|
|
31
31
|
OUTPUT_DOTS_LEN = 40 # TODO: the length should be dynamically calculated, based on the strlen of longest tmtarget or volume
|
32
32
|
|
33
|
-
|
34
33
|
def exec_cmd(msg, cmd)
|
35
34
|
|
36
35
|
print msg
|
@@ -119,6 +118,15 @@ module Frachtraum
|
|
119
118
|
(volume_info[:used].to_i + volume_info[:available].to_i)
|
120
119
|
end
|
121
120
|
|
121
|
+
volume_info[:usage] =
|
122
|
+
if volume_info[:total] == 0
|
123
|
+
"0 %"
|
124
|
+
elsif volume_info[:used]=="N/A" || volume_info[:total]=="N/A"
|
125
|
+
"N/A"
|
126
|
+
else
|
127
|
+
(100 * volume_info[:used].to_f / volume_info[:available].to_f ).to_i.to_s + " %"
|
128
|
+
end
|
129
|
+
|
122
130
|
report_table[dataset] = volume_info
|
123
131
|
end
|
124
132
|
|