From 183d420f42fc872f31b0f62d7964cacd0f7b6bc4 Mon Sep 17 00:00:00 2001
From: Mitchell Stanley <mitchell.stanley@isev.co.uk>
Date: Mon, 20 Jan 2020 12:21:53 +0000
Subject: [PATCH] Fix bug for init command

---
 CHANGELOG.md                                         | 4 ++++
 shard.yml                                            | 2 +-
 snap/snapcraft.yaml                                  | 2 +-
 src/snipline_cli.cr                                  | 2 +-
 src/snipline_cli/commands/init.cr                    | 4 ++--
 src/snipline_cli/services/create_config_directory.cr | 3 ++-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36a8fed..74d4645 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.3
+
+* Fix bug when creating config files with snipcli init
+
 ## 0.3.2
 
 * Make compatible with Crystal 0.32.1 and 0.31.1
diff --git a/shard.yml b/shard.yml
index 0bf4e15..8774805 100644
--- a/shard.yml
+++ b/shard.yml
@@ -1,5 +1,5 @@
 name: cli
-version: 0.3.2
+version: 0.3.3
 
 authors:
   - Mitchell Stanley <mitchell.stanley@isev.co.uk>
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 7664eda..a648022 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: snipcli
-version: 0.3.2
+version: 0.3.3
 summary: Shell Snippet organiser
 description: >
   Snipcli is a commandline interface for managing shell commands. Sync commands with your Snipline account or use in guest mode. Snipline lets you dynamically change command parameters easily so you never have to remember how to build a command.
diff --git a/src/snipline_cli.cr b/src/snipline_cli.cr
index d8c4eea..82f90bf 100644
--- a/src/snipline_cli.cr
+++ b/src/snipline_cli.cr
@@ -27,7 +27,7 @@ module Repo
 end
 
 module SniplineCli
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 
   def self.config
     Config.config
diff --git a/src/snipline_cli/commands/init.cr b/src/snipline_cli/commands/init.cr
index cc7d607..e53ba58 100644
--- a/src/snipline_cli/commands/init.cr
+++ b/src/snipline_cli/commands/init.cr
@@ -13,8 +13,6 @@ module SniplineCli
       define_help description: "Initialise Snipline CLI without logging in"
 
       def run
-        puts "Migrating Database..."
-        Migrator.run
         config = SniplineCli.config
         toml_contents = <<-TOML
         title = "Snipline"
@@ -36,6 +34,8 @@ module SniplineCli
           File.write(expand_path(config.get("general.db")), "", mode: "w")
           puts "Created SQLite file in #{expand_path(config.get("general.db")).colorize.mode(:bold)}"
         end
+        puts "Migrating Database..."
+        Migrator.run
         puts ""
         puts "Run #{"snipcli new".colorize.mode(:bold)} to create your first snippet"
         puts "Search snippets with #{"snipcli search".colorize.mode(:bold)}"
diff --git a/src/snipline_cli/services/create_config_directory.cr b/src/snipline_cli/services/create_config_directory.cr
index 649e1c2..7b4626c 100644
--- a/src/snipline_cli/services/create_config_directory.cr
+++ b/src/snipline_cli/services/create_config_directory.cr
@@ -1,9 +1,10 @@
+require "../helpers/*"
 module SniplineCli
   module Services
     # Creates a config directory for storing configuration files for SnipCLI.
     class CreateConfigDirectory
       def self.run(file)
-        directory_name = File.expand_path(File.dirname(file))
+				directory_name = SniplineCli::Helpers.expand_path(File.dirname(file))
         unless File.directory?(directory_name)
           SniplineCli.log.debug("Making config directory #{directory_name}")
           Dir.mkdir(directory_name)