Permalink
Switch branches/tags
Nothing to show
Commits on Aug 29, 2011
  1. merged branch havvg/master (PR #29)

    fabpot committed Aug 29, 2011
    Commits
    -------
    
    e80a0df fixed git log format being escaped twice
    
    Discussion
    ----------
    
    fixed git show format being escaped twice
    
    Introduced by 00a3beb the format option of
    `git show` shows up a single quote within itself e.g.
    
    `git show -s --pretty=format:"'%H%n%an%n%ci%n%s%n'" 'ef499980ac8b7b07636bd58029f2c137037fd19c'`
    
    This breaks the hashes and messages of commits with a leading and trailing quote, respectively.
Commits on Aug 26, 2011
  1. merged branch havvg/hotfix/xmppnotifier-broken (PR #27)

    fabpot committed Aug 26, 2011
    Commits
    -------
    
    80c9215 added missing use statemetns for XmppNotifer
    
    Discussion
    ----------
    
    added missing use statemetns for XmppNotifer
  2. merged branch havvg/hotfix/tests-kill-config (PR #28)

    fabpot committed Aug 26, 2011
    Commits
    -------
    
    963121d added some tests to ProjectTest
    7e4f7d1 added invalid config file tests
    23e0d33 fixed appTest not overwriting production config
    
    Discussion
    ----------
    
    appTest overwrites production config.file
    
    The commit 23e0d33 fixes this. The other commits add some more tests.
  3. added some tests to ProjectTest

    havvg committed Aug 26, 2011
  4. added invalid config file tests

    havvg committed Aug 26, 2011
Commits on Aug 25, 2011
  1. reorganized files

    fabpot committed Aug 25, 2011
  2. bumped version

    fabpot committed Aug 25, 2011
  3. updated Silex

    fabpot committed Aug 25, 2011
Commits on Aug 17, 2011
  1. merged branch havvg/master (PR #23)

    fabpot committed Aug 17, 2011
    Commits
    -------
    
    a832b93 use escapeshellarg instead of quoting the paths
    59f0288 fixed git clone command quoting paths
    
    Discussion
    ----------
    
    quote path names within git clone command
    
    The quotes are required to be able
    to configure paths with spaces in themselves.
    
    Log:
    <pre>
    ~/Web Development/Sismo (master u=) $ php sismo build cronparser-local -v
    Building Project "CronParser (Local)" (into "0536c7")
    
    OUT| Running "git clone --progress --recursive /Users/havvg/Web Development/CronParser/ /Users/havvg/.sismo/data/build/0536c7"
    OUT|
    ERR| Too many arguments.
    ERR|
    ERR| usage: git clone [options] [--] <repo> [<dir>]
    ERR|
    ERR|     -v, --verbose         be more verbose
    ERR|     -q, --quiet           be more quiet
    ERR|     --progress            force progress reporting
    ERR|     -n, --no-checkout     don't create a checkout
    ERR|     --bare                create a bare repository
    ERR|     --mirror              create a mirror repository (implies bare)
    ERR|     -l, --local           to clone from a local repository
    ERR|     --no-hardlinks        don't use local hardlinks, always copy
    ERR|     -s, --shared          setup as shared repository
    ERR|     --recursive           initialize submodules in the clone
    ERR|     --recurse-submodules  initialize submodules in the clone
    ERR|     --template <template-directory>
    ERR|                           directory from which templates will be used
    ERR|     --reference <repo>    reference repository
    ERR|     -o, --origin <branch>
    ERR|                           use <branch> instead of 'origin' to track upstream
    ERR|     -b, --branch <branch>
    ERR|                           checkout <branch> instead of the remote's HEAD
    ERR|     -u, --upload-pack <path>
    ERR|                           path to git-upload-pack on the remote
    ERR|     --depth <depth>       create a shallow clone of that depth
    ERR|
    ERR|
    Unable to clone repository for project "CronParser (Local)".
    ~/Web Development/Sismo (master u=) $ git stash pop
    # On branch master
    # Changes not staged for commit:
    #   (use "git add <file>..." to update what will be committed)
    #   (use "git checkout -- <file>..." to discard changes in working directory)
    #
    #	modified:   src/Sismo/Builder.php
    #
    no changes added to commit (use "git add" and/or "git commit -a")
    Dropped refs/stash@{0} (718054c773033064f1f45e51900b93e6f0c9f0da)
    ~/Web Development/Sismo (master u=) $ git di -w
    diff --git a/src/Sismo/Builder.php b/src/Sismo/Builder.php
    index 946e894..2140098 100644
    --- a/src/Sismo/Builder.php
    +++ b/src/Sismo/Builder.php
    @@ -33,7 +33,7 @@ class Builder
             $this->baseBuildDir = $buildDir;
             $this->gitPath = $gitPath;
             $this->gitCmds = array_replace(array(
    -            'clone'    => 'clone --progress --recursive %repo% %dir%',
    +            'clone'    => 'clone --progress --recursive "%repo%" "%dir%"',
                 'fetch'    => 'fetch origin',
                 'prepare'  => 'submodule update --init --recursive',
                 'checkout' => 'checkout origin/%branch%',
    ~/Web Development/Sismo (master u=) $ php sismo build cronparser-local -v
    Building Project "CronParser (Local)" (into "0536c7")
    
    OUT| Running "git clone --progress --recursive "/Users/havvg/Web Development/CronParser/" "/Users/havvg/.sismo/data/build/0536c7""
    OUT| Cloning into /Users/havvg/.sismo/data/build/0536c7...
    OUT| done.
    OUT| Running "git fetch origin"
    OUT| Running "git submodule update --init --recursive"
    OUT| Running "git checkout origin/master"
    OUT|
    ERR| HEAD is now at 7584242... added test cases for n-th of month
    ERR|
    OUT| Running "git reset --hard 7584242a4ec909c187a324d2ac39c68c474717ee"
    OUT| HEAD is now at 7584242 added test cases for n-th of month
    OUT| Running "git show -s --pretty=format:"%H%n%an%n%ci%n%s%n" 7584242a4ec909c187a324d2ac39c68c474717ee"
    OUT| 7584242a4ec909c187a324d2ac39c68c474717ee
    OUT| Toni Uebernickel
    OUT| 2011-04-12 15:19:38 +0200
    OUT| added test cases for n-th of month
    OUT|
    </pre>
    
    ---------------------------------------------------------------------------
    
    by havvg at 2011/08/15 06:49:58 -0700
    
    Good point, I added a commit changing to escapeshellarg().
    
    Log:
    <pre>
    ~/Web Development/Sismo (master u=) $ php sismo build cronparser-local -v
    Building Project "CronParser (Local)" (into "0536c7")
    
    OUT| Running "git clone --progress --recursive '/Users/havvg/Web Development/CronParser/' '/Users/havvg/.sismo/data/build/0536c7'"
    OUT| Cloning into /Users/havvg/.sismo/data/build/0536c7...
    OUT| done.
    OUT| Running "git fetch origin"
    OUT| Running "git submodule update --init --recursive"
    OUT| Running "git checkout origin/master"
    OUT|
    ERR| HEAD is now at 7584242... added test cases for n-th of month
    ERR|
    OUT| Running "git reset --hard 7584242a4ec909c187a324d2ac39c68c474717ee"
    OUT| HEAD is now at 7584242 added test cases for n-th of month
    OUT| Running "git show -s --pretty=format:"%H%n%an%n%ci%n%s%n" 7584242a4ec909c187a324d2ac39c68c474717ee"
    OUT| 7584242a4ec909c187a324d2ac39c68c474717ee
    OUT| Toni Uebernickel
    OUT| 2011-04-12 15:19:38 +0200
    OUT| added test cases for n-th of month
    OUT|
    </pre>
  2. merged branch havvg/fix-sismo-test (PR #24)

    fabpot committed Aug 17, 2011
    Commits
    -------
    
    068e8b4 fixed SismoTest expectations on Process
    
    Discussion
    ----------
    
    fixed SismoTest expectations on Process
    
    Sismo::build() does not check for an exit code of the Process directly to decide whether the build failed or not, but it checks for Process::isSuccessful() to be true.
    
    Log:
    <pre>
    ~/Web Development/Sismo (master u=) $ phpunit
    PHPUnit 3.5.14 by Sebastian Bergmann.
    
    .....................................................FF....
    
    Time: 0 seconds, Memory: 23.75Mb
    
    There were 2 failures:
    
    1) Sismo\Tests\SismoTest::testCommitResultForSuccessBuild
    Failed asserting that two strings are equal.
    --- Expected
    +++ Actual
    @@ @@
    -success
    +failed
    
    /Users/havvg/Web Development/Sismo/src/Sismo/Sismo.php:60
    /Users/havvg/Web Development/Sismo/tests/Sismo/Tests/SismoTest.php:194
    
    2) Sismo\Tests\SismoTest::testCommitResultForSuccessFail
    Expectation failed for method name is equal to <string:getExitCode> when invoked 1 time(s).
    Method was expected to be called 1 times, actually called 0 times.
    
    FAILURES!
    Tests: 59, Assertions: 199, Failures: 2.
    ~/Web Development/Sismo (master u=) $ git co fix-sismo-test
    Switched to branch 'fix-sismo-test'
    ~/Web Development/Sismo (fix-sismo-test u=) $ phpunit
    PHPUnit 3.5.14 by Sebastian Bergmann.
    
    ...........................................................
    
    Time: 0 seconds, Memory: 23.25Mb
    
    OK (59 tests, 208 assertions)
    </pre>
  3. merged branch havvg/feature/fix-readme (PR #25)

    fabpot committed Aug 17, 2011
    Commits
    -------
    
    2bc44fe fixed README on SISMO_CONFIG_PATH to be file path
    
    Discussion
    ----------
    
    fixed README on SISMO_CONFIG_PATH to be file path
    
    The configuration entry of the path is actually the complete file path.
    Also see lines 48 and 108-111 of bootstrap.php
  4. updated vendors

    fabpot committed Aug 17, 2011
  5. fixed README on SISMO_CONFIG_PATH to be file path

    havvg committed Aug 17, 2011
    The configuration entry of the path is actually the complete file path.
    Also see lines 48 and 108-111 of bootstrap.php
Commits on Aug 16, 2011
Commits on Aug 15, 2011
  1. fixed git clone command quoting paths

    havvg committed Aug 15, 2011
    The quotes are required to be able
    to configure paths with spaces in themselves.
Commits on Aug 13, 2011
  1. merged branch rouffj/assets-fix (PR #21)

    fabpot committed Aug 13, 2011
    Commits
    -------
    
    2e89492 Avoid  routing conflicts between assets & dynamic routes
    
    Discussion
    ----------
    
    Avoid  routing conflicts between assets & dynamic routes
    
    /{var1}/{var2} vs /css/sismo.css
    
    Thanks, for merging this contrib. Without this patch, the images & css are not loaded in compiled version of Sismo. Please also update sismo.php from sismo-project.com.
Commits on Jul 2, 2011
  1. Avoid routing conflicts between assets & dynamic routes

    rouffj committed Jul 2, 2011
    /{var1}/{var2} vs /css/sismo.css
Commits on Jun 23, 2011
  1. removed hack

    fabpot committed Jun 23, 2011
  2. updated vendors

    fabpot committed Jun 23, 2011
Commits on Jun 22, 2011
  1. updated vendors

    fabpot committed Jun 22, 2011
Commits on May 17, 2011
  1. updated vendors

    fabpot committed May 17, 2011
Commits on Apr 28, 2011
Commits on Apr 17, 2011
  1. updated vendors

    fabpot committed Apr 17, 2011
Commits on Apr 12, 2011
  1. Merge remote branch 'pborreli/windows-fix-test'

    fabpot committed Apr 12, 2011
    * pborreli/windows-fix-test:
      [Sismo][Windows] Fixed tests
      [Sismo] Better exception for failing Process