shelly 0.3.7 → 0.3.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. data/CHANGELOG.md +5 -0
  2. data/lib/shelly/cli/config.rb +1 -1
  3. data/lib/shelly/cli/main.rb +1 -2
  4. data/lib/shelly/version.rb +1 -1
  5. data/spec/shelly/cli/config_spec.rb +4 -3
  6. data/spec/shelly/cli/main_spec.rb +3 -4
  7. metadata +28 -28
data/CHANGELOG.md CHANGED
@@ -1,3 +1,8 @@
1
+ ## 0.3.8 / 2013-08-05
2
+
3
+ * [bugfix] Show proper path when asking to delete configuration file
4
+ * [improvement] Removed `git push` from instructions given by `shelly add`
5
+
1
6
  ## 0.3.7 / 2013-07-30
2
7
 
3
8
  * [improvement] Show warning if application Gemfile contains shelly gem.
data/lib/shelly/cli/config.rb CHANGED
@@ -81,7 +81,7 @@ module Shelly
81
81
  desc "delete PATH", "Delete configuration file"
82
82
  def delete(path)
83
83
  app = multiple_clouds(options[:cloud], "config delete #{path}")
84
- if yes?("Are you sure you want to delete 'path' (yes/no): ")
84
+ if yes?("Are you sure you want to delete '#{path}' (yes/no):")
85
85
  app.delete_config(path)
86
86
  say "File '#{path}' deleted.", :green
87
87
  say "To make changes to running application redeploy it using:"
data/lib/shelly/cli/main.rb CHANGED
@@ -669,10 +669,9 @@ Wait until cloud is in 'turned off' state and try again.}
669
669
 
670
670
  def info_deploying_to_shellycloud(remote = 'shelly')
671
671
  say_new_line
672
- say "When you make sure all settings are correct please issue following commands:", :green
672
+ say "When you make sure all settings are correct, add changes to your repository:", :green
673
673
  say " git add ."
674
674
  say ' git commit -m "Application added to Shelly Cloud"'
675
- say " git push"
676
675
  say_new_line
677
676
  say "Deploy to your cloud using:", :green
678
677
  say " git push #{remote} master"
data/lib/shelly/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Shelly
2
- VERSION = "0.3.7"
2
+ VERSION = "0.3.8"
3
3
  end
data/spec/shelly/cli/config_spec.rb CHANGED
@@ -208,12 +208,13 @@ describe Shelly::CLI::Config do
208
208
  end
209
209
 
210
210
  it "should delete configuration file" do
211
- @client.should_receive(:app_delete_config).with("foo-production", "path").and_return({})
212
- $stdout.should_receive(:puts).with(green "File 'path' deleted.")
211
+ @client.should_receive(:app_delete_config).with("foo-production", "some-path").and_return({})
212
+ $stdout.should_receive(:print).with("Are you sure you want to delete 'some-path' (yes/no): ")
213
+ $stdout.should_receive(:puts).with(green "File 'some-path' deleted.")
213
214
  $stdout.should_receive(:puts).with("To make changes to running application redeploy it using:")
214
215
  $stdout.should_receive(:puts).with("`shelly redeploy --cloud foo-production`")
215
216
  fake_stdin(["y"]) do
216
- invoke(@config, :delete, "path")
217
+ invoke(@config, :delete, "some-path")
217
218
  end
218
219
  end
219
220
 
data/spec/shelly/cli/main_spec.rb CHANGED
@@ -496,10 +496,9 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
496
496
  end
497
497
 
498
498
  it "should display info on how to deploy to ShellyCloud" do
499
- $stdout.should_receive(:puts).with("\e[32mWhen you make sure all settings are correct please issue following commands:\e[0m")
499
+ $stdout.should_receive(:puts).with("\e[32mWhen you make sure all settings are correct, add changes to your repository:\e[0m")
500
500
  $stdout.should_receive(:puts).with(" git add .")
501
501
  $stdout.should_receive(:puts).with(' git commit -m "Application added to Shelly Cloud"')
502
- $stdout.should_receive(:puts).with(" git push")
503
502
  $stdout.should_receive(:puts).with("\e[32mDeploy to your cloud using:\e[0m")
504
503
  $stdout.should_receive(:puts).with(" git push shelly master")
505
504
  fake_stdin(["foooo", "none"]) do
@@ -509,7 +508,7 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
509
508
 
510
509
  it "should check shelly requirements" do
511
510
  $stdout.should_receive(:puts) \
512
- .with("\e[32mWhen you make sure all settings are correct please issue following commands:\e[0m")
511
+ .with("\e[32mWhen you make sure all settings are correct, add changes to your repository:\e[0m")
513
512
  @main.should_receive(:check).with(false).and_return(true)
514
513
  fake_stdin(["foooo", "none"]) do
515
514
  invoke(@main, :add)
@@ -518,7 +517,7 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
518
517
 
519
518
  it "should abort when shelly requirements are not met" do
520
519
  $stdout.should_not_receive(:puts) \
521
- .with("\e[32mWhen you make sure all settings are correct please issue following commands:\e[0m")
520
+ .with("\e[32mWhen you make sure all settings are correct, add changes to your repository:\e[0m")
522
521
  @main.should_receive(:check).with(false).and_return(false)
523
522
  fake_stdin(["foooo", "none"]) do
524
523
  invoke(@main, :add)
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.3.7
4
+ version: 0.3.8
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-07-30 00:00:00.000000000 Z
12
+ date: 2013-08-05 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rspec
@@ -32,7 +32,7 @@ dependencies:
32
32
  requirement: !ruby/object:Gem::Requirement
33
33
  none: false
34
34
  requirements:
35
- - - '>='
35
+ - - ! '>='
36
36
  - !ruby/object:Gem::Version
37
37
  version: '0'
38
38
  type: :development
@@ -40,7 +40,7 @@ dependencies:
40
40
  version_requirements: !ruby/object:Gem::Requirement
41
41
  none: false
42
42
  requirements:
43
- - - '>='
43
+ - - ! '>='
44
44
  - !ruby/object:Gem::Version
45
45
  version: '0'
46
46
  - !ruby/object:Gem::Dependency
@@ -48,7 +48,7 @@ dependencies:
48
48
  requirement: !ruby/object:Gem::Requirement
49
49
  none: false
50
50
  requirements:
51
- - - '>='
51
+ - - ! '>='
52
52
  - !ruby/object:Gem::Version
53
53
  version: '0'
54
54
  type: :development
@@ -56,7 +56,7 @@ dependencies:
56
56
  version_requirements: !ruby/object:Gem::Requirement
57
57
  none: false
58
58
  requirements:
59
- - - '>='
59
+ - - ! '>='
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  - !ruby/object:Gem::Dependency
@@ -64,7 +64,7 @@ dependencies:
64
64
  requirement: !ruby/object:Gem::Requirement
65
65
  none: false
66
66
  requirements:
67
- - - '>='
67
+ - - ! '>='
68
68
  - !ruby/object:Gem::Version
69
69
  version: '0'
70
70
  type: :development
@@ -72,7 +72,7 @@ dependencies:
72
72
  version_requirements: !ruby/object:Gem::Requirement
73
73
  none: false
74
74
  requirements:
75
- - - '>='
75
+ - - ! '>='
76
76
  - !ruby/object:Gem::Version
77
77
  version: '0'
78
78
  - !ruby/object:Gem::Dependency
@@ -80,7 +80,7 @@ dependencies:
80
80
  requirement: !ruby/object:Gem::Requirement
81
81
  none: false
82
82
  requirements:
83
- - - '>='
83
+ - - ! '>='
84
84
  - !ruby/object:Gem::Version
85
85
  version: '0'
86
86
  type: :development
@@ -88,7 +88,7 @@ dependencies:
88
88
  version_requirements: !ruby/object:Gem::Requirement
89
89
  none: false
90
90
  requirements:
91
- - - '>='
91
+ - - ! '>='
92
92
  - !ruby/object:Gem::Version
93
93
  version: '0'
94
94
  - !ruby/object:Gem::Dependency
@@ -96,7 +96,7 @@ dependencies:
96
96
  requirement: !ruby/object:Gem::Requirement
97
97
  none: false
98
98
  requirements:
99
- - - '>='
99
+ - - ! '>='
100
100
  - !ruby/object:Gem::Version
101
101
  version: '0'
102
102
  type: :development
@@ -104,7 +104,7 @@ dependencies:
104
104
  version_requirements: !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
- - - '>='
107
+ - - ! '>='
108
108
  - !ruby/object:Gem::Version
109
109
  version: '0'
110
110
  - !ruby/object:Gem::Dependency
@@ -112,7 +112,7 @@ dependencies:
112
112
  requirement: !ruby/object:Gem::Requirement
113
113
  none: false
114
114
  requirements:
115
- - - '>='
115
+ - - ! '>='
116
116
  - !ruby/object:Gem::Version
117
117
  version: '0'
118
118
  type: :development
@@ -120,7 +120,7 @@ dependencies:
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  none: false
122
122
  requirements:
123
- - - '>='
123
+ - - ! '>='
124
124
  - !ruby/object:Gem::Version
125
125
  version: '0'
126
126
  - !ruby/object:Gem::Dependency
@@ -144,7 +144,7 @@ dependencies:
144
144
  requirement: !ruby/object:Gem::Requirement
145
145
  none: false
146
146
  requirements:
147
- - - '>='
147
+ - - ! '>='
148
148
  - !ruby/object:Gem::Version
149
149
  version: '0'
150
150
  type: :runtime
@@ -152,7 +152,7 @@ dependencies:
152
152
  version_requirements: !ruby/object:Gem::Requirement
153
153
  none: false
154
154
  requirements:
155
- - - '>='
155
+ - - ! '>='
156
156
  - !ruby/object:Gem::Version
157
157
  version: '0'
158
158
  - !ruby/object:Gem::Dependency
@@ -160,7 +160,7 @@ dependencies:
160
160
  requirement: !ruby/object:Gem::Requirement
161
161
  none: false
162
162
  requirements:
163
- - - '>='
163
+ - - ! '>='
164
164
  - !ruby/object:Gem::Version
165
165
  version: '0'
166
166
  type: :runtime
@@ -168,7 +168,7 @@ dependencies:
168
168
  version_requirements: !ruby/object:Gem::Requirement
169
169
  none: false
170
170
  requirements:
171
- - - '>='
171
+ - - ! '>='
172
172
  - !ruby/object:Gem::Version
173
173
  version: '0'
174
174
  - !ruby/object:Gem::Dependency
@@ -176,7 +176,7 @@ dependencies:
176
176
  requirement: !ruby/object:Gem::Requirement
177
177
  none: false
178
178
  requirements:
179
- - - '>='
179
+ - - ! '>='
180
180
  - !ruby/object:Gem::Version
181
181
  version: '0'
182
182
  type: :runtime
@@ -184,7 +184,7 @@ dependencies:
184
184
  version_requirements: !ruby/object:Gem::Requirement
185
185
  none: false
186
186
  requirements:
187
- - - '>='
187
+ - - ! '>='
188
188
  - !ruby/object:Gem::Version
189
189
  version: '0'
190
190
  - !ruby/object:Gem::Dependency
@@ -192,7 +192,7 @@ dependencies:
192
192
  requirement: !ruby/object:Gem::Requirement
193
193
  none: false
194
194
  requirements:
195
- - - '>='
195
+ - - ! '>='
196
196
  - !ruby/object:Gem::Version
197
197
  version: '0'
198
198
  type: :runtime
@@ -200,7 +200,7 @@ dependencies:
200
200
  version_requirements: !ruby/object:Gem::Requirement
201
201
  none: false
202
202
  requirements:
203
- - - '>='
203
+ - - ! '>='
204
204
  - !ruby/object:Gem::Version
205
205
  version: '0'
206
206
  - !ruby/object:Gem::Dependency
@@ -208,7 +208,7 @@ dependencies:
208
208
  requirement: !ruby/object:Gem::Requirement
209
209
  none: false
210
210
  requirements:
211
- - - '>='
211
+ - - ! '>='
212
212
  - !ruby/object:Gem::Version
213
213
  version: '0'
214
214
  type: :runtime
@@ -216,7 +216,7 @@ dependencies:
216
216
  version_requirements: !ruby/object:Gem::Requirement
217
217
  none: false
218
218
  requirements:
219
- - - '>='
219
+ - - ! '>='
220
220
  - !ruby/object:Gem::Version
221
221
  version: '0'
222
222
  description: Tool for managing applications and clouds at shellycloud.com
@@ -313,21 +313,21 @@ require_paths:
313
313
  required_ruby_version: !ruby/object:Gem::Requirement
314
314
  none: false
315
315
  requirements:
316
- - - '>='
316
+ - - ! '>='
317
317
  - !ruby/object:Gem::Version
318
318
  version: '0'
319
319
  segments:
320
320
  - 0
321
- hash: 1029066838988587454
321
+ hash: -1190904301794294451
322
322
  required_rubygems_version: !ruby/object:Gem::Requirement
323
323
  none: false
324
324
  requirements:
325
- - - '>='
325
+ - - ! '>='
326
326
  - !ruby/object:Gem::Version
327
327
  version: '0'
328
328
  segments:
329
329
  - 0
330
- hash: 1029066838988587454
330
+ hash: -1190904301794294451
331
331
  requirements: []
332
332
  rubyforge_project: shelly
333
333
  rubygems_version: 1.8.25