shelly 0.4.26 → 0.4.27

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +1 -0
  3. data/CHANGELOG.md +5 -0
  4. data/lib/shelly/cli/main.rb +2 -2
  5. data/lib/shelly/client.rb +8 -4
  6. data/lib/shelly/helpers.rb +0 -7
  7. data/lib/shelly/version.rb +1 -1
  8. data/shelly.gemspec +1 -1
  9. data/spec/input_faker.rb +4 -0
  10. data/spec/shelly/client_spec.rb +14 -2
  11. metadata +86 -72
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f80e157ff4c37c6bf427bebbe53c7ab203d620ff
4
- data.tar.gz: ea01799a2b32e1e0be4fe8b3e98aa70690f0ed0d
3
+ metadata.gz: 28f1c401ce8ce75157e936a8026688c44348479c
4
+ data.tar.gz: e090819c15f52fb5e899a7e2cb42c460d7dbe4f8
5
5
  SHA512:
6
- metadata.gz: 6fe68ccd9c840a32673a322d32747a959ac96483943b9cf174ab5965d67fb2f9641c29ae0ad384342122bbd18d33725258c23d4142bb2a2521a54588c40612ee
7
- data.tar.gz: 8b258ce306aec17a0134df20bca077580733f4ef7d7b8e8fe99e1f9f13da0786282af3aa005481e6540469524cf1c68027951359c51d3bb70c703bea914324e8
6
+ metadata.gz: a74b2653e06afbeefc57dddaf8c2424b5600fb51935d7065f7f10903222fd35d5a73b264b77e1d43654c8f525ca85aa45b0d195d8c32570ad15a5475db4143c5
7
+ data.tar.gz: bb588554fdcc7bb9e10fe0fd6ec33025d2578f61f874a4d251f00952f72f51a2fbd4d479f8182626711eeda0478e0a83dd0e52f32c3f31e0c0ef8002caf4e67b
data/.travis.yml CHANGED
@@ -1,4 +1,5 @@
1
1
  rvm:
2
+ - "2.1"
2
3
  - 2.0.0
3
4
  - 1.9.3
4
5
  - 1.9.2
data/CHANGELOG.md CHANGED
@@ -1,3 +1,8 @@
1
+ ## 0.4.27 / 2014-03-19
2
+
3
+ * [bugfix] Don't send body with GET and HEAD requests
4
+ * [bugfix] Disable echo when providing password for JRuby users
5
+
1
6
  ## 0.4.26 / 2014-03-05
2
7
 
3
8
  * [feature] Removed monitoring_email from Cloudfile
data/lib/shelly/cli/main.rb CHANGED
@@ -431,11 +431,11 @@ Wait until cloud is in 'turned off' state and try again.}
431
431
  options = {:with_confirmation => true}.merge(options)
432
432
  loop do
433
433
  say "Password: "
434
- password = echo_disabled { $stdin.gets.strip }
434
+ password = $stdin.noecho(&:gets).strip
435
435
  say_new_line
436
436
  return password unless options[:with_confirmation]
437
437
  say "Password confirmation: "
438
- password_confirmation = echo_disabled { $stdin.gets.strip }
438
+ password_confirmation = $stdin.noecho(&:gets).strip
439
439
  say_new_line
440
440
  if password.present?
441
441
  return password if password == password_confirmation
data/lib/shelly/client.rb CHANGED
@@ -91,11 +91,15 @@ module Shelly
91
91
  end
92
92
 
93
93
  def request_parameters(path, method, params = {})
94
- {:method => method,
95
- :url => "#{api_url}#{path}",
96
- :headers => headers,
97
- :payload => params.to_json
94
+ parameters = {
95
+ :method => method,
96
+ :url => "#{api_url}#{path}",
97
+ :headers => headers
98
98
  }.merge(http_basic_auth_options)
99
+ unless [:get, :head].include?(method)
100
+ parameters = parameters.merge(:payload => params.to_json)
101
+ end
102
+ parameters
99
103
  end
100
104
 
101
105
  def process_response(response)
data/lib/shelly/helpers.rb CHANGED
@@ -1,13 +1,6 @@
1
1
  # encoding: utf-8
2
2
  module Shelly
3
3
  module Helpers
4
- def echo_disabled
5
- system "stty -echo"
6
- value = yield
7
- system "stty echo"
8
- value
9
- end
10
-
11
4
  def say_new_line
12
5
  say "\n"
13
6
  end
data/lib/shelly/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Shelly
2
- VERSION = "0.4.26"
2
+ VERSION = "0.4.27"
3
3
  end
data/shelly.gemspec CHANGED
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
22
22
  end
23
23
  s.add_development_dependency "fakefs", "~> 0.4.3"
24
24
  s.add_development_dependency "fakeweb"
25
+ s.add_development_dependency "pry"
25
26
  s.add_runtime_dependency "wijet-thor", "~> 0.14.10"
26
27
  s.add_runtime_dependency "rest-client"
27
28
  s.add_runtime_dependency "mime-types", "~> 1.16"
@@ -35,4 +36,3 @@ Gem::Specification.new do |s|
35
36
  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
36
37
  s.require_paths = ["lib"]
37
38
  end
38
-
data/spec/input_faker.rb CHANGED
@@ -10,6 +10,10 @@ class InputFaker
10
10
  next_string
11
11
  end
12
12
 
13
+ def noecho
14
+ @strings.shift
15
+ end
16
+
13
17
  def self.with_fake_input(strings)
14
18
  $stdin = new(strings)
15
19
  yield
data/spec/shelly/client_spec.rb CHANGED
@@ -468,11 +468,23 @@ describe Shelly::Client do
468
468
  expected = {
469
469
  :method => :get,
470
470
  :url => "#{@client.api_url}/account",
471
- :headers => @client.headers,
472
- :payload => {}.to_json
471
+ :headers => @client.headers
473
472
  }
474
473
  @client.request_parameters("/account", :get).should == expected
475
474
  end
475
+
476
+ [:get, :head].each do |method|
477
+ it "should not include payload when method is #{method}" do
478
+ expected = {
479
+ :method => method,
480
+ :url => "#{@client.api_url}/account",
481
+ :headers => @client.headers,
482
+ :user => "bob@example.com",
483
+ :password => "123123"
484
+ }
485
+ @client.request_parameters("/account", method, :name => "bob").should == expected
486
+ end
487
+ end
476
488
  end
477
489
 
478
490
  describe "#request" do
metadata CHANGED
@@ -1,211 +1,225 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: shelly
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.26
4
+ version: 0.4.27
5
5
  platform: ruby
6
6
  authors:
7
7
  - Shelly Cloud team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-03-05 00:00:00.000000000 Z
11
+ date: 2014-03-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
- version_requirements: !ruby/object:Gem::Requirement
15
- requirements:
16
- - - ~>
17
- - !ruby/object:Gem::Version
18
- version: 2.11.0
19
- prerelease: false
20
14
  name: rspec
21
15
  requirement: !ruby/object:Gem::Requirement
22
16
  requirements:
23
- - - ~>
17
+ - - "~>"
24
18
  - !ruby/object:Gem::Version
25
19
  version: 2.11.0
26
20
  type: :development
27
- - !ruby/object:Gem::Dependency
21
+ prerelease: false
28
22
  version_requirements: !ruby/object:Gem::Requirement
29
23
  requirements:
30
- - - '>='
24
+ - - "~>"
31
25
  - !ruby/object:Gem::Version
32
- version: '0'
33
- prerelease: false
26
+ version: 2.11.0
27
+ - !ruby/object:Gem::Dependency
34
28
  name: rake
35
29
  requirement: !ruby/object:Gem::Requirement
36
30
  requirements:
37
- - - '>='
31
+ - - ">="
38
32
  - !ruby/object:Gem::Version
39
33
  version: '0'
40
34
  type: :development
41
- - !ruby/object:Gem::Dependency
35
+ prerelease: false
42
36
  version_requirements: !ruby/object:Gem::Requirement
43
37
  requirements:
44
- - - '>='
38
+ - - ">="
45
39
  - !ruby/object:Gem::Version
46
40
  version: '0'
47
- prerelease: false
41
+ - !ruby/object:Gem::Dependency
48
42
  name: simplecov
49
43
  requirement: !ruby/object:Gem::Requirement
50
44
  requirements:
51
- - - '>='
45
+ - - ">="
52
46
  - !ruby/object:Gem::Version
53
47
  version: '0'
54
48
  type: :development
55
- - !ruby/object:Gem::Dependency
49
+ prerelease: false
56
50
  version_requirements: !ruby/object:Gem::Requirement
57
51
  requirements:
58
- - - '>='
52
+ - - ">="
59
53
  - !ruby/object:Gem::Version
60
54
  version: '0'
61
- prerelease: false
55
+ - !ruby/object:Gem::Dependency
62
56
  name: ruby_gntp
63
57
  requirement: !ruby/object:Gem::Requirement
64
58
  requirements:
65
- - - '>='
59
+ - - ">="
66
60
  - !ruby/object:Gem::Version
67
61
  version: '0'
68
62
  type: :development
69
- - !ruby/object:Gem::Dependency
63
+ prerelease: false
70
64
  version_requirements: !ruby/object:Gem::Requirement
71
65
  requirements:
72
- - - '>='
66
+ - - ">="
73
67
  - !ruby/object:Gem::Version
74
68
  version: '0'
75
- prerelease: false
69
+ - !ruby/object:Gem::Dependency
76
70
  name: rb-fsevent
77
71
  requirement: !ruby/object:Gem::Requirement
78
72
  requirements:
79
- - - '>='
73
+ - - ">="
80
74
  - !ruby/object:Gem::Version
81
75
  version: '0'
82
76
  type: :development
83
- - !ruby/object:Gem::Dependency
77
+ prerelease: false
84
78
  version_requirements: !ruby/object:Gem::Requirement
85
79
  requirements:
86
- - - ~>
80
+ - - ">="
87
81
  - !ruby/object:Gem::Version
88
- version: 0.4.3
89
- prerelease: false
82
+ version: '0'
83
+ - !ruby/object:Gem::Dependency
90
84
  name: fakefs
91
85
  requirement: !ruby/object:Gem::Requirement
92
86
  requirements:
93
- - - ~>
87
+ - - "~>"
94
88
  - !ruby/object:Gem::Version
95
89
  version: 0.4.3
96
90
  type: :development
97
- - !ruby/object:Gem::Dependency
91
+ prerelease: false
98
92
  version_requirements: !ruby/object:Gem::Requirement
99
93
  requirements:
100
- - - '>='
94
+ - - "~>"
101
95
  - !ruby/object:Gem::Version
102
- version: '0'
103
- prerelease: false
96
+ version: 0.4.3
97
+ - !ruby/object:Gem::Dependency
104
98
  name: fakeweb
105
99
  requirement: !ruby/object:Gem::Requirement
106
100
  requirements:
107
- - - '>='
101
+ - - ">="
108
102
  - !ruby/object:Gem::Version
109
103
  version: '0'
110
104
  type: :development
111
- - !ruby/object:Gem::Dependency
105
+ prerelease: false
112
106
  version_requirements: !ruby/object:Gem::Requirement
113
107
  requirements:
114
- - - ~>
108
+ - - ">="
115
109
  - !ruby/object:Gem::Version
116
- version: 0.14.10
110
+ version: '0'
111
+ - !ruby/object:Gem::Dependency
112
+ name: pry
113
+ requirement: !ruby/object:Gem::Requirement
114
+ requirements:
115
+ - - ">="
116
+ - !ruby/object:Gem::Version
117
+ version: '0'
118
+ type: :development
117
119
  prerelease: false
120
+ version_requirements: !ruby/object:Gem::Requirement
121
+ requirements:
122
+ - - ">="
123
+ - !ruby/object:Gem::Version
124
+ version: '0'
125
+ - !ruby/object:Gem::Dependency
118
126
  name: wijet-thor
119
127
  requirement: !ruby/object:Gem::Requirement
120
128
  requirements:
121
- - - ~>
129
+ - - "~>"
122
130
  - !ruby/object:Gem::Version
123
131
  version: 0.14.10
124
132
  type: :runtime
125
- - !ruby/object:Gem::Dependency
133
+ prerelease: false
126
134
  version_requirements: !ruby/object:Gem::Requirement
127
135
  requirements:
128
- - - '>='
136
+ - - "~>"
129
137
  - !ruby/object:Gem::Version
130
- version: '0'
131
- prerelease: false
138
+ version: 0.14.10
139
+ - !ruby/object:Gem::Dependency
132
140
  name: rest-client
133
141
  requirement: !ruby/object:Gem::Requirement
134
142
  requirements:
135
- - - '>='
143
+ - - ">="
136
144
  - !ruby/object:Gem::Version
137
145
  version: '0'
138
146
  type: :runtime
139
- - !ruby/object:Gem::Dependency
147
+ prerelease: false
140
148
  version_requirements: !ruby/object:Gem::Requirement
141
149
  requirements:
142
- - - ~>
150
+ - - ">="
143
151
  - !ruby/object:Gem::Version
144
- version: '1.16'
145
- prerelease: false
152
+ version: '0'
153
+ - !ruby/object:Gem::Dependency
146
154
  name: mime-types
147
155
  requirement: !ruby/object:Gem::Requirement
148
156
  requirements:
149
- - - ~>
157
+ - - "~>"
150
158
  - !ruby/object:Gem::Version
151
159
  version: '1.16'
152
160
  type: :runtime
153
- - !ruby/object:Gem::Dependency
161
+ prerelease: false
154
162
  version_requirements: !ruby/object:Gem::Requirement
155
163
  requirements:
156
- - - '>='
164
+ - - "~>"
157
165
  - !ruby/object:Gem::Version
158
- version: '0'
159
- prerelease: false
166
+ version: '1.16'
167
+ - !ruby/object:Gem::Dependency
160
168
  name: json
161
169
  requirement: !ruby/object:Gem::Requirement
162
170
  requirements:
163
- - - '>='
171
+ - - ">="
164
172
  - !ruby/object:Gem::Version
165
173
  version: '0'
166
174
  type: :runtime
167
- - !ruby/object:Gem::Dependency
175
+ prerelease: false
168
176
  version_requirements: !ruby/object:Gem::Requirement
169
177
  requirements:
170
- - - '>='
178
+ - - ">="
171
179
  - !ruby/object:Gem::Version
172
180
  version: '0'
173
- prerelease: false
181
+ - !ruby/object:Gem::Dependency
174
182
  name: progressbar
175
183
  requirement: !ruby/object:Gem::Requirement
176
184
  requirements:
177
- - - '>='
185
+ - - ">="
178
186
  - !ruby/object:Gem::Version
179
187
  version: '0'
180
188
  type: :runtime
181
- - !ruby/object:Gem::Dependency
189
+ prerelease: false
182
190
  version_requirements: !ruby/object:Gem::Requirement
183
191
  requirements:
184
- - - '>='
192
+ - - ">="
185
193
  - !ruby/object:Gem::Version
186
194
  version: '0'
187
- prerelease: false
195
+ - !ruby/object:Gem::Dependency
188
196
  name: launchy
189
197
  requirement: !ruby/object:Gem::Requirement
190
198
  requirements:
191
- - - '>='
199
+ - - ">="
192
200
  - !ruby/object:Gem::Version
193
201
  version: '0'
194
202
  type: :runtime
195
- - !ruby/object:Gem::Dependency
203
+ prerelease: false
196
204
  version_requirements: !ruby/object:Gem::Requirement
197
205
  requirements:
198
- - - '>='
206
+ - - ">="
199
207
  - !ruby/object:Gem::Version
200
208
  version: '0'
201
- prerelease: false
209
+ - !ruby/object:Gem::Dependency
202
210
  name: netrc
203
211
  requirement: !ruby/object:Gem::Requirement
204
212
  requirements:
205
- - - '>='
213
+ - - ">="
206
214
  - !ruby/object:Gem::Version
207
215
  version: '0'
208
216
  type: :runtime
217
+ prerelease: false
218
+ version_requirements: !ruby/object:Gem::Requirement
219
+ requirements:
220
+ - - ">="
221
+ - !ruby/object:Gem::Version
222
+ version: '0'
209
223
  description: Tool for managing applications and clouds at shellycloud.com
210
224
  email:
211
225
  - devs@shellycloud.com
@@ -214,8 +228,8 @@ executables:
214
228
  extensions: []
215
229
  extra_rdoc_files: []
216
230
  files:
217
- - .gitignore
218
- - .travis.yml
231
+ - ".gitignore"
232
+ - ".travis.yml"
219
233
  - CHANGELOG.md
220
234
  - Gemfile
221
235
  - LICENSE
@@ -310,17 +324,17 @@ require_paths:
310
324
  - lib
311
325
  required_ruby_version: !ruby/object:Gem::Requirement
312
326
  requirements:
313
- - - '>='
327
+ - - ">="
314
328
  - !ruby/object:Gem::Version
315
329
  version: '0'
316
330
  required_rubygems_version: !ruby/object:Gem::Requirement
317
331
  requirements:
318
- - - '>='
332
+ - - ">="
319
333
  - !ruby/object:Gem::Version
320
334
  version: '0'
321
335
  requirements: []
322
336
  rubyforge_project: shelly
323
- rubygems_version: 2.2.1
337
+ rubygems_version: 2.2.2
324
338
  signing_key:
325
339
  specification_version: 4
326
340
  summary: Shelly Cloud command line tool