adminix 0.1.47 → 0.1.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4dddb4e6c33611ec6fc4c2c1054ee58d1b5cd4745c452917c9a7340fa64ea20
-  data.tar.gz: 311c4f717e279521d27a8007f88d259cc3c3cd0b471910c0d075784c6b0200ff
+  metadata.gz: 4f33fd698ed6fad1f65f8c2db5194d63d4d6e89c67fa3fa1825e8972e5675eb3
+  data.tar.gz: 91bf7ff798147fe961ceaac7e66904c86de908a0ae4dea42f07d6b38dfc2c8dd
 SHA512:
-  metadata.gz: 7f9dafdaf9991d839d443a20b741bf0191d4f2d1b7b749d6e66edc2c817053459fcfa6f8359165cef8e7aff8846c62c3712d9650893768ba05a2d4993b1248fc
-  data.tar.gz: 435ebea008f19a65a6a2d9692eecdd4275fbf363047d013d47be94aace3bd003aa93e3934dd8259f64ee32d5563a4c8fa2f48f969b84a281c38d702da1cfa6ae
+  metadata.gz: 2b08d3d0e13c2a1df24fb129f6ec8ba4561933475191afb8e1bed990a337f29fbde22c2b42d06d59df19f803e809e17a1bbc17ac07f3503e2824f876787dd66f
+  data.tar.gz: e26ae4ea490b1faf3809f592e1930325502f852f20ea225ae29aa333cf8ec8871c3ecad4f67b4d79bfbc509197d11276c1f50bc7950485bb5a047a2b9f68f449

data/bin/build

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require_relative '../lib/adminix'
+
+gem_file = "adminix-#{Adminix::VERSION}.gem"
+
+`gem build adminix.gemspec`
+`gem install #{gem_file}`
+`rm #{gem_file}`
+
+puts 'OK'

data/exe/adminix

@@ -20,6 +20,12 @@ parsers[:env] = OptionParser.new do |opts|
   opts.separator ""
 end
 
+parsers[:download_source] = OptionParser.new do |opts|
+  opts.banner =  "Downloads a project source if exists"
+  opts.separator "  Usage: adminix download_source"
+  opts.separator ""
+end
+
 parsers[:watch] = OptionParser.new do |opts|
   opts.banner =  "Launch Adminix watcher"
   opts.separator "  Usage: adminix watch"
@@ -42,7 +48,7 @@ options[:action] = ARGV[0] || "help"
 parsers[options[:action].to_sym].parse!(ARGV) rescue nil
 
 unless options[:action] == "help"
-  require 'adminix'
+  require_relative '../lib/adminix'
   config = Adminix::Config.instance 
 
   config.secret_key = options[:secret_key]
@@ -55,12 +61,14 @@ end
 case options[:action]
   when "env"
     puts Adminix::Service.instance.options_to_envs
+  when "download_source"
+    puts Adminix::Service.instance.download_source
   when "watch"
     if config.credentials_defined?
       puts Adminix::Watcher.run!(options)
     else
       puts 'Credentials are not defined, running setup server'
-      require 'adminix/server_setup'
+      require_relative '../lib/adminix/server_setup'
     end
   when "version"
     puts "adminix version #{Adminix::VERSION}"

data/lib/adminix/helpers/file.rb

@@ -0,0 +1,13 @@
+module Adminix
+  module Helpers
+    module File
+      def self.mkdir_p(dirname)
+        `mkdir -p #{dirname}`
+      end
+
+      def self.touch(file_path)
+        `touch #{file_path}`
+      end
+    end
+  end
+end

data/lib/adminix/helpers/http.rb

@@ -0,0 +1,19 @@
+module Adminix
+  module Helpers
+    module HTTP
+      def self.get(path)
+        config = Adminix::Config.instance
+        uri = URI.parse("#{config.host}/v1/#{path}")
+        request = Net::HTTP::Get.new(uri)
+        request['Authorization'] = "Bearer #{config.secret_key}"
+
+        opts = { use_ssl: uri.scheme == 'https' }
+        response = Net::HTTP.start(uri.hostname, uri.port, opts) do |http|
+          http.request(request)
+        end
+
+        JSON.parse(response.body)
+      end
+    end
+  end
+end

data/lib/adminix/helpers.rb

@@ -0,0 +1,2 @@
+require_relative 'helpers/file'
+require_relative 'helpers/http'

data/lib/adminix/service.rb

@@ -88,16 +88,7 @@ module Adminix
     end
 
     def fetch_options
-      uri = URI.parse("#{config.host}/v1/services/#{id}/options")
-      request = Net::HTTP::Get.new(uri)
-      request["Authorization"] = "Bearer #{config.secret_key}"
-
-      opts = { use_ssl: uri.scheme == 'https' }
-      response = Net::HTTP.start(uri.hostname, uri.port, opts) do |http|
-        http.request(request)
-      end
- 
-      JSON.parse(response.body)
+      Helpers::HTTP.get("services/#{id}/options")
     end
 
     def count_logs_lines
@@ -111,7 +102,7 @@ module Adminix
     end
 
     def stop!
-      system.log "Stopping process"
+      system.log 'Stopping process'
       case config.mode
       when 'classic'
         system.eval("#{config.scripts[:process_stop]} && #{config.scripts[:process_start]}")
@@ -120,6 +111,27 @@ module Adminix
       end
     end
 
+    def download_source
+      data = fetch_options
+      unless data['success']
+        puts 'Error, please try again later!'
+        return
+      end
+
+      vars = data['result'] || []
+      bin = 'git'
+      repo_var = vars.find { |v| v['key'] == 'git_repo' }
+      branch_var = vars.find { |v| v['key'] == 'git_branch' }
+
+      if repo_var && repo_var['value'] && branch_var
+        repo = repo_var['value']
+        branch = branch_var['value'] || 'master'
+        `#{bin} clone #{repo} -b #{branch}`
+      else
+        puts 'Please define your GIT repository and branch'
+      end
+    end
+
     private
 
     def config
@@ -137,27 +149,27 @@ module Adminix
     def execute_command(key, process_id, args)
       command = config.commands.find { |c| c['key'] == key }
       script = command['command'].dup
-      
+
       # TODO frontend fix attribute args
       args.each { |hs| script.gsub!("%{#{hs[0]}}", hs[1]) }
 
       # export_envs = options_to_envs_inline
       # script = "cd #{config.working_dir} && #{export_envs} && #{script}"
 
-      system.log "Executing command: "
-      system.log "-----------------------------------"
+      system.log 'Executing command: '
+      system.log '-----------------------------------'
       system.log script
-      system.log "-----------------------------------"
+      system.log '-----------------------------------'
       
       output = system.eval("#{config.scripts[:run_script]} #{script}")
       
-      system.log "Command execution output: "
-      system.log "-----------------------------------"
+      system.log 'Command execution output: '
+      system.log '-----------------------------------'
       system.log output
-      system.log "-----------------------------------"
+      system.log '-----------------------------------'
 
       {
-        id: process_id, 
+        id: process_id,
         success: true,
         output: output
       }

data/lib/adminix/setup.rb

@@ -1,3 +1,3 @@
-require 'adminix/setup/views'
-require 'adminix/setup/services'
-require 'adminix/setup/routes'
+# require_relative 'setup/views'
+# require_relative 'setup/services'
+# require_relative 'setup/routes'

data/lib/adminix/version.rb

@@ -1,3 +1,3 @@
 module Adminix
-  VERSION = '0.1.47'
+  VERSION = '0.1.48'
 end

data/lib/adminix/watcher.rb

@@ -1,6 +1,5 @@
-require "eventmachine"
-require "action_cable_client"
-require "fileutils"
+require 'eventmachine'
+require 'action_cable_client'
 
 module Adminix
   class Watcher
@@ -57,8 +56,8 @@ module Adminix
           log_files_exists = false
           config.watch_log_files.each do |file_path|
             dirname = File.dirname(file_path)
-            FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
-            FileUtils.touch(file_path) unless File.exists?(file_path)
+            Helpers::File.mkdir_p(dirname) unless File.directory?(dirname)
+            Helpers::File.touch(file_path) unless File.exists?(file_path)
               
             if File.exists?(file_path)
               log_files_exists = true

data/lib/adminix.rb

@@ -1,10 +1,11 @@
-require 'adminix/version'
+require_relative 'adminix/version'
 # require 'adminix/errors'
-require 'adminix/config'
-require 'adminix/service'
-require 'adminix/system'
-require 'adminix/log_watch_handler'
-require 'adminix/watcher'
+require_relative 'adminix/helpers'
+require_relative 'adminix/config'
+require_relative 'adminix/service'
+require_relative 'adminix/system'
+require_relative 'adminix/log_watch_handler'
+require_relative 'adminix/watcher'
 
 module Adminix
   def self.root

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adminix
 version: !ruby/object:Gem::Version
-  version: 0.1.47
+  version: 0.1.48
 platform: ruby
 authors:
 - Christian Dyl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2018-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -193,12 +193,16 @@ files:
 - README.md
 - Rakefile
 - adminix.gemspec
+- bin/build
 - bin/console
 - bin/setup
 - exe/adminix
 - lib/adminix.rb
 - lib/adminix/config.rb
 - lib/adminix/errors.rb
+- lib/adminix/helpers.rb
+- lib/adminix/helpers/file.rb
+- lib/adminix/helpers/http.rb
 - lib/adminix/log_watch_handler.rb
 - lib/adminix/server_setup.rb
 - lib/adminix/service.rb