Version 2.0-beta.1

ThinkUpLLC · Jan 14, 2013 · e6e1a07 · e6e1a07
1 parent 40e275d
commit e6e1a07
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 7 deletions.
diff --git a/docs/source/changelog/2.0-beta.1.rst b/docs/source/changelog/2.0-beta.1.rst
@@ -0,0 +1,14 @@
+2.0-beta.1 - 1 Jan 2013
+=======================
+
+ThinkUp 2.0 is a major functional and visual overhaul of the version 1.x application. An overview of changes includes:
+
+*  Replaced the dashboard with a reverse chronological stream of insights into the user's social data. Unlike the 
+   dashboard, this stream combines insights from all the service users set up on an installation in one view. Click on
+   an insight's permalink or the button on the far right to expand it and see more information.
+*  Added a new Insights Generator plugin which calculates and inserts these insights on each crawl. View a list of the
+   insights and what they do in Settings > Plugins > Insights Generator. Each insight is a plugin in and of itself.
+   View individual insight plugins in plugins/insightsgenerator/insights/ folder.
+*  Completely redesigned the login, registration, update data, and settings areas of the app using the Twitter Bootstrap
+   framework.
+*  Removed the ability to deactivate plugins. All plugins are activated by default to simplify the interface.
diff --git a/docs/source/changelog/index.rst b/docs/source/changelog/index.rst
@@ -6,6 +6,7 @@ Check out what's new, fixed, and updated in each version release of ThinkUp.
 .. toctree::
    :maxdepth: 1
 
+   2.0-beta.1
    1.2.1
    1.2
    1.1.1

diff --git a/tests/WebTestOfInstallation.php b/tests/WebTestOfInstallation.php
@@ -72,6 +72,7 @@ public function tearDown() {
         global $THINKUP_CFG;
         //Clean up test installation files
         @exec('rm -rf ' . THINKUP_WEBAPP_PATH.'test_installer/*' );
+        @exec('rmdir ' . THINKUP_WEBAPP_PATH.'test_installer/' );
         //Delete test database created during installation process
         require THINKUP_WEBAPP_PATH.'config.inc.php';
 

diff --git a/tests/migration-assertions.php b/tests/migration-assertions.php
@@ -29,8 +29,8 @@
  *
  * Database migration assertions to test during WebTestOfUpgradeDatabase
  */
-$LATEST_VERSION = '1.2';
-$TOTAL_MIGRATION_COUNT = 240;
+$LATEST_VERSION = '2.0-beta.1';
+$TOTAL_MIGRATION_COUNT = 243;
 
 $MIGRATIONS = array(
     /* beta 0.1 */
@@ -932,7 +932,34 @@
 
      /* 1.2.1 */
     '1.2.1' => array(
-        'zip_url' => 'file://./build/thinkup.zip',
+        'zip_url' => 'https://thinkup.com/downloads/thinkup-1.2.1.zip',
         'migrations' => 0,
      ),
+
+     /* 2.0-beta.1 */
+    '2.0-beta.1' => array(
+        'zip_url' => 'file://./build/thinkup.zip',
+        'migrations' => 3,
+        'migration_assertions' => array(
+            'sql' => array(
+                array(
+                    // Added tu_insights.filename
+                    'query' => 'DESCRIBE tu_insights filename;',
+                    'match' => "/varchar\(100\)/",
+                    'column' => 'Type',
+                ),
+                array(
+                    // Default value for tu_plugins is_active
+                    'query' => 'DESCRIBE tu_plugins is_active;',
+                    'match' => '/1/',
+                    'column' => 'Default',
+                ),
+                array(
+                    // All plugins are active
+                    'query' => "SELECT id FROM tu_plugins WHERE is_active = 0",
+                    'no_match' => true,
+                ),
+             )
+        )
+     ),
 );
diff --git a/webapp/_lib/controller/class.UpgradeDatabaseController.php b/webapp/_lib/controller/class.UpgradeDatabaseController.php
@@ -247,7 +247,9 @@ public function getMigrationList($version, $no_version = false) {
         $dir_list = glob('{' . $dir . '/*.sql,' . $dir . '/*.migration}', GLOB_BRACE);
         $migrations = array();
         for ($i = 0; $i < count($dir_list); $i++) {
-            if (preg_match('/_v(\d+\.\d+(\.\d+)?(\w+)?)\.sql(\.migration)?/', $dir_list[$i], $matches)) {
+            if (preg_match('/_v(\d+\.\d+(\.\d+)?(\w+)?)\.sql(\.migration)?/', $dir_list[$i], $matches)
+            //TODO combine these into a single regex
+            || preg_match('/_v(\d+\.\d+(-beta\.\d+)?(\w+)?)\.sql(\.migration)?/', $dir_list[$i], $matches)) {
                 $migration_version = $matches[1];
                 // skip early pre beta 1 versions...
                 if (preg_match('/^0\.00/', $migration_version)) {

diff --git a/webapp/install/sql/build-db_mysql.sql b/webapp/install/sql/build-db_mysql.sql
@@ -518,13 +518,13 @@ CREATE TABLE tu_users (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Service user details.';
 
 
--- Dump completed on 2013-01-01 19:06:37
+-- Dump completed on 2013-01-01 19:07:23
 
 --
 -- Insert DB Version
 --
 INSERT INTO tu_options (namespace, option_name, option_value, last_updated, created)
-VALUES ('application_options', 'database_version', '1.2.1', NOW(), NOW()); 
+VALUES ('application_options', 'database_version', '2.0-beta.1', NOW(), NOW()); 
 
 --
 -- Insert default plugin(s)

diff --git a/...ons/2012-11-24_insight-filename-field.sql → ...24_insight-filename-field_v2.0-beta.1.sql b/...ons/2012-11-24_insight-filename-field.sql → ...24_insight-filename-field_v2.0-beta.1.sql
diff --git a/...12-27_activate-all-plugins-by-default.sql → ...te-all-plugins-by-default_v2.0-beta.1.sql b/...12-27_activate-all-plugins-by-default.sql → ...te-all-plugins-by-default_v2.0-beta.1.sql
diff --git a/webapp/install/version.php b/webapp/install/version.php
@@ -26,6 +26,6 @@
  * @license http://www.gnu.org/licenses/gpl.html
  * @copyright 2009-2013 Dwi Widiastuti, Gina Trapani, Guillaume Boudreau
  */
-$THINKUP_VERSION = '1.2.1';
+$THINKUP_VERSION = '2.0-beta.1';
 $THINKUP_VERSION_REQUIRED['php'] = '5.2';
 $THINKUP_VERSION_REQUIRED['mysql'] = '5';