Skip to content

Support for non-interactive setUp #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
demarey wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Support for non-interactive setUp #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e021311
Add a non-interactive setup.
demarey Jul 7, 2014
44cc841
Refactor set up to be able to specify db host, port and db name.
demarey Jul 9, 2014
9916e8d
fix wrong method name
demarey Jul 9, 2014
7f75b5a
Add missing parameter to setUpWebsite
demarey Jul 9, 2014
974a888
fixes pb with adminUser.
demarey Jul 10, 2014
0342635
fixes pb with adminUser (again).
demarey Jul 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Marina.package/MRConfig.class/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
I store configuration elements for the Marina CMS.
I'm used by MRSetup.
3 changes: 3 additions & 0 deletions Marina.package/MRConfig.class/instance/adminUser..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
adminUser: anObject
adminUser := anObject
3 changes: 3 additions & 0 deletions Marina.package/MRConfig.class/instance/adminUser.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
adminUser
^ adminUser
3 changes: 3 additions & 0 deletions Marina.package/MRConfig.class/instance/dbHostname..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
dbHostname: anObject
dbHostname := anObject
3 changes: 3 additions & 0 deletions Marina.package/MRConfig.class/instance/dbHostname.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
dbHostname
^ dbHostname
3 changes: 3 additions & 0 deletions Marina.package/MRConfig.class/instance/dbName..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
dbName: anObject
dbName := anObject
3 changes: 3 additions & 0 deletions Marina.package/MRConfig.class/instance/dbName.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
dbName
^ dbName
3 changes: 3 additions & 0 deletions Marina.package/MRConfig.class/instance/dbPort..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
dbPort: anObject
dbPort := anObject
3 changes: 3 additions & 0 deletions Marina.package/MRConfig.class/instance/dbPort.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
dbPort
^ dbPort
3 changes: 3 additions & 0 deletions Marina.package/MRConfig.class/instance/hostname..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
hostname: anObject
hostname := anObject
3 changes: 3 additions & 0 deletions Marina.package/MRConfig.class/instance/hostname.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
hostname
^ hostname
8 changes: 8 additions & 0 deletions Marina.package/MRConfig.class/instance/initialize.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
initialization
initialize
super initialize.
hostname := 'localhost'.
port := 8080.
dbHostname := 'localhost'.
dbName := 'Marina'.
dbPort := 27017.
3 changes: 3 additions & 0 deletions Marina.package/MRConfig.class/instance/port..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
port: anObject
port := anObject
3 changes: 3 additions & 0 deletions Marina.package/MRConfig.class/instance/port.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
port
^ port
17 changes: 17 additions & 0 deletions Marina.package/MRConfig.class/methodProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"class" : {
},
"instance" : {
"adminUser" : "ChristopheDemarey 7/8/2014 09:11",
"adminUser:" : "ChristopheDemarey 7/8/2014 09:11",
"dbHostname" : "ChristopheDemarey 7/8/2014 09:22",
"dbHostname:" : "ChristopheDemarey 7/8/2014 09:22",
"dbName" : "ChristopheDemarey 7/8/2014 09:11",
"dbName:" : "ChristopheDemarey 7/8/2014 09:11",
"dbPort" : "ChristopheDemarey 7/8/2014 09:11",
"dbPort:" : "ChristopheDemarey 7/8/2014 09:11",
"hostname" : "ChristopheDemarey 7/8/2014 09:11",
"hostname:" : "ChristopheDemarey 7/8/2014 09:11",
"initialize" : "ChristopheDemarey 7/8/2014 09:22",
"port" : "ChristopheDemarey 7/8/2014 09:11",
"port:" : "ChristopheDemarey 7/8/2014 09:11" } }
19 changes: 19 additions & 0 deletions Marina.package/MRConfig.class/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"category" : "Marina-Models",
"classinstvars" : [
],
"classvars" : [
],
"commentStamp" : "ChristopheDemarey 7/8/2014 09:10",
"instvars" : [
"adminUser",
"hostname",
"port",
"dbPort",
"dbName",
"dbHostname" ],
"name" : "MRConfig",
"pools" : [
],
"super" : "Object",
"type" : "normal" }
17 changes: 17 additions & 0 deletions Marina.package/MRSetup.class/class/configure.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
public
configure
| config serverBasePath serverPort |
config := MRConfig new.
serverBasePath := UIManager default
request: 'Base path where the server is going to be deployed (e.g., www.marina.eu)'
initialAnswer: config hostname
title: 'Server base path'.
serverBasePath isEmptyOrNil
ifFalse: [ config hostname: serverBasePath ].
serverPort := UIManager default
request: 'Port where the server should listen to (e.g., 8080)'
initialAnswer: config port
title: 'Server port'.
serverPort isEmptyOrNil
ifFalse: [ config port: (Number readFrom: serverPort) ].
^ config
9 changes: 9 additions & 0 deletions Marina.package/MRSetup.class/class/nonInteractiveSetupWith..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
public
nonInteractiveSetupWith: aMarinaConfig
self
setupVoyageWith: aMarinaConfig;
dropDatabase;
setupWebsiteWithAdmin: aMarinaConfig adminUser.
self
startWebserverOn: aMarinaConfig hostname
port: aMarinaConfig port
10 changes: 4 additions & 6 deletions Marina.package/MRSetup.class/class/setupAll.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
public
setupAll
| config |
(self confirm: 'This will erase your marina database, are you *really* sure?')
ifTrue: [
self
setupVoyage;
dropDatabase;
setupWebsite;
setupWebserver ]
ifTrue: [
config := self configure.
self nonInteractiveSetupWith: config ]
6 changes: 0 additions & 6 deletions Marina.package/MRSetup.class/class/setupVoyage.st
View file
Open in desktop

This file was deleted.

9 changes: 9 additions & 0 deletions Marina.package/MRSetup.class/class/setupVoyageWith..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
public
setupVoyageWith: aMarinaConfig
| repository |
repository := VOMongoRepository
host: aMarinaConfig dbHostname
port: aMarinaConfig dbPort
database: aMarinaConfig dbName.
repository enableSingleton.
^ repository
9 changes: 0 additions & 9 deletions Marina.package/MRSetup.class/class/setupWebserver.st
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions Marina.package/MRSetup.class/class/setupWebsite.st
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions Marina.package/MRSetup.class/class/setupWebsiteWithAdmin..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
public
setupWebsiteWithAdmin: adminUserEmail
^ self new setupWebsiteWithAdmin: adminUserEmail
2 changes: 1 addition & 1 deletion ...p.class/class/startWebserverWith.port..st → ...tup.class/class/startWebserverOn.port..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
public
startWebserverWith: serverBasePath port: serverPort
startWebserverOn: serverBasePath port: serverPort
TDServer startOn: serverPort.
TDServer server serverUrl: 'http://', (serverBasePath trimRight: [:char | char = $/ ]).
8 changes: 1 addition & 7 deletions Marina.package/MRSetup.class/instance/createAdminUser.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
creation
createAdminUser
| user email |
user := MRUser new.
email := UIManager default request: 'Email of the admin user. This MUST be a valid email address.' initialAnswer: 'your.email@server.com' title: 'Email of admin'.
user email: email.
user fullName: email.
user save.
^ user
^ self createAdminUserWithEmail: nil
14 changes: 14 additions & 0 deletions Marina.package/MRSetup.class/instance/createAdminUserWithEmail..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
creation
createAdminUserWithEmail: aString
| user email |
user := MRUser new.
email := aString.
email ifNil: [
UIManager default
request: 'Email of the admin user. This MUST be a valid email address.'
initialAnswer: 'your.email@server.com'
title: 'Email of admin' ].
user email: email.
user fullName: email.
user save.
^ user
6 changes: 0 additions & 6 deletions Marina.package/MRSetup.class/instance/setupWebsite.st
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions Marina.package/MRSetup.class/instance/setupWebsiteWithAdmin..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
actions
setupWebsiteWithAdmin: adminUserEmail
MRStructure removeAll.
MRRoot removeAll.
MRUser removeAll.
adminUser := self createAdminUserWithEmail: adminUserEmail.
self root
18 changes: 10 additions & 8 deletions Marina.package/MRSetup.class/methodProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
{
"class" : {
"configure" : "ChristopheDemarey 7/8/2014 23:00",
"dropDatabase" : "DamienCassou 4/10/2014 18:03",
"setupAll" : "DamienCassou 4/14/2014 13:51",
"setupVoyage" : "DamienCassou 4/10/2014 11:31",
"setupWebserver" : "DamienCassou 4/14/2014 11:29",
"setupWebsite" : "DamienCassou 4/17/2014 10:50",
"startWebserverWith:port:" : "DamienCassou 4/14/2014 11:33" },
"nonInteractiveSetupWith:" : "ChristopheDemarey 7/10/2014 00:11",
"setupAll" : "ChristopheDemarey 7/9/2014 21:45",
"setupVoyageWith:" : "ChristopheDemarey 7/9/2014 21:43",
"setupWebsiteWithAdmin:" : "ChristopheDemarey 7/10/2014 00:39",
"startWebserverOn:port:" : "ChristopheDemarey 7/9/2014 21:39" },
"instance" : {
"adminUser" : "DamienCassou 4/16/2014 18:13",
"adminUser" : "ChristopheDemarey 7/9/2014 21:37",
"blog" : "DamienCassou 4/11/2014 06:14",
"blogPost1" : "DamienCassou 4/11/2014 06:17",
"blogTemplate" : "DamienCassou 4/14/2014 16:27",
"createAdminUser" : "DamienCassou 4/17/2014 10:45",
"createAdminUser" : "ChristopheDemarey 7/10/2014 15:18",
"createAdminUserWithEmail:" : "ChristopheDemarey 7/10/2014 15:18",
"createBlog" : "DamienCassou 4/14/2014 16:29",
"createBlogPost1" : "DamienCassou 4/15/2014 18:00",
"createBlogTemplate" : "NicolasPetton 4/23/2014 14:47",
Expand All @@ -25,4 +27,4 @@
"docPage" : "DamienCassou 4/14/2014 14:07",
"indexPage" : "DamienCassou 4/10/2014 11:15",
"root" : "DamienCassou 4/10/2014 11:15",
"setupWebsite" : "DamienCassou 4/17/2014 10:53" } }
"setupWebsiteWithAdmin:" : "ChristopheDemarey 7/10/2014 15:44" } }
Loading