eventhub-command 0.8.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9adae3bad773165a879b27894dcaf17009e57591
-  data.tar.gz: 8f4c06c769658f2aa17a4200ef7e2c3fc55b235d
+SHA256:
+  metadata.gz: a3b9ef32ec489113cd533f9603db9c1ae542bf32aabf82c3ae7ae4d5000919bd
+  data.tar.gz: a6ada20b684ac2a911ae411ab738a2d904fc151206d8f42e529967feb2bc5d08
 SHA512:
-  metadata.gz: 8ddb5be2988d59273b157f7362030f5e020aef2d49ada1ccf4c898d077fb4ce467650856728360a3fd997787e8edeff7b5873252318483119e28375bd9b5ece4
-  data.tar.gz: b5d6f672efad3767cd28fd45ec51bca3008287028f47782eaa5d4aee0c2c24a6e517e5b5c5d122790c0f858845c8e10a31106b67fc0d97796402112430b03d6f
+  metadata.gz: 93bbf8d4c58fc240bdf0f15531f99992f927024e280e5258147373e2d867667ae52b09eb6db542d6ff10f400ed687eca39a2d113ccbd7762166d50772b77ab55
+  data.tar.gz: 5afc8e32a44692f25c6977db3641f3ef1bf1e7663b24c14d5126a6f2b3dec49bb033419659f8aeedcafb6e33f0c02880363ccc26002376fb7d77b5c55a94d830

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## 0.10.0 (2021-08-03)
+
+* Change: Bump version
+
+## 0.9.0 (2021-08-02)
+
+* Add: Apply ruby styles (standard gem)
+* Add: Simple test coverage (simplecov gem)
+* Add: ci with github actions
+* Change: Update ruby to 2.6.6
+* Change: Update rake to 13.0
+* Change: Update rspec to 3.10
+* Change: Update highline to 2.0
+* Change: Update rubyzip to 2.3
+* Change: Update net-ssh to 6.1
+* Change: Hide scm password for log output
+* Change: Remove redundant rails_src_dir method
+* Change: rspec - improve test performance
+* Change: rspec - order is randomized
+* Delete: travis ci dependency
+
 ## 0.8.0 (2018-02-21)
 
 * Change: Update gem dependencies (rake, rspec, bundler, GLI)

data/README.md

@@ -1,6 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/eventhub-command.svg)](https://badge.fury.io/rb/eventhub-command)
-[![Dependency Status](https://gemnasium.com/badges/github.com/thomis/eventhub-command.svg)](https://gemnasium.com/github.com/thomis/eventhub-command)
-[![Build Status](https://travis-ci.org/thomis/eventhub-command.svg?branch=master)](https://travis-ci.org/thomis/eventhub-command)
+![](https://github.com/thomis/eventhub-command/workflows/ci/badge.svg)
 
 eventhub-command
 ================

data/lib/deployer.rb

@@ -1,13 +1,13 @@
 module Deployer
 end
 
-require_relative 'deployer/executor'
-require_relative 'deployer/net_ssh_extension'
-require_relative 'deployer/stage'
+require_relative "deployer/executor"
+require_relative "deployer/net_ssh_extension"
+require_relative "deployer/stage"
 
-require_relative 'deployer/base_deployer'
-require_relative 'deployer/mule_deployer'
-require_relative 'deployer/ruby_deployer'
-require_relative 'deployer/go_deployer'
-require_relative 'deployer/config_deployer'
-require_relative 'deployer/console_deployer'
+require_relative "deployer/base_deployer"
+require_relative "deployer/mule_deployer"
+require_relative "deployer/ruby_deployer"
+require_relative "deployer/go_deployer"
+require_relative "deployer/config_deployer"
+require_relative "deployer/console_deployer"

data/lib/deployer/base_deployer.rb

@@ -11,11 +11,11 @@ class Deployer::BaseDeployer
   private
 
   def config_source_dir(*extra_paths)
-    File.join(base_dir, 'config', *extra_paths)
+    File.join(base_dir, "config", *extra_paths)
   end
 
   def log_deployment(executor, message)
-    executor.execute("echo $(date): #{message} - #{ENV['USER']} >> #{deploy_log_file}")
+    executor.execute("echo $(date): #{message} - #{ENV["USER"]} >> #{deploy_log_file}")
   end
 
   def base_dir
@@ -23,7 +23,7 @@ class Deployer::BaseDeployer
   end
 
   def deploy_log_file
-    File.join(shared_dir, 'logs', 'deploy.log')
+    File.join(shared_dir, "logs", "deploy.log")
   end
 
   def deploy_via
@@ -35,32 +35,30 @@ class Deployer::BaseDeployer
   end
 
   def via_scp?
-    deploy_via == 'scp'
+    deploy_via == "scp"
   end
 
   def shared_dir
-    File.join(base_dir, 'shared')
+    File.join(base_dir, "shared")
   end
 
   def cached_copy_scp_dir
-    File.join(shared_dir, 'cached_copy_scp')
+    File.join(shared_dir, "cached_copy_scp")
   end
 
   def cached_copy_svn_dir
-    File.join(shared_dir, 'cached_copy_svn')
+    File.join(shared_dir, "cached_copy_svn")
   end
 
   def cached_copy_dir(*extra_paths)
     dir = if via_scp?
       cached_copy_scp_dir
+    elsif options[:tag]
+      File.join(cached_copy_svn_dir, "tags", options[:tag], "releases")
+    elsif options[:branch]
+      File.join(cached_copy_svn_dir, "branches", options[:branch], "releases")
     else
-      if options[:tag]
-        File.join(cached_copy_svn_dir, 'tags', options[:tag], 'releases')
-      elsif options[:branch]
-        File.join(cached_copy_svn_dir, 'branches', options[:branch], 'releases')
-      else
-        File.join(cached_copy_svn_dir, 'branches', 'master', 'releases')
-      end
+      File.join(cached_copy_svn_dir, "branches", "master", "releases")
     end
     File.join(dir, *extra_paths)
   end
@@ -81,16 +79,15 @@ class Deployer::BaseDeployer
     "#{scm_base_url}/branches/master/releases"
   end
 
-
   def create_base_dirs(executor)
     dirs = [
-      File.join(base_dir, 'config'),
-      File.join(base_dir, 'ruby'),
-      File.join(base_dir, 'mule'),
-      File.join(base_dir, 'rails'),
+      File.join(base_dir, "config"),
+      File.join(base_dir, "ruby"),
+      File.join(base_dir, "mule"),
+      File.join(base_dir, "rails"),
       shared_dir,
-      File.join(shared_dir, 'pids'),
-      File.join(shared_dir, 'logs'),
+      File.join(shared_dir, "pids"),
+      File.join(shared_dir, "logs"),
       cached_copy_scp_dir
     ]
     cmds = dirs.map do |dir|
@@ -115,7 +112,6 @@ class Deployer::BaseDeployer
 
   private
 
-
   # Executes an ls on all hosts and returns the combined
   # list of files or dirs.
   def remote_ls(executor, options, pattern)
@@ -129,7 +125,7 @@ class Deployer::BaseDeployer
 
   def verify_deployment_list!(requested, available)
     # remove requested that are not available
-    puts 'Deployment List'.light_blue.on_blue
+    puts "Deployment List".light_blue.on_blue
     abort = false
     requested.each do |name|
       if available.include?(name)
@@ -143,11 +139,9 @@ class Deployer::BaseDeployer
       puts "Not all requested components are available in #{cached_copy_dir}. Will abort.".red
       raise
     end
-
   end
 
   def inspector_command(action, name)
     "curl -X POST --data '[{\"name\": \"#{name}\",\"action\": \"#{action}\"}]' --header \"Content-Type:application/json\" http://localhost:5500/applications"
   end
-
 end

data/lib/deployer/config_deployer.rb

@@ -1,6 +1,6 @@
 class Deployer::ConfigDeployer < Deployer::BaseDeployer
   def initialize(options = {})
-    options[:deploy_via] = 'svn'
+    options[:deploy_via] = "svn"
     super(options)
   end
 
@@ -10,7 +10,7 @@ class Deployer::ConfigDeployer < Deployer::BaseDeployer
       create_base_dirs(executor)
       update_scm(executor)
 
-      source = cached_copy_dir('..', 'config', "%{stagename}", "%{hostname}", '')
+      source = cached_copy_dir("..", "config", "%{stagename}", "%{hostname}", "")
       target = config_source_dir
 
       cmd = "rsync -r --exclude=.svn #{source} #{target}"

data/lib/deployer/console_deployer.rb

@@ -1,5 +1,4 @@
 class Deployer::ConsoleDeployer < Deployer::BaseDeployer
-
   def initialize(options)
     @options = options
   end
@@ -19,6 +18,6 @@ class Deployer::ConsoleDeployer < Deployer::BaseDeployer
   end
 
   def stage
-    @options.fetch(:stage, 'development')
+    @options.fetch(:stage, "development")
   end
 end

data/lib/deployer/executor.rb

@@ -1,5 +1,5 @@
-require 'net/ssh'
-require 'colorize'
+require "net/ssh"
+require "colorize"
 
 class Deployer::Executor
   attr_reader :stage
@@ -26,7 +26,6 @@ class Deployer::Executor
       log_result(result)
       result
     end
-
   rescue => e
     handle_exception(e, options)
   end
@@ -45,7 +44,6 @@ class Deployer::Executor
       log_result(result)
       result
     end
-
   rescue => e
     handle_exception(e, options)
   end
@@ -58,12 +56,12 @@ class Deployer::Executor
       log_result(result)
       result
     end
-
   rescue => e
     handle_exception(e, options)
   end
 
   private
+
   def handle_exception(e, options)
     if options[:abort_on_error] == false
       puts "warning".black.on_yellow
@@ -73,7 +71,6 @@ class Deployer::Executor
       puts "    #{e.message}".red
     end
     raise unless options[:abort_on_error] == false
-
   end
 
   def verbose?
@@ -92,7 +89,7 @@ class Deployer::Executor
   end
 
   def log_command(cmd, comment = nil)
-    puts cmd.blue
+    puts filter(cmd).blue
     puts "  (#{comment})" if verbose? && comment
   end
 
@@ -104,8 +101,9 @@ class Deployer::Executor
     execute_local "scp -P #{host[:port]} #{host[:user]}@#{host[:host]}:#{source} #{target}"
   end
 
-
-
+  def filter(text)
+    text.gsub(/--password (\S)+/, "--password [FILTERED]")
+  end
 
   def execute_local(command)
     output = nil
@@ -118,12 +116,10 @@ class Deployer::Executor
 
     raise "Command \"#{command}\" returned exit code #{exit_code}" unless exit_code.success?
 
-    result = {
+    {
       stdout: output,
-      stderr: '',
-      exit_code: 0,
+      stderr: "",
+      exit_code: 0
     }
-
-    result
   end
 end

data/lib/deployer/go_deployer.rb

@@ -12,7 +12,6 @@ class Deployer::GoDeployer < Deployer::BaseDeployer
     Deployer::Executor.new(stage, verbose: verbose?) do |executor|
       create_base_dirs(executor)
 
-
       update_cached_copy(executor)
 
       # fetch processor_names unless they have been passed as an argument to the initializer
@@ -23,37 +22,37 @@ class Deployer::GoDeployer < Deployer::BaseDeployer
         log_deployment(executor, "Deploying #{processor_name} via #{deploy_via} from #{cached_copy_dir}")
 
         # stop old one
-        if processor_name != 'inspector'
-          cmd = inspector_command('stop', processor_name)
+        if processor_name != "inspector"
+          cmd = inspector_command("stop", processor_name)
           executor.execute(cmd, abort_on_error: false, comment: "Request to stop component")
         else
           executor.execute("kill -s TERM $(cat #{File.join(pids_dir, processor_name)}.pid)", abort_on_error: false, comment: "This is not sooo important")
         end
 
         # unzip package
-        target = deploy_dir('go')
-        source = cached_copy_dir('go',"#{processor_name}.zip")
+        target = deploy_dir("go")
+        source = cached_copy_dir("go", "#{processor_name}.zip")
         executor.execute("rm -rf #{processor_dir(processor_name)} && unzip -o -d #{target} #{source}")
 
         # copy config
         executor.execute("if [[ -d #{config_source_dir(processor_name)} ]] ; then cp -r #{config_source_dir(processor_name)}/* #{processor_dir(processor_name)}; fi")
 
         # remove log dir if it exists
-        executor.execute("if [[ -d #{processor_dir(processor_name, 'logs')} ]] ; then rm -rf #{processor_dir(processor_name, 'logs')}; fi")
+        executor.execute("if [[ -d #{processor_dir(processor_name, "logs")} ]] ; then rm -rf #{processor_dir(processor_name, "logs")}; fi")
 
         # symlink log dir
-        executor.execute("ln -s #{logs_dir} #{processor_dir(processor_name, 'logs')}")
+        executor.execute("ln -s #{logs_dir} #{processor_dir(processor_name, "logs")}")
 
         # symlink pids dir
-        executor.execute("ln -s #{pids_dir} #{processor_dir(processor_name, 'pids')}")
+        executor.execute("ln -s #{pids_dir} #{processor_dir(processor_name, "pids")}")
 
         # start new one
-        if processor_name == 'inspector'
+        if processor_name == "inspector"
           # default start
           executor.execute("cd #{processor_dir(processor_name)} && ./#{processor_name} -d -e $EH_ENV")
         else
           # startig go via inspector
-          cmd = inspector_command('start', processor_name)
+          cmd = inspector_command("start", processor_name)
           executor.execute(cmd, abort_on_error: false, comment: "Request to start component")
         end
       end
@@ -64,8 +63,8 @@ class Deployer::GoDeployer < Deployer::BaseDeployer
 
   def update_cached_copy(executor)
     if via_scp?
-      source = Eh::Settings.current.releases_dir('go', '*.zip')
-      target_dir = File.join(cached_copy_dir, 'go')
+      source = Eh::Settings.current.releases_dir("go", "*.zip")
+      target_dir = File.join(cached_copy_dir, "go")
       executor.execute("rm -rf #{target_dir}/*.zip && mkdir -p #{target_dir}")
       executor.upload(source, target_dir)
     else
@@ -74,11 +73,11 @@ class Deployer::GoDeployer < Deployer::BaseDeployer
   end
 
   def logs_dir
-    File.join(shared_dir, 'logs')
+    File.join(shared_dir, "logs")
   end
 
   def pids_dir
-    File.join(shared_dir, 'pids')
+    File.join(shared_dir, "pids")
   end
 
   def deploy_dir(*extra_paths)
@@ -86,23 +85,23 @@ class Deployer::GoDeployer < Deployer::BaseDeployer
   end
 
   def processor_dir(*extra_paths)
-    File.join(deploy_dir, 'go', *extra_paths)
+    File.join(deploy_dir, "go", *extra_paths)
   end
 
   def config_source_dir(processor_name)
-    super('go', processor_name)
+    super("go", processor_name)
   end
 
   # Detect what processors to deploy
   #
   def resolve_processor_names(executor, options)
-    available = remote_ls(executor, options, File.join(cached_copy_dir, 'go', '*.zip')).map do |name|
-      File.basename(name, '.zip')
+    available = remote_ls(executor, options, File.join(cached_copy_dir, "go", "*.zip")).map do |name|
+      File.basename(name, ".zip")
     end
 
     fetched = Array(processor_names).map do |name|
-      if name.include?('*') # resolve pattern on remote machine
-        remote_ls(executor, options, File.join(cached_copy_dir, 'go', "#{name}.zip"))
+      if name.include?("*") # resolve pattern on remote machine
+        remote_ls(executor, options, File.join(cached_copy_dir, "go", "#{name}.zip"))
       else
         name
       end
@@ -112,7 +111,7 @@ class Deployer::GoDeployer < Deployer::BaseDeployer
     end
 
     fetched = fetched.flatten.map do |name|
-      File.basename(name, '.zip')
+      File.basename(name, ".zip")
     end
 
     verify_deployment_list!(fetched, available)
@@ -124,10 +123,9 @@ class Deployer::GoDeployer < Deployer::BaseDeployer
   #
   def go_sorter
     ->(a, b) do
-      return -1 if a =~ /inspector/i
-      return 1 if b =~ /inspector/i
+      return -1 if /inspector/i.match?(a)
+      return 1 if /inspector/i.match?(b)
       a <=> b
     end
   end
-
 end

data/lib/deployer/mule_deployer.rb

@@ -7,11 +7,11 @@ class Deployer::MuleDeployer < Deployer::BaseDeployer
   end
 
   def adapter_cached_copy(adapter_name)
-    cached_copy_dir('mule', "#{adapter_name}.zip")
+    cached_copy_dir("mule", "#{adapter_name}.zip")
   end
 
   def config_source_dir(adapter_name)
-    super('mule', adapter_name)
+    super("mule", adapter_name)
   end
 
   def deploy!
@@ -31,7 +31,7 @@ class Deployer::MuleDeployer < Deployer::BaseDeployer
         log_deployment(executor, "Deploying #{adapter_name} via #{deploy_via} from #{cached_copy_dir}")
         # make a copy of the zip files to merge them with config
         cached_copy_source = adapter_cached_copy(adapter_name)
-        configuration_target = File.join(base_dir, 'mule', "#{adapter_name}.zip")
+        configuration_target = File.join(base_dir, "mule", "#{adapter_name}.zip")
         executor.execute("cp #{cached_copy_source} #{configuration_target}")
 
         # copy config
@@ -44,17 +44,16 @@ class Deployer::MuleDeployer < Deployer::BaseDeployer
     end
   end
 
-
   private
 
   def resolve_adapter_names(executor, options)
-    available = remote_ls(executor, options, cached_copy_dir('mule', '*.zip')).map do |name|
-      File.basename(name, '.zip')
+    available = remote_ls(executor, options, cached_copy_dir("mule", "*.zip")).map do |name|
+      File.basename(name, ".zip")
     end
 
     fetched = Array(adapter_names).map do |name|
-      if name.include?('*') # resolve pattern on remote machine
-        remote_ls(executor, options, cached_copy_dir('mule', "#{name}.zip"))
+      if name.include?("*") # resolve pattern on remote machine
+        remote_ls(executor, options, cached_copy_dir("mule", "#{name}.zip"))
       else
         name
       end
@@ -64,7 +63,7 @@ class Deployer::MuleDeployer < Deployer::BaseDeployer
     end
 
     fetched = fetched.flatten.map do |name|
-      File.basename(name, '.zip')
+      File.basename(name, ".zip")
     end
 
     verify_deployment_list!(fetched, available)
@@ -74,8 +73,8 @@ class Deployer::MuleDeployer < Deployer::BaseDeployer
 
   def update_cached_copy(executor)
     if via_scp?
-      source = Eh::Settings.current.releases_dir('mule', '*.zip')
-      target_dir = cached_copy_dir('mule')
+      source = Eh::Settings.current.releases_dir("mule", "*.zip")
+      target_dir = cached_copy_dir("mule")
       executor.execute("rm -rf #{target_dir}/*.zip && mkdir -p #{target_dir}")
       executor.upload(source, target_dir)
     else