Skip to content

Commit

Permalink
Merge pull request #10 from supervisorphp/ini
Browse files Browse the repository at this point in the history
Upgrade INI engine, closes #3
  • Loading branch information
sagikazarmark committed Jan 4, 2016
2 parents b64ff8a + a561556 commit 6088ca3
Show file tree
Hide file tree
Showing 62 changed files with 819 additions and 1,146 deletions.
14 changes: 5 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,23 @@
],
"require": {
"php": ">=5.4",
"indigophp/ini": "^0.2",
"league/flysystem": "^1.0",
"symfony/options-resolver": "^2.6|^3.0"
},
"require-dev": {
"league/flysystem": "^1.0",
"phpspec/phpspec": "^2.4",
"henrikbjorn/phpspec-code-coverage" : "^1.0"
},
"suggest": {
"league/flysystem": "Used by Filesystem Parsers/Writers"
},
"autoload": {
"psr-4": {
"Supervisor\\": "src/"
"Supervisor\\Configuration\\": "src/"
},
"files": ["src/functions.php"]
},
"autoload-dev": {
"psr-4": {
"Supervisor\\Stub\\": "stub/"
"spec\\Supervisor\\Configuration\\": "spec/"
}
},
"scripts": {
Expand All @@ -41,7 +39,5 @@
"branch-alias": {
"dev-master": "0.2-dev"
}
},
"prefer-stable": true,
"minimum-stability": "dev"
}
}
4 changes: 2 additions & 2 deletions phpspec.yml.ci
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
suites:
supervisor_configuration_suite:
namespace: Supervisor
psr4_prefix: Supervisor
namespace: Supervisor\Configuration
psr4_prefix: Supervisor\Configuration
formatter.name: pretty
extensions:
- PhpSpec\Extension\CodeCoverageExtension
Expand Down
4 changes: 2 additions & 2 deletions phpspec.yml.dist
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
suites:
supervisor_configuration_suite:
namespace: Supervisor
psr4_prefix: Supervisor
namespace: Supervisor\Configuration
psr4_prefix: Supervisor\Configuration
formatter.name: pretty
16 changes: 8 additions & 8 deletions resources/example.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ password = 123
[supervisord]
logfile = /tmp/supervisord.log
logfile_maxbytes = 50MB
logfile_backups=10 ;comment
logfile_backups=10
loglevel = info
pidfile = /tmp/supervisord.pid
nodaemon = false
Expand All @@ -26,7 +26,7 @@ directory = /tmp
nocleanup = true
childlogdir = /tmp
strip_ansi = false
environment = KEY1="value1",KEY2="value2"
environment = "KEY1="value1",KEY2="value2""

[supervisorctl]
serverurl = unix:///tmp/supervisor.sock
Expand All @@ -36,7 +36,7 @@ prompt = mysupervisor

[program:cat]
command = /bin/cat
process_name = %(program_name)s
process_name = "%(program_name)s"
numprocs = 1
directory = /tmp
umask = 022
Expand All @@ -58,12 +58,12 @@ stderr_logfile = /a/path
stderr_logfile_maxbytes = 1MB
stderr_logfile_backups = 10
stderr_capture_maxbytes = 1MB
environment = A="1",B="2"
environment = "A="1",B="2""
serverurl = AUTO

[program:cat2]
command = /bin/cat
process_name = %(program_name)s
process_name = "%(program_name)s"
numprocs = 1
directory = /tmp
umask = 022
Expand Down Expand Up @@ -101,10 +101,10 @@ priority = 999

[fcgi-program:fcgiprogramname]
command = /usr/bin/example.fcgi
socket = unix:///var/run/supervisor/%(program_name)s.sock
socket = "unix:///var/run/supervisor/%(program_name)s.sock"
socket_owner = chrism
socket_mode = 0700
process_name = %(program_name)s_%(process_num)02d
process_name = "%(program_name)s_%(process_num)02d"
numprocs = 5
priority = 999
autostart = true
Expand All @@ -127,7 +127,7 @@ serverurl = AUTO

[eventlistener:theeventlistenername]
command = /bin/eventlistener
process_name = %(program_name)s_%(process_num)02d
process_name = "%(program_name)s_%(process_num)02d"
numprocs = 5
events = PROCESS_STATE
buffer_size = 10
Expand Down
53 changes: 0 additions & 53 deletions spec/Configuration/Parser/FileSpec.php

This file was deleted.

51 changes: 0 additions & 51 deletions spec/Configuration/Parser/FilesystemSpec.php

This file was deleted.

46 changes: 0 additions & 46 deletions spec/Configuration/Parser/TextSpec.php

This file was deleted.

40 changes: 0 additions & 40 deletions spec/Configuration/RendererSpec.php

This file was deleted.

41 changes: 0 additions & 41 deletions spec/Configuration/Writer/FileSpec.php

This file was deleted.

Loading

0 comments on commit 6088ca3

Please sign in to comment.