eventhub-command 0.7.3 → 0.10.0

data/lib/deployer/net_ssh_extension.rb

@@ -1,9 +1,8 @@
 class Net::SSH::Connection::Session
-
   def exec_sc!(command, verbose = false)
-    stdout_data,stderr_data = "",""
-    exit_code, exit_signal = nil,nil
-    self.open_channel do |channel|
+    stdout_data, stderr_data = "", ""
+    exit_code, exit_signal = nil, nil
+    open_channel do |channel|
       channel.exec(command) do |_, success|
         raise "Command \"#{command}\" was unable to execute" unless success
 

data/lib/deployer/ruby_deployer.rb

@@ -22,31 +22,31 @@ class Deployer::RubyDeployer < Deployer::BaseDeployer
         log_deployment(executor, "Deploying #{processor_name} via #{deploy_via} from #{cached_copy_dir}")
 
         # stop old one
-        cmd = inspector_command('stop', processor_name)
+        cmd = inspector_command("stop", processor_name)
         executor.execute(cmd, abort_on_error: false, comment: "Request to stop component")
 
         # unzip package
-        target = deploy_dir('ruby')
-        source = cached_copy_dir('ruby',"#{processor_name}.zip")
+        target = deploy_dir("ruby")
+        source = cached_copy_dir("ruby", "#{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")}")
 
         # install gems
         executor.execute("cd #{processor_dir(processor_name)} && bundle install --without test")
 
         # start new one
-        cmd = inspector_command('start', processor_name)
+        cmd = inspector_command("start", processor_name)
         executor.execute(cmd, abort_on_error: false, comment: "Request to stop component")
       end
     end
@@ -56,8 +56,8 @@ class Deployer::RubyDeployer < Deployer::BaseDeployer
 
   def update_cached_copy(executor)
     if via_scp?
-      source = Eh::Settings.current.releases_dir('ruby', '*.zip')
-      target_dir = File.join(cached_copy_dir, 'ruby')
+      source = Eh::Settings.current.releases_dir("ruby", "*.zip")
+      target_dir = File.join(cached_copy_dir, "ruby")
       executor.execute("rm -rf #{target_dir}/*.zip && mkdir -p #{target_dir}")
       executor.upload(source, target_dir)
     else
@@ -66,11 +66,11 @@ class Deployer::RubyDeployer < 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)
@@ -78,23 +78,23 @@ class Deployer::RubyDeployer < Deployer::BaseDeployer
   end
 
   def processor_dir(*extra_paths)
-    File.join(deploy_dir, 'ruby', *extra_paths)
+    File.join(deploy_dir, "ruby", *extra_paths)
   end
 
   def config_source_dir(processor_name)
-    super('ruby', processor_name)
+    super("ruby", processor_name)
   end
 
   # Detect what processors to deploy
   #
   def resolve_processor_names(executor, options)
-    available = remote_ls(executor, options, File.join(cached_copy_dir, 'ruby', '*.zip')).map do |name|
-      File.basename(name, '.zip')
+    available = remote_ls(executor, options, File.join(cached_copy_dir, "ruby", "*.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, 'ruby', "#{name}.zip"))
+      if name.include?("*") # resolve pattern on remote machine
+        remote_ls(executor, options, File.join(cached_copy_dir, "ruby", "#{name}.zip"))
       else
         name
       end
@@ -104,7 +104,7 @@ class Deployer::RubyDeployer < Deployer::BaseDeployer
     end
 
     fetched = fetched.flatten.map do |name|
-      File.basename(name, '.zip')
+      File.basename(name, ".zip")
     end
 
     verify_deployment_list!(fetched, available)
@@ -112,15 +112,13 @@ class Deployer::RubyDeployer < Deployer::BaseDeployer
     fetched
   end
 
-
   # custom ruby sorting makes sure dispatcher is always first if multiple go apps are given
   #
   def ruby_sorter
     ->(a, b) do
-      return -1 if a =~ /dispatcher/i
-      return 1 if b =~ /dispatcher/i
+      return -1 if /dispatcher/i.match?(a)
+      return 1 if /dispatcher/i.match?(b)
       a <=> b
     end
   end
-
 end

data/lib/deployer/stage.rb

@@ -27,8 +27,8 @@ class Deployer::Stage
     data = YAML.load_file(file)
     data.map do |_, config|
       stage = Deployer::Stage.new(name)
-      config['hosts'].each do |host|
-        stage.host(host['host'], host['port'], host['user'])
+      config["hosts"].each do |host|
+        stage.host(host["host"], host["port"], host["user"])
       end
       stage
     end.first

data/lib/eh-commands.rb

@@ -1,19 +1,19 @@
 # All commands are required here
 if Eh::Settings.current.repository
-  require 'eh/commands/generate'
-  require 'eh/commands/package'
-  require 'eh/commands/deploy'
-  require 'eh/commands/stage'
-  require 'eh/commands/proxy'
-  require 'eh/commands/dump'
-  require 'eh/commands/database'
-  require 'eh/proxy/proxy'
+  require "eh/commands/generate"
+  require "eh/commands/package"
+  require "eh/commands/deploy"
+  require "eh/commands/stage"
+  require "eh/commands/proxy"
+  require "eh/commands/dump"
+  require "eh/commands/database"
+  require "eh/proxy/proxy"
 else
   # remove unused settings for this version
-  Eh::Settings.current.data.delete('repository_root_dir')
+  Eh::Settings.current.data.delete("repository_root_dir")
   Eh::Settings.current.write
   puts "No current repository found."
   puts "You can configure other repositories by running 'eh repository add' and/or 'eh repository select'"
 end
 
-require 'eh/commands/repository'
+require "eh/commands/repository"

data/lib/eh.rb

@@ -1,13 +1,13 @@
 module Eh
 end
 
-require 'zip'
-require 'pathname'
+require "zip"
+require "pathname"
 
-require 'eh/version'
-require 'eh/settings'
-require 'yaml'
+require "eh/version"
+require "eh/settings"
+require "yaml"
 
-require_relative 'helper'
-require_relative 'deployer'
-require_relative 'packager'
+require_relative "helper"
+require_relative "deployer"
+require_relative "packager"

data/lib/eh/commands/database.rb

@@ -1,15 +1,14 @@
-desc 'Database commands (run on local machine)'
+desc "Database commands (run on local machine)"
 command :database do |database|
-
-  database.flag([:user], default_value: 'event_hub_console', desc: 'DB User')
-  database.flag([:db], default_value: 'event_hub_console', desc: 'DB name')
+  database.flag([:user], default_value: "event_hub_console", desc: "DB User")
+  database.flag([:db], default_value: "event_hub_console", desc: "DB name")
   database.flag([:file], desc: "Output Filename, last backup will be taken as default")
 
-  database.desc 'Dump database from defined stage'
+  database.desc "Dump database from defined stage"
   database.command :dump do |dump|
     dump.action do |global_options, options, args|
       base = Eh::Settings.current.db_backups_dir
-      stamp = Time.now.strftime('%Y%m%d%H%M%S')
+      stamp = Time.now.strftime("%Y%m%d%H%M%S")
       target = options[:file] || "#{stamp}-console-dump.sql.compressed"
 
       cmd = "mkdir -p #{base} && cd #{base} && pg_dump -Fc -U#{options[:user]} #{options[:db]} -f#{target}"
@@ -19,12 +18,12 @@ command :database do |database|
     end
   end
 
-  database.desc 'Restore database to defined stage'
+  database.desc "Restore database to defined stage"
   database.command :restore do |restore|
     restore.action do |global_options, options, args|
       source = options[:file] || begin
         base = Eh::Settings.current.db_backups_dir
-        pattern = File.join(base, '*')
+        pattern = File.join(base, "*")
         files = Dir.glob(pattern).sort
         files.last
       end
@@ -33,7 +32,7 @@ command :database do |database|
       end
       puts "This can destroy the contents of #{options[:db]}. Is this OK? [yes/NO]:"
       answer = $stdin.gets.chomp.downcase
-      if answer == 'yes'
+      if answer == "yes"
         cmd = "pg_restore -Fc -U #{options[:user]} -d #{options[:db]} #{source}"
         puts "will execute '#{cmd}'" if global_options[:verbose]
         system cmd
@@ -44,15 +43,15 @@ command :database do |database|
     end
   end
 
-  database.desc 'Cleanup dump files'
+  database.desc "Cleanup dump files"
   database.command :cleanup do |cleanup|
     cleanup.flag([:keep], type: Integer, desc: "How many dumps to keep", default_value: 25)
     cleanup.action do |global_options, options, args|
       keep = options[:keep]
       base = Eh::Settings.current.db_backups_dir
-      pattern = File.join(base, '*')
+      pattern = File.join(base, "*")
       files = Dir.glob(pattern).sort.reverse # keep most recent
-      to_delete = files[keep..-1] || []
+      to_delete = files[keep..] || []
 
       to_delete.each do |file|
         puts "will delete #{file}" if global_options[:verbose]
@@ -61,5 +60,4 @@ command :database do |database|
       puts "Deleted #{to_delete.size} file(s)".green
     end
   end
-
 end

data/lib/eh/commands/deploy.rb

@@ -1,14 +1,14 @@
-desc 'Deployment commands'
+desc "Deployment commands"
 command :deploy do |deploy|
-  deploy.flag([:stage], desc: 'stage', type: String, long_desc: 'Stage where processor is deployed to', default_value: Eh::Settings.current.default_stage)
-  deploy.flag([:branch], desc: 'branch', type: String, long_desc: 'What branch to deploy. Only when deploy_via=scm', default_value: 'master')
-  deploy.flag([:tag], desc: 'tag', type: String, long_desc: 'What tag to deploy. Only when deploy_via=scm', default_value: nil)
-  deploy.flag([:deploy_via], desc: 'where to deploy from', type: String, long_desc: 'deploy via scm or scp. If you use scp then the working_dir is packaged and copied tot the servers', default_value: 'svn')
+  deploy.flag([:stage], desc: "stage", type: String, long_desc: "Stage where processor is deployed to", default_value: Eh::Settings.current.default_stage)
+  deploy.flag([:branch], desc: "branch", type: String, long_desc: "What branch to deploy. Only when deploy_via=scm", default_value: "master")
+  deploy.flag([:tag], desc: "tag", type: String, long_desc: "What tag to deploy. Only when deploy_via=scm", default_value: nil)
+  deploy.flag([:deploy_via], desc: "where to deploy from", type: String, long_desc: "deploy via scm or scp. If you use scp then the working_dir is packaged and copied tot the servers", default_value: "svn")
 
-  deploy.desc 'Deploy all components'
+  deploy.desc "Deploy all components"
   deploy.command :all do |all|
     all.action do |global_options, options, args|
-      forward_arguments = args.join(' ')
+      forward_arguments = args.join(" ")
       deploy_config(options, forward_arguments)
       deploy_console(options, forward_arguments)
       deploy_go(options, forward_arguments)
@@ -17,57 +17,45 @@ command :deploy do |deploy|
     end
   end
 
-  deploy.desc 'Deploy configuration files'
+  deploy.desc "Deploy configuration files"
   deploy.command :config do |config|
     config.action do |global_options, options, args|
       Deployer::ConfigDeployer.new(options).deploy!
     end
   end
 
-  deploy.desc 'Deploy rails console'
+  deploy.desc "Deploy rails console"
   deploy.command :console do |console|
-    console.flag([:working_dir], desc: 'directory to execute commands in', type: String, default_value: '.')
+    console.flag([:working_dir], desc: "directory to execute commands in", type: String, default_value: ".")
 
     console.action do |global_options, options, args|
       Deployer::ConsoleDeployer.new(options).deploy!
     end
   end
 
-  deploy.desc 'Deploy channel adapter(s)'
-  deploy.arg_name '[NAME1[,NAME2,PATTERN*]]'
+  deploy.desc "Deploy channel adapter(s)"
+  deploy.arg_name "[NAME1[,NAME2,PATTERN*]]"
   deploy.command :mule do |mule|
     mule.action do |global_options, options, args|
-      if args[0]
-        adapter_names = args[0].split(',').map(&:strip)
-      else
-        adapter_names = nil
-      end
+      adapter_names = args[0]&.split(",")&.map(&:strip)
       Deployer::MuleDeployer.new(adapter_names, options).deploy!
     end
   end
 
-  deploy.desc 'Deploy ruby processor(s)'
-  deploy.arg_name '[NAME1[,NAME2,PATTERN*]]'
+  deploy.desc "Deploy ruby processor(s)"
+  deploy.arg_name "[NAME1[,NAME2,PATTERN*]]"
   deploy.command :ruby do |ruby|
     ruby.action do |global_options, options, args|
-      if args[0]
-        processor_names = args[0].split(',').map(&:strip)
-      else
-        processor_names = nil
-      end
+      processor_names = args[0]&.split(",")&.map(&:strip)
       Deployer::RubyDeployer.new(processor_names, options).deploy!
     end
   end
 
-  deploy.desc 'Deploy go processor(s)'
-  deploy.arg_name '[NAME1[,NAME2,PATTERN*]]'
+  deploy.desc "Deploy go processor(s)"
+  deploy.arg_name "[NAME1[,NAME2,PATTERN*]]"
   deploy.command :go do |go|
     go.action do |global_options, options, args|
-      if args[0]
-        processor_names = args[0].split(',').map(&:strip)
-      else
-        processor_names = nil
-      end
+      processor_names = args[0]&.split(",")&.map(&:strip)
       Deployer::GoDeployer.new(processor_names, options).deploy!
     end
   end
@@ -75,23 +63,23 @@ command :deploy do |deploy|
   private
 
   def deploy_ruby(options, forward_arguments)
-    system "#{extend_command('deploy ruby')} #{copy_options(options, :stage, :branch, :tag, :verbose)} #{forward_arguments}"
+    system "#{extend_command("deploy ruby")} #{copy_options(options, :stage, :branch, :tag, :verbose)} #{forward_arguments}"
   end
 
   def deploy_go(options, forward_arguments)
-    system "#{extend_command('deploy go')} #{copy_options(options, :stage, :branch, :tag, :verbose)} #{forward_arguments}"
+    system "#{extend_command("deploy go")} #{copy_options(options, :stage, :branch, :tag, :verbose)} #{forward_arguments}"
   end
 
   def deploy_console(options, forward_arguments)
-    system "#{extend_command('deploy console')} #{copy_options(options, :stage)} #{forward_arguments}"
+    system "#{extend_command("deploy console")} #{copy_options(options, :stage)} #{forward_arguments}"
   end
 
   def deploy_mule(options, forward_arguments)
-    system "#{extend_command('deploy mule')} #{copy_options(options, :stage, :verbose)} #{forward_arguments}"
+    system "#{extend_command("deploy mule")} #{copy_options(options, :stage, :verbose)} #{forward_arguments}"
   end
 
   def deploy_config(options, forward_arguments)
-    system "#{extend_command('deploy config')} #{copy_options(options, :stage, :branch, :tag, :verbose)} #{forward_arguments}"
+    system "#{extend_command("deploy config")} #{copy_options(options, :stage, :branch, :tag, :verbose)} #{forward_arguments}"
   end
 
   def copy_option(options, option)
@@ -103,11 +91,10 @@ command :deploy do |deploy|
   def copy_options(options, *selected)
     selected.map do |name|
       copy_option(options, name)
-    end.compact.join(' ')
+    end.compact.join(" ")
   end
 
   def extend_command(command)
     "eh #{command}"
   end
-
 end

data/lib/eh/commands/dump.rb

@@ -2,17 +2,15 @@ desc "Creating a dump from an eventhub environment with database, logfiles, fold
 
 command :dump do |command|
   command.desc "Create a backup"
-  command.flag([:stage], desc: 'stage', type: String, long_desc: 'Stage where processor is deployed to', default_value: Eh::Settings.current.default_stage)
+  command.flag([:stage], desc: "stage", type: String, long_desc: "Stage where processor is deployed to", default_value: Eh::Settings.current.default_stage)
 
-  command.desc('Download dumped database')
+  command.desc("Download dumped database")
   command.command :download do |command|
-
     command.action do |global_options, options, args|
-      source = File.join('/tmp', "dump-#{args[0]}.zip")
-      target = File.join('/tmp', "dump-#{args[0]}.zip")
-      dir = File.join('/tmp', "dump-#{args[0]}")
+      source = File.join("/tmp", "dump-#{args[0]}.zip")
+      target = File.join("/tmp", "dump-#{args[0]}.zip")
+      dir = File.join("/tmp", "dump-#{args[0]}")
 
-      cmds = []
       host = stage(options).single_host_stage.hosts[0]
 
       system "scp -P #{host[:port]} #{host[:user]}@#{host[:host]}:#{source} #{target}"
@@ -21,18 +19,17 @@ command :dump do |command|
     end
   end
 
-  command.desc('Create dump file from database')
+  command.desc("Create dump file from database")
   command.command :create do |command|
-
     command.action do |global_options, options, args|
       stamp = Time.now.strftime("%Y%m%d-%H%M%S")
-      dir = File.join('/tmp', "dump-#{stamp}")
-      zip_target = File.join('/tmp', "dump-#{stamp}.zip")
-      logstash_source = '~/apps/event_hub/shared/logs/logstash_output.log'
+      dir = File.join("/tmp", "dump-#{stamp}")
+      zip_target = File.join("/tmp", "dump-#{stamp}.zip")
+      logstash_source = "~/apps/event_hub/shared/logs/logstash_output.log"
       cmds = []
       cmds << "mkdir -p #{dir}"
       cmds << "cd #{dir} && pg_dump -Uevent_hub_console event_hub_console > console_pg.sql"
-      cmds << "if [[ -f #{logstash_source} ]] ; then cp #{logstash_source} #{File.join(dir, 'logstash_output.log')} ; fi"
+      cmds << "if [[ -f #{logstash_source} ]] ; then cp #{logstash_source} #{File.join(dir, "logstash_output.log")} ; fi"
       cmds << "cd #{dir} && zip -r #{zip_target} ."
       cmds << "rm -rf #{dir}"
 
@@ -46,7 +43,6 @@ command :dump do |command|
     end
   end
 
-
   private
 
   def stage(options)