Merge pull request #1337 from pymedusa/develop

Release 0.1.7

.build/Gruntfile.js

@@ -1,11 +1,11 @@
-module.exports = function(grunt) {
+module.exports = function(grunt) { // eslint-disable-line xo/filename-case
     require('load-grunt-tasks')(grunt);
 
     grunt.initConfig({
         clean: {
             dist: './dist/',
-            bower_components: './bower_components',
-            fonts: '../gui/slick/css/*.ttf',
+            bower_components: './bower_components', // eslint-disable-line camelcase
+            fonts: '../static/css/*.ttf',
             options: {
                 force: true
             }
@@ -17,7 +17,7 @@ module.exports = function(grunt) {
                 }
             }
         },
-        bower_concat: {
+        bower_concat: { // eslint-disable-line camelcase
             all: {
                 dest: {
                     js: './dist/bower.js',
@@ -42,11 +42,11 @@ module.exports = function(grunt) {
                         'dist/js/bootstrap-formhelpers.min.js'
                     ],
                     'isotope': [
-                        "dist/isotope.pkgd.min.js"
+                        'dist/isotope.pkgd.min.js'
                     ],
-                    "outlayer": [
-                        "item.js",
-                        "outlayer.js"
+                    'outlayer': [
+                        'item.js',
+                        'outlayer.js'
                     ]
                 },
                 bowerOptions: {
@@ -63,7 +63,7 @@ module.exports = function(grunt) {
                     src: [
                         '*.ttf'
                     ],
-                    dest: '../gui/slick/css/'
+                    dest: '../static/css/'
                 }]
             },
             glyphicon: {
@@ -78,24 +78,28 @@ module.exports = function(grunt) {
                         '*.woff',
                         '*.woff2'
                     ],
-                    dest: '../gui/slick/fonts/'
+                    dest: '../static/fonts/'
+                }]
+            },
+            vender: {
+                files: [{
+                    expand: true,
+                    dot: true,
+                    cwd: 'dist',
+                    src: [
+                        'bower.js'
+                    ],
+                    dest: '../static/js/',
+                    rename: function(dest, src) {
+                        return dest + src.replace('bower.js', 'vender.js');
+                    }
                 }]
             }
         },
         uglify: {
             bower: {
                 files: {
-                    '../gui/slick/js/vender.min.js': ['./dist/bower.js']
-                }
-            }
-        },
-        sass: {
-            options: {
-                sourceMap: true
-            },
-            core: {
-                files: {
-                    './dist/core.css': ['../gui/slick/scss/core.scss']
+                    '../static/js/vender.min.js': './dist/bower.js'
                 }
             }
         },
@@ -106,32 +110,8 @@ module.exports = function(grunt) {
             },
             bower: {
                 files: {
-                    '../gui/slick/css/vender.min.css': ['./dist/bower.css']
+                    '../static/css/vender.min.css': './dist/bower.css'
                 }
-            },
-            core: {
-                files: {
-                    '../gui/slick/css/core.min.css': ['./dist/core.css']
-                }
-            }
-        },
-        jshint: {
-            options: {
-                jshintrc: '../.jshintrc'
-            },
-            all: [
-                '../gui/slick/js/**/*.js',
-                '!../gui/slick/js/lib/**/*.js',
-                '!../gui/slick/js/ajax-notifications.js',
-                '!../gui/slick/js/**/*.min.js', // We use this because ignores doesn't seem to work :(
-            ]
-        },
-        mocha: {
-            all: {
-                src: ['tests/testrunner.html'],
-            },
-            options: {
-                run: true
             }
         }
     });
@@ -142,20 +122,13 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-cssmin');
-    grunt.loadNpmTasks('grunt-contrib-jshint');
-    grunt.loadNpmTasks('grunt-mocha');
 
     grunt.registerTask('default', [
         'clean',
         'bower',
         'bower_concat',
         'copy',
         'uglify',
-        'sass',
-        'cssmin',
-        'mocha'
-    ]);
-    grunt.registerTask('travis', [
-        'mocha'
+        'cssmin'
     ]);
 };

.build/bower.json

@@ -1,5 +1,5 @@
 {
-  "name": "medusa",
+  "name": "Medusa",
   "private": true,
   "ignore": [
     "**/.*",
@@ -9,26 +9,25 @@
     "tests"
   ],
   "dependencies": {
-    "jquery": "~2.1.4",
-    "bootstrap": "~3.3.5",
-    "bootstrap-hover-dropdown": "~2.1.3",
-    "jquery-ui": "~1.11.4",
-    "jquery-timeago": "~1.4.3",
-    "jquery-tokeninput": "~1.7.0",
-    "bootstrap3-typeahead": "~3.1.1",
-    "underscore": "~1.8.3",
+    "jquery": "3.0.0",
+    "bootstrap": "3.3.7",
+    "underscore": "^1.8.3",
+    "bootstrap-hover-dropdown": "2.2.1",
+    "jquery-ui": "1.12.1",
+    "jquery-tokeninput": "^1.7.0",
+    "bootstrap3-typeahead": "4.0.2",
     "jqueryui-touch-punch": "*",
-    "pnotify": "~2.1.0",
-    "qtip2": "~2.2.1",
-    "tablesorter": "jquery.tablesorter#~2.24.5",
-    "jquery-confirm": "~2.5.2",
-    "bootstrap-formhelpers": "~2.3.0",
-    "isotope": "~2.2.2",
+    "pnotify": "2.1.0",
+    "qtip2": "2.2.1",
+    "tablesorter": "jquery.tablesorter#2.24.5",
+    "jquery-confirm": "2.5.2",
+    "bootstrap-formhelpers": "2.3.0",
+    "isotope": "3.0.1",
     "openSans": "https://google-fonts.azurewebsites.net/googleFonts/openSans?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic",
     "jquery-backstretch-2": "^2.1.13"
   },
   "resolutions": {
-    "bootstrap": "~3.3.5",
-    "jquery": "~2.1.4"
+    "bootstrap": "3.3.7",
+    "jquery": "2.1.4"
   }
 }

.build/test/testrunner.html

@@ -13,8 +13,8 @@
         <div id="mocha"></div>
         <script src="../node_modules/mocha/mocha.js"></script>
         <script src="../node_modules/chai/chai.js"></script>
-        <script src="../../gui/slick/js/vender.min.js"></script>
-        <script src="../../gui/slick/js/core.js"></script>
+        <script src="../../static/js/vender.min.js"></script>
+        <script src="../../static/js/core.js"></script>
 
         <script>
             mocha.setup('bdd');

.gitignore

@@ -5,9 +5,11 @@
 /data/
 restore/
 backup*/
+backup-*.zip
 cache.db*
 config.ini*
 sickbeard.db*
+main.db.*
 failed.db*
 *.db
 autoProcessTV.cfg
@@ -66,6 +68,7 @@ lib/unrar2/UnRAR.exe
 .build/bower_components
 .build/node_modules
 .build/dist
+.build/package.json
 
 # Unit test/Coverage #
 ######################

.travis.yml

@@ -8,12 +8,12 @@ branches:
 env:
 - TRAVIS_NODE_VERSION="5.0.0"
 before_install:
-- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm
-  && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm
-  install $TRAVIS_NODE_VERSION
-- npm install -g grunt-cli
-- npm install -g bower
-- cd .build && cp ../package.json . && npm install --quiet && bower install && cd ..
+#- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm
+#  && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm
+#  install $TRAVIS_NODE_VERSION
+#- npm install -g grunt-cli
+#- npm install -g bower
+#- cd .build && cp ../package.json . && npm install --quiet && bower install && cd ..
 install:
 - pip install --upgrade pip
 - pip install --upgrade tox