shelly 0.5.4 → 0.5.5
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.
- checksums.yaml +4 -4
- data/CHANGELOG.md +5 -0
- data/lib/shelly/cli/main.rb +1 -1
- data/lib/shelly/templates/Cloudfile.erb +1 -1
- data/lib/shelly/version.rb +1 -1
- data/spec/shelly/app_spec.rb +4 -4
- data/spec/shelly/cli/main_spec.rb +4 -3
- data/spec/shelly/cloudfile_spec.rb +6 -6
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 83e74344b4c23aff3f2f79ef0bd82fa18a29ecba
|
4
|
+
data.tar.gz: d3209d7422dacfb73880d9decae3e1a33842787b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 28dadb4647b9a14dc80e719c140cdbdd93c1eeb17f41df8918bdc6cc99fc0ce2c261432df172daa34089e9bcb38c3b945aa1b467a8f9040bdf9d34015faa5e3d
|
7
|
+
data.tar.gz: 65bbeb3801cf0ca8cbff4bd213718a811ebccd8a9fee33e890ea83deda24b891738433d4feeb3078ac9baa0ee66d8bd2eb4506f9467679a0ce7012c9da236e0c
|
data/CHANGELOG.md
CHANGED
data/lib/shelly/cli/main.rb
CHANGED
@@ -26,7 +26,7 @@ module Shelly
|
|
26
26
|
register_subcommand(File, "file", "file <command>", "Upload and download files to and from persistent storage")
|
27
27
|
register_subcommand(Organization, "organization", "organization <command>", "View organizations")
|
28
28
|
register_subcommand(Logs, "log", "logs <command>", "View application logs")
|
29
|
-
register_subcommand(Endpoint, "endpoint", "
|
29
|
+
register_subcommand(Endpoint, "endpoint", "endpoint <command>", "Manage application HTTP(S) endpoints")
|
30
30
|
register_subcommand(Maintenance, "maintenance", "maintenance <command>", "Mange application maintenance events")
|
31
31
|
|
32
32
|
check_unknown_options!(:except => :rake)
|
data/lib/shelly/version.rb
CHANGED
data/spec/shelly/app_spec.rb
CHANGED
@@ -406,10 +406,10 @@ describe Shelly::App do
|
|
406
406
|
|
407
407
|
it "should return ruby_version from gemfile" do
|
408
408
|
Bundler::Definition.stub_chain(:build, :ruby_version).
|
409
|
-
and_return(mock(:engine => 'ruby', :version => '
|
409
|
+
and_return(mock(:engine => 'ruby', :version => '2.2.0'))
|
410
410
|
|
411
411
|
@app.create
|
412
|
-
@app.ruby_version.should == "
|
412
|
+
@app.ruby_version.should == "2.2.0"
|
413
413
|
end
|
414
414
|
end
|
415
415
|
end
|
@@ -607,9 +607,9 @@ describe Shelly::App do
|
|
607
607
|
end
|
608
608
|
|
609
609
|
it "should create cloudfile with app attributes" do
|
610
|
-
@app.ruby_version = "
|
610
|
+
@app.ruby_version = "2.2.0"
|
611
611
|
@cloudfile.should_receive(:code_name=).with("foo-staging")
|
612
|
-
@cloudfile.should_receive(:ruby_version=).with("
|
612
|
+
@cloudfile.should_receive(:ruby_version=).with("2.2.0")
|
613
613
|
@cloudfile.should_receive(:environment=).with("production")
|
614
614
|
@cloudfile.should_receive(:domains=).with(["example.com", "another.example.com"])
|
615
615
|
@cloudfile.should_receive(:size=).with("large")
|
@@ -39,6 +39,7 @@ describe Shelly::CLI::Main do
|
|
39
39
|
out.should include("shelly dbconsole # Run rails dbconsole")
|
40
40
|
out.should include("shelly delete # Delete the cloud")
|
41
41
|
out.should include("shelly deploy <command> # View deploy logs")
|
42
|
+
out.should include("shelly endpoint <command> # Manage application HTTP(S) endpoints")
|
42
43
|
out.should include("shelly file <command> # Upload and download files to and from persistent storage")
|
43
44
|
out.should include("shelly help [TASK] # Describe available tasks or one specific task")
|
44
45
|
out.should include("shelly info # Show basic information about cloud")
|
@@ -1833,7 +1834,7 @@ Wait until cloud is in 'turned off' state and try again.")
|
|
1833
1834
|
Bundler::Definition.stub_chain(:build, :specs, :map) \
|
1834
1835
|
.and_return(["thin", "pg", "delayed_job", "whenever", "sidekiq"])
|
1835
1836
|
Bundler::Definition.stub_chain(:build, :ruby_version).
|
1836
|
-
and_return(mock(:engine => 'ruby', :version => '
|
1837
|
+
and_return(mock(:engine => 'ruby', :version => '2.2.0'))
|
1837
1838
|
Shelly::StructureValidator.any_instance.stub(:repo_paths) \
|
1838
1839
|
.and_return(["config.ru", "Gemfile", "Gemfile.lock", "Rakefile"])
|
1839
1840
|
Shelly::StructureValidator.any_instance.stub(:tasks).and_return(["rake db:migrate"])
|
@@ -1904,9 +1905,9 @@ Wait until cloud is in 'turned off' state and try again.")
|
|
1904
1905
|
context "supported version" do
|
1905
1906
|
it "should show checked message" do
|
1906
1907
|
Bundler::Definition.stub_chain(:build, :ruby_version).
|
1907
|
-
and_return(mock(:engine => 'ruby', :version => '
|
1908
|
+
and_return(mock(:engine => 'ruby', :version => '2.2.0'))
|
1908
1909
|
|
1909
|
-
$stdout.should_receive(:puts).with(" #{green("✓")} ruby
|
1910
|
+
$stdout.should_receive(:puts).with(" #{green("✓")} ruby 2.2.0 is supported")
|
1910
1911
|
invoke(@main, :check)
|
1911
1912
|
end
|
1912
1913
|
end
|
@@ -14,7 +14,7 @@ describe Shelly::Cloudfile do
|
|
14
14
|
it "should fetch and parse file content" do
|
15
15
|
content = <<-config
|
16
16
|
foo-staging:
|
17
|
-
ruby_version:
|
17
|
+
ruby_version: 2.2.1
|
18
18
|
environment: production
|
19
19
|
domains:
|
20
20
|
- foo-staging.winniecloud.com
|
@@ -29,7 +29,7 @@ foo-staging:
|
|
29
29
|
config
|
30
30
|
File.open("/projects/foo/Cloudfile", "w") { |f| f << content }
|
31
31
|
@cloudfile.content.should == {"foo-staging" => {
|
32
|
-
"ruby_version" => "
|
32
|
+
"ruby_version" => "2.2.1",
|
33
33
|
"environment" => "production",
|
34
34
|
"domains" => ["foo-staging.winniecloud.com"],
|
35
35
|
"servers" => { "app1" =>
|
@@ -69,7 +69,7 @@ foo-staging:
|
|
69
69
|
it "should create Cloud objects" do
|
70
70
|
content = <<-config
|
71
71
|
foo-staging:
|
72
|
-
ruby_version:
|
72
|
+
ruby_version: 2.2.1
|
73
73
|
servers:
|
74
74
|
app1:
|
75
75
|
size: small
|
@@ -92,7 +92,7 @@ config
|
|
92
92
|
@cloudfile.code_name = "foo-staging"
|
93
93
|
@cloudfile.domains = ["foo-staging.winniecloud.com", "*.foo.example.com"]
|
94
94
|
@cloudfile.databases = ["postgresql", "mongodb"]
|
95
|
-
@cloudfile.ruby_version = "
|
95
|
+
@cloudfile.ruby_version = "2.2.1"
|
96
96
|
@cloudfile.environment = "production"
|
97
97
|
@cloudfile.size = "large"
|
98
98
|
@cloudfile.thin = 4
|
@@ -104,7 +104,7 @@ config
|
|
104
104
|
FakeFS.deactivate!
|
105
105
|
expected = <<-config
|
106
106
|
foo-staging:
|
107
|
-
ruby_version:
|
107
|
+
ruby_version: 2.2.1
|
108
108
|
environment: production # RAILS_ENV
|
109
109
|
domains:
|
110
110
|
- foo-staging.winniecloud.com
|
@@ -136,7 +136,7 @@ config
|
|
136
136
|
@cloudfile.thin = 2
|
137
137
|
expected = <<-config
|
138
138
|
foo-staging:
|
139
|
-
ruby_version:
|
139
|
+
ruby_version: 2.2.1
|
140
140
|
environment: production # RAILS_ENV
|
141
141
|
domains:
|
142
142
|
- foo-staging.winniecloud.com
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: shelly
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.5.
|
4
|
+
version: 0.5.5
|
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: 2015-
|
11
|
+
date: 2015-03-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rspec
|
@@ -392,3 +392,4 @@ test_files:
|
|
392
392
|
- spec/shelly/user_spec.rb
|
393
393
|
- spec/spec_helper.rb
|
394
394
|
- spec/thor/options_spec.rb
|
395
|
+
has_rdoc:
|