adminix 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95a49d190d16c14ccd3cccc09e06732568f0e9cd
-  data.tar.gz: 5a2e0e20318f38da17a6e4b118ead094c3ae97a3
+  metadata.gz: 7d1340dfd107acc28ac80b42c73ca5a810043d4f
+  data.tar.gz: bf6eaa5de07b2efafabcc77c2b4bd7b5df7ffd1e
 SHA512:
-  metadata.gz: 9452e2d00bfd6e3ac1aafc78a0293d021050e3018f71dfbe183450ce9a169ec701631c7ad43936a9b747952488ae286a11fb99b0f5d51fc523c1850a1514c559
-  data.tar.gz: f1731de81b7c47a8ad54b841496e188a86535e66f2f35bd29530c725809a95596911cb4dd31c87bd6a60c3ea3a2d9dfd30e6b5e89fc02c1d9980b3efc51e5d4b
+  metadata.gz: fd09d0eb87229096618c129cc0278c31e6f2b19fd6575f35d6f4007d73e11fe95945f70091c32e6b99ebb8e647df7459c12bf18ee11e44d37d8b884569087c35
+  data.tar.gz: 64e2bd6508b630a83cf8137e258ee6a0c7c784a765b5b23d4ffab9c9ed855a4bd0c45bdbeb77f21494b3ded7abef77e1a07baf78984f6cb2d8a2cf3f8af8c8c1

data/.byebug_history

@@ -1,4 +1,12 @@
 q
+output = system.eval(script)
+script
+args['args'].each { |hs| script.gsub!("%{#{hs[0]}}", hs[1]) }
+script = command['command'].dup
+command = config.commands.find { |c| c['key'] == key }
+args
+key
+q
 options
 options[:action].to_sym
 parsers[options[:action].to_sym]
@@ -246,11 +254,3 @@ Adminix::Config.instance.errors
 Adminix::Config.instance
 q
 Adminix::Config.instance.errors
-Adminix::Config.instance.valid?
-Adminix::Config.instance
-q
-service_id
-service_name
-q
-service_name
-self.service_name = hs['service_name']

data/exe/adminix

@@ -5,6 +5,8 @@ require 'optparse'
 
 options = {
   action: "help",
+  secret_key: ENV['ADMINIX_SECRET_KEY'],
+  service_id: ENV['ADMINIX_SERVICE_ID'],
   daemonize: false,
   stop_daemon: false
 }
@@ -12,7 +14,9 @@ parsers = {}
 
 parsers[:env] = OptionParser.new do |opts|
   opts.banner =  "Display the commands to define ENV variables"
-  opts.separator "  Usage: adminix env"
+  opts.separator "  Usage: adminix env [options]"
+  opts.on("--secret-key SECRET_KEY", "define api SECRET_KEY") { |key| options[:secret_key] = key }
+  opts.on("--service-id SERVICE_ID", "define api SERVICE_ID") { |id| options[:service_id] = id }
   opts.separator ""
 end
 
@@ -21,6 +25,8 @@ parsers[:watch] = OptionParser.new do |opts|
   opts.separator "  Usage: adminix watch"
   opts.separator "  Usage: adminix watch [options]"
   opts.separator "  Options:"
+  opts.on("--secret-key SECRET_KEY", "define api SECRET_KEY") { |key| options[:secret_key] = key }
+  opts.on("--service-id SERVICE_ID", "define api SERVICE_ID") { |id| options[:service_id] = id }
   opts.on("-d", "--daemonize", "run watcher in background process") { options[:daemonize] = true }
   opts.on("-s", "--stop-daemon", "stop daemon watcher") { options[:stop_daemon] = true }
   opts.separator ""
@@ -35,10 +41,15 @@ end
 options[:action] = ARGV[0] || "help"
 parsers[options[:action].to_sym].parse!(ARGV) rescue nil
 
-require "adminix" unless options[:action] == "help"
+unless options[:action] == "help"
+  require'adminix'
+  Adminix::Config.instance.secret_key = options[:secret_key]
+  Adminix::Config.instance.service_id = options[:service_id]
+  Adminix::Config.instance.daemon = options[:daemonize]
+end
 
 case options[:action]
-  when "env"
+  when "env" 
     puts Adminix::Service.instance.options_to_envs
   when "watch"
     puts Adminix::Watcher.run!(options)

data/lib/adminix/config.rb

@@ -6,12 +6,13 @@ module Adminix
 
     DEFAULT_HOST = 'http://api.adminix.io'.freeze
 
-    attr_accessor :service_id, :secret_key, :host
+    attr_accessor :service_id, :secret_key, :host, :commands, :daemon
 
     def initialize
-      self.service_id = ENV['ADMINIX_SERVICE_ID']
-      self.secret_key = ENV['ADMINIX_SECRET_KEY']
+      #self.service_id = ENV['ADMINIX_SERVICE_ID']
+      #self.secret_key = ENV['ADMINIX_SECRET_KEY']
       self.host = ENV['ADMINIX_CONFIG_HOST'] || DEFAULT_HOST 
+      self.commands = []
     end
   end
 end

data/lib/adminix/service.rb

@@ -1,4 +1,5 @@
 require 'singleton'
+require 'net/http'
 
 module Adminix
   class Service
@@ -11,6 +12,8 @@ module Adminix
     end
 
     def to_cable
+      system.check_system_load
+
       {
         id: id,
         process_id: process_id,
@@ -23,6 +26,7 @@ module Adminix
 
     def sync(watcher, data)
       @process_id = data['process_id']
+      config.commands = data['commands'] || []
 
       commands_queue = data['commands_queue'] || []
       commands_queue.each do |q|
@@ -68,8 +72,11 @@ module Adminix
       # TODO frontend fix attribute args
       args['args'].each { |hs| script.gsub!("%{#{hs[0]}}", hs[1]) }
 
-      output =  system.eval(script)
-    
+      output = system.eval(script)
+      system.log "Command execution output: "
+      system.log output
+      system.log "-----------------------------------"
+
       {
         id: process_id, 
         success: true,

data/lib/adminix/system.rb

@@ -28,10 +28,10 @@ module Adminix
     attr_reader :os, :processor_load, :memory_load, :username, :home, :adminix_bin, :ruby_version
 
     def initialize
-      _define_os
-      _parse_system_info
-      _define_adminix_bin
-      _check_system_load
+      define_os
+      parse_system_info
+      define_adminix_bin
+      check_system_load
     end
 
     def generate_daemon
@@ -53,9 +53,28 @@ module Adminix
       @username == 'root'
     end
 
+    def check_system_load
+      case @os
+        when :mac
+          @processor_load = `ps -A -o %cpu | awk '{s+=$1} END {print s "%"}'`.to_f
+          @memory_load = 0.1
+        when :linux, :unix
+          @processor_load = `grep 'cpu ' /proc/stat | awk '{usage=($2+$4)*100/($2+$4+$5)} END {print usage "%"}'`.to_f
+          @memory_load = `free | grep Mem | awk '{print $3/$2 * 100.0}'`.to_f
+        end
+    end
+
+    def log(message)
+      puts message unless config.daemon
+    end
+
     private
 
-    def _define_os
+    def config
+      Config.instance
+    end
+
+    def define_os
       @os = if self.class.windows?
               :windows
             elsif self.class.mac?
@@ -67,30 +86,19 @@ module Adminix
             end
     end
 
-    def _parse_system_info
+    def parse_system_info
       @username = ENV['USER'] || `whoami`.split("\n")[0]
       @home = "/home/#{@username}"
       @ruby_version = RUBY_VERSION
     end
 
-    def _define_adminix_bin
+    def define_adminix_bin
       @adminix_bin = if self.class.rvm?
                        "/home/#{@username}/.rvm/gems/ruby-#{@ruby_version}/wrappers/adminix"
                      else
                        "/usr/local/bin/adminix"
                      end
     end
-
-    def _check_system_load
-      case @os
-        when :mac
-          @processor_load = `ps -A -o %cpu | awk '{s+=$1} END {print s "%"}'`.to_f
-          @memory_load = 0.1
-        when :linux, :unix
-          @processor_load = `grep 'cpu ' /proc/stat | awk '{usage=($2+$4)*100/($2+$4+$5)} END {print usage "%"}'`.to_f
-          @memory_load = `free | grep Mem | awk '{print $3/$2 * 100.0}'`.to_f
-        end
-    end
   end
 end
 

data/lib/adminix/version.rb

@@ -1,3 +1,3 @@
 module Adminix
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

data/lib/adminix/watcher.rb

@@ -38,7 +38,6 @@ module Adminix
         end
 
         @client.connect do |message|
-          puts message
           on_message_receive(@client, message)
         end
         
@@ -98,7 +97,7 @@ module Adminix
       if pid != 0
         Process.kill('HUP', pid.to_i)
         File.delete(@pid_full)
-        puts "Stopped"
+        system.log "Stopped"
       else
         warn "Daemon is not running"
         exit -1
@@ -111,13 +110,17 @@ module Adminix
       Config.instance
     end
 
+    def system
+      System.instance
+    end
+
     def on_message_receive(client, message)
       case message['type']
       when 'welcome'
-        puts 'connected to server'
+        system.log 'connected to server'
         on_success_connect(client)
       when 'ping'
-        puts 'ping from server'
+        #system.log 'ping from server'
         # do something
       else
         # do something
@@ -125,9 +128,9 @@ module Adminix
     end
 
     def on_disconnect(client)
-      puts 'Disconnected. Reconnecting...'
+      system.log 'Disconnected. Reconnecting...'
       client.connect do |message|
-        puts message
+        system.log message
         on_message_receive(client, message)
       end
 
@@ -143,9 +146,7 @@ module Adminix
     end
 
     def on_service_message_receive(type, data)
-      puts 'on_service_message_receive'
-      puts type
-      puts data
+      system.log 'on_service_message_receive'
       case type
       when 'confirm_subscription'
       when 'sync'
@@ -155,7 +156,7 @@ module Adminix
 
     def trap_signal
        Signal.trap("SIGINT") do
-         puts "Stopping..."
+         system.log "Stopping..."
          EventMachine.stop
        end
     end

data/lib/adminix/websocket_client.rb

@@ -19,7 +19,7 @@ module Adminix
       self.channel_handlers = {}
       self.client = EventMachine::WebSocketClient.connect(url)
       client.callback do
-        puts "Connected WebSocket to #{url}."
+        system.log "Connected WebSocket to #{url}."
         self.connected = true
       end
       client.stream do |raw|
@@ -79,6 +79,12 @@ module Adminix
       result['data'] = JSON.parse(result['data']) if result['data']
       result
     end
+
+    private
+
+    def system
+      System.instance
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adminix
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Christian Dyl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Adminix