Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
1d1a275
implements ArrayAccess, Iterator for config container.
c9s Apr 19, 2012
752a880
Update testing sample package.ini
c9s Apr 19, 2012
086fe31
Update test config
c9s Apr 19, 2012
b6f00a0
Add new INIParser class.
c9s Apr 19, 2012
fe71f60
ant-build CI config files
c9s May 23, 2012
18c0930
Merge branch 'master' into develop
c9s May 23, 2012
f48cc3f
Fix LibraryInstaller
c9s May 23, 2012
235798a
Fix package.ini style
c9s May 23, 2012
4bed0b9
Rename packages
c9s Jun 9, 2012
ecf3db0
progress handler setter
c9s Jun 9, 2012
1bc7ccd
check download size
c9s Jun 9, 2012
9b9bc2a
Rename bundle command to install command.
c9s Jun 9, 2012
e4a3cf5
Update todo
c9s Jun 9, 2012
04aa0d8
--quiet option support (curl downloader)
c9s Jun 9, 2012
c3a881c
Merge branch 'develop' of git.corneltek.com:php/Onion into develop
c9s Jun 14, 2012
41fe0e5
Update readme
c9s Jun 14, 2012
d215cb2
update readme for new command
c9s Jun 14, 2012
1252c72
Fix CurlKit class name
c9s Jun 19, 2012
185f1df
Remove PEARX tests
c9s Jun 19, 2012
b3a3887
remove tmp files
c9s Jun 19, 2012
aac1b01
Add tests/tmp to .gitignore file
c9s Jun 19, 2012
bb0ea97
Remvoe TestApp tests
c9s Jun 19, 2012
61c5ec1
Add new_package.ini
c9s Jun 19, 2012
0d59eec
remove var_dump
c9s Jun 19, 2012
b2367d0
rename getDownloader to createDownloader
c9s Jun 19, 2012
451c9a7
add base option to installer command
c9s Jun 19, 2012
fd5d944
document installer flow in doc/InstallerFlow.md
c9s Jun 19, 2012
e379380
use Onion\Installer
c9s Jun 19, 2012
828e2dd
Add workspace option to main Installer
c9s Jun 19, 2012
8687062
Update onion binary
c9s Jun 20, 2012
704953b
Let quiet option works!
c9s Jun 20, 2012
e50e312
Update onion binary
c9s Jun 20, 2012
167c786
Fix progress bar
c9s Jun 20, 2012
c1d806f
bump version
c9s Jun 23, 2012
43f7187
Build package.xml at 2012-06-23
c9s Jun 23, 2012
bd2d4ec
add script role
jaceju Jun 26, 2012
f680cee
Enable shell script role and fix installation.
jaceju Jun 26, 2012
8a9fd39
Use only bin folder to put shell script.
jaceju Jun 26, 2012
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
Prev Previous commit
Next Next commit
add script role
  • Loading branch information
jaceju committed Jun 26, 2012
commit bd2d4ec9ef34fd9419d43e54e5937a79de9f9fd7
10 changes: 4 additions & 6 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<email>[email protected]</email>
<active>yes</active>
</lead>
<date>2012-06-23</date>
<time>09:31:30</time>
<date>2012-06-26</date>
<time>16:27:36</time>
<version>
<release>1.4.0</release>
<api>1.4.0</api>
Expand All @@ -26,7 +26,6 @@
<contents>
<dir name="/">
<file name="doc/InstallerFlow.md" role="doc" md5sum="c90dc4974c13f6234207143f9e3b3b51"/>
<file name="doc/Package.md" role="doc" md5sum="f91a237502bbcab7236e8e34e9585f68"/>
<file name="doc/SPEC-v2.md" role="doc" md5sum="df50cefc5ca7f79b729b63c9329a1e95"/>
<file name="doc/SPEC.md" role="doc" md5sum="6d80a188581d0724ae9fdbe1ac0c2d7e"/>
<file name="examples/package.ini" role="doc" md5sum="eb08e83054a681d7ced8249b84a02cce"/>
Expand All @@ -53,7 +52,7 @@
<file name="src/CurlKit/Progress/ProgressInterface.php" role="php" md5sum="38c46e77d6045c6cb903e36fe2e2f214"/>
<file name="src/CurlKit/Progress/ProgressStar.php" role="php" md5sum="45284e6cb587732d5dfd621fde9693d2"/>
<file name="src/Onion/Application.php" role="php" md5sum="72d603eb7a8e791da0824e059197d759"/>
<file name="src/Onion/Command/BuildCommand.php" role="php" md5sum="da0e916c71f7a8395d70c9d5ff4ce228"/>
<file name="src/Onion/Command/BuildCommand.php" role="php" md5sum="adbac46127f85f42634bdf0a45f7b4da"/>
<file name="src/Onion/Command/CompileCommand.php" role="php" md5sum="462ddad12678f5bae9cebcfbadd9d569"/>
<file name="src/Onion/Command/InitCommand.php" role="php" md5sum="9ee53174df1f1ba932e0e449c1f912a7"/>
<file name="src/Onion/Command/InstallCommand.php" role="php" md5sum="2491c2b7e8fef5494b3b9593c9ad8aa4"/>
Expand All @@ -76,7 +75,7 @@
<file name="src/Onion/Installer.php" role="php" md5sum="e44a842ef2e3308e3bb5e4dceaf049cb"/>
<file name="src/Onion/LoggableInterface.php" role="php" md5sum="c31c46dcff37284f35cadbed42e49978"/>
<file name="src/Onion/Operation/InstallOperation.php" role="php" md5sum="79d2f4de5f57931b9c2c29342d3f418c"/>
<file name="src/Onion/Package/Package.php" role="php" md5sum="cd9b2373a09de87fffdde9801edd34b7"/>
<file name="src/Onion/Package/Package.php" role="php" md5sum="8cbeeb4221bc2bf18b0b85e07a5e382b"/>
<file name="src/Onion/Package/PackageInterface.php" role="php" md5sum="7a619a551d50b5497e94592766984d38"/>
<file name="src/Onion/Package/PearPackage.php" role="php" md5sum="d4a6652b2d309379aaf8017f95bcde2b"/>
<file name="src/Onion/PackageConfigReader.php" role="php" md5sum="713c0195d13cfe96528efe24d694bf7a"/>
Expand Down Expand Up @@ -133,7 +132,6 @@
<phprelease>
<filelist>
<install name="doc/InstallerFlow.md" as="InstallerFlow.md"/>
<install name="doc/Package.md" as="Package.md"/>
<install name="doc/SPEC-v2.md" as="SPEC-v2.md"/>
<install name="doc/SPEC.md" as="SPEC.md"/>
<install name="examples/package.ini" as="package.ini"/>
Expand Down
12 changes: 7 additions & 5 deletions src/Onion/Command/BuildCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
use Onion\PackageConfigReader;
use Onion\Pear\PackageXmlGenerator;

class BuildCommand extends Command
class BuildCommand extends Command
implements CommandInterface
{
function brief()
Expand All @@ -31,7 +31,7 @@ function help()
Define your package.ini file first.

run the command below to build PEAR package:

$ onion.phar build

EOT;
Expand All @@ -43,7 +43,7 @@ function options($opts)
$opts->add('pyrus','use pyrus to build PEAR package');
}

function execute()
function execute()
{
// options result.
$options = $this->getOptions();
Expand All @@ -68,9 +68,11 @@ function execute()
else
$logger->warn( '* docs/ or doc/ directory not found.',1 );

if( is_dir('scripts') || is_dir('script') )
$logger->info2( '* found scripts/ || script ', 1 );

$logger->info( 'Configuring package.ini' );
$config = new PackageConfigReader(array(
$config = new PackageConfigReader(array(
'validate' => true,
));
$config->setLogger( $logger );
Expand All @@ -94,7 +96,7 @@ function execute()
elseif( $options->pyrus ) {
$logger->info('Building PEAR package with pyrus...');
system('pyrus.phar package');
}
}
else {
$notice =<<<EOS
package.xml is generated. you can now build your PEAR package with:
Expand Down
8 changes: 4 additions & 4 deletions src/Onion/Package/Package.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ class Package implements PackageInterface
public $license;
public $licenseUri;

/**
* main stability
/**
* main stability
*/
public $stability;

Expand Down Expand Up @@ -57,7 +57,7 @@ class Package implements PackageInterface
*/
public $deps = array();

/**
/**
* ConfigContainer object
*/
public $config;
Expand All @@ -75,7 +75,7 @@ public function getDefaultStructureConfig()
'test' => (array) 'tests',
'php' => (array) 'src',
// xxx: better config for roles
// 'script' => (array) 'bin',
'script' => (array) 'bin',
'data' => (array) 'data',
);
}
Expand Down