Merge lp:~mandel/ubuntuone-windows-installer/systray_integrate_update into lp:ubuntuone-windows-installer/beta

[Manuel de la Peña]

Provides the basics to allow the systray to auto-update.

[Vincenzo Di Somma (vds)]

review: Approve

[Tim Cole (tcole)]

Hmm. Why are we adding redundant entries to .bzrignore?

[Manuel de la Peña (mandel)]

> Hmm. Why are we adding redundant entries to .bzrignore?

You are right, that is strange, I'll take a look at the ignore file and will clean it up.

[lp:~mandel/ubuntuone-windows-installer/systray_integrate_update]

56. By Manuel de la Peña on 2010-07-29

Cleaned bzrignore.

57. By Manuel de la Peña on 2010-07-30

Merge with trunk.

[John Lenton (chipaca)]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2010-07-27 15:02:26 +0000
+++ .bzrignore	2010-07-30 09:47:43 +0000
@@ -1,54 +1,28 @@
-_ReSharper.Canonical.UbuntuOne.ProcessDispatcher
-Canonical.UbuntuOne.ProcessDispatcher.5.0.ReSharper.user
-bin
-obj
-bin
-obj
-bin
-obj
-bin
-obj
-bin
-obj
-Canonical.UbuntuOne.Common.csproj.ReSharper
-bin
-Canonical.UbuntuOne.ProcessDispatcher.5.0.ReSharper.user
-Canonical.UbuntuOne.ProcessDispatcher.csproj.ReSharper
-Canonical.UbuntuOne.ProcessDispatcher.Tests.csproj.ReSharper
-Canonical.UbuntuOne.Client.su
-Canonical.UbuntuOne.ProcessDispatcher.suo
-Canonical.UbuntuOne.ProcessDispatcher.suo
-Canonical.UbuntuOne.ProcessDispatcher.suo
-Canonical.UbuntuOne.suo
-_ReSharper.Canonical.UbuntuOne
-Canonical.UbuntuOne.5.0.ReSharper.user
-Canonical.UbuntuOne.Client.Views.csproj.user
-test-results
-Canonical.UbuntuOne.Client.pidb
-Canonical.UbuntuOne.Common.pidb
-Canonical.UbuntuOne.Common.Tests.pidb
-Canonical.UbuntuOne.ProcessDispatcher.pidb
-Canonical.UbuntuOne.ProcessDispatcher.Tests.pidb
-UbuntuOne.sln.cache
-UbuntuOne.userprefs
-Canonical.UbuntuOne.Client.Views.pidb
-_ReSharper.UbuntuOne
-UbuntuOne.5.1.ReSharper.user
-UbuntuOne.suo
-Canonical.UbuntuOne.ProcessDispatcher.Tests.csproj.user
-Canonical.UbuntuOne.ProcessDispatcher.csproj.user
-tomboy.msi
-tomboy.wxs
-Tomboy.wixobj
-UbuntuOne.msi
-UbuntuOne.wixobj
-UbuntuOne.wixpdb
-tomboy
-setup.exe
-bin
-obj
-./bin
-./bin
-./obj
-./bin
-./obj
+
+install/UbuntuOne.wixobj
+install/UbuntuOne.wixpdb
+install/build_results
+src/UbuntuOne.5.1.ReSharper.user
+src/UbuntuOne.sln.cache
+src/UbuntuOne.suo
+src/_ReSharper.UbuntuOne
+src/Canonical.UbuntuOne.Client/bin
+src/Canonical.UbuntuOne.Client/obj
+src/Canonical.UbuntuOne.Client.Test/obj
+src/Canonical.UbuntuOne.Client.Test/bin
+src/Canonical.UbuntuOne.Client.Views/bin
+src/Canonical.UbuntuOne.Client.Views/obj
+src/Canonical.UbuntuOne.Common/bin
+src/Canonical.UbuntuOne.Common/obj
+src/Canonical.UbuntuOne.Common.Tests/obj
+src/Canonical.UbuntuOne.Common.Tests/bin
+src/Canonical.UbuntuOne.ProcessDispatcher/bin
+src/Canonical.UbuntuOne.ProcessDispatcher/obj
+src/Canonical.UbuntuOne.ProcessDispatcher.Tests/obj
+src/Canonical.UbuntuOne.ProcessDispatcher.Tests/bin
+src/ServiceTestApp/bin
+src/ServiceTestApp/obj
+src/UbuntuOneClient/bin
+src/UbuntuOneClient/obj
+src/UbuntuOneClient.Tests/bin
+src/UbuntuOneClient.Tests/obj

=== modified file 'main.build'
--- main.build	2010-07-28 09:04:19 +0000
+++ main.build	2010-07-30 09:47:43 +0000
@@ -135,13 +135,20 @@
               workingdir="src/Canonical.UbuntuOne.ProcessDispatcher.Tests/bin/${enviroment}"
               program="nunit-console.exe"
               commandline="Canonical.UbuntuOne.ProcessDispatcher.Tests.dll /xml=../../../../test-results/Canonical.UbuntuOne.ProcessDispatcher.Tests-Result.xml" />
-			  
+		
 		<echo>Canonical.UbuntuOne.Client.Test</echo>
 		<exec basedir="tools/NUnit"
               managed="true"
               workingdir="src/Canonical.UbuntuOne.Client.Test/bin/${enviroment}"
               program="nunit-console.exe"
               commandline="Canonical.UbuntuOne.Client.Test.dll /xml=../../../../test-results/Canonical.UbuntuOne.Client.Test-Result.xml" />
+			  
+		<echo>UbuntuOneClient.Tests</echo>
+		<exec basedir="tools/NUnit"
+              managed="true"
+              workingdir="src/UbuntuOneClient.Tests/bin/${enviroment}"
+              program="nunit-console.exe"
+              commandline="UbuntuOneClient.Tests.dll /xml=../../../../test-results/UbuntuOneClient.Tests-Result.xml" />
 	</target>
 	
 	<target name="installer"

=== modified file 'src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj'
--- src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj	2010-07-27 16:03:23 +0000
+++ src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj	2010-07-30 09:47:43 +0000
@@ -181,6 +181,12 @@
     <Resource Include="Resources\ubuntu-logo-32x32.png">
     </Resource>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Canonical.UbuntuOne.Client\Canonical.UbuntuOne.Client.csproj">
+      <Project>{7467483A-D6D5-4362-8DF4-57A7254EB569}</Project>
+      <Name>Canonical.UbuntuOne.Client</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

=== modified file 'src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs'
--- src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs	2010-07-27 15:02:26 +0000
+++ src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs	2010-07-30 09:47:43 +0000
@@ -18,13 +18,14 @@
  * Authors: Manuel de la Peña <[e-mail]>
  */
 using System.Windows;
+using Canonical.UbuntuOne.Client.Notification;
 
 namespace Canonical.UbuntuOne.Client.Views
 {
     /// <summary>
     /// Interaction logic for UbuntuOneNotifyIcon.xaml
     /// </summary>
-    public partial class UbuntuOneNotifyIcon : Window
+    public partial class UbuntuOneNotifyIcon : Window, INotificationIconView
     {
         public UbuntuOneNotifyIcon()
         {

=== modified file 'src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj'
--- src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj	2010-07-27 15:02:26 +0000
+++ src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj	2010-07-30 09:47:43 +0000
@@ -32,6 +32,7 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="Notification\INotificationIconView.cs" />
     <Compile Include="Notification\NotificationIconPresenter.cs" />
     <Compile Include="Notification\OperationCompletenessEventArgs.cs" />
     <Compile Include="Notification\RecentlyModifiedEventArgs.cs" />

=== added file 'src/Canonical.UbuntuOne.Client/Notification/INotificationIconView.cs'
--- src/Canonical.UbuntuOne.Client/Notification/INotificationIconView.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client/Notification/INotificationIconView.cs	2010-07-30 09:47:43 +0000
@@ -0,0 +1,25 @@
+/**
+ * Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+namespace Canonical.UbuntuOne.Client.Notification
+{
+    public interface INotificationIconView
+    {
+    }
+}

=== modified file 'src/Canonical.UbuntuOne.Common.Tests/Update/UpdaterFixture.cs'
--- src/Canonical.UbuntuOne.Common.Tests/Update/UpdaterFixture.cs	2010-07-21 10:07:22 +0000
+++ src/Canonical.UbuntuOne.Common.Tests/Update/UpdaterFixture.cs	2010-07-30 09:47:43 +0000
@@ -193,6 +193,24 @@
             }
         }
 
+        [Test]
+        [ExpectedException(typeof(SelfUpdateException))]
+        public void CheckForUpdatesExceptionTest()
+        {
+            using(_mocks.Record())
+            {
+                Expect.Call(_dotUpdaterWrapper.CheckForUpdates())
+                    .Throw(new UpdaterException(""));
+            }
+            using(_mocks.Playback())
+            {
+                if (_updater.UpdatesArePresent())
+                {
+                    _updater.PerformUpdate();
+                }
+            }
+        }
+
         #endregion
     }
 }

=== modified file 'src/Canonical.UbuntuOne.Common/Update/IUpdateView.cs'
--- src/Canonical.UbuntuOne.Common/Update/IUpdateView.cs	2010-07-14 13:50:36 +0000
+++ src/Canonical.UbuntuOne.Common/Update/IUpdateView.cs	2010-07-30 09:47:43 +0000
@@ -32,7 +32,7 @@
         /// and return if he decided to update the application or not.
         /// </summary>
         /// <returns>The answer that the user provided.</returns>
-        UpdateConfirmation AskForDownloadConfirmation();
+        UpdateConfirmation AskForDownloadAndUpdateConfirmation();
 
         /// <summary>
         /// This method should prompt some kind of confirmation to the user to close and install the update

=== modified file 'src/Canonical.UbuntuOne.Common/Update/Updater.cs'
--- src/Canonical.UbuntuOne.Common/Update/Updater.cs	2010-07-21 10:07:22 +0000
+++ src/Canonical.UbuntuOne.Common/Update/Updater.cs	2010-07-30 09:47:43 +0000
@@ -160,34 +160,43 @@
 
         public bool UpdatesArePresent()
         {
-            // we lock since this is done in a multithreaded enviroment and 
-            // we want to make sure that we do not check for the update twice at the same time
-            if(_task == null)
+            try
             {
-                lock (_updateLock)
+                // we lock since this is done in a multithreaded enviroment and 
+                // we want to make sure that we do not check for the update twice at the same time
+                if (_task == null)
                 {
-                    _task = DotUpdater.CheckForUpdates();
-                    _updateChecked = true;
+                    lock (_updateLock)
+                    {
+                        _task = DotUpdater.CheckForUpdates();
+                        _updateChecked = true;
+                    }
                 }
-            }
-            return _task != null;
+                return _task != null;
+            }
+            catch(UpdaterException ex)
+            {
+                throw new SelfUpdateException("Could not check for updates.", ex);
+            }
         }
 
         public void PerformUpdate()
         {
             lock (_updateLock)
             {
+                // ask the user if he wants to perform the update
+                if (UpdateView.AskForDownloadAndUpdateConfirmation() == UpdateConfirmation.NO) return;
                 if (!_updateChecked)
                 {
                     Logger.Error(UpdateResources.CheckNotDone);
                     throw new SelfUpdateException(UpdateResources.CheckNotDone);
                 }
-                if(_task == null)
+                if (_task == null)
                 {
                     Logger.Error(UpdateResources.NoUpdatesAvailable);
                     throw new SelfUpdateException(UpdateResources.NoUpdatesAvailable);
                 }
-                if(!_task.Downloaded && !_downloadingUpdate)
+                if (!_task.Downloaded && !_downloadingUpdate)
                 {
                     // we need to download the update
                     try
@@ -212,7 +221,7 @@
                         throw new SelfUpdateException(UpdateResources.CannotDownload, e);
                     }
                 }
-                if(_task.Downloaded)
+                if (_task.Downloaded)
                 {
                     _downloadingUpdate = false;
                     // just call the handler directly

=== modified file 'src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj'
--- src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj	2010-07-26 16:01:28 +0000
+++ src/Canonical.UbuntuOne.ProcessDispatcher/Canonical.UbuntuOne.ProcessDispatcher.csproj	2010-07-30 09:47:43 +0000
@@ -29,6 +29,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -121,6 +122,7 @@
       <HintPath>..\..\lib\Protobuf-net\protobuf-net.dll</HintPath>
     </Reference>
     <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Xml" />
   </ItemGroup>

=== modified file 'src/UbuntuOne.sln'
--- src/UbuntuOne.sln	2010-07-27 15:02:26 +0000
+++ src/UbuntuOne.sln	2010-07-30 09:47:43 +0000
@@ -19,6 +19,8 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UbuntuOneClient", "UbuntuOneClient\UbuntuOneClient.csproj", "{E41083CC-B99A-4AEC-93CC-F693F6AA6071}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UbuntuOneClient.Tests", "UbuntuOneClient.Tests\UbuntuOneClient.Tests.csproj", "{53B3D3DA-687D-4D35-A3D3-7939E635098B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -119,6 +121,16 @@
 		{E41083CC-B99A-4AEC-93CC-F693F6AA6071}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E41083CC-B99A-4AEC-93CC-F693F6AA6071}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E41083CC-B99A-4AEC-93CC-F693F6AA6071}.Release|x86.ActiveCfg = Release|Any CPU
+		{53B3D3DA-687D-4D35-A3D3-7939E635098B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53B3D3DA-687D-4D35-A3D3-7939E635098B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53B3D3DA-687D-4D35-A3D3-7939E635098B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{53B3D3DA-687D-4D35-A3D3-7939E635098B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{53B3D3DA-687D-4D35-A3D3-7939E635098B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{53B3D3DA-687D-4D35-A3D3-7939E635098B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53B3D3DA-687D-4D35-A3D3-7939E635098B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53B3D3DA-687D-4D35-A3D3-7939E635098B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{53B3D3DA-687D-4D35-A3D3-7939E635098B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{53B3D3DA-687D-4D35-A3D3-7939E635098B}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

=== added directory 'src/UbuntuOneClient.Tests'
=== added file 'src/UbuntuOneClient.Tests/ProgramFixture.cs'
--- src/UbuntuOneClient.Tests/ProgramFixture.cs	1970-01-01 00:00:00 +0000
+++ src/UbuntuOneClient.Tests/ProgramFixture.cs	2010-07-30 09:47:43 +0000
@@ -0,0 +1,140 @@
+/**
+ * Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+using System.Windows;
+using Canonical.UbuntuOne.Client.Notification;
+using Canonical.UbuntuOne.Common.Update;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+namespace UbuntuOneClient.Tests
+{
+    [TestFixture]
+    public class ProgramFixture
+    {
+        // TODO: If this tests are ran in TestDriven.net there are exceptions thrown
+        // due to the way in which the threads are spawn. If the tests are ran with NUnit
+        // there are no issues.
+        #region Variables
+
+        private IUpdater _updater;
+        private INotificationIconView _notifyIcon;
+        private IApplication _app;
+        private MockRepository _mocks;
+        private Program _program;
+
+        #endregion
+
+        #region Seup & Tear Down
+
+        [SetUp]
+        public void Setup()
+        {
+            _mocks = new MockRepository();
+            _updater = _mocks.StrictMock<IUpdater>();
+            _notifyIcon = _mocks.StrictMock<INotificationIconView>();
+            _app = _mocks.StrictMock<IApplication>();
+            _program = new Program
+            {
+                NotifyIcon = _notifyIcon, 
+                Updater = _updater,
+                Application = _app
+            };
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            // ensure that the updater thread joins the application, if not we will have an issue 
+            // with the tests since the thread will not be collected
+            _program.StopUpdaterThread();
+        }
+
+        #endregion
+
+        [Test]
+        public void StartApplicationNoUpdates()
+        {
+            using(_mocks.Record())
+            {
+                // expect the application shutdown mode to change
+                _app.ShutdownMode = ShutdownMode.OnExplicitShutdown;
+   
+                // expect that we are calling the run with the correct window
+                Expect.Call(() => _app.Run(_notifyIcon))
+                    .Repeat.Once();
+
+                // return that the are no update, since we have a strict mock the test will
+                // fail if we perform the update.
+                Expect.Call(_updater.UpdatesArePresent())
+                    .Return(false);
+            }
+            using(_mocks.Playback())
+            {
+                _program.StartApplication();
+            }
+        }
+
+        [Test]
+        public void StartApplicationWithUpdates()
+        {
+            using (_mocks.Record())
+            {
+                _app.ShutdownMode = ShutdownMode.OnExplicitShutdown;
+
+                // expect that we are calling the run with the correct window
+                Expect.Call(() => _app.Run(_notifyIcon))
+                    .Repeat.Once();
+
+                // return that the are no update, since we have a strict mock the test will
+                // fail if we perform the update.
+                Expect.Call(_updater.UpdatesArePresent())
+                    .Return(true);
+
+                Expect.Call(() => _updater.PerformUpdate());
+            }
+            using(_mocks.Playback())
+            {
+                _program.StartApplication();
+            }
+        }
+
+        [Test]
+        public void StartApplicationWithCheckUpdatesExceptionTest()
+        {
+            using(_mocks.Record())
+            {
+                _app.ShutdownMode = ShutdownMode.OnExplicitShutdown;
+
+                // expect that we are calling the run with the correct window
+                Expect.Call(() => _app.Run(_notifyIcon))
+                    .Repeat.Once();
+
+                // throw an exception and expect it to be caught and continue.
+                Expect.Call(_updater.UpdatesArePresent())
+                    .Throw(new SelfUpdateException());
+
+            }
+            using(_mocks.Playback())
+            {
+                _program.StartApplication();
+            }
+        }
+    }
+}

=== added directory 'src/UbuntuOneClient.Tests/Properties'
=== added file 'src/UbuntuOneClient.Tests/Properties/AssemblyInfo.cs'
--- src/UbuntuOneClient.Tests/Properties/AssemblyInfo.cs	1970-01-01 00:00:00 +0000
+++ src/UbuntuOneClient.Tests/Properties/AssemblyInfo.cs	2010-07-30 09:47:43 +0000
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("UbuntuOneClient.Tests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("UbuntuOneClient.Tests")]
+[assembly: AssemblyCopyright("Copyright ©  2010")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("007ab11d-53f0-4edd-8044-f6aaba73ac6c")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

=== added file 'src/UbuntuOneClient.Tests/UbuntuOneClient.Tests.csproj'
--- src/UbuntuOneClient.Tests/UbuntuOneClient.Tests.csproj	1970-01-01 00:00:00 +0000
+++ src/UbuntuOneClient.Tests/UbuntuOneClient.Tests.csproj	2010-07-30 09:47:43 +0000
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{53B3D3DA-687D-4D35-A3D3-7939E635098B}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>UbuntuOneClient.Tests</RootNamespace>
+    <AssemblyName>UbuntuOneClient.Tests</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="nunit.framework, Version=2.5.5.10112, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\Nunit\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="PresentationFramework">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\RhinoMocks\Rhino.Mocks.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ProgramFixture.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Canonical.UbuntuOne.Client\Canonical.UbuntuOne.Client.csproj">
+      <Project>{7467483A-D6D5-4362-8DF4-57A7254EB569}</Project>
+      <Name>Canonical.UbuntuOne.Client</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Canonical.UbuntuOne.Common\Canonical.UbuntuOne.Common.csproj">
+      <Project>{11353FF8-8E5A-488E-9CB1-873DADD232B9}</Project>
+      <Name>Canonical.UbuntuOne.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\UbuntuOneClient\UbuntuOneClient.csproj">
+      <Project>{E41083CC-B99A-4AEC-93CC-F693F6AA6071}</Project>
+      <Name>UbuntuOneClient</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file

=== added file 'src/UbuntuOneClient/ApplicationWrapper.cs'
--- src/UbuntuOneClient/ApplicationWrapper.cs	1970-01-01 00:00:00 +0000
+++ src/UbuntuOneClient/ApplicationWrapper.cs	2010-07-30 09:47:43 +0000
@@ -0,0 +1,55 @@
+using System;
+/**
+ * Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+using System.Threading;
+using System.Windows;
+using Canonical.UbuntuOne.Client.Notification;
+using Canonical.UbuntuOne.Common.Validation;
+
+namespace UbuntuOneClient
+{
+    /// <summary>
+    /// Helper class that has been created to allow an easy way to test the Program class that starts the application.
+    /// </summary>
+    internal class ApplicationWrapper : IApplication
+    {
+        private readonly Application _app;
+
+        public ApplicationWrapper()
+        {
+            _app = new Application();
+        }
+
+        public void Run(INotificationIconView notificationIcon)
+        {
+            ValidateArgs.Begin()
+                .IsOfType(notificationIcon, typeof (Window), "notificationIcon")
+                .Check();
+            var window = (Window)notificationIcon;
+            _app.Run(window);
+        }
+
+        public ShutdownMode ShutdownMode
+        {
+            get { return _app.ShutdownMode; }
+            set { _app.ShutdownMode = value; }
+        }
+    }
+}

=== added file 'src/UbuntuOneClient/IApplication.cs'
--- src/UbuntuOneClient/IApplication.cs	1970-01-01 00:00:00 +0000
+++ src/UbuntuOneClient/IApplication.cs	2010-07-30 09:47:43 +0000
@@ -0,0 +1,41 @@
+/**
+ * Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+using System.Windows;
+using Canonical.UbuntuOne.Client.Notification;
+
+namespace UbuntuOneClient
+{
+    /// <summary>
+    /// Helper interface that has been added to make the code more testable in the program class.
+    /// </summary>
+    public interface IApplication
+    {
+        /// <summary>
+        /// Runs an application using the passed window as its main window in the thread.
+        /// </summary>
+        /// <param name="notificationIcon">The notification icon used by the user to interact with the daemon.</param>
+        void Run(INotificationIconView notificationIcon);
+
+        /// <summary>
+        /// Gets and sets the shutdown mode to be used in the application.
+        /// </summary>
+        ShutdownMode ShutdownMode { get; set; }
+    }
+}

=== modified file 'src/UbuntuOneClient/Program.cs'
--- src/UbuntuOneClient/Program.cs	2010-07-28 07:47:45 +0000
+++ src/UbuntuOneClient/Program.cs	2010-07-30 09:47:43 +0000
@@ -18,25 +18,138 @@
  * Authors: Manuel de la Peña <[e-mail]>
  */
 using System;
+using System.Threading;
 using System.Windows;
-using Canonical.UbuntuOne.Client.Views;
+using Canonical.UbuntuOne.Client.Notification;
 using Canonical.UbuntuOne.Common.Container;
+using Canonical.UbuntuOne.Common.Update;
 using log4net;
 
 namespace UbuntuOneClient
 {
-    class Program
+    /// <summary>
+    /// Class that will start the application when needed.
+    /// </summary>
+    internal class Program
     {
-        private static ILog _logger = LogManager.GetLogger(typeof(Program));
+        private static readonly ILog _logger = LogManager.GetLogger(typeof(Program));
+        private IUpdater _updater;
+        private readonly object _updaterLock = new object();
+        private INotificationIconView _notifyIcon;
+        private readonly object _notifyIconLock = new object();
+        private Thread _updatesThread;
+        #region DI Properties for testability
+
+        /// <summary>
+        /// Allows to get and set the updater to be used, if the updater is not present the class
+        /// will use the ObjectsContainer to retrieve it. This property has been added to increase the testability
+        /// of the class.
+        /// </summary>
+        internal IUpdater Updater
+        {
+            get
+            {
+                if(_updater == null)
+                {
+                    lock(_updaterLock)
+                    {
+                        _updater = ObjectsContainer.GetImplementationOf<IUpdater>();
+                    }
+                }
+                return _updater;
+            }
+            set { _updater = value; }
+        }
+
+        /// <summary>
+        /// Allows to get and set the notification icon, if the notification icon is not present the class 
+        /// will use the Objects container to retrieve it. This property has been added to icrease the testability of the 
+        /// class.
+        /// </summary>
+        internal INotificationIconView NotifyIcon
+        {
+            get
+            {
+                if(_notifyIcon == null)
+                {
+                    lock (_notifyIconLock)
+                    {
+                        _notifyIcon = ObjectsContainer.GetImplementationOf<INotificationIconView>();
+                    }
+                }
+                return _notifyIcon;
+            }
+            set { _notifyIcon = value; }
+        }
+
+        /// <summary>
+        /// Allows to get and set the application that will be used to ran the client. This property has been 
+        /// added to increase the testability of the class.
+        /// </summary>
+        internal IApplication Application { get; set; }
+
+        #endregion
+
+        #region Helper methods
+
+        /// <summary>
+        /// Helper method that will check for updates and will ask the user if an update is required.
+        /// </summary>
+        private void CheckForUpdates()
+        {
+            try
+            {
+                if (!Updater.UpdatesArePresent()) return;
+                _logger.Info("Updates are available.");
+                Updater.PerformUpdate();
+            }catch(SelfUpdateException ex)
+            {
+                _logger.WarnFormat("Application could not be update {0}", ex);
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Starts the application when requested. The code has been refactored to this method to allow
+        /// unit testing.
+        /// </summary>
+        public void StartApplication()
+        {
+            _logger.Debug("Starting client application.");
+            // we explicitly want to stop the application
+            Application.ShutdownMode = ShutdownMode.OnExplicitShutdown;
+            // we start the check for updates in another thread so that we do not block the user, 
+            // that way we will not stop the execution of the application while we chec the rss feed.
+            _updatesThread = new Thread(CheckForUpdates);
+            _updatesThread.Start();
+            // we do not worry about looping to allow the other thread to finish, we no that app should take longer
+            Application.Run(NotifyIcon);
+        }
+
+        /// <summary>
+        /// Allows to stop the trhad that is checking if updates are avialble.
+        /// </summary>
+        public void StopUpdaterThread()
+        {
+            if(_updatesThread != null)
+            {
+                _updatesThread.Join();
+            }
+            else
+            {
+                _logger.Warn("Not update thread exists.");
+            }
+        }
+
 
         [STAThread]
         static void Main()
         {
-            _logger.Debug("Starting client application.");
+            // init the objects container
             ObjectsContainer.Initialize(new SpringContainer());
-            var notifyIcon = ObjectsContainer.GetImplementationOf<UbuntuOneNotifyIcon>();
-            var app = new Application {ShutdownMode = ShutdownMode.OnExplicitShutdown};
-            app.Run(notifyIcon);
+            var program = ObjectsContainer.GetImplementationOf<Program>();
+            program.StartApplication();
         }
     }
 }

=== modified file 'src/UbuntuOneClient/Properties/AssemblyInfo.cs'
--- src/UbuntuOneClient/Properties/AssemblyInfo.cs	2010-07-27 14:19:43 +0000
+++ src/UbuntuOneClient/Properties/AssemblyInfo.cs	2010-07-30 09:47:43 +0000
@@ -53,3 +53,5 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
+// allow the test assembly to access the internals
+[assembly: InternalsVisibleTo("UbuntuOneClient.Tests")]

=== modified file 'src/UbuntuOneClient/UbuntuOneClient.csproj'
--- src/UbuntuOneClient/UbuntuOneClient.csproj	2010-07-28 07:47:45 +0000
+++ src/UbuntuOneClient/UbuntuOneClient.csproj	2010-07-30 09:47:43 +0000
@@ -62,6 +62,8 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ApplicationWrapper.cs" />
+    <Compile Include="IApplication.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
@@ -96,6 +98,10 @@
       <Project>{1F0E3DAF-F22F-4B0C-8039-118B082DA237}</Project>
       <Name>Canonical.UbuntuOne.Client.Views</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Canonical.UbuntuOne.Client\Canonical.UbuntuOne.Client.csproj">
+      <Project>{7467483A-D6D5-4362-8DF4-57A7254EB569}</Project>
+      <Name>Canonical.UbuntuOne.Client</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Canonical.UbuntuOne.Common\Canonical.UbuntuOne.Common.csproj">
       <Project>{11353FF8-8E5A-488E-9CB1-873DADD232B9}</Project>
       <Name>Canonical.UbuntuOne.Common</Name>

=== modified file 'src/UbuntuOneClient/objects.xml'
--- src/UbuntuOneClient/objects.xml	2010-07-28 07:47:45 +0000
+++ src/UbuntuOneClient/objects.xml	2010-07-30 09:47:43 +0000
@@ -1,6 +1,22 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <objects xmlns="http://www.springframework.net">
   <!--  Define window that will be used as the start point of the app -->
+  <object id="Updater"
+          type="Canonical.UbuntuOne.Common.Update.Updater, Canonical.UbuntuOne.Common" >
+    <property name="RSSFeed"
+              value="http://path/to/rss.feed"/>
+  </object>
+  
   <object id="UbuntuOneNotifyIcon"
           type="Canonical.UbuntuOne.Client.Views.UbuntuOneNotifyIcon, Canonical.UbuntuOne.Client.Views" />
+
+  <object id="Application"
+          type="UbuntuOneClient.ApplicationWrapper, UbuntuOneClient" />
+
+  <object id="Program"
+          type="UbuntuOneClient.Program, UbuntuOneClient"
+          autowire="autodetect" >
+    <property name="Application"
+              ref="Application" />
+  </object>
 </objects>
\ No newline at end of file