havvg's playground

git rebase is not a lion, it's a cat - Part Two

2012-02-20T00:00:00-08:00

The first part being an introduction to git rebase mechanics, this follow-up drives that introduction into real-world examples.

git rebase is not a lion, it's a cat - Part One

2012-02-18T00:00:00-08:00

There are many users out there being scared to use git rebase. To wrap things up, git rebase is not a lion that will hunt you down.

It is a cat, it likes you, until you do something fancy and will hurt you once. You will know how to deal with the situation properly the next time - but give it a try.

This post is about quelling some fears off those users - maybe you are one of them?

Merging a git subtree on failing path guessing

2012-02-15T00:00:00-08:00

In the previous post we set up a project using git-subtree. Unfortunately there may be situations when the merge of the subtree will not make its way into the correct directory.

Using git-subtree: Example adding Symfony2 bundle on cloudControl

2012-02-13T00:00:00-08:00

Let’s say you got your closed source project built on Symfony2. Let’s further say you are a proud customer of cloudControl. Third assumption: You have not only one project, but two and those are sharing a closed source bundle.

See how to use git-subtree to add the shared bundle to both projects and having the bundle in a separate repository.

How to extend form fields in Symfony2 using extensions

2011-11-25T00:00:00-08:00

This blogpost explains on the example of adding a “help” message to widgets how to use form type extensions.

Github:Pages with Jekyll

2011-10-30T00:00:00-07:00

Finally, my blog is now on github:pages!

Behavior Driven Development in Symfony2 with Behat, Mink and Zombie.js

2011-09-13T00:00:00-07:00

Long time no post, but now it’s time for a new one. I wrote a guide on behavior driven development in Symfony2. It’s meant for beginners and designed “from scratch”. This guide caught some attention and made it into the official Behat documentation as a cookbook entry.

If you have any feedback on it, please let me know! If you would like to have something related covered, drop me a message!

How to combine git and cloudControl using github

2011-06-07T00:00:00-07:00

What is git? – The short version.

Git is a distributed version control system (VCS). What does “distributed” mean in this case? It means, that there is no “server” as in other VCS like subversion. The repository will be transferred as it to any other user who has access to it – including the complete history.

What is github? – A small overview.

Github is a web based service to manage git repositories in a social way. You can create new repositories, fork others, modify the codebase and send your changes back. There are many more very cool features, but we keep it here for now.

What is cloudControl? – A PHP PaaS!

Yes, that’s it: a great PHP platform as a service (PaaS) on top of Amazon Web Services. You will have your php application deployed on multiple machines with a single command. There are plenty of add-ons available such as worker processes, MySQL database, MongoDB and memcached to name a few.

Rackspace Cloud Servers

2010-12-05T00:00:00-08:00

I moved my servers into “The Cloud”™ - more specifically the Rackspace Cloud. Well why did I do this? The answer is about two years old. I asked my previous hosting service whether they are able to migrate my virtual servers to instances of their “root servers”. They said, this is not possible. As time flies by the vServers reached their limits. They were not scalable, so either I get another one .. and another one .. and yet another one. Well at some point I don’t want to sign another and another contract. I want to say “Now!” and the server is up - That’s why cloud. You have plenty of servers, make up your images for your certain server types and go for it. If you need more hardware, reboot - done!

CruiseControl git modificationset errors

2010-11-29T00:00:00-08:00

I encountered some errors while configuring my phpUnderControl. One of the errors were the <git> <modificationset> not returning results, but the gitbootstrapper actually updated the git repository. In my case, this was because the user running CruiseControl has set up colorful output in its git config. This option changes the output of the git-log command. The problem with that? The patterns the modificationset looks for do not match! I opened a change request on Thoughtworks for that - hopefully this will be fixed in the next release of CruiseControl.

The other error was about this warning Git - warning: Log for '' only goes back to [date]. This warning is thrown when you don’t have a local reflog back to that given date. This happened to me, because I removed the git repository within my build and cloned it on each build. This warning is no problem for the modificationset. However, I didn’t want this warning, so I updated my config.xml to use a cleanroom for the bootstrapper and the modificationset. Once built this warning should not occur another time, because you are not loosing the reflog of git anymore. I still clone the repository on each build, but this cleanroom won’t be touched anytime.

speed up PHPUnit CodeCoverage in symfony projects

2010-11-27T00:00:00-08:00

Well, PHPUnit CodeCoverage is pretty nice and exports some nice HTML files to take a look into. However, a project most often contains more than just PHP files and for a symfony project this could be the phpunit.xml.dist. It removes all folders from your coverage report, that most likely are not your stuff. This one is based on the shipped file of sfPHPUnit2Plugin. The relevant part is the <filter> section.

config.xml and build.xml for phpUnderControl building a symfony project hosted on github

2010-11-27T00:00:00-08:00

Well yesterday I moved to PHPUnit and I just felt the way I want to use phpUnderControl as continuous integration server. The installation part was the easiest one, gathering all the information spread among several websites was not that easy. Especially for me not having used CruiseControl either.

I don’t want to take you into the installation of either PHPUnit, phpUnderControl or CruiseControl. These steps are pretty easy and straight forward.

Let me explain, what my setup looks like. I’m hosting the project on github.com as a private repository. Side note: add the public key of your CI to your account to be able to clone these. This project uses symfony with Propel and PHPUnit.

add a project wide TestCase to sfPHPUnit2Plugin

2010-11-27T00:00:00-08:00

I just moved my projects from lime to PHPUnit testing framework. To make this easier, I appreciate the work of Frank Stelzer, who has created a plugin which makes this move pretty easy within symfony. Setting things up was one easy task, but soon I ran into the problem not being able to share code within the classes of the test cases without touching the plugins code.

In order to being able to do this, we use the autoloader of symfony. If the sfPHPUnitBaseTestCase is found in our library use this, otherwise the one provided by the sfPHPUnit2Plugin. So, what’s left is moving the current code of the sfPHPUnitBaseTestCase into a new class and make it the superclass of this one. I have chosen to add another entry for the autoloader %SF_LIB_DIR%/test. The only thing left, since the bootstraps for functional and selenium tests can make good out of the autoloader. There are slight adjustments to check whether the file is given at the chosen place. This is the only thing I don’t like yet, because it’s hardcoded within the plugin. However you can use the bootstrap templates to adjust it easily. Having done the explanation, here comes the complete patch for r31286.

I sent the patch to Frank and he is reviewing it and will hopefully apply this in the near future to the trunk. In the meanwhile, feel free to use it. But be advised that you might get conflict when you are going to update the plugin later and the actual solution was being adjusted. I will let you know, how to solve this in case it happens.

Index: lib/test/sfPHPUnitPluginBaseTestCase.class.php
===================================================================
--- lib/test/sfPHPUnitPluginBaseTestCase.class.php	(revision 0)
+++ lib/test/sfPHPUnitPluginBaseTestCase.class.php	(revision 0)
@@ -0,0 +1,150 @@
+<?php
+
+/*
+ * This file is part of the sfPHPUnit2Plugin package.
+ * (c) 2010 Frank Stelzer <dev@frankstelzer.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * The plugins base class for all test cases.
+ *
+ * @package    sfPHPUnit2Plugin
+ * @subpackage test
+ * @author     Frank Stelzer <dev@frankstelzer.de>
+ */
+abstract class sfPHPUnitPluginBaseTestCase extends PHPUnit_Framework_TestCase
+{
+  /**
+   * The sfContext instance
+   *
+   * @var sfContext
+   */
+  private $context = null;
+
+  /**
+   * The sfApplicationConfiguration instance
+   *
+   * @var sfApplicationConfiguration
+   */
+  private $applicationConfiguration = null;
+
+  /**
+   * Dev hook for custom "setUp" stuff
+   * Overwrite it in your test class, if you have to execute stuff before a test is called.
+   */
+  protected function _start()
+  {
+  }
+
+  /**
+   * Dev hook for custom "tearDown" stuff
+   * Overwrite it in your test class, if you have to execute stuff after a test is called.
+   */
+  protected function _end()
+  {
+  }
+
+  /**
+   * Please do not touch this method and use _start directly!
+   */
+  protected function setUp()
+  {
+    $this->_start();
+  }
+
+  /**
+   * Please do not touch this method and use _end directly!
+   */
+  protected function tearDown()
+  {
+    $this->_end();
+  }
+
+  /**
+   * Returns current sfApplicationConfiguration instance.
+   * If no configuration does currently exist, a new one will be created.
+   *
+   * @return sfApplicationConfiguration
+   */
+  protected function getApplicationConfiguration()
+  {
+  	if (is_null($this->applicationConfiguration))
+  	{
+  		$this->applicationConfiguration = ProjectConfiguration::getApplicationConfiguration($this->getApplication(), $this->getEnvironment(), true);
+  	}
+
+  	return $this->applicationConfiguration;
+  }
+
+  /**
+   * A unit test does not have loaded the whole symfony context on start-up, but
+   * you can create a working instance if you need it with this method
+   * (taken from the bootstrap file).
+   *
+   * @return sfContext
+   */
+  protected function getContext()
+  {
+    if (!$this->context)
+    {
+      // ProjectConfiguration is already required in the bootstrap file
+      $this->context = sfContext::createInstance($this->getApplicationConfiguration());
+    }
+
+    return $this->context;
+  }
+
+  /**
+   * Returns current sfPHPUnitTest
+   *
+   * @return sfPHPUnitTest
+   */
+  protected function getTest()
+  {
+    if (!$this->test)
+    {
+      $this->test = new sfPHPUnitTest( $this );
+    }
+
+    return $this->test;
+  }
+
+  /**
+   * Prints a debug message and dumps the
+   * assigned variable
+   *
+   * @param mixed $mixed The content which should be dumped
+   * @param string $message A debug message
+   */
+  protected function debug($mixed, $message = 'debug')
+  {
+  	$this->getTest()->diag(sprintf('[%s] %s', $message, var_export($mixed, true)));
+  }
+
+  /**
+   * Returns application name
+   *
+   * Overwrite this method if you need a context instance in your unit test!
+   *
+   * @return string
+   */
+  protected function getApplication()
+  {
+    throw new Exception( 'Application name is not defined. Overwrite "getApplication" in your unit test!');
+  }
+
+  /**
+   * Returns environment name
+   *
+   * Overwrite this method if you need a context instance in your unit test!
+   *
+   * @return string test by default
+   */
+  protected function getEnvironment()
+  {
+    return 'test';
+  }
+}
\ No newline at end of file
 
Property changes on: lib/test/sfPHPUnitPluginBaseTestCase.class.php
___________________________________________________________________
Added: svn:keywords
   + "LastChangedBy LastChangedDate Revision HeadURL Id"
 
Index: lib/test/sfPHPUnitBaseTestCase.class.php
===================================================================
--- lib/test/sfPHPUnitBaseTestCase.class.php	(revision 31514)
+++ lib/test/sfPHPUnitBaseTestCase.class.php	(working copy)
@@ -9,150 +9,16 @@
  */
 
 /**
- * sfBasePHPUnitTestCase is the super class for all unit
+ * sfPHPUnitBaseTestCase is the super class for all unit
  * tests using PHPUnit.
  *
- * @package    sfPHPUnit2Plugin
+ * Make a class available in your library folder and put your project relevant helper methods in there.
+ *
+ * @package sfPHPUnit2Plugin
  * @subpackage test
- * @author     Frank Stelzer <dev@frankstelzer.de>
+ * @author Toni Uebernickel <tuebernickel@gmail.com>
  */
-abstract class sfPHPUnitBaseTestCase extends PHPUnit_Framework_TestCase
+class sfPHPUnitBaseTestCase extends sfPHPUnitPluginBaseTestCase
 {
-  /**
-   * The sfPHPUnitTest instance for lime compatibility
-   *
-   * @var sfPHPUnitTest
-   */
-  private $test = null;
 
-  /**
-   * The sfContext instance
-   *
-   * @var sfContext
-   */
-  private $context = null;
-
-  /**
-   * The sfApplicationConfiguration instance
-   *
-   * @var sfApplicationConfiguration
-   */
-  private $applicationConfiguration = null;
-
-  /**
-   * Dev hook for custom "setUp" stuff
-   * Overwrite it in your test class, if you have to execute stuff before a test is called.
-   */
-  protected function _start()
-  {
-  }
-
-  /**
-   * Dev hook for custom "tearDown" stuff
-   * Overwrite it in your test class, if you have to execute stuff after a test is called.
-   */
-  protected function _end()
-  {
-  }
-
-  /**
-   * Please do not touch this method and use _start directly!
-   */
-  protected function setUp()
-  {
-    $this->_start();
-  }
-
-  /**
-   * Please do not touch this method and use _end directly!
-   */
-  protected function tearDown()
-  {
-    $this->_end();
-  }
-
-  /**
-   * Returns current sfApplicationConfiguration instance.
-   * If no configuration does currently exist, a new one will be created.
-   *
-   * @return sfApplicationConfiguration
-   */
-  protected function getApplicationConfiguration()
-  {
-  	if (is_null($this->applicationConfiguration))
-  	{
-  		$this->applicationConfiguration = ProjectConfiguration::getApplicationConfiguration($this->getApplication(), $this->getEnvironment(), true);
-  	}
-
-  	return $this->applicationConfiguration;
-  }
-
-  /**
-   * A unit test does not have loaded the whole symfony context on start-up, but
-   * you can create a working instance if you need it with this method
-   * (taken from the bootstrap file).
-   *
-   * @return sfContext
-   */
-  protected function getContext()
-  {
-    if (!$this->context)
-    {
-      // ProjectConfiguration is already required in the bootstrap file
-      $this->context = sfContext::createInstance($this->getApplicationConfiguration());
-    }
-
-    return $this->context;
-  }
-
-  /**
-   * Returns current sfPHPUnitTest
-   *
-   * @return sfPHPUnitTest
-   */
-  protected function getTest()
-  {
-    if (!$this->test)
-    {
-      $this->test = new sfPHPUnitTest( $this );
-    }
-
-    return $this->test;
-  }
-
-  /**
-   * Prints a debug message and dumps the
-   * assigned variable
-   *
-   * @param mixed $mixed The content which should be dumped
-   * @param string $message A debug message
-   */
-  protected function debug($mixed, $message = 'debug')
-  {
-  	$this->getTest()->diag(sprintf('[%s] %s', $message, var_export($mixed, true)));
-  }
-
-  /**
-   * Returns application name
-   *
-   * Overwrite this method if you need a context instance in your unit test!
-   *
-   * @return string
-   */
-  protected function getApplication()
-  {
-    throw new Exception( 'Application name is not defined. Overwrite "getApplication" in your unit test!');
-  }
-
-  /**
-   * Returns environment name
-   *
-   * Overwrite this method if you need a context instance in your unit test!
-   *
-   * @return string test by default
-   */
-  protected function getEnvironment()
-  {
-    return 'test';
-  }
 }
\ No newline at end of file
Index: lib/config/autoload.yml
===================================================================
--- lib/config/autoload.yml	(revision 31514)
+++ lib/config/autoload.yml	(working copy)
@@ -1,6 +1,11 @@
-autoload:
+autoload:  
   # tests for sfPHPUnit2Plugin
   sfPHPUnit2Plugin_tests:
     name:           sfPHPUnit2Plugin tests
     path:           %SF_PLUGINS_DIR%/sfPHPUnit2Plugin/lib/test
     recursive:      false
+    
+  project_lib_test:
+    name:           project test library
+    path:           %SF_LIB_DIR%/test
+    recursive:      false
\ No newline at end of file
Index: data/template/selenium/bootstrap.tpl
===================================================================
--- data/template/selenium/bootstrap.tpl	(revision 31514)
+++ data/template/selenium/bootstrap.tpl	(working copy)
@@ -14,7 +14,19 @@
 
 // autoloading does not exist at this point yet, require base classes by hand
 $_phpunitPluginDir = dirname(__FILE__).'/../../../plugins/sfPHPUnit2Plugin';
-require_once $_phpunitPluginDir.'/lib/test/sfPHPUnitBaseTestCase.class.php';
+require_once $_phpunitPluginDir.'/lib/test/sfPHPUnitPluginBaseTestCase.class.php';
+
+// check for project specific base class
+$_projectBaseTestCase = sfConfig::get('sf_lib_dir').'/test/sfPHPUnitBaseTestCase.class.php';
+if (file_exists($_projectBaseTestCase))
+{
+  require_once $_projectBaseTestCase;
+}
+else
+{
+  require_once $_phpunitPluginDir.'/lib/test/sfPHPUnitBaseTestCase.class.php';
+}
+
 require_once $_phpunitPluginDir.'/lib/test/sfPHPUnitBaseSeleniumTestCase.class.php';
 
 // remove all cache
Index: data/template/functional/bootstrap.tpl
===================================================================
--- data/template/functional/bootstrap.tpl	(revision 31514)
+++ data/template/functional/bootstrap.tpl	(working copy)
@@ -13,7 +13,20 @@
 
 // autoloading does not exist at this point yet, require base classes by hand
 $_phpunitPluginDir = dirname(__FILE__).'/../../../plugins/sfPHPUnit2Plugin';
-require_once $_phpunitPluginDir.'/lib/test/sfPHPUnitBaseTestCase.class.php';
+
+require_once $_phpunitPluginDir.'/lib/test/sfPHPUnitPluginBaseTestCase.class.php';
+
+// check for project specific base class
+$_projectBaseTestCase = sfConfig::get('sf_lib_dir').'/test/sfPHPUnitBaseTestCase.class.php';
+if (file_exists($_projectBaseTestCase))
+{
+  require_once $_projectBaseTestCase;
+}
+else
+{
+  require_once $_phpunitPluginDir.'/lib/test/sfPHPUnitBaseTestCase.class.php';
+}
+
 require_once $_phpunitPluginDir.'/lib/test/sfPHPUnitBaseFunctionalTestCase.class.php';
 
 // remove all cache

git checkout name in bash primary prompt

2010-11-25T00:00:00-08:00

You want to have an overview of your current git checkout in your bash prompt? Then read on!

parse_git_branch () {
  git name-rev HEAD 2> /dev/null | sed -e 's/\^0$//' | sed 's#HEAD\ \(.*\)# (\1)#'
}
 
BLACK="\[\033[0;38m\]"
RED="\[\033[0;31m\]"
RED_BOLD="\[\033[01;31m\]"
BLUE="\[\033[01;34m\]"
GREEN="\[\033[0;32m\]"
 
export PS1="$BLACK\u@\h:$GREEN\w$RED_BOLD\$(parse_git_branch)$BLACK \$ "

Here some explanation, on what’s going on. The obvious one is the git name-rev HEAD command, which will retrieve a named revision for you. The first usage of the stream editor (sed) simply strips the “^0” at the end of the name, which means in git terms, that’s the exact commit of the name, it’s prefixed to. Any other refs will be shown, so if you are one commit before the tag, it will be shown with a “^1”. The second sed command strips some more output from the orignal. It turns “HEAD tags/3.5.5” into “tags/3.5.5” by simply stripping “HEAD “.

The next part is a set of color declarations. If you don’t like colors, omit this part. The last - and most important - part is the setting of the primary prompt of your bash. Stripping all the colors, this would be: export PS1="\u@\h:\w\$(parse_git_branch) \$ " This would lead to a bash prompt like: havvg@havvgbook:~/Web Development/phpunit (tags/3.5.5) $ You can find some more information on what’s available for the bash prompts and where to put the code above properly on linuxselfhelp.com

jQuery qTip applies two times after adding objects to the DOM

2010-10-19T00:00:00-07:00

At Adcloud we are using the jQuery qTip plugin, which provides pretty nice and easy to apply tooltips. We ran into one small problem, which solution I want to share. The tooltips work fine, except when you are adding new objects to the DOM. As of jQuery 1.4 there is no availability of live binding on the load-Event.