device-tracker 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0bdc0c33a0e543c9539628b3f71df9fbae9865f
-  data.tar.gz: 225a51dfa8856ad6207baef4fe71f3a457179d6a
+  metadata.gz: 612e4d0e8f1d36f1f8096e3190df5f7fa46105d7
+  data.tar.gz: 282da092fe8a8c7d8699097a18abd07597371007
 SHA512:
-  metadata.gz: c457ce2d6e69d27b579df7347be83b4e6ced47cbe93c24c6b9341aba610dd6bc022f0755993cb55944b085170361ab5e399cc95b58fc19ce1f1fd7bca67883a6
-  data.tar.gz: 493d8244b35570e1a741fc9b8daa8ac43ce68a644fb823e7348ba543f4dfd95435e733dd23544641452a214b89d396d638422bf774b0d6f30d2266bb2d3f9dde
+  metadata.gz: 71f60854460879101473fcb0ee3b9bc0385a0c47aa73047d1bf6939510ccacdfbfea65ed0df2b8af917c6d72b349160941da000a3892f4092704043e6c945ef9
+  data.tar.gz: 36140f6db897c69bb894585a51fcdb8f011a19fac847111620e1b0e5d5f2591344269962bc60fd505dfe7f84ab07a0ce59635680c72cd99a8946ed4729884ae4

data/exe/device-tracker

@@ -12,7 +12,7 @@ opts = OptionParser.new do |opts|
 
   opts.separator ""
 
-   opts.on("-c", "--config" "path to config file") do |path|
+  opts.on("-c", "--config" "path to config file") do |path|
     config_path = path
   end
 
@@ -40,11 +40,16 @@ config = JSON.parse(json)
 set :database, config["database"]
 Pony.options = config["email"]
 set :google_maps_api_key, config["google_maps_api_key"]
+port = config["port"] || "3000"
+host = config["host"] || "127.0.0.1"
+name = config["admin"]["name"]
+password = config["admin"]["password"]
+email = config["admin"]["email"]
 
 ActiveRecord::Migrator.migrate(File.expand_path('../../lib/device/tracker/db/migrate', __FILE__))
 
 require_relative '../lib/device/tracker/dependencies'
 require_relative '../lib/device/tracker/db/seeds'
 
-Device::Tracker::Seed.seed(name: 'James Ruston', password: 'password', email: 'james.ruston@bbc.co.uk')
-Device::Tracker.start
+Device::Tracker::Seed.seed(name: name, password: password, email: email)
+Device::Tracker.start(host, port)

data/lib/device/tracker.rb

@@ -5,10 +5,10 @@ require "rack"
 
 module Device
   module Tracker
-    def self.start
+    def self.start(host, port)
       options = {
-        :Host => '127.0.0.1',
-        :Port => '3000'
+        :Host => host,
+        :Port => port
       }
 
       Rack::Handler::Thin.run(App.new, options) do |server|

data/lib/device/tracker/config-schema.json

@@ -36,18 +36,76 @@
         "via_options": {
           "id": "http://jsonschema.net/email/via_options",
           "type": "object",
-          "properties": {}
+          "properties": {
+            "address": {
+              "id": "http://jsonschema.net/email/via_options/address",
+              "type": "string"
+            },
+            "port": {
+              "id": "http://jsonschema.net/email/via_options/port",
+              "type": "string"
+            },
+            "enable_starttls_auto": {
+              "id": "http://jsonschema.net/email/via_options/enable_starttls_auto",
+              "type": "boolean"
+            },
+            "user_name": {
+              "id": "http://jsonschema.net/email/via_options/user_name",
+              "type": "string"
+            },
+            "password": {
+              "id": "http://jsonschema.net/email/via_options/password",
+              "type": "string"
+            },
+            "authentication": {
+              "id": "http://jsonschema.net/email/via_options/authentication",
+              "type": "string"
+            },
+            "domain": {
+              "id": "http://jsonschema.net/email/via_options/domain",
+              "type": "string"
+            }
+          }
         }
       }
     },
     "google_maps_api_key": {
       "id": "http://jsonschema.net/google_maps_api_key",
       "type": "string"
+    },
+    "host": {
+      "id": "http://jsonschema.net/host",
+      "type": "string"
+    },
+    "port": {
+      "id": "http://jsonschema.net/port",
+      "type": "string"
+    },
+    "admin": {
+      "id": "http://jsonschema.net/admin",
+      "type": "object",
+      "properties": {
+        "name": {
+          "id": "http://jsonschema.net/admin/name",
+          "type": "string"
+        },
+        "email": {
+          "id": "http://jsonschema.net/admin/email",
+          "type": "string"
+        },
+        "password": {
+          "id": "http://jsonschema.net/admin/password",
+          "type": "string"
+        }
+      }
     }
   },
   "required": [
     "database",
     "email",
-    "google_maps_api_key"
+    "google_maps_api_key",
+    "host",
+    "port",
+    "admin"
   ]
 }

data/lib/device/tracker/db/seeds.rb

@@ -2,6 +2,13 @@ module Device
   module Tracker
     class Seed
       def self.seed(name: name, password: password, email: email)
+
+        user = User.where(email: email)
+
+        if user.exists?
+          return
+        end
+
         user = User.find_or_create_by({
           name: name,
           username: 'admin',

data/lib/device/tracker/version.rb

@@ -1,5 +1,5 @@
 module Device
   module Tracker
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: device-tracker
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Ruston
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler