Merge pull request #44 from kakawait/develop

[Release] 0.1.3-ALPHA

Author: kakawait

CHANGELOG.md

@@ -2,12 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
-## [0.1.2-ALPHA] 16 nov 2016
+## [0.1.3-ALPHA](https://github.com/kakawait/hugo-tranquilpeak-theme/milestone/8) - 16 nov 2016
+
+- Remove unused npm deps ([#43](https://github.com/kakawait/hugo-tranquilpeak-theme/pull/43))
+
+## [0.1.2-ALPHA](https://github.com/kakawait/hugo-tranquilpeak-theme/milestone/7) - 16 nov 2016
 
 - Fix *archives* pages generation by creating `archive` taxonomy ([#31](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/31))
 - Use `slug` instead of `title` for *permalink* urls ([#33](https://github.com/kakawait/hugo-tranquilpeak-theme/pull/33))
 
-## [0.1.1-ALPHA] 13 nov 2016
+## [0.1.1-ALPHA](https://github.com/kakawait/hugo-tranquilpeak-theme/milestone/6) - 13 nov 2016
 
 - Upgrade *Google Analytics* script to do not use anymore `ga.js` which is now deprecated ([#21](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/21))
 - **[Breaking changes]** Changes *Google Analytics* config key from `params.google_analytics_id` to official `googleAnalytics` ([#21](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/21))

README.md

@@ -36,7 +36,7 @@ Please all the credit should be attributed to [original *Hexo* version](https://
 ## General
 
 - **Authors**: [Louis Barranqueiro (LouisBarranqueiro)](https://github.com/LouisBarranqueiro) and [Thibaud Leprêtre (kakawait)](https://github.com/kakawait)
-- **Version**: 0.1.2-ALPHA (based on Hexo version 1.9.1)
+- **Version**: 0.1.3-ALPHA (based on Hexo version 1.9.1)
 - **Compatibility**: Hugo v0.17
 
 ## Features

bower.json

@@ -1,6 +1,6 @@
 {
     "name": "hugo-tranquilpeak-theme",
-    "version": "0.1.2-ALPHA",
+    "version": "0.1.3-ALPHA",
     "description": "A gorgeous responsive theme for Hexo blog framework",
     "authors": [
         "Thibaud Leprêtre"

docs/developer.md

@@ -28,7 +28,7 @@ If you want to report a bug or ask a question, [create an issue](https://github.
 ## General ##
 
 - **Author** : Thibaud Leprêtre
-- **Version** : 0.1.2-ALPHA (based on Hexo version 1.9.1)
+- **Version** : 0.1.3-ALPHA (based on Hexo version 1.9.1)
 - **Compatibility** : Hugo v0.17
 
 ## Requirements ##

docs/user.md

@@ -48,7 +48,7 @@ If you want to report a bug or ask a question, [create an issue](https://github.
 ## General
 
 - **Authors**: [Louis Barranqueiro (LouisBarranqueiro)](https://github.com/LouisBarranqueiro) and [Thibaud Leprêtre (kakawait)](https://github.com/kakawait)
-- **Version**: 0.1.2-ALPHA (based on Hexo version 1.9.1)
+- **Version**: 0.1.3-ALPHA (based on Hexo version 1.9.1)
 - **Compatibility**: Hugo v0.17
 
 ## Features

exampleSite/config.toml

@@ -1,5 +1,5 @@
 # Tranquilpeak
-# Version : 0.1.2-ALPHA
+# Version : 0.1.3-ALPHA
 # Author : Thibaud Leprêtre
 
 # I STRONGLY recommend you to use a CDN to speed up loading of pages.

exampleSite/content/post/Welcome-to-the-new-Tranquilpeak.md

@@ -1,5 +1,5 @@
 ---
-title: "Welcome to Tranquilpeak 0.1.2"
+title: "Welcome to Tranquilpeak 0.1.3"
 date: 2015-06-15
 categories:
 - tranquilpeak
@@ -67,7 +67,7 @@ Please all the credit should be attributed to [original *Hexo* version](https://
 ## General
 
 - **Authors**: [Louis Barranqueiro (LouisBarranqueiro)](https://github.com/LouisBarranqueiro) and [Thibaud Leprêtre (kakawait)](https://github.com/kakawait)
-- **Version**: 0.1.2-ALPHA (based on Hexo version 1.9.1)
+- **Version**: 0.1.3-ALPHA (based on Hexo version 1.9.1)
 - **Compatibility**: Hugo v0.17
 
 ## Features

exampleSite/content/post/中%E6%96%87測試.md renamed to exampleSite/content/post/中文測試.md

@@ -0,0 +1,44 @@
+package main
+
+import (
+    "os"
+    "fmt"
+    "io/ioutil"
+    "github.com/mickep76/iodatafmt"
+)
+
+func main() {
+    if len(os.Args) < 2 {
+        fmt.Print("Missing first parameter: file config.{toml,json,yml} path")
+        os.Exit(1)
+    }
+    path := os.Args[1]
+    if _, err := os.Stat(path); os.IsNotExist(err) {
+        panic(fmt.Errorf("Unable to find config file using path \"%s\", %s", path, err))
+    }
+    f, err := iodatafmt.FileFormat(path)
+    if err != nil {
+        panic(fmt.Errorf("Unable to determine format of given config file \"%s\", %s", path, err))
+    }
+    d, err := iodatafmt.Load(path, f)
+    if err != nil {
+        panic(fmt.Errorf("Unable to read config from given file \"%s\", %s", path, err))
+    }
+    if val, ok := d.(map[string]interface {})["googleAnalytics"]; ok {
+        fmt.Printf("googleAnalytics value already exists with: \"%s\"! No migration applied", val)
+        os.Exit(0)
+    }
+    if _, ok := d.(map[string]interface {})["params"]; ok {
+        if val, ok := d.(map[string]interface {})["params"].(map[string]interface {})["google_analytics_id"]; ok {
+            fmt.Printf("Migrate\n=======\n\n[params]\n\tgoogle_analytics_id = %s\n\nto\n\ngoogleAnalytics = %s\n\n", val, val)
+            d.(map[string]interface {})["googleAnalytics"] = val
+            delete(d.(map[string]interface {})["params"].(map[string]interface {}), "google_analytics_id")
+        }
+    }
+    m, err := iodatafmt.Marshal(d, f)
+    if err != nil {
+        panic(fmt.Errorf("Unable to marshal config, %s", err))
+    }
+    ioutil.WriteFile(path + ".new", m, 0644)
+    fmt.Printf("New configuration has been generated on %s", path + ".new")
+}

exampleSite/content/post/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83%86%E3%82%B9%E3%83%88.md renamed to exampleSite/content/post/日本語テスト.md

@@ -0,0 +1,41 @@
+package main
+
+import (
+    "os"
+    "fmt"
+    "github.com/mickep76/iodatafmt"
+    "io/ioutil"
+)
+
+func main() {
+    if len(os.Args) < 2 {
+        fmt.Print("Missing first parameter: file config.{toml,json,yml} path")
+        os.Exit(1)
+    }
+    path := os.Args[1]
+    if _, err := os.Stat(path); os.IsNotExist(err) {
+        panic(fmt.Errorf("Unable to find config file using path \"%s\", %s", path, err))
+    }
+    f, err := iodatafmt.FileFormat(path)
+    if err != nil {
+        panic(fmt.Errorf("Unable to determine format of given config file \"%s\", %s", path, err))
+    }
+    d, err := iodatafmt.Load(path, f)
+    if err != nil {
+        panic(fmt.Errorf("Unable to read config from given file \"%s\", %s", path, err))
+    }
+    if _, ok := d.(map[string]interface {})["taxonomies"]; ok {
+        if _, ok := d.(map[string]interface{})["taxonomies"].(map[string]interface{})["archives"]; ok {
+            fmt.Print("archives taxonomies already exists! No migration applied")
+            os.Exit(0)
+        }
+        fmt.Print("Migrate\n=======\n\n[taxonomies]\n\tarchive = \"archives\"\n\naddded\n\n")
+        d.(map[string]interface {})["taxonomies"].(map[string]interface{})["archives"] = "archive"
+    }
+    m, err := iodatafmt.Marshal(d, f)
+    if err != nil {
+        panic(fmt.Errorf("Unable to marshal config, %s", err))
+    }
+    ioutil.WriteFile(path + ".new", m, 0644)
+    fmt.Printf("New configuration has been generated on %s", path + ".new")
+}

migrations/src/0_1_0_to_0_1_1.go

@@ -1,6 +1,6 @@
 {
   "name": "hugo-tranquilpeak-theme",
-  "version": "0.1.2-ALPHA",
+  "version": "0.1.3-ALPHA",
   "description": "A gorgeous responsive theme for Hugo blog framework",
   "main": "Gruntfile.js",
   "scripts": {
@@ -47,14 +47,5 @@
     "load-grunt-tasks": "~0.2.0",
     "rand-token": "^0.2.1"
   },
-  "dependencies": {
-    "async": "^1.5.2",
-    "jsdom": "^8.1.0",
-    "jquery": "^2.2.4",
-    "marked": "^0.3.5",
-    "mkdirp": "^0.5.1",
-    "moment": "^2.13.0",
-    "prompt": "^1.0.0",
-    "strip-indent": "^1.0.1"
-  }
+  "dependencies": {}
 }

migrations/src/0_1_1_to_0_1_2.go

@@ -6,7 +6,7 @@ module.exports = function(grunt) {
       options: {
         startTag: '<!--SCRIPTS-->',
         endTag: '<!--SCRIPTS END-->',
-        fileRef: function (filepath) {
+        fileRef: function(filepath) {
           var tmpl = '<script src="%s" type="text/javascript"></script>';
           return util.format(tmpl, filepath.substring(filepath.indexOf("/")));
         },
@@ -20,7 +20,7 @@ module.exports = function(grunt) {
       options: {
         startTag: '<!--STYLES-->',
         endTag: '<!--STYLES END-->',
-        fileRef: function (filepath) {
+        fileRef: function(filepath) {
           var tmpl = '<link rel="stylesheet" href="%s" />';
           return util.format(tmpl, filepath.substring(filepath.indexOf("/")));
         },
@@ -34,7 +34,7 @@ module.exports = function(grunt) {
       options: {
         startTag: '<!--SCRIPTS-->',
         endTag: '<!--SCRIPTS END-->',
-        fileRef: function (filepath) {
+        fileRef: function(filepath) {
           var tmpl = '<script src="%s" type="text/javascript"></script>';
           return util.format(tmpl, filepath.substring(filepath.indexOf("/")));
         },
@@ -48,7 +48,7 @@ module.exports = function(grunt) {
       options: {
         startTag: '<!--STYLES-->',
         endTag: '<!--STYLES END-->',
-        fileRef: function (filepath) {
+        fileRef: function(filepath) {
           var tmpl = '<link rel="stylesheet" href="%s" />';
           return util.format(tmpl, filepath.substring(filepath.indexOf("/")));
         },