The Edinburgh singer-songwriter has announced a Scottish tour which will see him perform in locations including Oban, Dunfermline and Perth later this year.