Merge branch 'release/v0.3.1'

.editorconfig

@@ -0,0 +1,33 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+# Matches multiple files with brace expansion notation
+# Set default charset
+[*.{js,py}]
+charset = utf-8
+
+# 4 space indentation
+[*.py]
+indent_style = space
+indent_size = 4
+
+# Tab indentation (no size specified)
+[Makefile]
+indent_style = tab
+
+# Indentation override for all JS under lib directory
+[lib/**.js]
+indent_style = space
+indent_size = 2
+
+# Matches the exact files either package.json or .travis.yml
+[{package.json,.travis.yml}]
+indent_style = space
+indent_size = 2

.gitattributes

@@ -0,0 +1,10 @@
+* text=auto
+
+*.bat text
+*.sh text
+*.txt text
+*.ui text
+*.py text
+
+*.png binary
+*.jpg binary

.gitignore

@@ -66,3 +66,5 @@ target/
 #Vagrant
 .vagrant/
 
+#Settings
+.settings

.python-version

@@ -1,2 +1 @@
 miniconda3-3.19.0/envs/fomod-editor
-3.5.1

.travis.yml

@@ -0,0 +1,19 @@
+language: python
+
+install:
+  - chmod +x ./dev/travis-bootstrap.sh
+  - ./dev/travis-bootstrap.sh
+
+script:
+  - chmod +x ./dev/travis-build.sh
+  - ./dev/travis-build.sh
+
+deploy:
+  provider: releases
+  api_key: "$GITHUB_API_KEY"
+  file_glob: true
+  file:
+    - "dist/*.zip"
+  skip_cleanup: true
+  on:
+    tags: true

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+0.3.1 (2016-04-17)
+
+* Tags/item with name/source property now have that as the title instead of the tag's name.
+* Fixed all keyboard shortcuts.
+* Everything is now included within a single executable.
+* Added full linux support.
+* Included build number in version.
+* Fixed no error raised when no required child exist.
+* Window title now includes an asterisk when any content has been modified.
+* Missing files in fomod folder are now properly checked.
+* Fixed spinbox property.
+
+----------------------------------
+
 0.3.0 (2016-04-07)
 
 * All basic functionality is now done.

README.md

@@ -1,5 +1,5 @@
 # FOMOD Designer
-[![Build status](https://ci.appveyor.com/api/projects/status/nep4id3ammekof68?svg=true)](https://ci.appveyor.com/project/GandaG/fomod-editor)
+[![Build status](https://ci.appveyor.com/api/projects/status/nep4id3ammekof68?svg=true)](https://ci.appveyor.com/project/GandaG/fomod-editor) [![Build Status](https://travis-ci.org/GandaG/fomod-editor.svg?branch=develop)](https://travis-ci.org/GandaG/fomod-editor)
 
 *A visual editor to quickly create FOMOD installers for Nexus based mods.*
 
@@ -23,7 +23,15 @@
 
 ## Contributing
 
-See the [CONTRIBUTING] document.
+This repo uses a ***.settings*** file to define all the necessary settings. This file follows this syntax:
+
+```
+[git]
+user=git_username
+email=git_email
+```
+
+For more information see the [CONTRIBUTING] document.
 Thank you, [contributors]!
 
   [CONTRIBUTING]: /.github/CONTRIBUTING.md

Vagrantfile

@@ -4,7 +4,7 @@
 Vagrant.configure(2) do |config|
   config.vm.define "ubuntu", primary: true do |ubuntu|
     ubuntu.vm.box = "ubuntu/trusty64"
-    ubuntu.vm.provision :shell, :path => "dev/vagrant-ubuntu-bootstrap.sh", :privileged => false
+    ubuntu.vm.provision :shell, :path => "dev/vagrant-bootstrap.sh", :privileged => false
   end
 
   config.ssh.insert_key = false

dev/build-linux.spec → dev/pyinstaller-build.spec

@@ -1,16 +1,13 @@
 # -*- mode: python -*-
 
 block_cipher = None
-
+import os
 
 a = Analysis(['pyinstaller-bootstrap.py'],
-             pathex=['/vagrant'],
+             pathex=[os.getcwd()],
              binaries=None,
              datas=[('../fomod/gui/logos', 'fomod/gui/logos'),
-                    ('../README.md', '.'),
-                    ('../LICENSE', '.'),
-                    ('../CHANGELOG.md', '.'),
-                    ('../CONTRIBUTING.md', '.'),],
+                    ('../setup.cfg', '.'),],
              hiddenimports=[],
              hookspath=[],
              runtime_hooks=[],
@@ -22,16 +19,11 @@ pyz = PYZ(a.pure, a.zipped_data,
              cipher=block_cipher)
 exe = EXE(pyz,
           a.scripts,
-          exclude_binaries=True,
-          name='designer',
+          a.binaries,
+          a.zipfiles,
+          a.datas,
+          name='FOMOD Designer',
           debug=False,
           strip=False,
           upx=True,
           console=False )
-coll = COLLECT(exe,
-               a.binaries,
-               a.zipfiles,
-               a.datas,
-               strip=False,
-               upx=True,
-               name='FOMOD Designer')

dev/travis-bootstrap.sh

@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+
+# Copyright 2016 Daniel Nunes
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# get pyenv - I hate messing with system python on ubuntu
+
+git clone https://github.com/yyuu/pyenv.git $HOME/.pyenv
+
+export PYENV_ROOT="$HOME/.pyenv"
+export PATH="$PYENV_ROOT/bin:$PATH"
+eval "$(pyenv init -)"
+
+
+# get pyenv-virtualenv instead of plain old virtualenv
+
+git clone https://github.com/yyuu/pyenv-virtualenv.git \
+ $HOME/.pyenv/plugins/pyenv-virtualenv
+
+eval "$(pyenv virtualenv-init -)"
+
+
+# start installing the python versions
+
+env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install miniconda3-3.19.0
+
+
+# make the virtualenv
+
+pyenv shell miniconda3-3.19.0
+conda create -y -n fomod-editor \
+ -c https://conda.anaconda.org/mmcauliffe \
+ -c https://conda.anaconda.org/anaconda \
+ python=3.5.1 pyqt5=5.5.1 lxml=3.5.0
+pyenv shell miniconda3-3.19.0/envs/fomod-editor
+
+
+# install the pip reqs
+
+pip install pip -U
+pip install setuptools -U --ignore-installed
+pip install -r dev/reqs.txt

dev/travis-build.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+# Copyright 2016 Daniel Nunes
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+export PYENV_ROOT="$HOME/.pyenv"
+export PATH="$PYENV_ROOT/bin:$PATH"
+eval "$(pyenv init -)"
+eval "$(pyenv virtualenv-init -)"
+
+pyenv shell miniconda3-3.19.0/envs/fomod-editor
+
+invoke build

dev/vagrant-ubuntu-bootstrap.sh → dev/vagrant-bootstrap.sh

@@ -52,8 +52,22 @@ export PS1="\[\033[38;5;10m\]\u@ \$(parse_git_branch)\w\\$ \[$(tput sgr0)\]"
 
 # configure git so you don't have to go back and forward all the time.
 
-git config --global user.email "gandaganza@gmail.com"
-git config --global user.name "Daniel Nunes"
+python3 - <<END
+#!/usr/bin/env python
+from configparser import ConfigParser, NoSectionError
+from os import system
+config = ConfigParser()
+config.read("/vagrant/.settings")
+try:
+    user = config.get("git", "user")
+    email = config.get("git", "email")
+    print("git user defined as " + user)
+    print("git email defined as " + email)
+    system("git config --global user.name \"{}\"".format(user))
+    system("git config --global user.email \"{}\"".format(email))
+except NoSectionError:
+    print("No .settings file - check readme for further details.")
+END
 git config --global core.editor nano
 git config --global push.default simple
 git config --global credential.helper 'cache --timeout=18000'
@@ -84,7 +98,6 @@ eval "$(pyenv virtualenv-init -)"
 # start installing the python versions
 
 env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install miniconda3-3.19.0
-env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install 3.5.1
 
 
 # make the virtualenv

fomod/__init__.py

@@ -14,4 +14,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.3.0"
+import sys
+from os.path import abspath, dirname, join
+
+
+if getattr(sys, 'frozen', False):
+    cur_folder = sys._MEIPASS
+else:
+    cur_folder = join(dirname(abspath(__file__)), "..")
+
+
+def get_version():
+    import configparser
+
+    config = configparser.ConfigParser()
+    config.read(join(cur_folder, "setup.cfg"))
+
+    return config.get('bumpversion', 'current_version') + "." + config.get('bumpversion', 'current_build')
+
+__version__ = get_version()