shelly 0.4.10 → 0.4.11

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- NDNmY2YzNjhlNzEzOTYyYTg0Mjk5OWRmM2U4YzRmMzZmMWUyMWZkYg==
5
- data.tar.gz: !binary |-
6
- NzY5ZjIyM2RjMDVmMjFhZGRhYTcxNmZiNzVlMTg0MmJlYTRhY2RhOA==
2
+ SHA1:
3
+ metadata.gz: adf2341b021f82d9ea1afdecdb788d68aa1d9ad8
4
+ data.tar.gz: 178d7244fe5cfedaee8eba8886654124706fc979
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- NTg0ZTYwZjdiNmU0MDRlYmIyMWI0YWMxNTMzZTI4YjkwN2Q4YTVkNDlmYzg3
10
- OTdmMmI5MWFmYTJjMWFjZDk2MjFkOTkyYzA0ZmQ3OWJhMzBkMzViMGM3MTY5
11
- MWE3ZDk3ZWQ0YzM5MWRlOGRkZmYxNGEyMDQ0YTVlZGU5OTU2MDA=
12
- data.tar.gz: !binary |-
13
- NDllMWY3NzRlN2Q3ZWZmZjk3Yzc2YzVkMDgxNDdhYjhiNTYwMzU2OTI2OGUw
14
- NzBjMGQ5YTIzY2EyZTk5Y2EwNzVkMjViMmMyYjM5YzM5Mzc0NDU5NTBhMGJl
15
- MDllMjU2NTM1YTgyYWNjY2UyY2RjNzQ2M2Y2ZTkwZWMzNzgxZWU=
6
+ metadata.gz: 22405e5e1f6667007c1881fb5919f34404bd0e43213fc0393364b39bbd415cc0873c849b49369f3a32cb9a60a8bc13b238b7bbc50c73ead4c8c3dd444193427d
7
+ data.tar.gz: 3eb6b521480439d2e74d60c71175568e5c9d83f474063b3304b98c4c789f99580c1d9aae66ad703f91ef571c0bae6af154b6dd9c04a0312730d6f18119a1876c
data/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ # 0.4.11 / 2013-10-30
2
+
3
+ * internal changes
4
+
1
5
  # 0.4.10 / 2013-10-30
2
6
 
3
7
  * [bugfix] Certificates CLI were not Ruby 1.8 compatible
data/lib/shelly/app.rb CHANGED
@@ -236,6 +236,10 @@ module Shelly
236
236
  @stats ||= shelly.statistics(code_name)
237
237
  end
238
238
 
239
+ def system_user
240
+ attributes["system_user"]
241
+ end
242
+
239
243
  def web_server_ip
240
244
  attributes["web_server_ip"]
241
245
  end
@@ -398,7 +402,7 @@ module Shelly
398
402
  end
399
403
 
400
404
  def persistent_disk
401
- "/home/#{code_name}/disk"
405
+ "/home/#{system_user}/disk"
402
406
  end
403
407
 
404
408
  def jruby?
@@ -1,3 +1,3 @@
1
1
  module Shelly
2
- VERSION = "0.4.10"
2
+ VERSION = "0.4.11"
3
3
  end
@@ -442,25 +442,28 @@ describe Shelly::App do
442
442
 
443
443
  describe "#list_files" do
444
444
  it "should list files for given subpath in disk" do
445
- @app.should_receive(:ssh).with(:command => "ls -l /home/foo-staging/disk/foo")
445
+ @app.stub(:attributes => {"system_user" => "system_user"})
446
+ @app.should_receive(:ssh).with(:command => "ls -l /home/system_user/disk/foo")
446
447
  @app.list_files("foo")
447
448
  end
448
449
  end
449
450
 
450
451
  describe "#upload" do
451
452
  it "should run rsync with proper parameters" do
453
+ @app.stub(:attributes => {"system_user" => "system_user"})
452
454
  @client.stub(:tunnel).and_return(
453
455
  {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
454
- @app.should_receive(:system).with("rsync -avz -e 'ssh -o StrictHostKeyChecking=no -p 40010 -l foo' --progress /path console.example.com:/home/foo-staging/disk")
456
+ @app.should_receive(:system).with("rsync -avz -e 'ssh -o StrictHostKeyChecking=no -p 40010 -l foo' --progress /path console.example.com:/home/system_user/disk")
455
457
  @app.upload("/path")
456
458
  end
457
459
  end
458
460
 
459
461
  describe "#download" do
460
462
  it "should run rsync with proper parameters" do
463
+ @app.stub(:attributes => {"system_user" => "system_user"})
461
464
  @client.stub(:tunnel).and_return(
462
465
  {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
463
- @app.should_receive(:system).with("rsync -avz -e 'ssh -o StrictHostKeyChecking=no -p 40010 -l foo' --progress console.example.com:/home/foo-staging/disk/. /tmp")
466
+ @app.should_receive(:system).with("rsync -avz -e 'ssh -o StrictHostKeyChecking=no -p 40010 -l foo' --progress console.example.com:/home/system_user/disk/. /tmp")
464
467
  @app.download(".", "/tmp")
465
468
  end
466
469
  end
@@ -28,6 +28,7 @@ describe Shelly::CLI::File do
28
28
 
29
29
  context "cloud is not running" do
30
30
  it "should display error" do
31
+ @app.stub(:attributes => {"system_user" => "system_user"})
31
32
  @client.stub(:tunnel).and_raise(Shelly::Client::ConflictException)
32
33
  $stdout.should_receive(:puts).with(red "Cloud foo-production wasn't deployed properly. Cannot list files.")
33
34
  lambda {
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: shelly
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.10
4
+ version: 0.4.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Shelly Cloud team
@@ -11,199 +11,199 @@ cert_chain: []
11
11
  date: 2013-10-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
- type: :development
15
- prerelease: false
16
14
  name: rspec
17
- version_requirements: !ruby/object:Gem::Requirement
15
+ requirement: !ruby/object:Gem::Requirement
18
16
  requirements:
19
17
  - - ~>
20
18
  - !ruby/object:Gem::Version
21
19
  version: 2.11.0
22
- requirement: !ruby/object:Gem::Requirement
20
+ type: :development
21
+ prerelease: false
22
+ version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - ~>
25
25
  - !ruby/object:Gem::Version
26
26
  version: 2.11.0
27
27
  - !ruby/object:Gem::Dependency
28
+ name: rake
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - '>='
32
+ - !ruby/object:Gem::Version
33
+ version: '0'
28
34
  type: :development
29
35
  prerelease: false
30
- name: rake
31
36
  version_requirements: !ruby/object:Gem::Requirement
32
37
  requirements:
33
- - - ! '>='
38
+ - - '>='
34
39
  - !ruby/object:Gem::Version
35
40
  version: '0'
41
+ - !ruby/object:Gem::Dependency
42
+ name: simplecov
36
43
  requirement: !ruby/object:Gem::Requirement
37
44
  requirements:
38
- - - ! '>='
45
+ - - '>='
39
46
  - !ruby/object:Gem::Version
40
47
  version: '0'
41
- - !ruby/object:Gem::Dependency
42
48
  type: :development
43
49
  prerelease: false
44
- name: simplecov
45
50
  version_requirements: !ruby/object:Gem::Requirement
46
51
  requirements:
47
- - - ! '>='
52
+ - - '>='
48
53
  - !ruby/object:Gem::Version
49
54
  version: '0'
55
+ - !ruby/object:Gem::Dependency
56
+ name: ruby_gntp
50
57
  requirement: !ruby/object:Gem::Requirement
51
58
  requirements:
52
- - - ! '>='
59
+ - - '>='
53
60
  - !ruby/object:Gem::Version
54
61
  version: '0'
55
- - !ruby/object:Gem::Dependency
56
62
  type: :development
57
63
  prerelease: false
58
- name: ruby_gntp
59
64
  version_requirements: !ruby/object:Gem::Requirement
60
65
  requirements:
61
- - - ! '>='
66
+ - - '>='
62
67
  - !ruby/object:Gem::Version
63
68
  version: '0'
69
+ - !ruby/object:Gem::Dependency
70
+ name: rb-fsevent
64
71
  requirement: !ruby/object:Gem::Requirement
65
72
  requirements:
66
- - - ! '>='
73
+ - - '>='
67
74
  - !ruby/object:Gem::Version
68
75
  version: '0'
69
- - !ruby/object:Gem::Dependency
70
76
  type: :development
71
77
  prerelease: false
72
- name: rb-fsevent
73
78
  version_requirements: !ruby/object:Gem::Requirement
74
79
  requirements:
75
- - - ! '>='
80
+ - - '>='
76
81
  - !ruby/object:Gem::Version
77
82
  version: '0'
83
+ - !ruby/object:Gem::Dependency
84
+ name: fakefs
78
85
  requirement: !ruby/object:Gem::Requirement
79
86
  requirements:
80
- - - ! '>='
87
+ - - '>='
81
88
  - !ruby/object:Gem::Version
82
89
  version: '0'
83
- - !ruby/object:Gem::Dependency
84
90
  type: :development
85
91
  prerelease: false
86
- name: fakefs
87
92
  version_requirements: !ruby/object:Gem::Requirement
88
93
  requirements:
89
- - - ! '>='
94
+ - - '>='
90
95
  - !ruby/object:Gem::Version
91
96
  version: '0'
97
+ - !ruby/object:Gem::Dependency
98
+ name: fakeweb
92
99
  requirement: !ruby/object:Gem::Requirement
93
100
  requirements:
94
- - - ! '>='
101
+ - - '>='
95
102
  - !ruby/object:Gem::Version
96
103
  version: '0'
97
- - !ruby/object:Gem::Dependency
98
104
  type: :development
99
105
  prerelease: false
100
- name: fakeweb
101
106
  version_requirements: !ruby/object:Gem::Requirement
102
107
  requirements:
103
- - - ! '>='
108
+ - - '>='
104
109
  - !ruby/object:Gem::Version
105
110
  version: '0'
111
+ - !ruby/object:Gem::Dependency
112
+ name: wijet-thor
106
113
  requirement: !ruby/object:Gem::Requirement
107
114
  requirements:
108
- - - ! '>='
115
+ - - ~>
109
116
  - !ruby/object:Gem::Version
110
- version: '0'
111
- - !ruby/object:Gem::Dependency
117
+ version: 0.14.10
112
118
  type: :runtime
113
119
  prerelease: false
114
- name: wijet-thor
115
120
  version_requirements: !ruby/object:Gem::Requirement
116
121
  requirements:
117
122
  - - ~>
118
123
  - !ruby/object:Gem::Version
119
124
  version: 0.14.10
125
+ - !ruby/object:Gem::Dependency
126
+ name: rest-client
120
127
  requirement: !ruby/object:Gem::Requirement
121
128
  requirements:
122
- - - ~>
129
+ - - '>='
123
130
  - !ruby/object:Gem::Version
124
- version: 0.14.10
125
- - !ruby/object:Gem::Dependency
131
+ version: '0'
126
132
  type: :runtime
127
133
  prerelease: false
128
- name: rest-client
129
134
  version_requirements: !ruby/object:Gem::Requirement
130
135
  requirements:
131
- - - ! '>='
136
+ - - '>='
132
137
  - !ruby/object:Gem::Version
133
138
  version: '0'
139
+ - !ruby/object:Gem::Dependency
140
+ name: mime-types
134
141
  requirement: !ruby/object:Gem::Requirement
135
142
  requirements:
136
- - - ! '>='
143
+ - - ~>
137
144
  - !ruby/object:Gem::Version
138
- version: '0'
139
- - !ruby/object:Gem::Dependency
145
+ version: '1.16'
140
146
  type: :runtime
141
147
  prerelease: false
142
- name: mime-types
143
148
  version_requirements: !ruby/object:Gem::Requirement
144
149
  requirements:
145
150
  - - ~>
146
151
  - !ruby/object:Gem::Version
147
152
  version: '1.16'
153
+ - !ruby/object:Gem::Dependency
154
+ name: json
148
155
  requirement: !ruby/object:Gem::Requirement
149
156
  requirements:
150
- - - ~>
157
+ - - '>='
151
158
  - !ruby/object:Gem::Version
152
- version: '1.16'
153
- - !ruby/object:Gem::Dependency
159
+ version: '0'
154
160
  type: :runtime
155
161
  prerelease: false
156
- name: json
157
162
  version_requirements: !ruby/object:Gem::Requirement
158
163
  requirements:
159
- - - ! '>='
164
+ - - '>='
160
165
  - !ruby/object:Gem::Version
161
166
  version: '0'
167
+ - !ruby/object:Gem::Dependency
168
+ name: progressbar
162
169
  requirement: !ruby/object:Gem::Requirement
163
170
  requirements:
164
- - - ! '>='
171
+ - - '>='
165
172
  - !ruby/object:Gem::Version
166
173
  version: '0'
167
- - !ruby/object:Gem::Dependency
168
174
  type: :runtime
169
175
  prerelease: false
170
- name: progressbar
171
176
  version_requirements: !ruby/object:Gem::Requirement
172
177
  requirements:
173
- - - ! '>='
178
+ - - '>='
174
179
  - !ruby/object:Gem::Version
175
180
  version: '0'
181
+ - !ruby/object:Gem::Dependency
182
+ name: launchy
176
183
  requirement: !ruby/object:Gem::Requirement
177
184
  requirements:
178
- - - ! '>='
185
+ - - '>='
179
186
  - !ruby/object:Gem::Version
180
187
  version: '0'
181
- - !ruby/object:Gem::Dependency
182
188
  type: :runtime
183
189
  prerelease: false
184
- name: launchy
185
190
  version_requirements: !ruby/object:Gem::Requirement
186
191
  requirements:
187
- - - ! '>='
192
+ - - '>='
188
193
  - !ruby/object:Gem::Version
189
194
  version: '0'
195
+ - !ruby/object:Gem::Dependency
196
+ name: netrc
190
197
  requirement: !ruby/object:Gem::Requirement
191
198
  requirements:
192
- - - ! '>='
199
+ - - '>='
193
200
  - !ruby/object:Gem::Version
194
201
  version: '0'
195
- - !ruby/object:Gem::Dependency
196
202
  type: :runtime
197
203
  prerelease: false
198
- name: netrc
199
204
  version_requirements: !ruby/object:Gem::Requirement
200
205
  requirements:
201
- - - ! '>='
202
- - !ruby/object:Gem::Version
203
- version: '0'
204
- requirement: !ruby/object:Gem::Requirement
205
- requirements:
206
- - - ! '>='
206
+ - - '>='
207
207
  - !ruby/object:Gem::Version
208
208
  version: '0'
209
209
  description: Tool for managing applications and clouds at shellycloud.com
@@ -306,17 +306,17 @@ require_paths:
306
306
  - lib
307
307
  required_ruby_version: !ruby/object:Gem::Requirement
308
308
  requirements:
309
- - - ! '>='
309
+ - - '>='
310
310
  - !ruby/object:Gem::Version
311
311
  version: '0'
312
312
  required_rubygems_version: !ruby/object:Gem::Requirement
313
313
  requirements:
314
- - - ! '>='
314
+ - - '>='
315
315
  - !ruby/object:Gem::Version
316
316
  version: '0'
317
317
  requirements: []
318
318
  rubyforge_project: shelly
319
- rubygems_version: 2.1.5
319
+ rubygems_version: 2.1.8
320
320
  signing_key:
321
321
  specification_version: 4
322
322
  summary: Shelly Cloud command line tool