shelly 0.1.10 → 0.1.11

Sign up to get free protection for your applications and to get access to all the features.
@@ -263,12 +263,13 @@ We have been notified about it. We will be adding new resources shortly}
263
263
  method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
264
264
  method_option :limit, :type => :numeric, :aliases => "-n", :desc => "Amount of messages to show"
265
265
  method_option :from, :type => :string, :desc => "Time from which to find the logs"
266
+ method_option :source, :type => :string, :aliases => "-s", :desc => "Limit logs to a single source, e.g. nginx"
266
267
  method_option :tail, :type => :boolean, :aliases => "-f", :desc => "Show new logs automatically"
267
268
  def logs
268
269
  cloud = options[:cloud]
269
270
  app = multiple_clouds(cloud, "logs")
270
271
  limit = options[:limit].to_i <= 0 ? 100 : options[:limit]
271
- query = {:limit => limit}
272
+ query = {:limit => limit, :source => options[:source]}
272
273
  query.merge!(:from => options[:from]) if options[:from]
273
274
 
274
275
  logs = app.application_logs(query)
@@ -1,3 +1,3 @@
1
1
  module Shelly
2
- VERSION = "0.1.10"
2
+ VERSION = "0.1.11"
3
3
  end
@@ -59,11 +59,12 @@ OUT
59
59
 
60
60
  it "should display options in help for logs" do
61
61
  out = IO.popen("bin/shelly help logs").read.strip
62
- out.should include("-c, [--cloud=CLOUD] # Specify cloud")
63
- out.should include("-n, [--limit=N] # Amount of messages to show")
64
- out.should include("-f, [--tail] # Show new logs automatically")
65
- out.should include("[--from=FROM] # Time from which to find the logs")
66
- out.should include("[--debug] # Show debug information")
62
+ out.should include("-c, [--cloud=CLOUD] # Specify cloud")
63
+ out.should include("-n, [--limit=N] # Amount of messages to show")
64
+ out.should include("-s, [--source=SOURCE] # Limit logs to a single source, e.g. nginx")
65
+ out.should include("-f, [--tail] # Show new logs automatically")
66
+ out.should include("[--from=FROM] # Time from which to find the logs")
67
+ out.should include("[--debug] # Show debug information")
67
68
  end
68
69
  end
69
70
 
@@ -1095,8 +1096,8 @@ We have been notified about it. We will be adding new resources shortly")
1095
1096
 
1096
1097
  it "should show requested amount of logs" do
1097
1098
  @client.should_receive(:application_logs).
1098
- with("foo-production", {:limit => 2}).and_return(@sample_logs)
1099
- @main.options = {:limit => 2}
1099
+ with("foo-production", {:limit => 2, :source => 'nginx'}).and_return(@sample_logs)
1100
+ @main.options = {:limit => 2, :source => 'nginx'}
1100
1101
  invoke(@main, :logs)
1101
1102
  end
1102
1103
  end
metadata CHANGED
@@ -1,280 +1,262 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: shelly
3
- version: !ruby/object:Gem::Version
4
- version: 0.1.10
3
+ version: !ruby/object:Gem::Version
4
+ hash: 13
5
5
  prerelease:
6
+ segments:
7
+ - 0
8
+ - 1
9
+ - 11
10
+ version: 0.1.11
6
11
  platform: ruby
7
- authors:
12
+ authors:
8
13
  - Shelly Cloud team
9
14
  autorequire:
10
15
  bindir: bin
11
16
  cert_chain: []
12
- date: 2012-06-06 00:00:00.000000000 Z
13
- dependencies:
14
- - !ruby/object:Gem::Dependency
17
+
18
+ date: 2012-06-12 00:00:00 Z
19
+ dependencies:
20
+ - !ruby/object:Gem::Dependency
15
21
  name: rspec
16
- requirement: !ruby/object:Gem::Requirement
22
+ version_requirements: &id001 !ruby/object:Gem::Requirement
17
23
  none: false
18
- requirements:
24
+ requirements:
19
25
  - - ~>
20
- - !ruby/object:Gem::Version
26
+ - !ruby/object:Gem::Version
27
+ hash: 47
28
+ segments:
29
+ - 2
30
+ - 8
31
+ - 0
21
32
  version: 2.8.0
22
33
  type: :development
23
34
  prerelease: false
24
- version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
- requirements:
27
- - - ~>
28
- - !ruby/object:Gem::Version
29
- version: 2.8.0
30
- - !ruby/object:Gem::Dependency
35
+ requirement: *id001
36
+ - !ruby/object:Gem::Dependency
31
37
  name: rake
32
- requirement: !ruby/object:Gem::Requirement
33
- none: false
34
- requirements:
35
- - - ! '>='
36
- - !ruby/object:Gem::Version
37
- version: '0'
38
+ version_requirements: &id002 !ruby/object:Gem::Requirement
39
+ none: false
40
+ requirements:
41
+ - - ">="
42
+ - !ruby/object:Gem::Version
43
+ hash: 3
44
+ segments:
45
+ - 0
46
+ version: "0"
38
47
  type: :development
39
48
  prerelease: false
40
- version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
- requirements:
43
- - - ! '>='
44
- - !ruby/object:Gem::Version
45
- version: '0'
46
- - !ruby/object:Gem::Dependency
49
+ requirement: *id002
50
+ - !ruby/object:Gem::Dependency
47
51
  name: guard
48
- requirement: !ruby/object:Gem::Requirement
49
- none: false
50
- requirements:
51
- - - ! '>='
52
- - !ruby/object:Gem::Version
53
- version: '0'
52
+ version_requirements: &id003 !ruby/object:Gem::Requirement
53
+ none: false
54
+ requirements:
55
+ - - ">="
56
+ - !ruby/object:Gem::Version
57
+ hash: 3
58
+ segments:
59
+ - 0
60
+ version: "0"
54
61
  type: :development
55
62
  prerelease: false
56
- version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
- requirements:
59
- - - ! '>='
60
- - !ruby/object:Gem::Version
61
- version: '0'
62
- - !ruby/object:Gem::Dependency
63
+ requirement: *id003
64
+ - !ruby/object:Gem::Dependency
63
65
  name: guard-rspec
64
- requirement: !ruby/object:Gem::Requirement
65
- none: false
66
- requirements:
67
- - - ! '>='
68
- - !ruby/object:Gem::Version
69
- version: '0'
66
+ version_requirements: &id004 !ruby/object:Gem::Requirement
67
+ none: false
68
+ requirements:
69
+ - - ">="
70
+ - !ruby/object:Gem::Version
71
+ hash: 3
72
+ segments:
73
+ - 0
74
+ version: "0"
70
75
  type: :development
71
76
  prerelease: false
72
- version_requirements: !ruby/object:Gem::Requirement
73
- none: false
74
- requirements:
75
- - - ! '>='
76
- - !ruby/object:Gem::Version
77
- version: '0'
78
- - !ruby/object:Gem::Dependency
77
+ requirement: *id004
78
+ - !ruby/object:Gem::Dependency
79
79
  name: simplecov
80
- requirement: !ruby/object:Gem::Requirement
81
- none: false
82
- requirements:
83
- - - ! '>='
84
- - !ruby/object:Gem::Version
85
- version: '0'
80
+ version_requirements: &id005 !ruby/object:Gem::Requirement
81
+ none: false
82
+ requirements:
83
+ - - ">="
84
+ - !ruby/object:Gem::Version
85
+ hash: 3
86
+ segments:
87
+ - 0
88
+ version: "0"
86
89
  type: :development
87
90
  prerelease: false
88
- version_requirements: !ruby/object:Gem::Requirement
89
- none: false
90
- requirements:
91
- - - ! '>='
92
- - !ruby/object:Gem::Version
93
- version: '0'
94
- - !ruby/object:Gem::Dependency
91
+ requirement: *id005
92
+ - !ruby/object:Gem::Dependency
95
93
  name: ruby_gntp
96
- requirement: !ruby/object:Gem::Requirement
97
- none: false
98
- requirements:
99
- - - ! '>='
100
- - !ruby/object:Gem::Version
101
- version: '0'
94
+ version_requirements: &id006 !ruby/object:Gem::Requirement
95
+ none: false
96
+ requirements:
97
+ - - ">="
98
+ - !ruby/object:Gem::Version
99
+ hash: 3
100
+ segments:
101
+ - 0
102
+ version: "0"
102
103
  type: :development
103
104
  prerelease: false
104
- version_requirements: !ruby/object:Gem::Requirement
105
- none: false
106
- requirements:
107
- - - ! '>='
108
- - !ruby/object:Gem::Version
109
- version: '0'
110
- - !ruby/object:Gem::Dependency
105
+ requirement: *id006
106
+ - !ruby/object:Gem::Dependency
111
107
  name: rb-fsevent
112
- requirement: !ruby/object:Gem::Requirement
113
- none: false
114
- requirements:
115
- - - ! '>='
116
- - !ruby/object:Gem::Version
117
- version: '0'
108
+ version_requirements: &id007 !ruby/object:Gem::Requirement
109
+ none: false
110
+ requirements:
111
+ - - ">="
112
+ - !ruby/object:Gem::Version
113
+ hash: 3
114
+ segments:
115
+ - 0
116
+ version: "0"
118
117
  type: :development
119
118
  prerelease: false
120
- version_requirements: !ruby/object:Gem::Requirement
121
- none: false
122
- requirements:
123
- - - ! '>='
124
- - !ruby/object:Gem::Version
125
- version: '0'
126
- - !ruby/object:Gem::Dependency
119
+ requirement: *id007
120
+ - !ruby/object:Gem::Dependency
127
121
  name: fakefs
128
- requirement: !ruby/object:Gem::Requirement
129
- none: false
130
- requirements:
131
- - - ! '>='
132
- - !ruby/object:Gem::Version
133
- version: '0'
122
+ version_requirements: &id008 !ruby/object:Gem::Requirement
123
+ none: false
124
+ requirements:
125
+ - - ">="
126
+ - !ruby/object:Gem::Version
127
+ hash: 3
128
+ segments:
129
+ - 0
130
+ version: "0"
134
131
  type: :development
135
132
  prerelease: false
136
- version_requirements: !ruby/object:Gem::Requirement
137
- none: false
138
- requirements:
139
- - - ! '>='
140
- - !ruby/object:Gem::Version
141
- version: '0'
142
- - !ruby/object:Gem::Dependency
133
+ requirement: *id008
134
+ - !ruby/object:Gem::Dependency
143
135
  name: fakeweb
144
- requirement: !ruby/object:Gem::Requirement
145
- none: false
146
- requirements:
147
- - - ! '>='
148
- - !ruby/object:Gem::Version
149
- version: '0'
136
+ version_requirements: &id009 !ruby/object:Gem::Requirement
137
+ none: false
138
+ requirements:
139
+ - - ">="
140
+ - !ruby/object:Gem::Version
141
+ hash: 3
142
+ segments:
143
+ - 0
144
+ version: "0"
150
145
  type: :development
151
146
  prerelease: false
152
- version_requirements: !ruby/object:Gem::Requirement
153
- none: false
154
- requirements:
155
- - - ! '>='
156
- - !ruby/object:Gem::Version
157
- version: '0'
158
- - !ruby/object:Gem::Dependency
147
+ requirement: *id009
148
+ - !ruby/object:Gem::Dependency
159
149
  name: wijet-thor
160
- requirement: !ruby/object:Gem::Requirement
150
+ version_requirements: &id010 !ruby/object:Gem::Requirement
161
151
  none: false
162
- requirements:
152
+ requirements:
163
153
  - - ~>
164
- - !ruby/object:Gem::Version
154
+ - !ruby/object:Gem::Version
155
+ hash: 41
156
+ segments:
157
+ - 0
158
+ - 14
159
+ - 7
165
160
  version: 0.14.7
166
161
  type: :runtime
167
162
  prerelease: false
168
- version_requirements: !ruby/object:Gem::Requirement
169
- none: false
170
- requirements:
171
- - - ~>
172
- - !ruby/object:Gem::Version
173
- version: 0.14.7
174
- - !ruby/object:Gem::Dependency
163
+ requirement: *id010
164
+ - !ruby/object:Gem::Dependency
175
165
  name: rest-client
176
- requirement: !ruby/object:Gem::Requirement
177
- none: false
178
- requirements:
179
- - - ! '>='
180
- - !ruby/object:Gem::Version
181
- version: '0'
166
+ version_requirements: &id011 !ruby/object:Gem::Requirement
167
+ none: false
168
+ requirements:
169
+ - - ">="
170
+ - !ruby/object:Gem::Version
171
+ hash: 3
172
+ segments:
173
+ - 0
174
+ version: "0"
182
175
  type: :runtime
183
176
  prerelease: false
184
- version_requirements: !ruby/object:Gem::Requirement
185
- none: false
186
- requirements:
187
- - - ! '>='
188
- - !ruby/object:Gem::Version
189
- version: '0'
190
- - !ruby/object:Gem::Dependency
177
+ requirement: *id011
178
+ - !ruby/object:Gem::Dependency
191
179
  name: json
192
- requirement: !ruby/object:Gem::Requirement
193
- none: false
194
- requirements:
195
- - - ! '>='
196
- - !ruby/object:Gem::Version
197
- version: '0'
180
+ version_requirements: &id012 !ruby/object:Gem::Requirement
181
+ none: false
182
+ requirements:
183
+ - - ">="
184
+ - !ruby/object:Gem::Version
185
+ hash: 3
186
+ segments:
187
+ - 0
188
+ version: "0"
198
189
  type: :runtime
199
190
  prerelease: false
200
- version_requirements: !ruby/object:Gem::Requirement
201
- none: false
202
- requirements:
203
- - - ! '>='
204
- - !ruby/object:Gem::Version
205
- version: '0'
206
- - !ruby/object:Gem::Dependency
191
+ requirement: *id012
192
+ - !ruby/object:Gem::Dependency
207
193
  name: progressbar
208
- requirement: !ruby/object:Gem::Requirement
209
- none: false
210
- requirements:
211
- - - ! '>='
212
- - !ruby/object:Gem::Version
213
- version: '0'
194
+ version_requirements: &id013 !ruby/object:Gem::Requirement
195
+ none: false
196
+ requirements:
197
+ - - ">="
198
+ - !ruby/object:Gem::Version
199
+ hash: 3
200
+ segments:
201
+ - 0
202
+ version: "0"
214
203
  type: :runtime
215
204
  prerelease: false
216
- version_requirements: !ruby/object:Gem::Requirement
217
- none: false
218
- requirements:
219
- - - ! '>='
220
- - !ruby/object:Gem::Version
221
- version: '0'
222
- - !ruby/object:Gem::Dependency
205
+ requirement: *id013
206
+ - !ruby/object:Gem::Dependency
223
207
  name: grit
224
- requirement: !ruby/object:Gem::Requirement
225
- none: false
226
- requirements:
227
- - - ! '>='
228
- - !ruby/object:Gem::Version
229
- version: '0'
208
+ version_requirements: &id014 !ruby/object:Gem::Requirement
209
+ none: false
210
+ requirements:
211
+ - - ">="
212
+ - !ruby/object:Gem::Version
213
+ hash: 3
214
+ segments:
215
+ - 0
216
+ version: "0"
230
217
  type: :runtime
231
218
  prerelease: false
232
- version_requirements: !ruby/object:Gem::Requirement
233
- none: false
234
- requirements:
235
- - - ! '>='
236
- - !ruby/object:Gem::Version
237
- version: '0'
238
- - !ruby/object:Gem::Dependency
219
+ requirement: *id014
220
+ - !ruby/object:Gem::Dependency
239
221
  name: launchy
240
- requirement: !ruby/object:Gem::Requirement
241
- none: false
242
- requirements:
243
- - - ! '>='
244
- - !ruby/object:Gem::Version
245
- version: '0'
222
+ version_requirements: &id015 !ruby/object:Gem::Requirement
223
+ none: false
224
+ requirements:
225
+ - - ">="
226
+ - !ruby/object:Gem::Version
227
+ hash: 3
228
+ segments:
229
+ - 0
230
+ version: "0"
246
231
  type: :runtime
247
232
  prerelease: false
248
- version_requirements: !ruby/object:Gem::Requirement
249
- none: false
250
- requirements:
251
- - - ! '>='
252
- - !ruby/object:Gem::Version
253
- version: '0'
254
- - !ruby/object:Gem::Dependency
233
+ requirement: *id015
234
+ - !ruby/object:Gem::Dependency
255
235
  name: shelly-dependencies
256
- requirement: !ruby/object:Gem::Requirement
236
+ version_requirements: &id016 !ruby/object:Gem::Requirement
257
237
  none: false
258
- requirements:
238
+ requirements:
259
239
  - - ~>
260
- - !ruby/object:Gem::Version
240
+ - !ruby/object:Gem::Version
241
+ hash: 25
242
+ segments:
243
+ - 0
244
+ - 1
245
+ - 1
261
246
  version: 0.1.1
262
247
  type: :runtime
263
248
  prerelease: false
264
- version_requirements: !ruby/object:Gem::Requirement
265
- none: false
266
- requirements:
267
- - - ~>
268
- - !ruby/object:Gem::Version
269
- version: 0.1.1
249
+ requirement: *id016
270
250
  description: Tool for managing applications and clouds at shellycloud.com
271
- email:
251
+ email:
272
252
  - support@shellycloud.com
273
- executables:
253
+ executables:
274
254
  - shelly
275
255
  extensions: []
256
+
276
257
  extra_rdoc_files: []
277
- files:
258
+
259
+ files:
278
260
  - .gitignore
279
261
  - .travis.yml
280
262
  - Gemfile
@@ -331,29 +313,38 @@ files:
331
313
  - spec/thor/options_spec.rb
332
314
  homepage: http://shellycloud.com
333
315
  licenses: []
316
+
334
317
  post_install_message:
335
318
  rdoc_options: []
336
- require_paths:
319
+
320
+ require_paths:
337
321
  - lib
338
- required_ruby_version: !ruby/object:Gem::Requirement
322
+ required_ruby_version: !ruby/object:Gem::Requirement
339
323
  none: false
340
- requirements:
341
- - - ! '>='
342
- - !ruby/object:Gem::Version
343
- version: '0'
344
- required_rubygems_version: !ruby/object:Gem::Requirement
324
+ requirements:
325
+ - - ">="
326
+ - !ruby/object:Gem::Version
327
+ hash: 3
328
+ segments:
329
+ - 0
330
+ version: "0"
331
+ required_rubygems_version: !ruby/object:Gem::Requirement
345
332
  none: false
346
- requirements:
347
- - - ! '>='
348
- - !ruby/object:Gem::Version
349
- version: '0'
333
+ requirements:
334
+ - - ">="
335
+ - !ruby/object:Gem::Version
336
+ hash: 3
337
+ segments:
338
+ - 0
339
+ version: "0"
350
340
  requirements: []
341
+
351
342
  rubyforge_project: shelly
352
- rubygems_version: 1.8.24
343
+ rubygems_version: 1.8.21
353
344
  signing_key:
354
345
  specification_version: 3
355
346
  summary: Shelly Cloud command line tool
356
- test_files:
347
+ test_files:
357
348
  - spec/helpers.rb
358
349
  - spec/input_faker.rb
359
350
  - spec/shelly/app_spec.rb