apiotics 0.1.129 → 0.1.130

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c378c288cbf257e1d42b6ef60317e5792a8d038
-  data.tar.gz: 87db512db1f61b939cbd5fd3c7d82a3a75a18afc
+  metadata.gz: 9b2d40e87c4aa2c5deed564677709545f5b560a0
+  data.tar.gz: 35db52f3cd33e69e04454b0599baf43784a7a8fd
 SHA512:
-  metadata.gz: fa8ee42109d3b57bffac13ec614c78910513b0a34b3b1390218a463054d99611b3f4b17e246eb5a3cf3517f3ad8c332fd69e51f7e0389484041dead776f0a5ee
-  data.tar.gz: e1aff58103d1e9439cc27e27d10fb90dc953b0abe4d645e86ec43086e315a324e999dbd4f09e5b134df3bd94d4dc2ad4c651aa8a0b4449166d78967c47c77274
+  metadata.gz: 221aac3e9249c432391a4ebc3fdd8504212afb80c59a38f248e55ef98633927a8ae878f6a275bbe05c813da43b2e4169af8075da452a7848155627641ca5013f
+  data.tar.gz: 63b0e5fa65a95f93444d10ebe7a48368171da531d4141f136f3ef866b9484590f366cf39c95b9a631c9eb5d08a5c9fc25603ad8bd05ee8297e340118b6a5d458

data/lib/apiotics/configuration.rb

@@ -1,7 +1,7 @@
 module Apiotics
   class Configuration
   
-    attr_accessor :public_key, :private_key, :local_logging, :targets, :local_port, :server, :server_port, :portal, :push, :tls, :verify_peer, :handshake, :parents, :reduced_metadata, :redis_comms_connection, :interface_kinds, :max_missed_heartbeats, :heartbeat_interval, :create_heartbeat_error
+    attr_accessor :public_key, :private_key, :local_logging, :targets, :local_port, :server, :server_port, :portal, :push, :tls, :verify_peer, :handshake, :parents, :reduced_metadata, :redis_comms_connection, :interface_kinds, :max_missed_heartbeats, :heartbeat_interval, :heroku, :create_heartbeat_error
   
     def initialize
       @public_key = nil
@@ -22,6 +22,7 @@ module Apiotics
       @max_missed_heartbeats = 3
       @heartbeat_interval = 5
       @create_heartbeat_error = false
+      @heroku = false
       @interface_kinds = {
         "string" => "string",
         "text" => "string",

data/lib/apiotics/version.rb

@@ -1,3 +1,3 @@
 module Apiotics
-  VERSION = '0.1.129'
+  VERSION = '0.1.130'
 end

data/lib/generators/apiotics/initializer/templates/apiotics.rb.erb

@@ -7,8 +7,9 @@ Apiotics.configure do |config|
   config.local_port = 8001
   
   # If you are deploying to a hosting service like Heroku, which does not easily permit local TCP connections, turn the redis comms connection 
-  # on, and configure a Redis server to permit connections between your application and your local comms server
+  # on, configure a Redis server to permit connections between your application and your local comms server, and set the heroku variable to true
   config.redis_comms_connection = false
+	config.heroku = false
   
   # The remote port at Apiotics to initially connect to.  There should be very few reasons to change this.
   config.server_port = 8000

data/lib/generators/apiotics/script/script_generator.rb

@@ -13,6 +13,7 @@ module Apiotics
       copy_file "test_server.rb", "lib/scripts/test_server.rb"
       copy_file "dev_server.rb", "lib/scripts/dev_server.rb"
       copy_file "server_control.rb", "lib/scripts/server_control.rb"
+      copy_file "heroku_server_control.rb", "lib/scripts/heroku_server_control.rb"
       copy_file "test_server_control.rb", "lib/scripts/test_server_control.rb"
       copy_file "dev_server_control.rb", "lib/scripts/dev_server_control.rb"
       copy_file "comm_server.rake", "lib/tasks/comm_server.rake"
@@ -21,6 +22,7 @@ module Apiotics
       copy_file "publish_script.rake", "lib/tasks/publish_script.rake"
       copy_file "install_firmware.rake", "lib/tasks/install_firmware.rake"
       FileUtils.chmod 0775, "lib/scripts/server_control.rb"
+      FileUtils.chmod 0775, "lib/scripts/heroku_server_control.rb"
     end
   
     private

data/lib/generators/apiotics/script/templates/comm_server.rake

@@ -1,19 +1,31 @@
 namespace :comms do
   desc "Start local communication server"
   task start: :environment do
-    system("ruby", "#{Rails.root}/lib/scripts/server_control.rb", "start")
+    if Apiotics.configuration.heroku == true
+      system("ruby", "#{Rails.root}/lib/scripts/heroku_server_control.rb", "start")
+    else
+      system("ruby", "#{Rails.root}/lib/scripts/server_control.rb", "start")
+    end
     puts $?
   end
 
   desc "Stop local communication server"
   task stop: :environment do
-    system("ruby", "#{Rails.root}/lib/scripts/server_control.rb", "stop")
+    if Apiotics.configuration.heroku == true
+      system("ruby", "#{Rails.root}/lib/scripts/heroku_server_control.rb", "stop")
+    else
+      system("ruby", "#{Rails.root}/lib/scripts/server_control.rb", "stop")
+    end
     puts $?
   end
   
   desc "Restart local communication server"
   task restart: :environment do
-    system("ruby", "#{Rails.root}/lib/scripts/server_control.rb", "restart")
+    if Apiotics.configuration.heroku == true
+      system("ruby", "#{Rails.root}/lib/scripts/heroku_server_control.rb", "restart")
+    else
+      system("ruby", "#{Rails.root}/lib/scripts/server_control.rb", "restart")
+    end
     puts $?
   end
 end

data/lib/generators/apiotics/script/templates/heroku_server_control.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+# add the ontop: true option to see the output of the server in the console in which you run rake comms:start
+
+require 'daemons'
+
+Daemons.run('lib/scripts/server.rb', ontop: true, no_pidfiles: true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apiotics
 version: !ruby/object:Gem::Version
-  version: 0.1.129
+  version: 0.1.130
 platform: ruby
 authors:
 - MicroArx Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-21 00:00:00.000000000 Z
+date: 2018-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -214,6 +214,7 @@ files:
 - lib/generators/apiotics/script/templates/dev_comm_server.rake
 - lib/generators/apiotics/script/templates/dev_server.rb
 - lib/generators/apiotics/script/templates/dev_server_control.rb
+- lib/generators/apiotics/script/templates/heroku_server_control.rb
 - lib/generators/apiotics/script/templates/install_firmware.rake
 - lib/generators/apiotics/script/templates/publish_script.rake
 - lib/generators/apiotics/script/templates/script.rb.erb