startapp 0.1.16 → 0.1.18
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/rhc/cli.rb +1 -1
- data/lib/rhc/commands.rb +1 -1
- data/lib/rhc/commands/account.rb +1 -1
- data/lib/rhc/commands/app.rb +6 -6
- data/lib/rhc/commands/authorization.rb +4 -4
- data/lib/rhc/commands/cartridge.rb +3 -3
- data/lib/rhc/commands/create.rb +5 -5
- data/lib/rhc/commands/deploy.rb +1 -1
- data/lib/rhc/commands/domain.rb +1 -1
- data/lib/rhc/commands/git_clone.rb +1 -1
- data/lib/rhc/commands/setup.rb +2 -2
- data/lib/rhc/commands/snapshot.rb +1 -1
- data/lib/rhc/config.rb +3 -3
- data/lib/rhc/context_helper.rb +1 -1
- data/lib/rhc/helpers.rb +3 -3
- data/lib/rhc/rest/client.rb +3 -3
- data/lib/rhc/wizard.rb +10 -10
- data/spec/rhc/cli_spec.rb +3 -3
- data/spec/rhc/command_spec.rb +1 -1
- data/spec/rhc/commands/authorization_spec.rb +1 -1
- data/spec/rhc/commands/setup_spec.rb +1 -1
- data/spec/rhc/rest_spec.rb +1 -1
- data/spec/rhc/wizard_spec.rb +7 -6
- data/spec/wizard_spec_helper.rb +2 -2
- metadata +32 -14
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e15fffaccf0fa00412085666ea0d23ae689a38ac
|
4
|
+
data.tar.gz: 8283f46d154f9d11ffc7c5885c1afeac1defe892
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 51763ff87c95d7c27ca065c6a4409ea5a37767eb556e1826ddebb4e0265fa79ba876d46bb4381d4b783d44535ca77fb3a9d85b17da55c52e3aacb046c39295d5
|
7
|
+
data.tar.gz: ff6f90063cf12f6028e52fe0b156d681fab9c82a08a28d797b0c10e76b317e37327f789a617d43246093ab212ed619e001f5e6ed92c157fd860b0347d2fed0d1
|
data/lib/rhc/cli.rb
CHANGED
@@ -28,7 +28,7 @@ module RHC
|
|
28
28
|
Commander::Runner.instance_variable_set :@singleton, runner
|
29
29
|
|
30
30
|
program :name, 'app'
|
31
|
-
program :description, 'Command line interface for
|
31
|
+
program :description, 'Command line interface for CloudStrap Cloud.'
|
32
32
|
program :version, RHC::VERSION::STRING
|
33
33
|
program :help_formatter, RHC::HelpFormatter
|
34
34
|
program :int_message, " Interrupted\n"
|
data/lib/rhc/commands.rb
CHANGED
@@ -206,7 +206,7 @@ module RHC
|
|
206
206
|
config.has_local_config? or
|
207
207
|
config.has_opts_config?)
|
208
208
|
|
209
|
-
$stderr.puts RHC::Helpers.color("You have not yet configured the
|
209
|
+
$stderr.puts RHC::Helpers.color("You have not yet configured the CloudStrap client tools. Please run 'app setup'.", :yellow)
|
210
210
|
end
|
211
211
|
end
|
212
212
|
|
data/lib/rhc/commands/account.rb
CHANGED
@@ -2,7 +2,7 @@ module RHC::Commands
|
|
2
2
|
class Account < Base
|
3
3
|
suppress_wizard
|
4
4
|
|
5
|
-
summary "Display details about your
|
5
|
+
summary "Display details about your CloudStrap account"
|
6
6
|
description <<-DESC
|
7
7
|
Shows who you are logged in to the server as and the capabilities
|
8
8
|
available to you on this server.
|
data/lib/rhc/commands/app.rb
CHANGED
@@ -8,7 +8,7 @@ module RHC::Commands
|
|
8
8
|
class App < Base
|
9
9
|
summary "Commands for creating and managing applications"
|
10
10
|
description <<-DESC
|
11
|
-
Creates and controls an
|
11
|
+
Creates and controls an CloudStrap application. To see the list of all
|
12
12
|
applications use the app domain show command. Note that delete is not
|
13
13
|
reversible and will stop your application and then remove the application
|
14
14
|
and repo from the remote server. No local changes are made.
|
@@ -19,17 +19,17 @@ module RHC::Commands
|
|
19
19
|
|
20
20
|
summary "Create an application"
|
21
21
|
description <<-DESC
|
22
|
-
Create an application. Every
|
22
|
+
Create an application. Every CloudStrap application must have one
|
23
23
|
web cartridge which serves web requests, and can have a number of
|
24
24
|
other cartridges which provide capabilities like databases,
|
25
25
|
scheduled jobs, or continuous integration.
|
26
26
|
|
27
27
|
You can see a list of all valid cartridge types by running
|
28
|
-
'app cartridge list'.
|
28
|
+
'app cartridge list'. CloudStrap also supports downloading cartridges -
|
29
29
|
pass a URL in place of the cartridge name and we'll download
|
30
30
|
and install that cartridge into your app. Keep in mind that
|
31
31
|
these cartridges receive no security updates. Note that not
|
32
|
-
all
|
32
|
+
all CloudStrap servers allow downloaded cartridges.
|
33
33
|
|
34
34
|
When your application is created, a URL combining the name of
|
35
35
|
your app and the name of your domain will be registered in DNS.
|
@@ -39,7 +39,7 @@ module RHC::Commands
|
|
39
39
|
structures - check the README provided with the cartridge if
|
40
40
|
you have questions.
|
41
41
|
|
42
|
-
|
42
|
+
CloudStrap runs the components of your application on small virtual
|
43
43
|
servers called "gears". Each account or plan is limited to a number
|
44
44
|
of gears which you can use across multiple applications. Some
|
45
45
|
accounts or plans provide access to gears with more memory or more
|
@@ -732,7 +732,7 @@ WARNING: Your application was created successfully but had problems during
|
|
732
732
|
Please contact us if you are unable to successfully create your
|
733
733
|
application:
|
734
734
|
|
735
|
-
Support - support@
|
735
|
+
Support - support@cloudstrap.io
|
736
736
|
|
737
737
|
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
738
738
|
|
@@ -4,7 +4,7 @@ module RHC::Commands
|
|
4
4
|
summary "Manage your authorization tokens"
|
5
5
|
syntax "<action>"
|
6
6
|
description <<-DESC
|
7
|
-
An authorization token grants access to the
|
7
|
+
An authorization token grants access to the CloudStrap REST API with a
|
8
8
|
set of privileges called 'scopes' for a limited time. You can add an
|
9
9
|
optional note to each authorization token to assist you in remembering
|
10
10
|
why it was created.
|
@@ -25,7 +25,7 @@ module RHC::Commands
|
|
25
25
|
Shows the full list of authorization tokens on your account. You
|
26
26
|
can add, edit, or delete authorizations with subcommands.
|
27
27
|
|
28
|
-
An authorization token grants access to the
|
28
|
+
An authorization token grants access to the CloudStrap REST API with
|
29
29
|
a set of privileges called 'scopes' for a limited time. You can
|
30
30
|
add an optional note to each authorization token to assist you in
|
31
31
|
remembering what is available.
|
@@ -45,7 +45,7 @@ module RHC::Commands
|
|
45
45
|
syntax "--scopes SCOPES [--note NOTE] [--expires-in SECONDS]"
|
46
46
|
description <<-DESC
|
47
47
|
Add an authorization to your account. An authorization token grants
|
48
|
-
access to the
|
48
|
+
access to the CloudStrap REST API with a set of privileges called 'scopes'
|
49
49
|
for a limited time. You can add an optional note to each authorization
|
50
50
|
token to assist you in remembering what is available.
|
51
51
|
|
@@ -81,7 +81,7 @@ module RHC::Commands
|
|
81
81
|
description <<-DESC
|
82
82
|
Delete one or more of the authorization tokens associated with
|
83
83
|
your account. After deletion, any clients using the token will
|
84
|
-
no longer have access to
|
84
|
+
no longer have access to CloudStrap and will need to reauthenticate.
|
85
85
|
DESC
|
86
86
|
argument :auth_token, "The token you wish to delete", ['--auth-token TOKEN'], :type => :list
|
87
87
|
def delete(tokens)
|
@@ -6,7 +6,7 @@ module RHC::Commands
|
|
6
6
|
summary "Manage your application cartridges"
|
7
7
|
syntax "<action>"
|
8
8
|
description <<-DESC
|
9
|
-
Cartridges add functionality to
|
9
|
+
Cartridges add functionality to CloudStrap applications. Each application
|
10
10
|
has one web cartridge to listen for HTTP requests, and any number
|
11
11
|
of addon cartridges. Addons may include databases like MySQL and Mongo,
|
12
12
|
administrative tools like phpMyAdmin, or build clients like Jenkins.
|
@@ -17,11 +17,11 @@ module RHC::Commands
|
|
17
17
|
(like Jenkins) or provide environment variables.
|
18
18
|
|
19
19
|
Use the 'cartridges' command to see a list of all available cartridges.
|
20
|
-
Add a new cartridge to your application with 'add-cartridge'.
|
20
|
+
Add a new cartridge to your application with 'add-cartridge'. CloudStrap
|
21
21
|
also supports downloading cartridges - pass a URL in place of the cartridge
|
22
22
|
name and we'll download and install that cartridge into your app. Keep
|
23
23
|
in mind that these cartridges receive no security updates. Note that
|
24
|
-
not all
|
24
|
+
not all CloudStrap servers allow downloaded cartridges.
|
25
25
|
|
26
26
|
For scalable applications, use the 'cartridge-scale' command on the web
|
27
27
|
cartridge to set the minimum and maximum scale.
|
data/lib/rhc/commands/create.rb
CHANGED
@@ -7,17 +7,17 @@ module RHC::Commands
|
|
7
7
|
|
8
8
|
summary "Create an application"
|
9
9
|
description <<-DESC
|
10
|
-
Create an application. Every
|
10
|
+
Create an application. Every CloudStrap application must have one
|
11
11
|
web cartridge which serves web requests, and can have a number of
|
12
12
|
other cartridges which provide capabilities like databases,
|
13
13
|
scheduled jobs, or continuous integration.
|
14
14
|
|
15
15
|
You can see a list of all valid cartridge types by running
|
16
|
-
'app cartridge list'.
|
16
|
+
'app cartridge list'. CloudStrap also supports downloading cartridges -
|
17
17
|
pass a URL in place of the cartridge name and we'll download
|
18
18
|
and install that cartridge into your app. Keep in mind that
|
19
19
|
these cartridges receive no security updates. Note that not
|
20
|
-
all
|
20
|
+
all CloudStrap servers allow downloaded cartridges.
|
21
21
|
|
22
22
|
When your application is created, a URL combining the name of
|
23
23
|
your app and the name of your domain will be registered in DNS.
|
@@ -27,7 +27,7 @@ module RHC::Commands
|
|
27
27
|
structures - check the README provided with the cartridge if
|
28
28
|
you have questions.
|
29
29
|
|
30
|
-
|
30
|
+
CloudStrap runs the components of your application on small virtual
|
31
31
|
servers called "gears". Each account or plan is limited to a number
|
32
32
|
of gears which you can use across multiple applications. Some
|
33
33
|
accounts or plans provide access to gears with more memory or more
|
@@ -70,7 +70,7 @@ module RHC::Commands
|
|
70
70
|
private
|
71
71
|
|
72
72
|
def get_quickstarts
|
73
|
-
@response ||= Net::HTTP.get(URI.parse('http://install.
|
73
|
+
@response ||= Net::HTTP.get(URI.parse('http://install.cloudstrap.io/q/quickstarts.json'))
|
74
74
|
JSON.parse @response
|
75
75
|
end
|
76
76
|
|
data/lib/rhc/commands/deploy.rb
CHANGED
@@ -6,7 +6,7 @@ module RHC::Commands
|
|
6
6
|
summary "Deploy a git reference or binary file of an application"
|
7
7
|
syntax "<ref> --app NAME [--namespace NAME]"
|
8
8
|
description <<-DESC
|
9
|
-
By default
|
9
|
+
By default CloudStrap applications prepare, distribute, and activate deployments
|
10
10
|
on every git push. Alternatively, a user may choose to disable automatic
|
11
11
|
deployments and use 'app deploy' and 'app deployment' commands to fully control the
|
12
12
|
deployment lifecycle.
|
data/lib/rhc/commands/domain.rb
CHANGED
@@ -5,7 +5,7 @@ module RHC::Commands
|
|
5
5
|
summary "Add or rename the container for your apps"
|
6
6
|
syntax "<action>"
|
7
7
|
description <<-DESC
|
8
|
-
All
|
8
|
+
All CloudStrap applications must belong to a domain. The name of the domain
|
9
9
|
will be used as part of the public URL for an application.
|
10
10
|
|
11
11
|
For example, when creating a domain with the name "test", any applications
|
@@ -23,7 +23,7 @@ module RHC::Commands
|
|
23
23
|
|
24
24
|
0
|
25
25
|
else
|
26
|
-
error "You do not have git installed. In order to fully interact with
|
26
|
+
error "You do not have git installed. In order to fully interact with CloudStrap you will need to install and configure a git client."
|
27
27
|
2
|
28
28
|
end
|
29
29
|
end
|
data/lib/rhc/commands/setup.rb
CHANGED
@@ -6,9 +6,9 @@ module RHC::Commands
|
|
6
6
|
class Setup < Base
|
7
7
|
suppress_wizard
|
8
8
|
|
9
|
-
summary "Connects to
|
9
|
+
summary "Connects to CloudStrap and sets up your keys and domain"
|
10
10
|
description <<-DESC
|
11
|
-
Connects to an
|
11
|
+
Connects to an CloudStrap server to get you started. Will help you
|
12
12
|
configure your SSH keys, set up a domain, and check for any potential
|
13
13
|
problems with Git or SSH.
|
14
14
|
|
@@ -5,7 +5,7 @@ module RHC::Commands
|
|
5
5
|
summary "Save the current state of your application locally"
|
6
6
|
syntax "<action>"
|
7
7
|
description <<-DESC
|
8
|
-
Snapshots allow you to export the current state of your
|
8
|
+
Snapshots allow you to export the current state of your CloudStrap application
|
9
9
|
into an archive on your local system, and then to restore it later.
|
10
10
|
|
11
11
|
The snapshot archive contains the Git repository, dumps of any attached databases,
|
data/lib/rhc/config.rb
CHANGED
@@ -49,13 +49,13 @@ module RHC
|
|
49
49
|
# Option name [config_key type comment_string_for_config]
|
50
50
|
# if nil, == key nil == string won't be written to file if nil
|
51
51
|
OPTIONS = {
|
52
|
-
:server => ['libra_server', nil, 'The
|
53
|
-
:rhlogin => ['default_rhlogin', nil, 'Your
|
52
|
+
:server => ['libra_server', nil, 'The CloudStrap server to connect to'],
|
53
|
+
:rhlogin => ['default_rhlogin', nil, 'Your CloudStrap login name'],
|
54
54
|
:password => nil,
|
55
55
|
:use_authorization_tokens =>
|
56
56
|
[nil, :boolean, 'If true, the server will attempt to create and use authorization tokens to connect to the server'],
|
57
57
|
:timeout => [nil, :integer, 'The default timeout for network operations'],
|
58
|
-
:insecure => [nil, :boolean, "If true, certificate errors will be ignored.\nWARNING: This may allow others to eavesdrop on your communication with
|
58
|
+
:insecure => [nil, :boolean, "If true, certificate errors will be ignored.\nWARNING: This may allow others to eavesdrop on your communication with CloudStrap."],
|
59
59
|
:ssl_version => [nil, nil, 'The SSL protocol version to use when connecting to this server'],
|
60
60
|
:ssl_client_cert_file => [nil, :path_to_file, 'A client certificate file for use with your server'],
|
61
61
|
:ssl_ca_file => [nil, :path_to_file, 'A file containing CA one or more certificates'],
|
data/lib/rhc/context_helper.rb
CHANGED
@@ -131,7 +131,7 @@ module RHC
|
|
131
131
|
rest_client.find_application(domain, app, opts)
|
132
132
|
end
|
133
133
|
else
|
134
|
-
raise ArgumentError, "You must specify an application with -a, or run this command from within Git directory cloned from
|
134
|
+
raise ArgumentError, "You must specify an application with -a, or run this command from within Git directory cloned from CloudStrap."
|
135
135
|
end
|
136
136
|
end
|
137
137
|
|
data/lib/rhc/helpers.rb
CHANGED
@@ -102,13 +102,13 @@ module RHC
|
|
102
102
|
# Global config
|
103
103
|
#
|
104
104
|
|
105
|
-
global_option '-l', '--rhlogin LOGIN', "
|
106
|
-
global_option '-p', '--password PASSWORD', "
|
105
|
+
global_option '-l', '--rhlogin LOGIN', "CloudStrap login"
|
106
|
+
global_option '-p', '--password PASSWORD', "CloudStrap password"
|
107
107
|
global_option '--token TOKEN', "An authorization token for accessing your account."
|
108
108
|
|
109
109
|
global_option '-d', '--debug', "Turn on debugging", :hide => true
|
110
110
|
|
111
|
-
global_option '--server NAME', String, 'An
|
111
|
+
global_option '--server NAME', String, 'An CloudStrap server hostname (default: api.startappcloud.com)'
|
112
112
|
global_option '-k', '--insecure', "Allow insecure SSL connections. Potential security risk.", :hide => true
|
113
113
|
|
114
114
|
global_option '--limit INTEGER', Integer, "Maximum number of simultaneous operations to execute.", :hide => true
|
data/lib/rhc/rest/client.rb
CHANGED
@@ -455,7 +455,7 @@ module RHC
|
|
455
455
|
rescue SocketError, Errno::ECONNREFUSED => e
|
456
456
|
raise ConnectionException.new(
|
457
457
|
"Unable to connect to the server (#{e.message})."\
|
458
|
-
"#{client.proxy.present? ? " Check that you have correctly specified your proxy server '#{client.proxy}' as well as your
|
458
|
+
"#{client.proxy.present? ? " Check that you have correctly specified your proxy server '#{client.proxy}' as well as your CloudStrap server '#{args[1]}'." : " Check that you have correctly specified your CloudStrap server '#{args[1]}'."}")
|
459
459
|
rescue Errno::ECONNRESET => e
|
460
460
|
raise ConnectionException.new(
|
461
461
|
"The server has closed the connection unexpectedly (#{e.message}). Your last operation may still be running on the server; please check before retrying your last request.")
|
@@ -589,7 +589,7 @@ module RHC
|
|
589
589
|
return true if i == 0 && args[0] == :get
|
590
590
|
raise ConnectionException.new(
|
591
591
|
"An error occurred while communicating with the server. This problem may only be temporary."\
|
592
|
-
"#{client.proxy.present? ? " Check that you have correctly specified your proxy server '#{client.proxy}' as well as your
|
592
|
+
"#{client.proxy.present? ? " Check that you have correctly specified your proxy server '#{client.proxy}' as well as your CloudStrap server '#{args[1]}'." : " Check that you have correctly specified your CloudStrap server '#{args[1]}'."}")
|
593
593
|
end
|
594
594
|
end
|
595
595
|
|
@@ -695,7 +695,7 @@ module RHC
|
|
695
695
|
"The server did not respond correctly. This may be an issue "\
|
696
696
|
"with the server configuration or with your connection to the "\
|
697
697
|
"server (such as a Web proxy or firewall)."\
|
698
|
-
"#{client.proxy.present? ? " Please verify that your proxy server is working correctly (#{client.proxy}) and that you can access the
|
698
|
+
"#{client.proxy.present? ? " Please verify that your proxy server is working correctly (#{client.proxy}) and that you can access the CloudStrap server #{url}" : " Please verify that you can access the CloudStrap server #{url}"}"
|
699
699
|
end
|
700
700
|
|
701
701
|
def handle_error!(response, url, client)
|
data/lib/rhc/wizard.rb
CHANGED
@@ -155,7 +155,7 @@ module RHC
|
|
155
155
|
#
|
156
156
|
|
157
157
|
def greeting_stage
|
158
|
-
info "
|
158
|
+
info "CloudStrap Client Tools (app) Setup Wizard"
|
159
159
|
|
160
160
|
paragraph do
|
161
161
|
say "This wizard will help you upload your SSH keys, set your application namespace, and check that other programs like Git are properly installed."
|
@@ -185,7 +185,7 @@ module RHC
|
|
185
185
|
warn "The server's certificate could not be verified, which means that a secure connection can't be established to '#{openshift_server}'."
|
186
186
|
end
|
187
187
|
if openshift_online_server?
|
188
|
-
paragraph{ warn "This may mean that a server between you and
|
188
|
+
paragraph{ warn "This may mean that a server between you and CloudStrap is capable of accessing information sent from this client. If you wish to continue without checking the certificate, please pass the -k (or --insecure) option to this command." }
|
189
189
|
return
|
190
190
|
else
|
191
191
|
paragraph{ warn "You may bypass this check, but any data you send to the server could be intercepted by others." }
|
@@ -202,7 +202,7 @@ module RHC
|
|
202
202
|
|
203
203
|
if rest_client.supports_sessions? && !options.token && options.create_token != false
|
204
204
|
paragraph do
|
205
|
-
info "
|
205
|
+
info "CloudStrap can create and store a token on disk which allows to you to access the server without using your password. The key is stored in your home directory and should be kept secret. You can delete the key at any time by running 'app logout'."
|
206
206
|
if options.create_token or agree "Generate a token now? (yes|no) "
|
207
207
|
say "Generating an authorization token for this client ... "
|
208
208
|
token = rest_client.new_session
|
@@ -257,13 +257,13 @@ module RHC
|
|
257
257
|
return true if ssh_key_uploaded?
|
258
258
|
|
259
259
|
upload = paragraph do
|
260
|
-
agree "Your public SSH key must be uploaded to the
|
260
|
+
agree "Your public SSH key must be uploaded to the CloudStrap server to access code. Upload now? (yes|no) "
|
261
261
|
end
|
262
262
|
|
263
263
|
if upload
|
264
264
|
if ssh_keys.empty?
|
265
265
|
paragraph do
|
266
|
-
info "Since you do not have any keys associated with your
|
266
|
+
info "Since you do not have any keys associated with your CloudStrap account, "\
|
267
267
|
"your new key will be uploaded as the 'default' key."
|
268
268
|
upload_ssh_key('default')
|
269
269
|
end
|
@@ -503,7 +503,7 @@ module RHC
|
|
503
503
|
###
|
504
504
|
def finalize_stage
|
505
505
|
paragraph do
|
506
|
-
say "The
|
506
|
+
say "The CloudStrap client tools have been configured on your computer. " \
|
507
507
|
"You can run this setup wizard at any time by using the command 'app setup' " \
|
508
508
|
"We will now execute your original " \
|
509
509
|
"command (app #{ARGV.join(" ")})"
|
@@ -555,7 +555,7 @@ module RHC
|
|
555
555
|
paragraph do
|
556
556
|
say "Automated installation of client tools is not supported for " \
|
557
557
|
"your platform. You will need to manually install git for full " \
|
558
|
-
"
|
558
|
+
"CloudStrap functionality."
|
559
559
|
end
|
560
560
|
end
|
561
561
|
end
|
@@ -567,11 +567,11 @@ module RHC
|
|
567
567
|
# print out urls and some instructions
|
568
568
|
warn <<EOF
|
569
569
|
|
570
|
-
In order to fully interact with
|
570
|
+
In order to fully interact with CloudStrap you will need to install and configure a git client if you have not already done so.
|
571
571
|
|
572
|
-
Documentation for installing other tools you will need for
|
572
|
+
Documentation for installing other tools you will need for CloudStrap can be found at:
|
573
573
|
|
574
|
-
* http://docs.
|
574
|
+
* http://docs.cloudstrap.io/getting-started/app-client-tools-install.html
|
575
575
|
* https://openshift.redhat.com/community/developers/install-the-client-tools
|
576
576
|
|
577
577
|
We recommend these free applications:
|
data/spec/rhc/cli_spec.rb
CHANGED
@@ -5,7 +5,7 @@ describe RHC::CLI do
|
|
5
5
|
|
6
6
|
shared_examples_for 'a global help page' do
|
7
7
|
let(:arguments) { @arguments or raise "no arguments" }
|
8
|
-
it('should contain the program description') { run_output.should =~ /Command line interface for
|
8
|
+
it('should contain the program description') { run_output.should =~ /Command line interface for CloudStrap/ }
|
9
9
|
it('should describe getting started') { run_output.should =~ /Getting started:/ }
|
10
10
|
it('should describe basic command') { run_output.should =~ /Working with apps:/ }
|
11
11
|
it('should mention the help command') { run_output.should =~ /See 'app help <command>'/ }
|
@@ -21,7 +21,7 @@ describe RHC::CLI do
|
|
21
21
|
|
22
22
|
shared_examples_for 'a help page' do
|
23
23
|
let(:arguments) { @arguments or raise "no arguments" }
|
24
|
-
it('should contain the program description') { run_output.should =~ /Command line interface for
|
24
|
+
it('should contain the program description') { run_output.should =~ /Command line interface for CloudStrap/ }
|
25
25
|
it('should contain the global options') { run_output.should =~ /Global Options/ }
|
26
26
|
it('should provide a --config switch') { run_output.should =~ /\-\-config FILE/ }
|
27
27
|
end
|
@@ -118,7 +118,7 @@ describe RHC::CLI do
|
|
118
118
|
context 'with help and a single matching command segment' do
|
119
119
|
let(:arguments){ ['help', 'app creat'] }
|
120
120
|
it("prints the usage for the command"){ run_output.should match('Usage: app app-create <') }
|
121
|
-
it("prints part of the description for the command"){ run_output.should match('
|
121
|
+
it("prints part of the description for the command"){ run_output.should match('CloudStrap runs the components of your') }
|
122
122
|
it("prints a local option"){ run_output.should match('--namespace NAME') }
|
123
123
|
end
|
124
124
|
|
data/spec/rhc/command_spec.rb
CHANGED
@@ -66,7 +66,7 @@ describe RHC::Commands::Base do
|
|
66
66
|
expects_running('test').should call(:run).on(instance).with(no_args)
|
67
67
|
wizard_run.should be_false
|
68
68
|
|
69
|
-
stderr.should match("You have not yet configured the
|
69
|
+
stderr.should match("You have not yet configured the CloudStrap client tools")
|
70
70
|
end
|
71
71
|
end
|
72
72
|
end
|
@@ -46,7 +46,7 @@ describe RHC::Commands::Authorization do
|
|
46
46
|
describe '#run' do
|
47
47
|
let(:arguments) { ['authorization']}
|
48
48
|
context 'given no arguments' do
|
49
|
-
it('should display help'){ run_output.should =~ /An authorization token grants access to the
|
49
|
+
it('should display help'){ run_output.should =~ /An authorization token grants access to the CloudStrap REST API.*To see all your authorizations/m }
|
50
50
|
it 'should ask for an argument' do
|
51
51
|
expect{ run }.to exit_with_code(1)
|
52
52
|
end
|
@@ -98,7 +98,7 @@ describe RHC::Commands::Setup do
|
|
98
98
|
@wizard.stub(:run).and_return(true)
|
99
99
|
expect { run }.to exit_with_code(0)
|
100
100
|
end
|
101
|
-
it('should output usage') { run_output.should match("Connects to an
|
101
|
+
it('should output usage') { run_output.should match("Connects to an CloudStrap server to get you started. Will") }
|
102
102
|
end
|
103
103
|
end
|
104
104
|
|
data/spec/rhc/rest_spec.rb
CHANGED
@@ -683,7 +683,7 @@ module RHC
|
|
683
683
|
let(:code){ 500 }
|
684
684
|
|
685
685
|
it "raises a generic server error" do
|
686
|
-
method.should raise_error(RHC::Rest::ServerErrorException, /server did not respond correctly.*verify that you can access the
|
686
|
+
method.should raise_error(RHC::Rest::ServerErrorException, /server did not respond correctly.*verify that you can access the CloudStrap server/i)
|
687
687
|
end
|
688
688
|
|
689
689
|
context "when proxy is set" do
|
data/spec/rhc/wizard_spec.rb
CHANGED
@@ -23,7 +23,7 @@ describe RHC::Wizard do
|
|
23
23
|
|
24
24
|
describe "#finalize_stage" do
|
25
25
|
subject{ described_class.new(config, options) }
|
26
|
-
before{ subject.should_receive(:say).with(/The
|
26
|
+
before{ subject.should_receive(:say).with(/The CloudStrap client tools have been configured/) }
|
27
27
|
it{ subject.send(:finalize_stage).should be_true }
|
28
28
|
end
|
29
29
|
|
@@ -146,7 +146,7 @@ describe RHC::Wizard do
|
|
146
146
|
expect_raise_from_api(RHC::Rest::SelfSignedCertificate.new('reason', 'message'))
|
147
147
|
subject.should_receive(:warn).with(/server's certificate is self-signed/).ordered
|
148
148
|
subject.should_receive(:openshift_online_server?).ordered.and_return(true)
|
149
|
-
subject.should_receive(:warn).with(/server between you and
|
149
|
+
subject.should_receive(:warn).with(/server between you and CloudStrap/).ordered
|
150
150
|
|
151
151
|
subject.send(:login_stage).should be_nil
|
152
152
|
end
|
@@ -155,7 +155,7 @@ describe RHC::Wizard do
|
|
155
155
|
expect_raise_from_api(RHC::Rest::CertificateVerificationFailed.new('reason', 'message'))
|
156
156
|
subject.should_receive(:warn).with(/server's certificate could not be verified/).ordered
|
157
157
|
subject.should_receive(:openshift_online_server?).ordered.and_return(true)
|
158
|
-
subject.should_receive(:warn).with(/server between you and
|
158
|
+
subject.should_receive(:warn).with(/server between you and CloudStrap/).ordered
|
159
159
|
|
160
160
|
subject.send(:login_stage).should be_nil
|
161
161
|
end
|
@@ -192,7 +192,7 @@ describe RHC::Wizard do
|
|
192
192
|
it "should check for an existing token" do
|
193
193
|
store.should_receive(:get).and_return(nil)
|
194
194
|
|
195
|
-
subject.should_receive(:info).with(/
|
195
|
+
subject.should_receive(:info).with(/CloudStrap can create and store a token on disk/).ordered
|
196
196
|
subject.should_receive(:agree).with(/Generate a token now?/).ordered.and_return(false)
|
197
197
|
|
198
198
|
subject.send(:login_stage).should be_true
|
@@ -209,7 +209,7 @@ describe RHC::Wizard do
|
|
209
209
|
|
210
210
|
it "should not generate a token if the user does not request it" do
|
211
211
|
store.should_not_receive(:get)
|
212
|
-
subject.should_receive(:info).with(/
|
212
|
+
subject.should_receive(:info).with(/CloudStrap can create and store a token on disk/).ordered
|
213
213
|
subject.should_receive(:agree).with(/Generate a token now?/).ordered.and_return(false)
|
214
214
|
|
215
215
|
subject.send(:login_stage).should be_true
|
@@ -218,7 +218,7 @@ describe RHC::Wizard do
|
|
218
218
|
|
219
219
|
it "should generate a token if the user requests it" do
|
220
220
|
store.should_not_receive(:get)
|
221
|
-
subject.should_receive(:info).with(/
|
221
|
+
subject.should_receive(:info).with(/CloudStrap can create and store a token on disk/).ordered
|
222
222
|
subject.should_receive(:agree).with(/Generate a token now?/).ordered.and_return(true)
|
223
223
|
subject.should_receive(:say).with(/Generating an authorization token for this client /).ordered
|
224
224
|
rest_client.should_receive(:new_session).ordered.and_return(auth_token)
|
@@ -553,6 +553,7 @@ describe RHC::Wizard do
|
|
553
553
|
setup_mock_ssh_keys(dir)
|
554
554
|
pub_ssh = File.join dir, "id_rsa.pub"
|
555
555
|
fallback_fingerprint = wizard.send :ssh_keygen_fallback, pub_ssh
|
556
|
+
puts fallback_fingerprint
|
556
557
|
internal_fingerprint, short_name = wizard.get_key_fingerprint pub_ssh
|
557
558
|
|
558
559
|
fallback_fingerprint.should == internal_fingerprint
|
data/spec/wizard_spec_helper.rb
CHANGED
@@ -5,7 +5,7 @@ module WizardStepsHelper
|
|
5
5
|
|
6
6
|
last_output do |s|
|
7
7
|
s.count("\n").should >= 3
|
8
|
-
s.should match(/
|
8
|
+
s.should match(/CloudStrap Client Tools \(app\) Setup Wizard/)
|
9
9
|
end
|
10
10
|
end
|
11
11
|
|
@@ -96,7 +96,7 @@ module WizardStepsHelper
|
|
96
96
|
|
97
97
|
last_output do |s|
|
98
98
|
s.should match('Git for Windows')
|
99
|
-
s.should match('In order to fully interact with
|
99
|
+
s.should match('In order to fully interact with CloudStrap you will need to install and configure a git client')
|
100
100
|
end
|
101
101
|
end
|
102
102
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: startapp
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.18
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
|
-
-
|
7
|
+
- CloudStrap
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-12-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: net-ssh
|
@@ -17,6 +17,9 @@ dependencies:
|
|
17
17
|
- - '>='
|
18
18
|
- !ruby/object:Gem::Version
|
19
19
|
version: 2.0.11
|
20
|
+
- - <=
|
21
|
+
- !ruby/object:Gem::Version
|
22
|
+
version: 2.9.2
|
20
23
|
type: :runtime
|
21
24
|
prerelease: false
|
22
25
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -24,6 +27,9 @@ dependencies:
|
|
24
27
|
- - '>='
|
25
28
|
- !ruby/object:Gem::Version
|
26
29
|
version: 2.0.11
|
30
|
+
- - <=
|
31
|
+
- !ruby/object:Gem::Version
|
32
|
+
version: 2.9.2
|
27
33
|
- !ruby/object:Gem::Dependency
|
28
34
|
name: net-scp
|
29
35
|
requirement: !ruby/object:Gem::Requirement
|
@@ -107,6 +113,9 @@ dependencies:
|
|
107
113
|
- - '>='
|
108
114
|
- !ruby/object:Gem::Version
|
109
115
|
version: 2.4.0
|
116
|
+
- - <
|
117
|
+
- !ruby/object:Gem::Version
|
118
|
+
version: 2.7.0
|
110
119
|
type: :runtime
|
111
120
|
prerelease: false
|
112
121
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -114,6 +123,9 @@ dependencies:
|
|
114
123
|
- - '>='
|
115
124
|
- !ruby/object:Gem::Version
|
116
125
|
version: 2.4.0
|
126
|
+
- - <
|
127
|
+
- !ruby/object:Gem::Version
|
128
|
+
version: 2.7.0
|
117
129
|
- !ruby/object:Gem::Dependency
|
118
130
|
name: open4
|
119
131
|
requirement: !ruby/object:Gem::Requirement
|
@@ -183,6 +195,9 @@ dependencies:
|
|
183
195
|
- - '>='
|
184
196
|
- !ruby/object:Gem::Version
|
185
197
|
version: '0.4'
|
198
|
+
- - <
|
199
|
+
- !ruby/object:Gem::Version
|
200
|
+
version: 0.6.0
|
186
201
|
type: :development
|
187
202
|
prerelease: false
|
188
203
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -190,6 +205,9 @@ dependencies:
|
|
190
205
|
- - '>='
|
191
206
|
- !ruby/object:Gem::Version
|
192
207
|
version: '0.4'
|
208
|
+
- - <
|
209
|
+
- !ruby/object:Gem::Version
|
210
|
+
version: 0.6.0
|
193
211
|
- !ruby/object:Gem::Dependency
|
194
212
|
name: thor
|
195
213
|
requirement: !ruby/object:Gem::Requirement
|
@@ -208,16 +226,16 @@ dependencies:
|
|
208
226
|
name: cucumber
|
209
227
|
requirement: !ruby/object:Gem::Requirement
|
210
228
|
requirements:
|
211
|
-
- -
|
229
|
+
- - <=
|
212
230
|
- !ruby/object:Gem::Version
|
213
|
-
version:
|
231
|
+
version: 1.3.20
|
214
232
|
type: :development
|
215
233
|
prerelease: false
|
216
234
|
version_requirements: !ruby/object:Gem::Requirement
|
217
235
|
requirements:
|
218
|
-
- -
|
236
|
+
- - <=
|
219
237
|
- !ruby/object:Gem::Version
|
220
|
-
version:
|
238
|
+
version: 1.3.20
|
221
239
|
- !ruby/object:Gem::Dependency
|
222
240
|
name: activesupport
|
223
241
|
requirement: !ruby/object:Gem::Requirement
|
@@ -232,9 +250,9 @@ dependencies:
|
|
232
250
|
- - ~>
|
233
251
|
- !ruby/object:Gem::Version
|
234
252
|
version: '3.0'
|
235
|
-
description:
|
236
|
-
management.
|
237
|
-
email: support@
|
253
|
+
description: startapp is a command line tool for the CloudStrap.io platform that allow
|
254
|
+
for application management and easy start for new apps.
|
255
|
+
email: support@cloudstrap.io
|
238
256
|
executables:
|
239
257
|
- app
|
240
258
|
extensions: []
|
@@ -398,15 +416,15 @@ files:
|
|
398
416
|
- spec/rhc/wizard_spec.rb
|
399
417
|
- spec/spec_helper.rb
|
400
418
|
- spec/wizard_spec_helper.rb
|
401
|
-
homepage: https://github.com/
|
419
|
+
homepage: https://github.com/cloudstrap/app
|
402
420
|
licenses: []
|
403
421
|
metadata: {}
|
404
422
|
post_install_message: |-
|
405
|
-
|
423
|
+
==================================================================================
|
406
424
|
|
407
|
-
If this is your first time installing the
|
425
|
+
If this is your first time installing the CloudStrap tools, please run 'app setup'
|
408
426
|
|
409
|
-
|
427
|
+
==================================================================================
|
410
428
|
rdoc_options: []
|
411
429
|
require_paths:
|
412
430
|
- lib
|