Fixed some package references

Fix missing commas

Add build tag
Additional items


commas


Fix appindicator reference


Can't have - in executable name


Tons of meta data changes


Extra references


Renamed again

.gitignore

@@ -1,7 +1,7 @@
 build/*
 debian/build/*
-debian/com.github.kjlaw89.web-watcher.debhelper.log
-debian/com.github.kjlaw89.web-watcher.substvars
-debian/com.github.kjlaw89.web-watcher/
+debian/com.github.kjlaw89.webwatcher.debhelper.log
+debian/com.github.kjlaw89.webwatcher.substvars
+debian/com.github.kjlaw89.webwatcher/
 debian/debhelper-build-stamp
-debian/files
+debian/files

README.md

@@ -1,26 +1,29 @@
 <div align="center">
-  <span align="center"> <img width="80" height="70" class="center" src="https://github.com/kjlaw89/web-watcher/blob/master/data/images/com.github.kjlaw89.web-watcher.png" alt="Icon"></span>
+  <span align="center"> <img width="80" height="70" class="center" src="https://github.com/kjlaw89/web-watcher/blob/master/data/images/com.github.kjlaw89.webwatcher.png" alt="Icon"></span>
   <h1 align="center">Web Watcher</h1>
   <h3 align="center">Know when your websites are misbehaving!</h3>
 </div>
 
 <br/>
 
 <p align="center">
-   <a href="https://github.com/kjlaw89/web-watcher/blob/master/LICENSE">
-    <img src="https://img.shields.io/badge/License-GPL--3.0-blue.svg">
-   </a>
-  <a href="https://github.com/kjlaw89/web-watcher/releases">
-    <img src="https://img.shields.io/badge/Release-v%201.0.0-orange.svg">
-   </a>
-  <a href="https://github.com/kjlaw89/web-watcher/releases/download/1.0.0/com.github.kjlaw89.web-watcher_1.0.0_amd64.deb">
-     <img src="https://img.shields.io/badge/Download-%20Package .deb-yellow.svg">
+    <a href="https://github.com/kjlaw89/web-watcher/blob/master/LICENSE">
+        <img src="https://img.shields.io/badge/License-GPL--3.0-blue.svg">
+    </a>
+    <a href="https://github.com/kjlaw89/web-watcher/releases">
+        <img src="https://img.shields.io/badge/Release-v%201.0.0-orange.svg">
+    </a>
+    <a href="https://github.com/kjlaw89/web-watcher/releases/download/1.0.0/com.github.kjlaw89.webwatcher_1.0.0_amd64.deb">
+        <img src="https://img.shields.io/badge/Download-%20Package .deb-yellow.svg">
+    </a>
+    <a href="https://travis-ci.com/kjlaw89/web-watcher">
+        <img src="https://travis-ci.com/kjlaw89/web-watcher.svg?branch=master" title="Build Status" alt="Build Status">
     </a>
 </p>
 
 <p align="center">
-    <img  src="https://github.com/kjlaw89/web-watcher/blob/master/data/images/screenshot1.png" alt="Screenshot 1"> <br>
-    <img  src="https://github.com/kjlaw89/web-watcher/blob/master/data/images/screenshot2.png" alt="Screenshot 1"> <br>
+    <img src="https://github.com/kjlaw89/web-watcher/blob/master/data/images/screenshot1.png" alt="Screenshot 1"> <br>
+    <img src="https://github.com/kjlaw89/web-watcher/blob/master/data/images/screenshot2.png" alt="Screenshot 1"> <br>
     <a href="https://github.com/kjlaw89/web-watcher/issues/new"> Report a problem! </a>
 </p>
 
@@ -45,9 +48,11 @@ These dependencies must be present before building
  - `debhelper (>= 9)`
  - `libgranite-dev`
  - `libgtk-3-dev`
- - `sqlite3-dev`
- - `unity-dev`
- - `appindicator3-0.1-dev`
+ - `libsqlite3-dev`
+ - `libunity-dev`
+ - `libappindicator3-dev`
+ - `libsoup2.4-dev`
+ - `libjson-glib-dev`
 
  ### Building
 
@@ -57,7 +62,7 @@ meson build && cd build
 meson configure -Dprefix=/usr
 ninja
 sudo ninja install
-com.github.kjlaw89.web-watcher
+com.github.kjlaw89.webwatcher
 ```
 
 ### Deconstruct

data/com.github.kjlaw89.web-watcher.appdata.xml → data/com.github.kjlaw89.webwatcher.appdata.xml

@@ -1,22 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2018 KJ Lawrence <[email protected]> -->
 <component type="desktop-application">
-    <id>com.github.kjlaw89.web-watcher</id>
+    <id>com.github.kjlaw89.webwatcher</id>
     <metadata_license>CC0-1.0</metadata_license>
     <project_license>GPL-3.0+</project_license>
-    <name>App Template</name>
-    <summary>Template for vala apps</summary>
+    <name>Web Watcher</name>
+    <summary>Know when your websites are misbehaving!</summary>
     <developer_name>KJ Lawrence</developer_name>
+    <releases>
+      <release version="1.0.0" date="2018-05-04"/>
+    </releases>
     <provides>
-        <binary>com.github.kjlaw89.web-watcher</binary>
+        <binary>com.github.kjlaw89.webwatcher</binary>
     </provides>
     <screenshots>
         <screenshot type="default">
             <image>https://raw.githubusercontent.com/kjlaw89/web-watcher/master/data/images/screenshot1.png</image>
         </screenshot>
+        <screenshot type="default">
+            <image>https://raw.githubusercontent.com/kjlaw89/web-watcher/master/data/images/screenshot2.png</image>
+        </screenshot>
     </screenshots>
     <description>
         <p>Know when your websites are misbehaving!</p>
+
+        <h2>Features</h2>
+
+        <ul>
+          <li>Easily add as many sites as you wish to monitor</li>
+          <li>All sites are checked every minute</li>
+          <li>Extra meta-data (title and icon) are automatically grabbed</li>
+          <li>Get a notification if a site goes down or comes back up</li>
+          <li>View all historical data for the past 2 hours (with eventual capabilities to export all data)</li>
+          <li>Does not require an external service (uses local network to check sites)</li>
+          <li>Runs in background automatically once started via System tray indicator</li>
+        </ul>
     </description>   
     <url type="homepage">https://kjlaw89.github.io/web-watcher/</url>
     <url type="bugtracker">https://github.com/kjlaw89/web-watcher/issues</url>

data/com.github.kjlaw89.web-watcher.desktop → data/com.github.kjlaw89.webwatcher.desktop

@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=Web Watcher
-Comment=Monitor your websites for uptime
-Icon=com.github.kjlaw89.web-watcher
-Exec=com.github.kjlaw89.web-watcher
+Comment=Know when your websites are misbehaving!
+Icon=com.github.kjlaw89.webwatcher
+Exec=com.github.kjlaw89.webwatcher
 Terminal=false
 Type=Application
 StartupNotify=true

data/com.github.kjlaw89.webwatcher.gresource.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+
+	<gresource prefix="/com/github/kjlaw89/webwatcher/css">
+		<file alias="style.css" compressed="true">css/style.css</file>
+	</gresource>
+
+	<gresource prefix="/com/github/webwatcher/images">
+		<file alias="com.github.kjlaw89.webwatcher.svg" compressed="true" preprocess="xml-stripblanks">images/com.github.kjlaw89.webwatcher.svg</file>
+
+		<file alias="16-com.github.kjlaw89.webwatcher.svg" compressed="true" preprocess="xml-stripblanks">images/icons/16/com.github.kjlaw89.webwatcher.svg</file>
+
+		<file alias="24-com.github.kjlaw89.webwatcher.svg" compressed="true" preprocess="xml-stripblanks">images/icons/24/com.github.kjlaw89.webwatcher.svg</file>
+
+		<file alias="32-com.github.kjlaw89.webwatcher.svg" compressed="true" preprocess="xml-stripblanks">images/icons/32/com.github.kjlaw89.webwatcher.svg</file>
+
+		<file alias="48-com.github.kjlaw89.webwatcher.svg" compressed="true" preprocess="xml-stripblanks">images/icons/48/com.github.kjlaw89.webwatcher.svg</file>
+
+		<file alias="64-com.github.kjlaw89.webwatcher.svg" compressed="true" preprocess="xml-stripblanks">images/icons/64/com.github.kjlaw89.webwatcher.svg</file>
+
+		<file alias="128-com.github.kjlaw89.webwatcher.svg" compressed="true" preprocess="xml-stripblanks">images/icons/128/com.github.kjlaw89.webwatcher.svg</file>
+	</gresource>
+
+</gresources>

data/com.github.kjlaw89.web-watcher.gschema.xml → data/com.github.kjlaw89.webwatcher.gschema.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
 
-	<schema id="com.github.kjlaw89.web-watcher" path="/com/github/kjlaw89/web-watcher/">
+	<schema id="com.github.kjlaw89.webwatcher" path="/com/github/kjlaw89/web-watcher/">
 		<key name="window-x" type="i">
 			<default>-1</default>
 			<summary>Most recent x position of Web Watcher</summary>

data/meson.build

@@ -9,7 +9,7 @@ endforeach
 
 install_data(
     join_paths('images', meson.project_name() + '.svg'),
-    install_dir: join_paths(get_option('datadir'), 'web-watcher', 'images')
+    install_dir: join_paths(get_option('datadir'), 'webwatcher', 'images')
 )
 
 install_data(
@@ -30,4 +30,4 @@ install_data(
 install_data(
     meson.project_name() + '.gschema.xml',
     install_dir: join_paths(get_option('datadir'), 'glib-2.0', 'schemas')
-)
+)

debian/changelog

@@ -1,4 +1,4 @@
-com.github.kjlaw89.web-watcher (1.0.0) xenial; urgency=low
+com.github.kjlaw89.webwatcher (1.0.0) xenial; urgency=low
 
   * Initial Release
 

debian/control

@@ -1,15 +1,20 @@
-Source: com.github.kjlaw89.web-watcher
+Source: com.github.kjlaw89.webwatcher
 Section: x11
 Priority: extra
 Maintainer: KJ Lawrence <[email protected]>
 Build-Depends: meson (>= 0.40),
                valac (>= 0.26),
                debhelper (>= 9),
                libgranite-dev (>= 0.3.0),
-               libgtk-3-dev
+               libgtk-3-dev,
+               libsqlite3-dev,
+               libunity-dev,
+               libappindicator3-dev,
+               libsoup2.4-dev,
+               libjson-glib-dev
 Standards-Version: 3.9.3
 
-Package: com.github.kjlaw89.web-watcher
+Package: com.github.kjlaw89.webwatcher
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Template for vala apps
+Description: Know when your websites are misbehaving!

debian/copyright

@@ -1,9 +1,9 @@
 Format: http://dep.debian.net/deps/dep5
-Upstream-Name: App Template
+Upstream-Name: Web Watcher
 Source: https://github.com/kjlaw89/web-watcher
 
 Files: *
-Copyright: 2017 KJ Lawrence <[email protected]>
+Copyright: 2018 KJ Lawrence <[email protected]>
 License: GPL-3.0+
 
 License: GPL-3.0+

debian/rules

@@ -29,5 +29,5 @@ override_dh_auto_test:
 	cd debian/build && ninja test
 
 override_dh_auto_install:
-	cd debian/build && DESTDIR=${CURDIR}/debian/com.github.kjlaw89.web-watcher ninja install
+	cd debian/build && DESTDIR=${CURDIR}/debian/com.github.kjlaw89.webwatcher ninja install
 

meson.build

@@ -1,4 +1,4 @@
-project('com.github.kjlaw89.web-watcher', ['vala', 'c'],
+project('com.github.kjlaw89.webwatcher', ['vala', 'c'],
     version : '1.0.0',
     license: 'GPL-3.0'
 )
@@ -7,7 +7,7 @@ gnome = import('gnome')
 i18n = import('i18n')
 
 gresource = gnome.compile_resources(
-    'as-resources', 'data/com.github.kjlaw89.web-watcher.gresource.xml',
+    'as-resources', 'data/com.github.kjlaw89.webwatcher.gresource.xml',
     source_dir: 'data',
     c_name: 'as'
 )
@@ -18,8 +18,7 @@ configure_file(output: 'config.h', configuration: conf)
 config_h_dir = include_directories('.')
 
 c_args = [
-  '-include', 'config.h',
-  '-DGWEATHER_I_KNOW_THIS_IS_UNSTABLE'
+  '-include', 'config.h'
 ]
 
 subdir('data')
@@ -38,7 +37,7 @@ dependencies = [
     dependency('appindicator3-0.1')
 ]
 
-executable('com.github.kjlaw89.web-watcher',
+executable('com.github.kjlaw89.webwatcher',
     sources,
     gresource,
     c_args: c_args,

po/LINGUAS

@@ -1 +0,0 @@
-pt_BR

po/POTFILES

@@ -1 +0,0 @@
-src/configs/Properties.vala

po/com.github.kjlaw89.web_watcher.pot

@@ -0,0 +1,17 @@
+# Copyright (c) 2018 KJ Lawrence <[email protected]>
+# This file is distributed under the same license as the com.github.kjlaw89.webwatcher package.
+# KJ Lawrence <[email protected]>, 2018.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: com.github.kjlaw89.webwatcher\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-05-03 12:00-0000\n"
+"PO-Revision-Date: 2018-MO-DA HO:MI+ZONE\n"
+"Last-Translator:  FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[email protected]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"

src/Application.vala

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2017 KJ Lawrence <[email protected]>
+* Copyright (c) 2018 KJ Lawrence <[email protected]>
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public
@@ -35,7 +35,7 @@ namespace App {
         /**
          * Constructs a new {@code Application} object.
          *
-         * @see web-watcher.Configs.Constants
+         * @see webwatcher.Configs.Constants
          */
         public Application () {
             Object (