columbusctl 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecfb29fb270880ef7b7ca2bf5f8f53bbaf3b816937accbd998ad88b5a4860371
-  data.tar.gz: a8bdfd8c21128e48ca806ecf9dbb957e6dd1c7560c66f9b8be007f2a6193934a
+  metadata.gz: d62a70e9232f06fb65c6d4b464eecfc4e864854fa2bfa1b3581bbae174775bff
+  data.tar.gz: 69e37dbe7d64519b38f9b05214dcc0086b7713e7096b1a2481b42a3ef652a6ee
 SHA512:
-  metadata.gz: 670a1a23db7cd77e5cbaad196c5f745c4f29649578a95ead8bb01aecbdd152c7893488cc4faaa19e4aaaf4daa6de23fd065e49aecff8f6e52670c65e11bb6497
-  data.tar.gz: f4600c9510f12470abe08ab2ef058fc8e8cf71686a359923d919891ac3047f6a67a007edd7206a5441d888b39a05e7d385866e2e3bc90be22af246151300c064
+  metadata.gz: 4cf851504d5fb8da1598d10ce027c819c1302522d1546d8c532e3e1522f7fe71108ff0c4acfef2e28c174a7981fa5474c499d70b0ef4988d3862bf1962fc5928
+  data.tar.gz: 8d3cd7d56df3dc5d05add0c62e96093318eef33ee0c0fb3a041bdeaf9dee778ba7c828f7d246b41b204822300ca3b9cb4a15e70b8fa93ed6a1ae4f5d48094408

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    columbusctl (0.0.1)
+    columbusctl (0.0.2)
+      awesome_print (~> 1.8.0)
       colorize (~> 0.8.1)
       json (~> 2.1, >= 2.1.0)
       rest-client (~> 1.8)
@@ -11,6 +12,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    awesome_print (1.8.0)
     colorize (0.8.1)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)

data/columbus.gemspec

@@ -42,4 +42,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'thor', '~> 0.20.0'
   spec.add_runtime_dependency 'colorize', '~> 0.8.1'
   spec.add_runtime_dependency 'terminal-table', '~> 1.8.0'
+  spec.add_runtime_dependency 'awesome_print', '~> 1.8.0'
+
 end

data/lib/columbus.rb

@@ -3,20 +3,22 @@ require 'rest-client'
 require 'yaml'
 require 'colorize'
 require 'terminal-table'
-require "columbus/version"
-require "columbus/start"
-require "columbus/stop"
-require "columbus/checks"
-require "columbus/check"
-require "columbus/connections"
-require "columbus/connection"
-require "columbus/env"
+require 'awesome_print'
+require 'columbus/config'
+require 'columbus/version'
+Dir[File.join(__dir__, 'columbus/cli', '*.rb')].each { |file| require file }
+
 
 module Columbus
   class Error < StandardError; end
   # Your code goes here...
   class CommandLineRunner < Thor
 
+    desc 'download', 'downloads the columbus jar'
+    def download
+      Columbus.download
+    end
+
     desc 'start', 'starts columbus'
     def start
       Columbus.start
@@ -27,6 +29,11 @@ module Columbus
       Columbus.stop
     end
 
+    desc 'log', 'shows the columbus log'
+    def log
+      Columbus.log
+    end
+
     desc 'checks', 'returns a list of all checks'
     def checks()
       Columbus.checks

data/lib/columbus/{checks.rb → cli/checks.rb}

@@ -1,5 +1,5 @@
 module Columbus
-  def self.checks()
+  def self.checks
     response = RestClient.get 'http://localhost:8080/api/checks'
 
     checks = JSON.parse(response.body)

data/lib/columbus/{connections.rb → cli/connections.rb}

@@ -1,5 +1,5 @@
 module Columbus
-  def self.connections()
+  def self.connections
 
     response = RestClient.get 'http://localhost:8080/api/connections'
 

data/lib/columbus/cli/download.rb

@@ -0,0 +1,8 @@
+module Columbus
+  def self.download
+    puts "Downloading Columbus ..."
+    columbus_jar_dir = "#{Columbus::COLUMBUS_HOME}/lib"
+    system "mkdir #{columbus_jar_dir}"
+    system "curl -L https://github.com/n3xtdata/columbus/raw/artifacts/columbus-0.0.1-SNAPSHOT.jar -o #{columbus_jar_dir}/columbus.jar"
+  end
+end

data/lib/columbus/{env.rb → cli/env.rb}

@@ -1,7 +1,5 @@
-require "columbus/config"
-
 module Columbus
-  def self.env()
+  def self.env
     puts "Get Env ..."
 
     puts "COLUMBUS_JAR" + "      " + Columbus::COLUMBUS_JAR;

data/lib/columbus/cli/log.rb

@@ -0,0 +1,7 @@
+module Columbus
+  def self.log
+
+    exec "tail -f #{Columbus::COLUMBUS_HOME}/log/columbus.log"
+
+  end
+end

data/lib/columbus/cli/start.rb

@@ -0,0 +1,10 @@
+module Columbus
+  def self.start
+    puts "Starting Columbus ..."
+    system "mkdir #{Columbus::COLUMBUS_HOME}/log"
+    system "mkdir #{Columbus::COLUMBUS_HOME}/tmp"
+    system "nohup java -jar #{Columbus::COLUMBUS_JAR} > #{Columbus::COLUMBUS_HOME}/log/columbus.log 2>&1 & echo $! > #{Columbus::COLUMBUS_HOME}/tmp/columbus.pid"
+    #system "nohup java -jar /Users/robs/Projects/n3xtdata/columbus/target/columbus-0.0.1-SNAPSHOT.jar > #{Columbus::COLUMBUS_HOME}/log/columbus.log 2>&1 & echo $! > #{Columbus::COLUMBUS_HOME}/tmp/columbus.pid"
+
+  end
+end

data/lib/columbus/cli/stop.rb

@@ -0,0 +1,8 @@
+module Columbus
+  def self.stop
+    puts "Stopping Columbus ..."
+
+    system "kill -9 $(cat #{Columbus::COLUMBUS_HOME}/tmp/columbus.pid)"
+
+  end
+end

data/lib/columbus/config.rb

@@ -1,4 +1,4 @@
 module Columbus
-  COLUMBUS_JAR = ENV['COLUMBUS_JAR']
   COLUMBUS_HOME = ENV['COLUMBUS_HOME']
+  COLUMBUS_JAR = "#{ENV['COLUMBUS_HOME']}/lib/columbus.jar"
 end

data/lib/columbus/version.rb

@@ -1,3 +1,3 @@
 module Columbus
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: columbusctl
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Nils Engelbrecht
@@ -129,6 +129,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 description: Desc
 email:
 - n.engelbrecht@gmx.net
@@ -148,14 +162,16 @@ files:
 - columbus.gemspec
 - exe/columbus
 - lib/columbus.rb
-- lib/columbus/check.rb
-- lib/columbus/checks.rb
+- lib/columbus/cli/check.rb
+- lib/columbus/cli/checks.rb
+- lib/columbus/cli/connection.rb
+- lib/columbus/cli/connections.rb
+- lib/columbus/cli/download.rb
+- lib/columbus/cli/env.rb
+- lib/columbus/cli/log.rb
+- lib/columbus/cli/start.rb
+- lib/columbus/cli/stop.rb
 - lib/columbus/config.rb
-- lib/columbus/connection.rb
-- lib/columbus/connections.rb
-- lib/columbus/env.rb
-- lib/columbus/start.rb
-- lib/columbus/stop.rb
 - lib/columbus/version.rb
 homepage: https://www.github.com/n3xtdata/columbus-cli
 licenses: []

data/lib/columbus/start.rb

@@ -1,8 +0,0 @@
-require "columbus/config"
-
-module Columbus
-  def self.start
-    puts "Starting Columbus ..."
-    system "nohup java -jar #{Columbus::COLUMBUS_JAR} > #{Columbus::COLUMBUS_HOME}/columbus.log 2>&1 & echo $! > #{Columbus::COLUMBUS_HOME}/columbus.pid"
-  end
-end

data/lib/columbus/stop.rb

@@ -1,10 +0,0 @@
-require "columbus/config"
-
-module Columbus
-  def self.stop
-    puts "Stopping Columbus ..."
-
-    system "kill -9 $(cat #{Columbus::COLUMBUS_HOME}/columbus.pid)"
-
-  end
-end