Bugfix/issue547

build.gradle

@@ -22,9 +22,9 @@ project.ext {
 
 dependencies {
 	compile			project(':syncany-lib')
-	compile			"net.java.dev.jets3t:jets3t:0.9.2"
+	compile			"net.java.dev.jets3t:jets3t:0.9.4"
 
-	pluginjar("net.java.dev.jets3t:jets3t:0.9.2") {
+	pluginjar("net.java.dev.jets3t:jets3t:0.9.4") {
 		exclude		group: "org.bouncycastle"
 		exclude		group: "org.apache.httpcomponents"
 	}

core/.gitignore

@@ -10,3 +10,6 @@ gradle/arch/syncany/pkg
 gradle/arch/syncany/src
 gradle/arch/syncany/syncany*.tar*
 *.orig
+.recommenders
+.idea/
+*.iml

core/.travis.sh

@@ -3,7 +3,7 @@
 set -e
 
 # Run JUnit tests and generate reports
-./gradlew testGlobal coberturaReport performCoverageCheck coveralls javadocAll
+./gradlew testGlobal jacocoRootReport javadocAll
 
 # SonarQube disabled for now. Took >43min on Travis!
 

core/.travis.yml

@@ -1,5 +1,7 @@
 language: java
-jdk: openjdk7
+jdk: openjdk8
+sudo: required
+dist: trusty
 
 env:
   global:
@@ -27,6 +29,8 @@ notifications:
   irc: "chat.freenode.net#syncany"
 
 before_install:
+  # Enable i386 for wine
+  - sudo dpkg --add-architecture i386
   # Update APT (necessary!)
   - sudo apt-get update
 
@@ -44,8 +48,7 @@ before_install:
 
   # Inno Setup (for Windows executable/installer)
   # Note: If this code is changed, also update syncany-plugin-gui/.travis.yml
-  - sudo add-apt-repository --yes ppa:arx/release
-  - sudo apt-get update -d
+
   - sudo apt-get install -y -q innoextract wine python-software-properties
   - wine --version 
   - innoextract --version 

core/CHANGELOG.md

@@ -1,6 +1,23 @@
 Change Log
 ==========
 
+### Syncany 0.4.8-alpha (Date: TBA)
+- Developer/alpha release (**We are now nearing the beta phase. Stay tuned!**)
+- Bugfixes and other things:
+  + Fixed bug with `sy restore` #534/#535
+  + Fix .syignore recursive behavior #555/#544
+
+### Syncany 0.4.7-alpha (Date: 7 Nov 2015)
+- Developer/alpha release (**We are now nearing the beta phase. Stay tuned!**)
+- Bugfixes and other things:
+  + Refactoring and simplification of UpOperation
+  + Refactoring DownOperation (better memory management)
+  + Refactoring of error handling (don't throw 'Exception')
+  + Fix GUI crashes in 'Add folder' wizard #497
+  + Fix OSX daemon start/stop to new style #281/#530
+  + Fix Windows spaces in path issue #522/#529
+  + Fix not resuming transactions if transaction files are corrupt #520
+
 ### Syncany 0.4.6-alpha (Date: 11 July 2015)
 - Developer/alpha release (**We are now nearing the beta phase. Stay tuned!**)
 - Features and significant changes:

core/README.md

@@ -1,6 +1,6 @@
 Syncany
 =======
-[![Build Status](https://travis-ci.org/syncany/syncany.svg?branch=master)](https://travis-ci.org/syncany/syncany) [![Coverage Status](https://coveralls.io/repos/syncany/syncany/badge.svg?branch=develop)](https://reports.syncany.org/coverage/) [![Test Status](https://api.syncany.org/v3/badges/tests)](https://reports.syncany.org/tests/) [![Lines of Code](https://api.syncany.org/v3/badges/lines)](https://syncany.org/reports/cloc.xml) [![Contribute and get some Bitcoins for every commit](https://api.syncany.org/v3/badges/tips)](http://tip4commit.com/github/syncany/syncany) [![User guide](https://readthedocs.org/projects/syncany/badge/?version=latest)](https://readthedocs.org/projects/syncany/?badge=latest) [![JavaDoc](https://api.syncany.org/v3/badges/javadoc)](https://docs.syncany.org/javadoc/) [![Issues needing your help](https://api.syncany.org/v3/badges/waffle)](http://waffle.io/syncany/syncany) [![Flattr](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/thing/290043/Syncany)
+[![Build Status](https://travis-ci.org/syncany/syncany.svg?branch=master)](https://travis-ci.org/syncany/syncany) [![Coverage Status](https://api.syncany.org/v3/badges/coverage)](https://reports.syncany.org/coverage/) [![Test Status](https://api.syncany.org/v3/badges/tests)](https://reports.syncany.org/tests/) [![Lines of Code](https://api.syncany.org/v3/badges/lines)](https://syncany.org/reports/cloc.xml) [![Contribute and get some Bitcoins for every commit](https://api.syncany.org/v3/badges/tips)](http://tip4commit.com/github/syncany/syncany) [![User guide](https://readthedocs.org/projects/syncany/badge/?version=latest)](https://readthedocs.org/projects/syncany/?badge=latest) [![JavaDoc](https://api.syncany.org/v3/badges/javadoc)](https://docs.syncany.org/javadoc/) [![Issues needing your help](https://api.syncany.org/v3/badges/waffle)](http://waffle.io/syncany/syncany) [![Flattr](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/thing/290043/Syncany)
 
 <img src="gradle/resources/syncany-logo.png" align="right" />
 

core/build.gradle

@@ -7,7 +7,7 @@ apply from: 'gradle/gradle/helpers.gradle'
 // Global Settings /////////////////////////////////////////////////////////////
 
 project.ext {
-	applicationVersion = "0.4.7-alpha"
+	applicationVersion = "0.4.8-alpha"
 	applicationVersionDebian = "1";
 
 	applicationRelease = isApplicationRelease()
@@ -49,4 +49,7 @@ dependencies {
 	testCompile		project(path: ":syncany-lib", configuration: "tests")
 	testCompile		project(path: ":syncany-cli", configuration: "tests")
 	testCompile		project(path: ":syncany-util", configuration: "tests")
+
+	testRuntime "org.slf4j:slf4j-log4j12:1.7.5"
+	testRuntime "log4j:log4j:1.2.7"
 }

core/gradle/arch/syncany-git/PKGBUILD

@@ -1,13 +1,15 @@
 # Maintainer: Armin Fisslthaler <armin@fisslthaler.net>
 pkgname=syncany-git
-pkgver=0.1.8.alpha.g95a5172
+pkgver=0.4.8.alpha.g194955d
 pkgrel=1
 pkgdesc="Cloud storage and filesharing application with a focus on security and abstraction of storage."
 arch=(any)
 url=https://www.syncany.org/
 license=(GPL3)
-depends=('java-runtime>=7', 'bash-completion')
+depends=('java-environment>=7', 'sh')
+optdepends=('bash-completion: auto completion in bash')
 makedepends=(git)
+conflicts=('syncany')
 source=("${pkgname}"::'git+http://github.com/syncany/syncany')
 md5sums=('SKIP')
 
@@ -23,7 +25,9 @@ build(){
 
 package(){
     install -Dm755 "$srcdir/$pkgname/gradle/arch/syncany/syncany" "${pkgdir}/usr/bin/syncany"
-    install -Dm755 "$srcdir/$pkgname/gradle/bash/syncany.bash-completion" "${pkgdir}/etc/bash_completion.d/"
+    install -Dm755 "$srcdir/$pkgname/gradle/bash/syncany.bash-completion" "${pkgdir}/etc/bash_completion.d/syncany.bash-completion"
+    install -Dm755 "$srcdir/$pkgname/gradle/systemd/syncany.service" "${pkgdir}/usr/lib/systemd/user/syncany.service"
+    install -Dm755 "$srcdir/$pkgname/gradle/systemd/syncany-gui.service" "${pkgdir}/usr/lib/systemd/user/syncany-gui.service"
 
     cd "$srcdir/$pkgname/build/install/syncany/lib"
     for jar in *; do

core/gradle/arch/syncany/PKGBUILD

@@ -1,16 +1,17 @@
 # Maintainer: Pim Otte <otte dot pim at gmail dot com>
 pkgname=syncany
-pkgver=0.4.5_alpha
-_realver=0.4.5-alpha
-pkgrel=1
+pkgver=0.4.7_alpha
+_realver=0.4.7-alpha
+pkgrel=2
 pkgdesc="Cloud storage and filesharing application with a focus on security and abstraction of storage."
 arch=(any)
 url="http://www.syncany.org/"
 license=('GPL3')
-depends=('java-runtime>=7' 'bash-completion')
+depends=('java-environment>=7', 'sh')
+optdepends=('bash-completion: auto completion in bash')
 source=("http://syncany.org/dist/$pkgname-${_realver}.tar.gz"
         )
-sha256sums=('7e8fbad0d9bf90369ad21fd1b3d54c7025738f2da9b1a364273f16cb76d59069')
+sha256sums=('14d822b34e0a6363fa580104c7fc0d58571b5adb766aff412b12e9f340ce3477')
 
 package() {
     install -Dm644 "$srcdir/$pkgname-${_realver}/bash/syncany.bash-completion" "${pkgdir}/etc/bash_completion.d/syncany"

core/gradle/daemon/syncanyd.bat.skel

@@ -1,10 +1,10 @@
 rem Embedded Daemon script begins ################################SYNCANY_INCL_3#
 
 set APP_NAME=syncanyd
-set APP_USER_DIR=%AppData%\Syncany
-set APP_DAEMON_CONTROL=%APP_USER_DIR%\daemon.ctrl
-set APP_DAEMON_PIDFILE=%APP_USER_DIR%\daemon.pid
-set APP_DAEMON_PIDFILE_TMP=%APP_USER_DIR%\daemon.pid.tmp
+set APP_USER_DIR="%AppData%\Syncany"
+set APP_DAEMON_CONTROL="%APP_USER_DIR%\daemon.ctrl"
+set APP_DAEMON_PIDFILE="%APP_USER_DIR%\daemon.pid"
+set APP_DAEMON_PIDFILE_TMP="%APP_USER_DIR%\daemon.pid.tmp"
 
 if not exist "%APP_USER_DIR%" mkdir "%APP_USER_DIR%" 
 

core/gradle/eclipse/org.eclipse.jdt.core.prefs

@@ -1,14 +1,14 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

core/gradle/gradle/application.distribution.gradle

@@ -22,7 +22,7 @@ startScripts {
 
 		// - Read max memory (-Xmx) from userconfig.xml
 		String winMaxMemoryCommands = "@rem Read max memory from userconfig.xml #SYNCANY_INCL_1#\r\n"
-		winMaxMemoryCommands += "set APP_USERCONFIG_FILE=%AppData%\\\\Syncany\\\\userconfig.xml\r\n";
+		winMaxMemoryCommands += "set APP_USERCONFIG_FILE=\"%AppData%\\\\Syncany\\\\userconfig.xml\"\r\n";
 		winMaxMemoryCommands += "\r\n";
 		winMaxMemoryCommands += "if exist \"%APP_USERCONFIG_FILE%\" (\r\n";
 		winMaxMemoryCommands += "  if \"%OS%\"==\"Windows_NT\" setlocal ENABLEDELAYEDEXPANSION\r\n";
@@ -42,7 +42,7 @@ startScripts {
 
 		// - Post Java process commands: Delayed plugin JAR file deletion (Windows only)
 		String winPurgeFileDeletionCommands = "@rem Delete plugin JARs #SYNCANY_INCL_2#\r\n"
-		winPurgeFileDeletionCommands += "SET PURGEFILE=%AppData%\\\\Syncany\\\\purgefile\r\n";
+		winPurgeFileDeletionCommands += "SET PURGEFILE=\"%AppData%\\\\Syncany\\\\purgefile\"\r\n";
 		winPurgeFileDeletionCommands += "if exist %PURGEFILE% (\r\n";
 		winPurgeFileDeletionCommands += "  @for /f %%b in (%PURGEFILE%) do del /q \"%%b\" 2>NUL\r\n";
 		winPurgeFileDeletionCommands += "  del /q %PURGEFILE% 2>NUL\r\n";
@@ -52,7 +52,7 @@ startScripts {
 
 		// - Post Java process commands: Delayed plugin JAR file install (Windows only)
 		String winUpdateFileCommands = "@rem Reinstall plugins after update removal #SYNCANY_INCL_4#\r\n"
-		winUpdateFileCommands += "SET UPDATEFILE=%AppData%\\\\Syncany\\\\updatefile\r\n";
+		winUpdateFileCommands += "SET UPDATEFILE=\"%AppData%\\\\Syncany\\\\updatefile\"\r\n";
 		winUpdateFileCommands += "if exist %UPDATEFILE% (\r\n";
 		winUpdateFileCommands += "  @for /f %%b in (%UPDATEFILE%) do (\r\n    <nul set /p =Updating %%b... \r\n    \"%JAVA_EXE%\" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %SYNCANY_OPTS%  -classpath \"%CLASSPATH%\" org.syncany.Syncany plugin install %%b -m 2>NUL)\r\n";
 		winUpdateFileCommands += "  del /q %UPDATEFILE% 2>NUL\r\n";
@@ -206,6 +206,12 @@ applicationDistribution.from("${rootProject.projectDir}/") {
 		include "syncany.bash-completion"
 		into "bash"
 	}
+
+    // Copy systemd file to distribution
+    from("${rootProject.projectDir}/gradle/systemd") {
+        include "syncany*"
+        into "systemd"
+    }
 }
 
 task manpages(dependsOn: compileJava) {

core/gradle/gradle/application.java.gradle

@@ -5,8 +5,8 @@ subprojects {
 
 	group = 'org.syncany'		
 
-	sourceCompatibility = 1.7
-	targetCompatibility = 1.7
+	sourceCompatibility = 1.8
+	targetCompatibility = 1.8
 
 	repositories {
 		mavenCentral()

core/gradle/gradle/development.eclipse.gradle

@@ -9,8 +9,8 @@ subprojects {
 		}
 
 		jdt {
-			sourceCompatibility = 1.7
-			targetCompatibility = 1.7			
+			sourceCompatibility = 1.8
+			targetCompatibility = 1.8
 		}		
 	}
 

core/gradle/gradle/reports.coverage.gradle

@@ -1,42 +1,57 @@
-// Coverage (Cobertura) ////////////////////////////////////////////////////////
-// Run as: gradle testGlobal coberturaReport performCoverageCheck
+// Coverage (JaCoCo) ////////////////////////////////////////////////////////
+// Run as: gradle testGlobal jacocoRootReport
 
 buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'net.saliman:gradle-cobertura-plugin:2.2.2'
-        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.3.1'
-    }
+	repositories {
+		mavenCentral()
+	}
 }
 
-// Reference by FQCN instead of name: http://forums.gradle.org/gradle/topics/plugin_not_found_when_i_using_a_gradle_from_other_gradle_file
-apply plugin: net.saliman.gradle.plugin.cobertura.CoberturaPlugin
-apply plugin: org.kt3k.gradle.plugin.CoverallsPlugin
+apply plugin: "jacoco"
 
 subprojects {
-    apply plugin: net.saliman.gradle.plugin.cobertura.CoberturaPlugin
+	apply plugin: "jacoco"
+
+	jacoco {
+		toolVersion = "0.7.1.201405082137"
+	}
+	test {
+		jacoco {
+			append = true
+			classDumpFile = file("${rootProject.buildDir}/jacoco/classpathdumps")
+			destinationFile = file("${rootProject.buildDir}/jacoco/tests.exec")
+		}
+	}
+
+
+	jacocoTestReport {
+		additionalSourceDirs = files(sourceSets.main.allSource.srcDirs)
+		sourceDirectories = files(sourceSets.main.allSource.srcDirs)
+		classDirectories =  files(sourceSets.main.output)
+
+		reports {
+			html.enabled = true
+			xml.enabled = true
+			csv.enabled = false
+		}
+	}
 }
 
-cobertura {
-    coverageFormats = ['html', 'xml']
-    coverageReportDatafile = file("build/cobertura/cobertura.ser")
-    coverageReportDir = file("build/reports/coverage")
-
-    coverageDirs = []
-    coverageSourceDirs = []
-    coverageMergeDatafiles = []
-
-    rootProject.subprojects.each {
-        coverageFormats = ['html', 'xml']
-        coverageDirs << file("${it.buildDir}/classes/main")
-        coverageSourceDirs << file("${it.projectDir}/src/main/java")
-        coverageMergeDatafiles << file("${it.buildDir}/cobertura/cobertura.ser")
-    }
+task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
+	dependsOn = subprojects.test
+	additionalSourceDirs = files(subprojects.sourceSets.main.allSource.srcDirs)
+	sourceDirectories = files(subprojects.sourceSets.main.allSource.srcDirs)
+	classDirectories =  files(subprojects.sourceSets.main.output)
+	executionData = files(subprojects.jacocoTestReport.executionData)
+
+	reports {
+		html.enabled = true
+		html.destination "${rootProject.buildDir}/reports/coverage"
+
+		xml.enabled = true
+		xml.destination "${rootProject.buildDir}/reports/coverage/coverage.xml"
+
+		csv.enabled = false
+	}   
 }
 
-coveralls {
-    coberturaReportPath = "${buildDir}/reports/coverage/coverage.xml"
-}

core/gradle/innosetup/innoinstall.sh

@@ -4,11 +4,8 @@ rm -rf /tmp/inno
 mkdir /tmp/inno
 cd /tmp/inno
 
-wget -O is.exe http://www.jrsoftware.org/download.php/is.exe
+wget -O is.exe http://files.jrsoftware.org/is/5/isetup-5.5.5.exe
 innoextract is.exe
 mkdir -p ~/".wine/drive_c/inno"
 cp -a app/* ~/".wine/drive_c/inno"
 
-#mkdir ~/".wine/drive_c/Program Files (x86)/Inno Setup 5"
-#cp -a app/* ~/".wine/drive_c/Program Files (x86)/Inno Setup 5"
-

core/gradle/osx/syncany.rb

@@ -2,9 +2,9 @@
 
 class Syncany < Formula
   homepage "https://www.syncany.org"
-  url "https://codeload.github.com/syncany/syncany/tar.gz/v0.4.5-alpha"
-  sha256 "957537a7177a5234e794d871043e67ac8e06ff3ff1ee059e599dfd477c5bb8e5"
-  version "0.4.5-alpha"
+  url "https://codeload.github.com/syncany/syncany/tar.gz/v0.4.6-alpha"
+  sha256 "1dfd92e7618297eae6ee0d8acb7103f55c8d18500da409d032a5941147fbcd85"
+  version "0.4.6-alpha"
   head "https://github.com/syncany/syncany.git", :branch => "develop"
 
   depends_on :java => "1.7+"
@@ -26,7 +26,7 @@ def install
     bin.install_symlink Dir["#{libexec}/bin/sy"]
   end
 
-  plist_options :manual => "sy --daemon"
+  plist_options :manual => "sy daemon start"
 
   def plist; <<-EOS.undent
     <?xml version="1.0" encoding="UTF-8"?>
@@ -38,7 +38,8 @@ def plist; <<-EOS.undent
       <key>ProgramArguments</key>
       <array>
         <string>#{prefix}/bin/sy</string>
-        <string>--daemon</string>
+        <string>daemon</string>
+        <string>start</string>
       </array>
       <key>ProcessType</key>
       <string>Background</string>

core/gradle/systemd/syncany-gui.service

@@ -0,0 +1,8 @@
+[Unit]
+Description=Syncany GUI
+
+[Service]
+ExecStart=/usr/bin/syncany gui
+
+[Install]
+WantedBy=default.target