shelly 0.2.0 → 0.2.1
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG.md +4 -0
- data/lib/shelly/cli/deploy.rb +2 -0
- data/lib/shelly/cli/main.rb +3 -2
- data/lib/shelly/version.rb +1 -1
- data/spec/shelly/cli/deploy_spec.rb +3 -1
- data/spec/shelly/cli/main_spec.rb +4 -3
- metadata +4 -4
data/CHANGELOG.md
CHANGED
data/lib/shelly/cli/deploy.rb
CHANGED
@@ -20,6 +20,8 @@ module Shelly
|
|
20
20
|
logs.each do |log|
|
21
21
|
if log['author'].present? && log['commit_sha'].present?
|
22
22
|
log_line = " * #{log['created_at']} #{log['commit_sha'][0..6]} by #{log['author']}"
|
23
|
+
elsif log['author'].present?
|
24
|
+
log_line = " * #{log['created_at']} redeploy by #{log['author']}"
|
23
25
|
else
|
24
26
|
log_line = " * #{log['created_at']}"
|
25
27
|
end
|
data/lib/shelly/cli/main.rb
CHANGED
@@ -211,8 +211,9 @@ We have been notified about it. We will be adding new resources shortly}
|
|
211
211
|
when "no_billing"
|
212
212
|
say_error "Please fill in billing details to start #{app}.", :with_exit => false
|
213
213
|
say_error "Visit: #{app.edit_billing_url}", :with_exit => false
|
214
|
-
when "
|
215
|
-
say_error
|
214
|
+
when "turning_off"
|
215
|
+
say_error %{Not starting: cloud '#{app}' is turning off.
|
216
|
+
Wait until cloud is in 'turned off' state and try again.}
|
216
217
|
end
|
217
218
|
exit 1
|
218
219
|
rescue Client::LockedException => e
|
data/lib/shelly/version.rb
CHANGED
@@ -38,12 +38,14 @@ describe Shelly::CLI::Deploy do
|
|
38
38
|
{"failed" => false, "created_at" => "2011-12-12-14-14-59", "author" => "wijet", "commit_sha" => "69fb7a9b5101969f284db15b937ea23e579b3d4d"},
|
39
39
|
{"failed" => true, "created_at" => "2011-12-12-15-14-59", "author" => "sabcio", "commit_sha" => "ac37e1993fea54ddbadaf7654b7ab0fa381d202b"},
|
40
40
|
{"failed" => false, "created_at" => "2011-12-12-16-14-59", "author" => nil, "commit_sha" => nil},
|
41
|
-
{"failed" => true, "created_at" => "2011-12-12-17-14-59", "author" => nil, "commit_sha" => nil}
|
41
|
+
{"failed" => true, "created_at" => "2011-12-12-17-14-59", "author" => nil, "commit_sha" => nil},
|
42
|
+
{"failed" => false, "created_at" => "2011-12-12-18-14-59", "author" => "wijet", "commit_sha" => nil}])
|
42
43
|
$stdout.should_receive(:puts).with(green "Available deploy logs")
|
43
44
|
$stdout.should_receive(:puts).with(" * 2011-12-12-14-14-59 69fb7a9 by wijet")
|
44
45
|
$stdout.should_receive(:puts).with(" * 2011-12-12-15-14-59 ac37e19 by sabcio (failed)")
|
45
46
|
$stdout.should_receive(:puts).with(" * 2011-12-12-16-14-59")
|
46
47
|
$stdout.should_receive(:puts).with(" * 2011-12-12-17-14-59 (failed)")
|
48
|
+
$stdout.should_receive(:puts).with(" * 2011-12-12-18-14-59 redeploy by wijet")
|
47
49
|
invoke(@deploys, :list)
|
48
50
|
end
|
49
51
|
end
|
@@ -774,9 +774,10 @@ We have been notified about it. We will be adding new resources shortly")
|
|
774
774
|
lambda { invoke(@main, :start) }.should raise_error(SystemExit)
|
775
775
|
end
|
776
776
|
|
777
|
-
it "should show messge about
|
778
|
-
raise_conflict("state" => "
|
779
|
-
$stdout.should_receive(:puts).with(red "Not starting
|
777
|
+
it "should show messge about app turning off" do
|
778
|
+
raise_conflict("state" => "turning_off")
|
779
|
+
$stdout.should_receive(:puts).with(red "Not starting: cloud 'foo-production' is turning off.
|
780
|
+
Wait until cloud is in 'turned off' state and try again.")
|
780
781
|
lambda { invoke(@main, :start) }.should raise_error(SystemExit)
|
781
782
|
end
|
782
783
|
|
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.2.
|
4
|
+
version: 0.2.1
|
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-01-
|
12
|
+
date: 2013-01-17 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rspec
|
@@ -317,7 +317,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
317
317
|
version: '0'
|
318
318
|
segments:
|
319
319
|
- 0
|
320
|
-
hash: -
|
320
|
+
hash: -2251539392438831574
|
321
321
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
322
322
|
none: false
|
323
323
|
requirements:
|
@@ -326,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
326
326
|
version: '0'
|
327
327
|
segments:
|
328
328
|
- 0
|
329
|
-
hash: -
|
329
|
+
hash: -2251539392438831574
|
330
330
|
requirements: []
|
331
331
|
rubyforge_project: shelly
|
332
332
|
rubygems_version: 1.8.24
|