eventhub-command 0.6.10 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bcb7db5976e5d3ddd64abcc0c262fd5314b59e9
-  data.tar.gz: 4cf465ee87b690a790ab1b4e5bcfa869721ca422
+  metadata.gz: 0c7dbd01c57417a4d8ffdffd338f2fa1ad170d23
+  data.tar.gz: f582323a6905bae41cd7bba5b5bffe1f35b3533a
 SHA512:
-  metadata.gz: cd77a2de01de709b108e1a9d86dbffec4c390fafd9d042cc48ec1a058734d7afcaec5ac5cb04c39590ef82f70f06493166fb7ced9f5c485a486f0289c31e7d4b
-  data.tar.gz: c99c369dce891908400b05aea7f138ff11d38549ed9de7c91761b0631f453585fc19138edbd3b3ee72ae2607d1dd6a8fef5d652b508b991d92d857b8e4ba6fc9
+  metadata.gz: 52d5cabc1dd6546c835ec7fbef0c294b919135310bf933623048868f547e7a45ad650eeacc5ca04d49b00f326e86a7fc061e0791c2e5ac225c6a85f82a46e805
+  data.tar.gz: 1ee64c56a674128255197cdac3d2dbdd1969379a38825b27fdcb043f81c6b7724845837a8fbc9446cf1bdd3470a3f9717fe98792b02d9dbd3a67bcc6e5a227e9

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.7.0 (2017-10-24)
+
+* Fix: Generate ruby pocessor
+* Edit: Harmonized subcommands
+* Edit: Colorized output
+* Edit: Newest GLI gem version
+* New: More rspecs
+
 ## 0.6.8 (2016-11-05)
 
 Fix

data/README.md

@@ -1,4 +1,6 @@
+[![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)
 
 eventhub-command
 ================

data/bin/eh

@@ -7,6 +7,7 @@ require 'bundler'
 include GLI::App
 
 program_desc 'Command line tools for EventHub'
+sort_help :manually
 
 version Eh::VERSION
 config_file = File.expand_path(File.join('~', '.eh'))
@@ -17,19 +18,15 @@ else
   File.open(config_file, 'w') do |file|
     file.write(JSON.dump({}))
   end
-  puts "No config File found. Created empty config file for you. You can run 'eh repository add/select' to manage repositories"
-  exit
+  raise "No config File found. Created empty config file for you. You can run 'eh repository add/select' to manage repositories"
 end
 
-
 require 'eh-commands'
 
-# Use argument validation
-arguments :strict
-
 accept Array do |value|
   value.split(/,/).map(&:strip)
 end
 
-switch([:v, :verbose], :desc => "Show additional output.")
+switch([:v, :verbose], :desc => "Show verbose output")
+
 exit run(ARGV)

data/lib/deployer/config_deployer.rb

@@ -15,15 +15,6 @@ class Deployer::ConfigDeployer < Deployer::BaseDeployer
 
       cmd = "rsync -r --exclude=.svn #{source} #{target}"
       executor.execute(cmd)
-      # stage.hosts.each do |host|
-      #   hostname = host[:host]
-      #   source = cached_copy_dir('..', 'config', stage.name, hostname, '')
-      #   target = config_source_dir
-
-      #   # we use rsync to copy without .svn folders
-      #   cmd = "mkdir -p #{target} && rsync -r --exclude=.svn #{source} #{target}"
-      #   executor.execute_on(host, cmd)
-      # end
     end
   end
 end

data/lib/deployer/ruby_deployer.rb

@@ -12,10 +12,8 @@ class Deployer::RubyDeployer < 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
       processor_names_to_deploy = resolve_processor_names(executor, options)
       processor_names_to_deploy.sort(& ruby_sorter).each do |processor_name|

data/lib/eh-commands.rb

@@ -1,12 +1,12 @@
 # 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/dump'
-  require 'eh/commands/db'
   require 'eh/commands/proxy'
-  require 'eh/commands/deploy'
-  require 'eh/commands/package'
+  require 'eh/commands/dump'
+  require 'eh/commands/database'
   require 'eh/proxy/proxy'
 else
   # remove unused settings for this version

data/lib/eh.rb

@@ -8,5 +8,6 @@ require 'eh/version'
 require 'eh/settings'
 require 'yaml'
 
+require_relative 'helper'
 require_relative 'deployer'
 require_relative 'packager'

data/lib/eh/commands/{db.rb → database.rb}

@@ -1,28 +1,27 @@
-desc 'dump and restore db. Attention: those commands run on the local machine, not remote.'
-command :db do |command|
+desc 'Database commands (run on local machine)'
+command :database do |database|
 
-  command.switch([:v, :verbose], :desc => 'Show additional output.')
-  command.flag([:user], default_value: 'event_hub_console', desc: 'DB User')
-  command.flag([:db], default_value: 'event_hub_console', desc: 'DB name')
-  command.flag([:file], desc: "Output Filename, last backup will be taken as default")
+  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")
 
-  command.command :dump do |c|
-    c.action do |global_options, options, args|
+  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')
       target = options[:file] || "#{stamp}-console-dump.sql.compressed"
 
       cmd = "mkdir -p #{base} && cd #{base} && pg_dump -Fc -U#{options[:user]} #{options[:db]} -f#{target}"
-      if options[:verbose]
-        puts "will execute '#{cmd}'"
-      end
+      puts "will execute '#{cmd}'" if global_options[:verbose]
       system cmd
-      puts "Dumped DB to #{target}"
+      puts "Database has been dumped to #{target}".green
     end
   end
 
-  command.command :restore do |c|
-    c.action do |global_options, options, args|
+  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, '*')
@@ -36,19 +35,19 @@ command :db do |command|
       answer = $stdin.gets.chomp.downcase
       if answer == 'yes'
         cmd = "pg_restore -Fc -U #{options[:user]} -d #{options[:db]} #{source}"
-        if options[:verbose]
-          puts "will execute '#{cmd}'"
-        end
+        puts "will execute '#{cmd}'" if global_options[:verbose]
         system cmd
+        puts "Database has been restored".green
       else
-        puts "Abort."
+        puts "Aborted".green
       end
     end
   end
 
-  command.command :cleanup_dumps do |c|
-    c.flag([:keep], type: Integer, desc: "How many dumps to keep", default_value: 25)
-    c.action do |global_options, options, args|
+  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, '*')
@@ -56,12 +55,10 @@ command :db do |command|
       to_delete = files[keep..-1] || []
 
       to_delete.each do |file|
-        if options[:verbose]
-          puts "will delete #{file}"
-        end
+        puts "will delete #{file}" if global_options[:verbose]
         system "rm #{file}"
       end
-      puts "deleted #{to_delete.size} file(s)"
+      puts "Deleted #{to_delete.size} file(s)".green
     end
   end
 

data/lib/eh/commands/deploy.rb

@@ -1,15 +1,14 @@
-desc 'deployment commands'
-command :deploy do |c|
-  c.flag([:stage], desc: 'stage', type: String, long_desc: 'Stage where processor is deployed to', default_value: Eh::Settings.current.default_stage)
-  c.flag([:branch], desc: 'branch', type: String, long_desc: 'What branch to deploy. Only when deploy_via=scm', default_value: 'master')
-  c.flag([:tag], desc: 'tag', type: String, long_desc: 'What tag to deploy. Only when deploy_via=scm', default_value: nil)
-  c.switch([:v, :verbose], :desc => 'Show additional output.')
-  c.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')
-
-  c.desc 'deploy all'
-  c.command :all do |c|
-    c.action do |global_options, options, arguments|
-      forward_arguments = arguments.join(' ')
+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.desc 'Deploy all components'
+  deploy.command :all do |all|
+    all.action do |global_options, options, args|
+      forward_arguments = args.join(' ')
       deploy_config(options, forward_arguments)
       deploy_console(options, forward_arguments)
       deploy_go(options, forward_arguments)
@@ -18,26 +17,26 @@ command :deploy do |c|
     end
   end
 
-  c.desc 'distribute the configs to the nodes'
-  c.command :config do |c|
-    c.action do |global_options, options, args|
+  deploy.desc 'Deploy configuration files'
+  deploy.command :config do |config|
+    config.action do |global_options, options, args|
       Deployer::ConfigDeployer.new(options).deploy!
     end
   end
 
-  c.desc 'deploy the rails console app'
-  c.command :console do |c|
-    c.flag([:working_dir], desc: 'directory to execute commands in', type: String, default_value: '.')
+  deploy.desc 'Deploy rails console'
+  deploy.command :console do |console|
+    console.flag([:working_dir], desc: 'directory to execute commands in', type: String, default_value: '.')
 
-    c.action do |global_options, options, args|
+    console.action do |global_options, options, args|
       Deployer::ConsoleDeployer.new(options).deploy!
     end
   end
 
-  c.desc 'deploy a single channel adapter'
-  c.arg_name '[channel_adapter[,other_channel_adapter,pattern*]]'
-  c.command :mule do |c|
-    c.action do |global_options, options, args|
+  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
@@ -47,10 +46,10 @@ command :deploy do |c|
     end
   end
 
-  c.desc 'deploy a single ruby processor'
-  c.arg_name '[processor_name,[other_processor_name,pattern*]]'
-  c.command :ruby do |c|
-    c.action do |global_options, options, args|
+  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
@@ -60,9 +59,9 @@ command :deploy do |c|
     end
   end
 
-  c.desc 'deploy a single go processor'
-  c.arg_name '[processor_name,[other_processor_name,pattern*]]'
-  c.command :go do |go|
+  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)

data/lib/eh/commands/dump.rb

@@ -1,10 +1,10 @@
-desc "manage repositories"
+desc "Creating a dump from an eventhub environment with database, logfiles, folders"
 
 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.switch([:v, :verbose], :desc => 'Show additional output.')
 
+  command.desc('Download dumped database')
   command.command :download do |command|
 
     command.action do |global_options, options, args|
@@ -21,6 +21,7 @@ command :dump do |command|
     end
   end
 
+  command.desc('Create dump file from database')
   command.command :create do |command|
 
     command.action do |global_options, options, args|
@@ -35,14 +36,12 @@ command :dump do |command|
       cmds << "cd #{dir} && zip -r #{zip_target} ."
       cmds << "rm -rf #{dir}"
 
-
-      Deployer::Executor.new(stage(options).single_host_stage, verbose: options[:verbose]) do |executor|
+      Deployer::Executor.new(stage(options).single_host_stage, verbose: global_options[:verbose]) do |executor|
         cmds.each do |cmd|
           executor.execute(cmd)
         end
       end
 
-
       puts "Created an dump in #{zip_target}. Use #{stamp.green} as identifier for eh dump download."
     end
   end

data/lib/eh/commands/generate.rb

@@ -1,14 +1,16 @@
-desc 'Generates a template for a processor'
-arg_name 'module_name processor_name'
+desc 'Generate template for a new processor'
 command :generate do |c|
-  c.command :processor do |c|
+
+  c.arg_name 'MODULE_NAME PROCESSOR_NAME'
+  c.desc "Generate ruby based processor"
+  c.command :ruby do |c|
     c.action do |global_options, options, args|
       require 'active_support/core_ext/string/inflections'
       require 'fileutils'
       require 'erb'
 
       if args.size != 2
-        puts "Needs exactly 2 arguments: eh generate_processor ModuleName ProcessorName"
+        puts "Needs exactly 2 arguments: eh generate processor MODULE NAME"
         exit -1
       end
 
@@ -17,7 +19,7 @@ command :generate do |c|
       underscored_processor_module_name = processor_module_name.underscore
       underscored_processor_class_name = processor_class_name.underscore
 
-      destination_dir = Eh::Settings.current.processors_src_dir
+      destination_dir = Eh::Settings.current.ruby_processors_src_dir
       destination_dir = File.join(destination_dir, "#{underscored_processor_module_name}.#{underscored_processor_class_name}")
 
       if Dir.exists? destination_dir

data/lib/eh/commands/package.rb

@@ -1,37 +1,36 @@
-desc 'package commands'
-command :package do |c|
-  c.flag([:s, :source], :desc => "Source directory to read processors from.")
-  c.flag([:d, :destination], :desc => "Destination directory to place created zip files.")
+desc 'Package commands'
+command :package do |package|
+  package.flag([:s, :source], :desc => "Source directory to read processors from.")
+  package.flag([:d, :destination], :desc => "Destination directory to place created zip files.")
+  package.flag([:x, :exclude], arg_name: 'NAME1,NAME2,PATTERN*', desc: "Exclude components with NAME1,NAME2,PATTERN*", type: String)
 
-  c.desc 'Packages ruby processors to zip files'
-  c.arg_name '[processor_name,[other_processor_name,pattern*]]'
-  c.command :ruby do |ruby|
-    ruby.flag([:i, :include], :desc => "Include processors by name format: [processor_name,[other_processor_name,pattern*]]", :type => String, :long_desc => "You can specify multiple processors by providing a comma-separated list as well as pattern using '*'")
-    ruby.flag([:x, :exclude], :desc => "Exclude processors by name format: [processor_name,[other_processor_name,pattern*]]", :type => String, :long_desc => "You can specify multiple processors by providing a comma-separated list as well as pattern using '*'")
+  package.desc 'Packages ruby processors to zip files'
+  package.arg_name '[NAME1,[NAME2,PATTERN*]]'
+  package.command :ruby do |ruby|
 
     ruby.action do |global_options, options, args|
       options['s'] ||= Eh::Settings.current.ruby_processors_src_dir
       options['d'] ||= Eh::Settings.current.ruby_release_dir
       source_dir = options.fetch('s')
       destination_dir = options.fetch('d')
-      include_pattern = options['i'] || args[0]
+      include_pattern = args[0]
       exclude_pattern = options['x']
       packager = Packager::Ruby.new(source_dir, destination_dir, include_pattern, exclude_pattern)
       packager.package
     end
   end
 
-  c.desc 'Packages go processors to zip files'
-  c.command :go do |go|
-
-    go.flag([:p, :platform], :desc => "Define target platform [linux, osx, window]")
+  package.desc 'Packages go processors to zip files'
+  package.arg_name '[NAME1,[NAME2,PATTERN*]]'
+  package.command :go do |go|
+    go.flag([:p, :platform], arg_name: 'PLATFORM', desc: 'Target platform', must_match: ['linux', 'darwin', 'windows'], default_value: 'linux')
 
     go.action do |global_options, options, args|
       options['s'] ||= Eh::Settings.current.go_processors_src_dir
       options['d'] ||= Eh::Settings.current.go_release_dir
       source_dir = options.fetch('s')
       destination_dir = options.fetch('d')
-      include_pattern = options['i'] || args[0]
+      include_pattern = args[0]
       exclude_pattern = options['x']
       platform = options['p'] || 'linux'
       packager = Packager::Go.new(source_dir, destination_dir, include_pattern, exclude_pattern, platform)
@@ -40,11 +39,14 @@ command :package do |c|
 
   end
 
-  c.desc 'Packages rails console app to zip file'
-  c.command :rails do |rails|
+  package.desc 'Packages rails console app to zip file'
+  package.command :rails do |rails|
     rails.action do |global_options, options, args|
       options['s'] ||= Eh::Settings.current.rails_src_dir
       options['d'] ||= Eh::Settings.current.rails_release_dir
+
+      raise 'Flag [-x, --exclude] is currently not supported with rails subcommand' if options[:exclude]
+
       source_dir = options.fetch('s')
       destination_dir = options.fetch('d')
 

data/lib/eh/commands/proxy.rb

@@ -1,50 +1,54 @@
-desc 'enable/disable proxy'
+desc 'Manage proxies'
+command :proxy do |proxy|
 
-command :proxy do |c|
+  proxy.switch([:v, :verbose], :desc => 'Show additional output.')
+  proxy.flag([:stage], desc: 'stage', type: String, long_desc: 'Stage where proxy is', default_value: Eh::Settings.current.default_stage)
 
-  c.switch([:v, :verbose], :desc => 'Show additional output.')
-  c.flag([:stage], desc: 'stage', type: String, long_desc: 'Stage where proxy is', default_value: Eh::Settings.current.default_stage)
-
-  c.command :off do |c|
-
-    c.action do |global_options, options, arguments|
-      Eh::Proxy::Proxy.new(options[:stage], options[:verbose]).unset
+  proxy.desc 'List defined proxies'
+  proxy.command :list do |list|
+    list.action do |global_options, options, arguments|
+      Eh::Proxy::Proxy.new(options[:stage], options[:verbose]).list
     end
   end
 
-  c.command :on do |c|
-    c.arg_name 'name'
-    c.action do |global_options, options, arguments|
-      Eh::Proxy::Proxy.new(options[:stage], options[:verbose]).set(arguments[0])
+  proxy.desc 'Select proxy by NAME'
+  proxy.arg_name 'NAME'
+  proxy.command :select do |select|
+    select.action do |global_options, options, arguments|
+      Eh::Proxy::Proxy.new(options[:stage], options[:verbose]).select(arguments[0])
     end
-
   end
 
-  c.command :list do |c|
-    c.action do |global_options, options, arguments|
-      Eh::Proxy::Proxy.new(options[:stage], options[:verbose]).list
+  proxy.desc 'Enable proxy default or by NAME'
+  proxy.arg_name 'NAME'
+  proxy.command :on do |on|
+    on.action do |global_options, options, arguments|
+      Eh::Proxy::Proxy.new(options[:stage], options[:verbose]).set(arguments[0])
     end
   end
 
-  c.arg_name 'name'
-  c.command :remove do |c|
-    c.action do |global_options, options, arguments|
-      Eh::Proxy::Proxy.new(options[:stage], options[:verbose]).remove(arguments[0])
+  proxy.desc 'Disable default proxy'
+  proxy.command :off do |off|
+    off.action do |global_options, options, arguments|
+      Eh::Proxy::Proxy.new(options[:stage], options[:verbose]).unset
     end
   end
 
-  c.arg_name 'name'
-  c.arg_name 'proxy'
-  c.command :add do |c|
-    c.action do |global, options, arguments|
+  proxy.desc 'Add new proxy by NAME and PROXY_URL'
+  proxy.arg_name 'NAME PROXY_URL'
+  proxy.command :add do |add|
+    add.action do |global, options, arguments|
       Eh::Proxy::Proxy.new(options[:stage], options[:verbose]).add(arguments[0], arguments[1])
     end
   end
 
-  c.arg_name 'name'
-  c.command :select do |c|
-    c.action do |global_options, options, arguments|
-      Eh::Proxy::Proxy.new(options[:stage], options[:verbose]).select(arguments[0])
+  proxy.desc "Remove by NAME"
+  proxy.arg_name 'NAME'
+  proxy.command :remove do |remove|
+    remove.action do |global_options, options, arguments|
+      Eh::Proxy::Proxy.new(options[:stage], options[:verbose]).remove(arguments[0])
     end
   end
+
+  proxy.default_command :list
 end

data/lib/eh/commands/repository.rb

@@ -1,39 +1,45 @@
-desc "manage repositories"
+desc "Manage repositories"
 
 command :repository do |command|
   command.desc "Lists all avaiable repositories"
   command.command :list do |command|
     command.action do |global_options,options,args|
 
+      puts "Defined Repositories [#{Eh::Settings.current.data['repositories'].size}]"
       Eh::Settings.current.repositories.each_with_index do |repository, index|
         if repository.current?
-          puts "#{index + 1}: #{repository.url} (current)"
+          puts " #{index+1}. #{repository.url} (current)".green
         else
-          puts "#{index + 1}: #{repository.url}"
+          puts " #{index+1}. #{repository.url}"
         end
       end
     end
   end
 
-  command.desc "selects a repository: eh repository select INDEX"
+  command.desc "Selects a repository by INDEX"
+  command.arg_name 'INDEX'
   command.command :select do |command|
     command.action do |global_options,options,args|
       if Eh::Settings.current.repositories.length == 0
         raise "No repository configured so far"
       end
       if args.length != 1
-        raise "Need exactly 1 arguments: index"
+        raise "Needs mandatory INDEX argument"
       end
       selected = args[0].to_i
+      if selected > Eh::Settings.current.data['repositories'].size
+        raise "Argument INDEX is out of range"
+      end
       Eh::Settings.current.data['repositories'].each_with_index do |repository, index|
         repository['current'] = (index + 1) == selected
       end
-      puts "Selected #{Eh::Settings.current.repository.url}"
       Eh::Settings.current.write
+      puts "Repository selected: #{Eh::Settings.current.repository.url}".green
     end
   end
 
-  command.desc 'add a repository to the config: eh repository add URL DIR USERNAME PASSWORD'
+  command.desc 'Add a repository with URL DIR USERNAME PASSWORD'
+  command.arg_name 'URL DIR USERNAME PASSWORD'
   command.command :add do |command|
     command.action do |global_options, options, args|
       if args.length != 4
@@ -46,7 +52,7 @@ command :repository do |command|
         repository['url'] == args[0]
       end
       if exists
-        raise "Already configured repository for '#{args[0]}'"
+        raise "Already configured repository [#{args[0]}]"
       end
 
       Eh::Settings.current.data['repositories'] << {
@@ -57,25 +63,32 @@ command :repository do |command|
         'current' => (Eh::Settings.current.data['repositories'].length == 0)
       }
       Eh::Settings.current.write
+
+      puts "New Repository [#{args[0]}] has beed added. Total Repositories: #{Eh::Settings.current.data['repositories'].size}".green
     end
   end
 
 
-  command.desc 'remove a repository from the config: eh repository remove INDEX'
+  command.desc 'Remove a repository by INDEX'
+  command.arg_name 'INDEX'
   command.command :remove do |command|
     command.action do |global_options, options, args|
 
       if args.length != 1
-        raise "Need exactly 1 arguments: index"
+        raise "Needs mandatory INDEX argument"
       end
       selected = args[0].to_i
 
       if Eh::Settings.current.repositories[selected - 1].nil?
-        raise "No repository with index #{selected}"
+        raise "No repository with index [selected]"
       end
 
       Eh::Settings.current.data['repositories'].delete_at(selected - 1)
       Eh::Settings.current.write
+
+      puts "Repository has been removed. Total Repositories: #{Eh::Settings.current.data['repositories'].size}".green
     end
   end
+
+  command.default_command :list
 end

data/lib/eh/commands/stage.rb

@@ -1,25 +1,39 @@
-desc 'manage stages'
+desc 'Manage stages'
 command :stage do |command|
-
-  command.switch([:v, :verbose], :desc => 'Show additional output.')
-  command.command :list do |c|
-    c.action do |global_options, options, args|
+  command.desc 'List defined stages'
+  command.command :list do |list|
+    list.action do |global_options, options, args|
       dir = Eh::Settings.current.stages_dir
-      puts "Checking in #{dir}".green if options[:verbose]
-      puts "Available stages are:".blue
+      puts "Checking in #{dir}".yellow if global_options[:verbose]
+      puts "Available Stages"
       Dir.glob(File.join(dir, '*.yml')) do |name|
         stage_name = File.basename(name, '.*')
-        default = '(default)' if Eh::Settings.current.default_stage == stage_name
-        puts "#{stage_name} #{default}".light_blue
+        is_default = Eh::Settings.current.default_stage == stage_name
+        puts " - #{stage_name} #{is_default ? '(default)' : nil}".send(is_default ? :green : :white)
       end
     end
   end
-  command.command :select_default do |c|
-    c.action do |global_options, options, args|
-      stage = args[0]
-      Eh::Settings.current.data['default_stage'] = stage
+
+  command.desc 'Select default stage'
+  command.arg_name 'NAME'
+  command.command :select do |default|
+    default.action do |global_options, options, args|
+      new_stage = args[0]
+
+      if args.size != 1
+        raise "Needs a stage NAME to select"
+      end
+
+      # check if new_stage.yml exist in stages folder
+      unless File.exist?(File.join(Eh::Settings.current.stages_dir, "#{new_stage}.yml"))
+        raise "Stage [#{new_stage}] is not defined yet"
+      end
+
+      Eh::Settings.current.data['default_stage'] = new_stage
       Eh::Settings.current.write
-      puts "Set stage default to '#{stage}'"
+      puts "Default stage selected: #{new_stage}".green
     end
   end
+
+  command.default_command :list
 end

data/lib/eh/proxy/proxy.rb

@@ -28,21 +28,23 @@ module Eh
       end
 
       def remove(name)
+        raise "Needs a proxy NAME to remove" if name.nil?
         proxy = find_proxy_by_name(name)
         if proxy.nil?
-          raise "No proxy with name #{name}"
+          raise "No proxy with given name [#{name}]"
         end
 
         Eh::Settings.current.data['proxies'].reject! { |json| json['name'] == name}
         Eh::Settings.current.write
+        puts "Proxy [#{name}] has been removed".green
       end
 
       def add(name, url)
         if name.nil? || url.nil?
-          raise "Please provide name and url"
+          raise "Please provide NAME and PROXY_URL"
         end
         if find_proxy_by_name(name) || find_proxy_by_url(url)
-          raise "Already configured proxy for '#{name} -> #{url}'"
+          raise "Already configured proxy for [#{name} -> #{url}]"
         end
 
         Eh::Settings.current.data['proxies'] << {
@@ -51,23 +53,27 @@ module Eh
           'default' => (Eh::Settings.current.proxies.length == 0)
         }
         Eh::Settings.current.write
+        puts "Proxy [#{name}] has been added".green
       end
 
       def select(name)
+        raise "Needs a proxy NAME to select" if name.nil?
         proxy = find_proxy_by_name(name)
         if proxy.nil?
-          raise "No proxy found with name #{name}"
+          raise "No proxy found with given name [#{name}]"
         end
 
         Eh::Settings.current.data['proxies'].each do |json|
           json['default'] = (json['name'] == name)
         end
         Eh::Settings.current.write
+        puts "Proxy [#{name}] has been selected".green
       end
 
       def list
+        puts "Defined Proxies"
         Eh::Settings.current.proxies.each do |proxy|
-          puts proxy.label
+          puts proxy.label.send( proxy.label =~ /\(default\)/ ? :green : :white )
         end
       end
 

data/lib/eh/proxy/settings/git.rb

@@ -31,7 +31,7 @@ module Eh::Proxy::Settings
     end
 
     def set_command(value)
-      "git config --global http.proxy http://#{value} ; git config --global https.proxy https://#{value}"
+      "git config --global http.proxy http://#{trim_url(value)} ; git config --global https.proxy https://#{trim_url(value)}"
     end
   end
 end

data/lib/eh/proxy/settings/svn.rb

@@ -26,7 +26,7 @@ module Eh::Proxy::Settings
     end
 
     def set(value)
-      uri = URI.parse("http://#{value}")
+      uri = URI.parse("http://#{trim_url(value)}")
 
       Deployer::Executor.new(stage, verbose: verbose?) do |executor|
         executor.download("~/.subversion/servers", temporary_config_file)

data/lib/eh/version.rb

@@ -1,3 +1,3 @@
 module Eh
-  VERSION = '0.6.10'
+  VERSION = '0.7.0'
 end

data/lib/helper.rb

@@ -0,0 +1,13 @@
+# have a custom error handling
+# have no "error:"-prefix and all text is red
+if self.respond_to?(:on_error) # to exclude it in rspecs
+  on_error do |exception|
+    $stderr.puts exception.to_s.red
+    false # skip GLI's error handling
+  end
+end
+
+# helper method to trim url
+def trim_url(str)
+  str.sub(%r{^https?:(//|\\\\)}i, '')
+end

data/lib/packager/go.rb

@@ -14,7 +14,6 @@ class Packager::Go
     assert_at_least_one_processor!
     validate_platforms!
     create_destination_dir
-    #copy_deployment_management_files
     build_processors
     package_processors
   end
@@ -41,7 +40,7 @@ class Packager::Go
     processor_names.each do |processor_name|
       package_processor(processor_name)
     end
-    puts "Done packaging #{processor_names.size} processors"
+    puts "Done packaging #{processor_names.size} processors".green
   end
 
   def package_processor(processor_name)
@@ -85,12 +84,6 @@ class Packager::Go
     File.join(destination_dir, "#{processor_name}.zip")
   end
 
-  def copy_deployment_management_files
-    Eh::Settings.current.deployment_management_files.each do |file|
-      FileUtils.cp(file, destination_dir)
-    end
-  end
-
   def assert_at_least_one_processor!
     if processor_names.empty?
       raise "There are no processor names. Either your -s directory is empty or you specified a strange combination of include and exclude pattern."

data/lib/packager/rails.rb

@@ -42,19 +42,3 @@ class Packager::Rails
     FileUtils.rm destination_file_name(dir), force: true
   end
 end
-
-
-# files_and_dirs =
-# source = options[:source]
-#
-# dirs = Dir.glob("#{source}")
-# dirs.each do |dir|
-#   app = File.basename(dir)
-#   destination = File.join(options[:d], "#{app}.zip")
-#   included = files_and_dirs.map do |s|
-#     File.join(app, s)
-#   end.join(' ')
-#   cmd = "cd #{File.join(dir, '..')} && zip -r #{destination} #{included}"
-#   ret = system cmd
-#   puts "Packaged #{app}: #{ret}"
-# end

data/lib/packager/ruby.rb

@@ -22,7 +22,7 @@ class Packager::Ruby
     processor_names.each do |processor_name|
       package_processor(processor_name)
     end
-    puts "Done packaging #{processor_names.size} processors"
+    puts "Done packaging #{processor_names.size} processors".green
   end
 
   def package_processor(processor_name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventhub-command
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.7.0
 platform: ruby
 authors:
 - Pascal Betz
@@ -9,148 +9,134 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: 1.15.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: 1.15.4
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.17.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.7.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.7.8
 - !ruby/object:Gem::Dependency
   name: parseconfig
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.8
 description: Event Hub Command Line Tool which supports you with various Event Hub
   related administrative development features.
 email:
@@ -176,7 +162,7 @@ files:
 - lib/deployer/stage.rb
 - lib/eh-commands.rb
 - lib/eh.rb
-- lib/eh/commands/db.rb
+- lib/eh/commands/database.rb
 - lib/eh/commands/deploy.rb
 - lib/eh/commands/dump.rb
 - lib/eh/commands/generate.rb
@@ -190,6 +176,7 @@ files:
 - lib/eh/proxy/settings/svn.rb
 - lib/eh/settings.rb
 - lib/eh/version.rb
+- lib/helper.rb
 - lib/packager.rb
 - lib/packager/go.rb
 - lib/packager/rails.rb
@@ -214,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Event Hub Command Line Tool