publish_to_web 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49d09ddb462630cc102a2dceec68d8d5cbea813c
-  data.tar.gz: 2e3a235daec84af70c6f064743ed82ee3d397e43
+  metadata.gz: 1f4db33296b70fcd1d9d12c67673c57b2d65fcff
+  data.tar.gz: edb2dad4f8c146eb9a7fd6c788926e912de1ad52
 SHA512:
-  metadata.gz: 7c1f98558959e1b40a1ee1bcc83272e0ae083c0eca35ca22f33ce1c0a0e3919dfd23f28b7980a620228b074db2e5e4138d259c386f9dfbb660a034f1612bf360
-  data.tar.gz: 435cf3f3840011a70633c3fa699629ff5da3b55a95c499d8241b57662854d2de8288e161c77bc2db1ee832c061dcf997fb80222368c566a12ae2686b2a0fdc79
+  metadata.gz: c02c078adae039427353534023a9ffab730c37b84913961d26c4fde3b08fdec95bc919b907e53cd483108f5de36c28fb690a6b018f4a4fb93cbec7519a59e4e7
+  data.tar.gz: 42bb86b062e59ecf95f7079242fed975e297e86cfd0e9481319760a62da1684b80073e359b745d8cb374898acf98e5ab5b4d297b75483ff05bd33747967b7712

data/lib/publish_to_web.rb

@@ -59,6 +59,7 @@ class PublishToWeb
   def check_local_endpoint
     logger.info "Checking if local backend is available at #{bind_host}:#{forward_port}"
     TCPSocket.new(bind_host, forward_port).close
+    logger.info "  ✔ Local backend is available!"
 
   rescue Errno::ECONNREFUSED
     logger.warn "Local backend is not available (yet?) - waiting for it to become available"
@@ -78,6 +79,7 @@ class PublishToWeb
     directory.set_version
     directory.public_key
 
+    logger.info "Updating SMTP configuration"
     directory.smtp_config.tap do |smtp|
       config.smtp_host   = smtp["host"]
       config.smtp_sender = smtp["sender"]
@@ -85,7 +87,15 @@ class PublishToWeb
       config.smtp_pass   = smtp["password"]
     end
 
+    logger.info "Updating limits configuration"
+    if limits = directory.limits
+      config.account_limit = limits["accounts"]
+    end
+
+    directory.report_usage
+
     config.success = 'directory_configured'
+
   rescue PublishToWeb::Directory::HttpResponseError => err
     logger.warn "#{err.class}: #{err}"
     logger.warn "Failed to interact with directory, will try again in a bit"
@@ -129,7 +139,6 @@ class PublishToWeb
     retry
 
   rescue PublishToWeb::Directory::HttpResponseError
-
     # already handled by #prepare_directory, we just need to wait and retry...
 
     sleep 30
@@ -140,8 +149,6 @@ class PublishToWeb
     logger.error error.message
     logger.error error.backtrace.join("\n")
 
-    abort error.message
-
   end
 
   private

data/lib/publish_to_web/config.rb

@@ -22,7 +22,7 @@ class PublishToWeb
     end
 
     def enabled?
-      !!store.get('ptw/enabled')
+      !!store.get('ptw/control/enabled')
     end
 
     config_attribute :hardware_id, "ptw/hardware_id"
@@ -37,5 +37,27 @@ class PublishToWeb
     config_attribute :smtp_sender, "smtp/sender"
     config_attribute :smtp_user,   "smtp/username"
     config_attribute :smtp_pass,   "smtp/password"
+
+    config_attribute :account_limit, "soul/account_limit"
+
+    def active_accounts
+      store.get 'soul/active_accounts'
+    end
+
+    def support_identifier
+      identifier = store.get('system/support_identifier')
+      if identifier.kind_of?(String) and identifier.strip.length > 0
+        identifier
+      end
+    end
+
+    def system_version
+      parts = [store.get('system/channel'), store.get('system/release_number')]
+      if parts.all? {|p| p.kind_of?(String) and p.strip.length > 0 }
+        parts.join("/")
+      else
+        "unknown"
+      end
+    end
   end
 end

data/lib/publish_to_web/directory.rb

@@ -54,7 +54,7 @@ class PublishToWeb
     end
 
     def version
-      "platform-alpha"
+      config.system_version
     end
 
     def set_node_name(node_name)
@@ -71,7 +71,12 @@ class PublishToWeb
 
     def set_version
       logger.info "Setting version at directory to #{version}"
-      response = HTTP.post url_for('set_version'), form: { license_key: license_key, version: Shellwords.shellescape(version) }
+      payload = { 
+        license_key: license_key, 
+        version: Shellwords.shellescape(version), 
+        support_identifier: config.support_identifier 
+      }
+      response = HTTP.post url_for('set_version'), form: payload
       if (200..299).include? response.status
         true
       else
@@ -79,6 +84,24 @@ class PublishToWeb
       end
     end
 
+    def report_usage
+      if active_accounts = config.active_accounts
+        logger.info "Reporting usage to directory"
+        payload = { 
+          license_key: license_key, 
+          active_accounts: active_accounts
+        }
+        response = HTTP.post url_for('usage'), form: payload
+        if (200..299).include? response.status
+          true
+        else
+          raise HttpResponseError.new("Failed to submit usage to directory", response)
+        end
+      else
+        logger.info "Not reporting usage as no data is available"
+      end
+    end
+
     def smtp_config
       logger.info "Retrieving SMTP configuration from directory"
       response = HTTP.get url_for('smtp_config'), params: { license_key: license_key }
@@ -89,6 +112,16 @@ class PublishToWeb
       end
     end
 
+    def limits
+      logger.info "Retrieving limits from directory"
+      response = HTTP.get url_for('limits'), params: { license_key: license_key }
+      if (200..299).include? response.status
+        JSON.parse(response.body)
+      else
+        raise HttpResponseError.new("Failed to retrieve limits from directory", response)
+      end
+    end
+
     private
 
       def public_key_ok?
@@ -123,7 +156,11 @@ class PublishToWeb
           logger.info "Retrieving connection info from directory #{host}"
           response = HTTP.get(url_for('info'), params: { license_key: license_key })
           if response.status == 200
-            JSON.load(response.body)
+            data = JSON.load(response.body)
+            data.each do |key, value|
+              logger.info "     #{key} = #{value}"
+            end
+            data
           else
             raise HttpResponseError.new("Failed to get connection info from directory", response)
           end

data/lib/publish_to_web/version.rb

@@ -1,3 +1,3 @@
 class PublishToWeb
-  VERSION = "2.3.0"
+  VERSION = "2.4.0"
 end

data/publish_to_web.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "net-ssh",        "~> 3.0"
   spec.add_runtime_dependency "http",           "~> 1.0"
   spec.add_runtime_dependency "sshkey",         "~> 1.8.0"
-  spec.add_runtime_dependency "platform-skvs",  "~> 0.2.0"
+  spec.add_runtime_dependency "platform-skvs",  "~> 0.4.0"
   spec.add_runtime_dependency "rainbow",        "~> 2.0"
 
   spec.add_development_dependency "bundler", "~> 1.11"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: publish_to_web
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Christoph Olszowka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement