collins_shell 0.2.24 → 0.2.26

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +5 -5
  2. data/Gemfile.lock +70 -19
  3. data/Rakefile +8 -1
  4. data/VERSION +1 -1
  5. data/collins_shell.gemspec +7 -5
  6. data/lib/collins_shell/monkeypatch.rb +1 -1
  7. data/lib/collins_shell/util.rb +5 -0
  8. metadata +40 -12
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: edb044740d90a2cd1cc62c7d9a2a45f13e083882
4
- data.tar.gz: 30f98f31b84e199fa6711345d76f431171f5eb81
2
+ SHA256:
3
+ metadata.gz: fd23e10170e804e1312e13c51876cf41f154144dddf601bd52865daee384aca4
4
+ data.tar.gz: 0163fb960f5d5f7db08a5937a91c42176fdf7ef2df928af35aa785619c65bcb5
5
5
  SHA512:
6
- metadata.gz: 6c1d768fcae3485bbedfcb778fef65bc39e7865c61aeedee8042a32b12e0cdbce4ff8076e0014718be1eec26d3aca8fc01fb898a54b4a6deab0e3e8f2408a72a
7
- data.tar.gz: 272e82b851265ec363391d33ca5383a41a61025a5f84b6d12387671bcaa3f4f34bc1d9355fe4b375dfcd3cd327639f88c9863667028d6cf61df0eb1d224e4b03
6
+ metadata.gz: 065e5dbaa837168522e28ff4241a0805d7b2a294bab2dedd8215e7ec1a7f0880d86369743a2c2de9c6acf8de8b410ef6c9243821461b5d36a5677923ca460719
7
+ data.tar.gz: 3bd18d3bc0d9c0e262de7e4d35bc796b709e8c31be699f2f58568ebb5c7949237e077849abe18dc3e157f1be1e69028d1725cbc9623e2d78864bc7ab17d8e80b
data/Gemfile.lock CHANGED
@@ -2,16 +2,18 @@ PATH
2
2
  remote: .
3
3
  specs:
4
4
  collins_shell (0.2.24)
5
- collins_client (~> 0.2.11)
5
+ collins_client (~> 0.2.20)
6
6
  highline (~> 1.6.15)
7
7
  mustache (~> 0.99.4)
8
8
  pry (~> 0.9.9.6)
9
9
  terminal-table (~> 1.4.5)
10
- thor (~> 0.16.0)
10
+ thor (~> 0.19.0)
11
11
 
12
12
  GEM
13
13
  remote: http://rubygems.org/
14
14
  specs:
15
+ addressable (2.4.0)
16
+ builder (3.2.3)
15
17
  capistrano (2.15.9)
16
18
  highline
17
19
  net-scp (>= 1.0.0)
@@ -19,41 +21,88 @@ GEM
19
21
  net-ssh (>= 2.0.14)
20
22
  net-ssh-gateway (>= 1.1.0)
21
23
  coderay (1.0.9)
22
- collins_client (0.2.19)
24
+ collins_client (0.2.21)
23
25
  httparty (~> 0.11.0)
24
- diff-lcs (1.1.3)
26
+ descendants_tracker (0.0.4)
27
+ thread_safe (~> 0.3, >= 0.3.1)
28
+ diff-lcs (1.3)
29
+ faraday (0.9.2)
30
+ multipart-post (>= 1.2, < 3)
31
+ git (1.3.0)
32
+ github_api (0.16.0)
33
+ addressable (~> 2.4.0)
34
+ descendants_tracker (~> 0.0.4)
35
+ faraday (~> 0.8, < 0.10)
36
+ hashie (>= 3.4)
37
+ mime-types (>= 1.16, < 3.0)
38
+ oauth2 (~> 1.0)
39
+ hashie (3.5.7)
25
40
  highline (1.6.21)
26
41
  httparty (0.11.0)
27
42
  multi_json (~> 1.0)
28
43
  multi_xml (>= 0.5.2)
44
+ jeweler (2.3.9)
45
+ builder
46
+ bundler
47
+ git (>= 1.2.5)
48
+ github_api (~> 0.16.0)
49
+ highline (>= 1.6.15)
50
+ nokogiri (>= 1.5.10)
51
+ psych
52
+ rake
53
+ rdoc
54
+ semver2
55
+ jwt (1.5.6)
29
56
  method_source (0.7.1)
30
- multi_json (1.12.1)
57
+ mime-types (2.99.3)
58
+ mini_portile2 (2.3.0)
59
+ multi_json (1.13.1)
31
60
  multi_xml (0.6.0)
61
+ multipart-post (2.0.0)
32
62
  mustache (0.99.8)
33
63
  net-scp (1.2.1)
34
64
  net-ssh (>= 2.6.5)
35
65
  net-sftp (2.1.2)
36
66
  net-ssh (>= 2.6.5)
37
- net-ssh (4.1.0)
67
+ net-ssh (4.2.0)
38
68
  net-ssh-gateway (2.0.0)
39
69
  net-ssh (>= 4.0.0)
70
+ nokogiri (1.8.2)
71
+ mini_portile2 (~> 2.3.0)
72
+ oauth2 (1.4.0)
73
+ faraday (>= 0.8, < 0.13)
74
+ jwt (~> 1.0)
75
+ multi_json (~> 1.3)
76
+ multi_xml (~> 0.5)
77
+ rack (>= 1.2, < 3)
40
78
  pry (0.9.9.6)
41
79
  coderay (~> 1.0.5)
42
80
  method_source (~> 0.7.1)
43
81
  slop (>= 2.4.4, < 3)
44
- redcarpet (2.2.2)
45
- rspec (2.10.0)
46
- rspec-core (~> 2.10.0)
47
- rspec-expectations (~> 2.10.0)
48
- rspec-mocks (~> 2.10.0)
49
- rspec-core (2.10.1)
50
- rspec-expectations (2.10.0)
51
- diff-lcs (~> 1.1.3)
52
- rspec-mocks (2.10.1)
82
+ psych (3.0.2)
83
+ rack (2.0.4)
84
+ rake (12.3.0)
85
+ rdoc (6.0.1)
86
+ redcarpet (3.4.0)
87
+ rspec (3.7.0)
88
+ rspec-core (~> 3.7.0)
89
+ rspec-expectations (~> 3.7.0)
90
+ rspec-mocks (~> 3.7.0)
91
+ rspec-core (3.7.1)
92
+ rspec-support (~> 3.7.0)
93
+ rspec-expectations (3.7.0)
94
+ diff-lcs (>= 1.2.0, < 2.0)
95
+ rspec-support (~> 3.7.0)
96
+ rspec-mocks (3.7.0)
97
+ diff-lcs (>= 1.2.0, < 2.0)
98
+ rspec-support (~> 3.7.0)
99
+ rspec-support (3.7.1)
100
+ semver2 (3.4.2)
53
101
  slop (2.4.4)
54
102
  terminal-table (1.4.5)
55
- thor (0.16.0)
56
- yard (0.8.3)
103
+ thor (0.19.4)
104
+ thread_safe (0.3.6)
105
+ yard (0.9.12)
57
106
 
58
107
  PLATFORMS
59
108
  ruby
@@ -61,9 +110,11 @@ PLATFORMS
61
110
  DEPENDENCIES
62
111
  capistrano (~> 2.15.5)
63
112
  collins_shell!
113
+ jeweler
114
+ rake
64
115
  redcarpet
65
116
  rspec (~> 2.10.0)
66
- yard (~> 0.8)
117
+ yard (~> 0.9)
67
118
 
68
119
  BUNDLED WITH
69
- 1.13.6
120
+ 1.16.1
data/Rakefile CHANGED
@@ -55,10 +55,17 @@ task :all => ["version:bump:patch", :publish] do
55
55
  puts("Done!")
56
56
  end
57
57
 
58
- task :default => :yard
58
+ require 'rspec/core'
59
+ require 'rspec/core/rake_task'
60
+ RSpec::Core::RakeTask.new(:spec) do |spec|
61
+ spec.fail_on_error = true
62
+ spec.pattern = FileList['spec/**/*_spec.rb']
63
+ end
59
64
 
60
65
  require 'yard'
61
66
  YARD::Rake::YardocTask.new do |t|
62
67
  t.files = ['lib/**/*.rb']
63
68
  t.options = ['--markup', 'markdown']
64
69
  end
70
+
71
+ task :default => [:yard, :spec]
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.2.24
1
+ 0.2.26
data/collins_shell.gemspec CHANGED
@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
3
3
  s.version = File.read 'VERSION'
4
4
 
5
5
  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
6
- s.authors = ['Blake Matheny', 'Gabe Conradi', 'Will Richard']
6
+ s.authors = ['Blake Matheny', 'Gabe Conradi', 'Will Richard', 'Stephen Gelman']
7
7
  s.date = '2016-02-03'
8
8
  s.description = 'Provides basic CLI for interacting with Collins API'
9
9
  s.email = ['collins-sm@googlegroups.com']
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
51
51
  'lib/collins_shell/util/log_printer.rb',
52
52
  'lib/collins_shell/util/printer_util.rb'
53
53
  ]
54
- s.homepage = 'https://github.com/tumblr/collins/tree/master/support/ruby/collins-shell'
54
+ s.homepage = 'https://github.com/tumblr/collins_shell'
55
55
  s.licenses = ['APL 2.0']
56
56
  s.require_paths = ['lib']
57
57
  s.summary = 'Shell for Collins API'
@@ -61,10 +61,12 @@ Gem::Specification.new do |s|
61
61
  s.add_runtime_dependency('mustache','~> 0.99.4')
62
62
  s.add_runtime_dependency('pry','~> 0.9.9.6')
63
63
  s.add_runtime_dependency('terminal-table','~> 1.4.5')
64
- s.add_runtime_dependency('thor','~> 0.16.0')
64
+ s.add_runtime_dependency('thor','~> 0.19.0')
65
65
 
66
- s.add_development_dependency('rspec','~> 2.10.0')
66
+ s.add_development_dependency('rspec')
67
67
  s.add_development_dependency('redcarpet')
68
- s.add_development_dependency('yard','~> 0.8')
68
+ s.add_development_dependency('yard','~> 0.9')
69
69
  s.add_development_dependency('capistrano','~> 2.15.5')
70
+ s.add_development_dependency('rake')
71
+ s.add_development_dependency('jeweler')
70
72
  end
data/lib/collins_shell/monkeypatch.rb CHANGED
@@ -15,7 +15,7 @@ class Float
15
15
  end
16
16
  end
17
17
 
18
- class Fixnum
18
+ class Integer
19
19
 
20
20
  def to_human_size
21
21
  return "0 Bytes" if (self == 0)
data/lib/collins_shell/util.rb CHANGED
@@ -137,6 +137,11 @@ module CollinsShell
137
137
  tags.map do |tag|
138
138
  if tag.to_s =~ /^ipmi_(.*)/ then
139
139
  asset.ipmi.send($1.to_sym)
140
+ elsif tag.to_s =~ /^addresses_(.*)/ then
141
+ result = asset.addresses.select do |a|
142
+ a.pool.upcase == $1.upcase
143
+ end
144
+ format_asset_value result
140
145
  elsif tag.to_s.split('.').length == 2 then
141
146
  o, m = tag.to_s.split('.')
142
147
  result = asset.send(o.to_sym)
metadata CHANGED
@@ -1,12 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: collins_shell
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.24
4
+ version: 0.2.26
5
5
  platform: ruby
6
6
  authors:
7
7
  - Blake Matheny
8
8
  - Gabe Conradi
9
9
  - Will Richard
10
+ - Stephen Gelman
10
11
  autorequire:
11
12
  bindir: bin
12
13
  cert_chain: []
@@ -88,28 +89,28 @@ dependencies:
88
89
  requirements:
89
90
  - - "~>"
90
91
  - !ruby/object:Gem::Version
91
- version: 0.16.0
92
+ version: 0.19.0
92
93
  type: :runtime
93
94
  prerelease: false
94
95
  version_requirements: !ruby/object:Gem::Requirement
95
96
  requirements:
96
97
  - - "~>"
97
98
  - !ruby/object:Gem::Version
98
- version: 0.16.0
99
+ version: 0.19.0
99
100
  - !ruby/object:Gem::Dependency
100
101
  name: rspec
101
102
  requirement: !ruby/object:Gem::Requirement
102
103
  requirements:
103
- - - "~>"
104
+ - - ">="
104
105
  - !ruby/object:Gem::Version
105
- version: 2.10.0
106
+ version: '0'
106
107
  type: :development
107
108
  prerelease: false
108
109
  version_requirements: !ruby/object:Gem::Requirement
109
110
  requirements:
110
- - - "~>"
111
+ - - ">="
111
112
  - !ruby/object:Gem::Version
112
- version: 2.10.0
113
+ version: '0'
113
114
  - !ruby/object:Gem::Dependency
114
115
  name: redcarpet
115
116
  requirement: !ruby/object:Gem::Requirement
@@ -130,14 +131,14 @@ dependencies:
130
131
  requirements:
131
132
  - - "~>"
132
133
  - !ruby/object:Gem::Version
133
- version: '0.8'
134
+ version: '0.9'
134
135
  type: :development
135
136
  prerelease: false
136
137
  version_requirements: !ruby/object:Gem::Requirement
137
138
  requirements:
138
139
  - - "~>"
139
140
  - !ruby/object:Gem::Version
140
- version: '0.8'
141
+ version: '0.9'
141
142
  - !ruby/object:Gem::Dependency
142
143
  name: capistrano
143
144
  requirement: !ruby/object:Gem::Requirement
@@ -152,6 +153,34 @@ dependencies:
152
153
  - - "~>"
153
154
  - !ruby/object:Gem::Version
154
155
  version: 2.15.5
156
+ - !ruby/object:Gem::Dependency
157
+ name: rake
158
+ requirement: !ruby/object:Gem::Requirement
159
+ requirements:
160
+ - - ">="
161
+ - !ruby/object:Gem::Version
162
+ version: '0'
163
+ type: :development
164
+ prerelease: false
165
+ version_requirements: !ruby/object:Gem::Requirement
166
+ requirements:
167
+ - - ">="
168
+ - !ruby/object:Gem::Version
169
+ version: '0'
170
+ - !ruby/object:Gem::Dependency
171
+ name: jeweler
172
+ requirement: !ruby/object:Gem::Requirement
173
+ requirements:
174
+ - - ">="
175
+ - !ruby/object:Gem::Version
176
+ version: '0'
177
+ type: :development
178
+ prerelease: false
179
+ version_requirements: !ruby/object:Gem::Requirement
180
+ requirements:
181
+ - - ">="
182
+ - !ruby/object:Gem::Version
183
+ version: '0'
155
184
  description: Provides basic CLI for interacting with Collins API
156
185
  email:
157
186
  - collins-sm@googlegroups.com
@@ -199,7 +228,7 @@ files:
199
228
  - lib/collins_shell/util/asset_stache.rb
200
229
  - lib/collins_shell/util/log_printer.rb
201
230
  - lib/collins_shell/util/printer_util.rb
202
- homepage: https://github.com/tumblr/collins/tree/master/support/ruby/collins-shell
231
+ homepage: https://github.com/tumblr/collins_shell
203
232
  licenses:
204
233
  - APL 2.0
205
234
  metadata: {}
@@ -218,8 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
218
247
  - !ruby/object:Gem::Version
219
248
  version: '0'
220
249
  requirements: []
221
- rubyforge_project:
222
- rubygems_version: 2.6.12
250
+ rubygems_version: 3.0.3
223
251
  signing_key:
224
252
  specification_version: 4
225
253
  summary: Shell for Collins API