nimbu 0.5.7 → 0.5.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +6 -14
  2. data/lib/nimbu/auth.rb +13 -3
  3. data/lib/nimbu/command/version.rb +22 -0
  4. data/lib/nimbu/version.rb +1 -1
  5. metadata +53 -67
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- OWJiMDc3YjEzNmZmMWM5MDg3NjhlYmQyOGI0YmM0YjJlZmZkZmVhYw==
5
- data.tar.gz: !binary |-
6
- NGNlNWM2YzQ1YmY3MmFhM2YwNmZhMWVmNTEyNDNhNDE0NjEwNGEwOQ==
7
- !binary "U0hBNTEy":
8
- metadata.gz: !binary |-
9
- Yzc2MDRmNDYyMGZiZGMzNTlkY2FhOWU3YTFiZDkwYzEzMTIzNmFmNjRmNjVi
10
- NDcwNGZhZDFlMzk3ZjczMzMyNjA5NGZkNjVkNmRiNmI0MGY0MjIwMWE1NzZi
11
- MTAxZDg0NmUzNzUzNDk2YmQ1ODYyMGNjOGUxZTNiNjZmODZmZTg=
12
- data.tar.gz: !binary |-
13
- N2ZkMTFhZTFlZWIwMjQwZDc4ZmQzY2M3NGFkNTAyNjlkNjQ0ODFlMTIxZTJj
14
- MTRjMWRlMGUyNWVjM2U3YmJiMGEwOTdlOTQxMWU5N2FmNTU3MDQ1NzUxNDIx
15
- M2UzYTU3MTExNDQxZWJkYjg1ZjNhNzllNzMxOWFlZmJlOTg4MTA=
2
+ SHA1:
3
+ metadata.gz: f5503794d07fa3aeb299001c5e365bc297a5daf4
4
+ data.tar.gz: 1f809596703508c0224a2983413b8f52fb01c841
5
+ SHA512:
6
+ metadata.gz: eccf64e33cec680b9368a3455edc5220d12a0552c65af7e3d3c5e7637aaa468151e497aff121a65480db18527c627139ad6bb545b5ded632fbf9c03e520a7796
7
+ data.tar.gz: 2f5c922a7ec114af3cb78343fc560099e85c1a3082b50709287e235f493fa759dd671a3beab63f1726118b1fc5dffd8ec20bd6a816a40900c238913478466e07
data/lib/nimbu/auth.rb CHANGED
@@ -12,10 +12,14 @@ class Nimbu::Auth
12
12
 
13
13
  def client
14
14
  @client ||= begin
15
- Nimbu::Client.new(:oauth_token => token, :endpoint => host)
15
+ Nimbu::Client.new(:oauth_token => token, :endpoint => host, :user_agent => self.user_agent)
16
16
  end
17
17
  end
18
18
 
19
+ def user_agent
20
+ "nimbu-toolbelt/#{Nimbu::VERSION} (#{RUBY_PLATFORM}) ruby/#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}".freeze
21
+ end
22
+
19
23
  def login
20
24
  delete_credentials
21
25
  get_credentials
@@ -216,11 +220,17 @@ class Nimbu::Auth
216
220
  password = running_on_windows? ? ask_for_password_on_windows : ask_for_password
217
221
 
218
222
  begin
219
- oauth = Nimbu::Client.new(:basic_auth => "#{user}:#{password}", :endpoint => host).authenticate
220
- oauth.token
223
+ basic_client = Nimbu::Client.new(
224
+ :basic_auth => "#{user}:#{password}",
225
+ :endpoint => host,
226
+ :user_agent => self.user_agent
227
+ )
228
+ basic_client.authenticate.token
221
229
  rescue Exception => e
222
230
  if e.respond_to?(:http_status_code) && e.http_status_code == 401
223
231
  display " => could not login... please check your username and/or password!\n\n"
232
+ else
233
+ display " => hmmmm... an error occurred: #{e}. \n\n\nIf this continues to occur, please report \nthe error at https://github.com/nimbu/nimbu/issues.\n\n"
224
234
  end
225
235
  nil
226
236
  end
data/lib/nimbu/command/version.rb ADDED
@@ -0,0 +1,22 @@
1
+ # -*- encoding : utf-8 -*-
2
+ require "nimbu/command/base"
3
+ require "nimbu/version"
4
+
5
+ # display version
6
+ #
7
+ class Nimbu::Command::Version < Nimbu::Command::Base
8
+
9
+ # version
10
+ #
11
+ # show nimbu client version
12
+ #
13
+ #Example:
14
+ #
15
+ # $ nimbu version
16
+ # nimbu-toolbelt/1.2.3 (x86_64-darwin11.2.0) ruby/1.9.3
17
+ #
18
+ def index
19
+ display(Nimbu::Auth.user_agent)
20
+ end
21
+
22
+ end
data/lib/nimbu/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  # -*- encoding : utf-8 -*-
2
2
  module Nimbu
3
- VERSION = "0.5.7"
3
+ VERSION = "0.5.8"
4
4
  end
metadata CHANGED
@@ -1,16 +1,17 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: nimbu
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.7
4
+ version: 0.5.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Zenjoy BVBA
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-06-03 00:00:00.000000000 Z
11
+ date: 2013-07-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
+ name: term-ansicolor
14
15
  requirement: !ruby/object:Gem::Requirement
15
16
  requirements:
16
17
  - - ~>
@@ -23,78 +24,78 @@ dependencies:
23
24
  - - ~>
24
25
  - !ruby/object:Gem::Version
25
26
  version: 1.0.5
26
- name: term-ansicolor
27
27
  - !ruby/object:Gem::Dependency
28
+ name: nimbu-api
28
29
  requirement: !ruby/object:Gem::Requirement
29
30
  requirements:
30
- - - ! '>='
31
+ - - ~>
31
32
  - !ruby/object:Gem::Version
32
- version: '0'
33
+ version: 0.1.3
33
34
  type: :runtime
34
35
  prerelease: false
35
36
  version_requirements: !ruby/object:Gem::Requirement
36
37
  requirements:
37
- - - ! '>='
38
+ - - ~>
38
39
  - !ruby/object:Gem::Version
39
- version: '0'
40
- name: nimbu-api
40
+ version: 0.1.3
41
41
  - !ruby/object:Gem::Dependency
42
+ name: rubyzip
42
43
  requirement: !ruby/object:Gem::Requirement
43
44
  requirements:
44
- - - ! '>='
45
+ - - '>='
45
46
  - !ruby/object:Gem::Version
46
47
  version: '0'
47
48
  type: :runtime
48
49
  prerelease: false
49
50
  version_requirements: !ruby/object:Gem::Requirement
50
51
  requirements:
51
- - - ! '>='
52
+ - - '>='
52
53
  - !ruby/object:Gem::Version
53
54
  version: '0'
54
- name: rubyzip
55
55
  - !ruby/object:Gem::Dependency
56
+ name: sinatra
56
57
  requirement: !ruby/object:Gem::Requirement
57
58
  requirements:
58
- - - ! '>='
59
+ - - '>='
59
60
  - !ruby/object:Gem::Version
60
61
  version: '0'
61
62
  type: :runtime
62
63
  prerelease: false
63
64
  version_requirements: !ruby/object:Gem::Requirement
64
65
  requirements:
65
- - - ! '>='
66
+ - - '>='
66
67
  - !ruby/object:Gem::Version
67
68
  version: '0'
68
- name: sinatra
69
69
  - !ruby/object:Gem::Dependency
70
+ name: sinatra-contrib
70
71
  requirement: !ruby/object:Gem::Requirement
71
72
  requirements:
72
- - - ! '>='
73
+ - - '>='
73
74
  - !ruby/object:Gem::Version
74
75
  version: '0'
75
76
  type: :runtime
76
77
  prerelease: false
77
78
  version_requirements: !ruby/object:Gem::Requirement
78
79
  requirements:
79
- - - ! '>='
80
+ - - '>='
80
81
  - !ruby/object:Gem::Version
81
82
  version: '0'
82
- name: sinatra-contrib
83
83
  - !ruby/object:Gem::Dependency
84
+ name: listen
84
85
  requirement: !ruby/object:Gem::Requirement
85
86
  requirements:
86
- - - ! '>='
87
+ - - '>='
87
88
  - !ruby/object:Gem::Version
88
89
  version: '0'
89
90
  type: :runtime
90
91
  prerelease: false
91
92
  version_requirements: !ruby/object:Gem::Requirement
92
93
  requirements:
93
- - - ! '>='
94
+ - - '>='
94
95
  - !ruby/object:Gem::Version
95
96
  version: '0'
96
- name: listen
97
97
  - !ruby/object:Gem::Dependency
98
+ name: rb-fsevent
98
99
  requirement: !ruby/object:Gem::Requirement
99
100
  requirements:
100
101
  - - ~>
@@ -107,64 +108,64 @@ dependencies:
107
108
  - - ~>
108
109
  - !ruby/object:Gem::Version
109
110
  version: '0.9'
110
- name: rb-fsevent
111
111
  - !ruby/object:Gem::Dependency
112
+ name: thin
112
113
  requirement: !ruby/object:Gem::Requirement
113
114
  requirements:
114
- - - ! '>='
115
+ - - '>='
115
116
  - !ruby/object:Gem::Version
116
117
  version: '0'
117
118
  type: :runtime
118
119
  prerelease: false
119
120
  version_requirements: !ruby/object:Gem::Requirement
120
121
  requirements:
121
- - - ! '>='
122
+ - - '>='
122
123
  - !ruby/object:Gem::Version
123
124
  version: '0'
124
- name: thin
125
125
  - !ruby/object:Gem::Dependency
126
+ name: rack-streaming-proxy
126
127
  requirement: !ruby/object:Gem::Requirement
127
128
  requirements:
128
- - - ! '>='
129
+ - - '>='
129
130
  - !ruby/object:Gem::Version
130
131
  version: '0'
131
132
  type: :runtime
132
133
  prerelease: false
133
134
  version_requirements: !ruby/object:Gem::Requirement
134
135
  requirements:
135
- - - ! '>='
136
+ - - '>='
136
137
  - !ruby/object:Gem::Version
137
138
  version: '0'
138
- name: rack-streaming-proxy
139
139
  - !ruby/object:Gem::Dependency
140
+ name: compass
140
141
  requirement: !ruby/object:Gem::Requirement
141
142
  requirements:
142
- - - ! '>='
143
+ - - '>='
143
144
  - !ruby/object:Gem::Version
144
145
  version: '0'
145
146
  type: :runtime
146
147
  prerelease: false
147
148
  version_requirements: !ruby/object:Gem::Requirement
148
149
  requirements:
149
- - - ! '>='
150
+ - - '>='
150
151
  - !ruby/object:Gem::Version
151
152
  version: '0'
152
- name: compass
153
153
  - !ruby/object:Gem::Dependency
154
+ name: haml
154
155
  requirement: !ruby/object:Gem::Requirement
155
156
  requirements:
156
- - - ! '>='
157
+ - - '>='
157
158
  - !ruby/object:Gem::Version
158
159
  version: '0'
159
160
  type: :runtime
160
161
  prerelease: false
161
162
  version_requirements: !ruby/object:Gem::Requirement
162
163
  requirements:
163
- - - ! '>='
164
+ - - '>='
164
165
  - !ruby/object:Gem::Version
165
166
  version: '0'
166
- name: haml
167
167
  - !ruby/object:Gem::Dependency
168
+ name: rack
168
169
  requirement: !ruby/object:Gem::Requirement
169
170
  requirements:
170
171
  - - ~>
@@ -177,8 +178,8 @@ dependencies:
177
178
  - - ~>
178
179
  - !ruby/object:Gem::Version
179
180
  version: 1.5.2
180
- name: rack
181
181
  - !ruby/object:Gem::Dependency
182
+ name: json
182
183
  requirement: !ruby/object:Gem::Requirement
183
184
  requirements:
184
185
  - - ~>
@@ -191,8 +192,8 @@ dependencies:
191
192
  - - ~>
192
193
  - !ruby/object:Gem::Version
193
194
  version: 1.7.7
194
- name: json
195
195
  - !ruby/object:Gem::Dependency
196
+ name: bundler
196
197
  requirement: !ruby/object:Gem::Requirement
197
198
  requirements:
198
199
  - - ~>
@@ -205,91 +206,76 @@ dependencies:
205
206
  - - ~>
206
207
  - !ruby/object:Gem::Version
207
208
  version: '1.3'
208
- name: bundler
209
209
  - !ruby/object:Gem::Dependency
210
- requirement: !ruby/object:Gem::Requirement
211
- requirements:
212
- - - ! '>='
213
- - !ruby/object:Gem::Version
214
- version: '0'
215
- type: :development
216
- prerelease: false
217
- version_requirements: !ruby/object:Gem::Requirement
218
- requirements:
219
- - - ! '>='
220
- - !ruby/object:Gem::Version
221
- version: '0'
222
210
  name: rake
223
- - !ruby/object:Gem::Dependency
224
211
  requirement: !ruby/object:Gem::Requirement
225
212
  requirements:
226
- - - ! '>='
213
+ - - '>='
227
214
  - !ruby/object:Gem::Version
228
215
  version: '0'
229
216
  type: :development
230
217
  prerelease: false
231
218
  version_requirements: !ruby/object:Gem::Requirement
232
219
  requirements:
233
- - - ! '>='
220
+ - - '>='
234
221
  - !ruby/object:Gem::Version
235
222
  version: '0'
236
- name: awesome_print
237
223
  - !ruby/object:Gem::Dependency
224
+ name: awesome_print
238
225
  requirement: !ruby/object:Gem::Requirement
239
226
  requirements:
240
- - - ! '>='
227
+ - - '>='
241
228
  - !ruby/object:Gem::Version
242
229
  version: '0'
243
230
  type: :development
244
231
  prerelease: false
245
232
  version_requirements: !ruby/object:Gem::Requirement
246
233
  requirements:
247
- - - ! '>='
234
+ - - '>='
248
235
  - !ruby/object:Gem::Version
249
236
  version: '0'
250
- name: pry
251
237
  - !ruby/object:Gem::Dependency
238
+ name: pry
252
239
  requirement: !ruby/object:Gem::Requirement
253
240
  requirements:
254
- - - ! '>='
241
+ - - '>='
255
242
  - !ruby/object:Gem::Version
256
243
  version: '0'
257
244
  type: :development
258
245
  prerelease: false
259
246
  version_requirements: !ruby/object:Gem::Requirement
260
247
  requirements:
261
- - - ! '>='
248
+ - - '>='
262
249
  - !ruby/object:Gem::Version
263
250
  version: '0'
264
- name: pry-remote
265
251
  - !ruby/object:Gem::Dependency
252
+ name: pry-remote
266
253
  requirement: !ruby/object:Gem::Requirement
267
254
  requirements:
268
- - - ! '>='
255
+ - - '>='
269
256
  - !ruby/object:Gem::Version
270
257
  version: '0'
271
258
  type: :development
272
259
  prerelease: false
273
260
  version_requirements: !ruby/object:Gem::Requirement
274
261
  requirements:
275
- - - ! '>='
262
+ - - '>='
276
263
  - !ruby/object:Gem::Version
277
264
  version: '0'
278
- name: pry-stack_explorer
279
265
  - !ruby/object:Gem::Dependency
266
+ name: pry-stack_explorer
280
267
  requirement: !ruby/object:Gem::Requirement
281
268
  requirements:
282
- - - ! '>='
269
+ - - '>='
283
270
  - !ruby/object:Gem::Version
284
271
  version: '0'
285
272
  type: :development
286
273
  prerelease: false
287
274
  version_requirements: !ruby/object:Gem::Requirement
288
275
  requirements:
289
- - - ! '>='
276
+ - - '>='
290
277
  - !ruby/object:Gem::Version
291
278
  version: '0'
292
- name: pry-debugger
293
279
  description: Client library and command-line tool to design and manage websites on
294
280
  the Nimbu platform.
295
281
  email:
@@ -314,6 +300,7 @@ files:
314
300
  - lib/nimbu/command/server.rb
315
301
  - lib/nimbu/command/sites.rb
316
302
  - lib/nimbu/command/themes.rb
303
+ - lib/nimbu/command/version.rb
317
304
  - lib/nimbu/helpers.rb
318
305
  - lib/nimbu/server/base.rb
319
306
  - lib/nimbu/ssh.rb
@@ -328,12 +315,12 @@ require_paths:
328
315
  - lib
329
316
  required_ruby_version: !ruby/object:Gem::Requirement
330
317
  requirements:
331
- - - ! '>='
318
+ - - '>='
332
319
  - !ruby/object:Gem::Version
333
320
  version: '0'
334
321
  required_rubygems_version: !ruby/object:Gem::Requirement
335
322
  requirements:
336
- - - ! '>='
323
+ - - '>='
337
324
  - !ruby/object:Gem::Version
338
325
  version: '0'
339
326
  requirements: []
@@ -343,4 +330,3 @@ signing_key:
343
330
  specification_version: 4
344
331
  summary: Client library and CLI to design websites on the Nimbu platform.
345
332
  test_files: []
346
- has_rdoc: