eventhub-command 0.3.14 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32761ef79619cd8e2bde1d39ef5c7933d2f51875
-  data.tar.gz: a8b2d169888960fa9fd37290f22cd2641f5a2a37
+  metadata.gz: 5146bf51057042c4f7ab5a36895dd7e039ac162e
+  data.tar.gz: 10cdad8b9dd1867d312734dc3005cbcc345e16ba
 SHA512:
-  metadata.gz: ac8221ef5e6a9ee218c3af306a3a2ccb60c76c4aa4e2d7b599e2975b0f1436bcd0248f2d354e3aec07cc06560c284ec5b2f6bf298333d18b8fc7ac00853004c3
-  data.tar.gz: 5a4eb8f139b83b7d1e1d61e9110337cf9b62d0f57dcce898c75ee4bb50b92a8bf67213e5bbf99749e90d003864d50a4230d43927ec912f1d79ee3ced2f7e0a22
+  metadata.gz: 52d2eef34897bf5207f7e2f57d19cbdea64ccd4a7dd56f318e6e2b24128348f577def951edb7dd70ff204ae977d29151241a99944e1780d8bbf91ab08d3d8730
+  data.tar.gz: 0993f713103cfe7121f8187e4090f20b459d1f1050831cc5d2a905498eb34154ad0f8145d19450b711d96a1e12231769fd11352d8cbe3a7c98c38b658acdfaf6

data/lib/deployer.rb

@@ -9,3 +9,4 @@ require_relative 'deployer/base_deployer'
 require_relative 'deployer/mule_deployer'
 require_relative 'deployer/ruby_deployer'
 require_relative 'deployer/config_deployer'
+require_relative 'deployer/console_deployer'

data/lib/deployer/console_deployer.rb

@@ -1,45 +1,24 @@
 class Deployer::ConsoleDeployer < Deployer::BaseDeployer
 
+  def initialize(options)
+    @options = options
+  end
+
   def deploy!
-    case deploy_via
-    when 'scp' then deploy_via_scp
-    when 'svn' then deploy_via_svn
-    else raise "Unknown value for deploy_via: #{deploy_via}"
+    Bundler.with_clean_env do
+      Dir.chdir(console_dir) do
+        system "bundle install && cap #{stage} deploy"
+      end
     end
   end
 
   private
 
-  def working_dir
-    options[:working_dir]
-  end
-
-  def deploy_via_scp
-    cmd = "cd #{working_dir} && bundle install && bundle exec cap #{stage.name} deploy"
-    execute_in_clean_env(cmd)
-  end
-
-  def deploy_via_svn
-    console_release_zip = '~/apps/event_hub/shared/cached_copy_svn/branches/master/releases/rails/console.zip'
-    cmds = []
-    cmds << "rm -rf /tmp/console_deployment && mkdir -p /tmp/console_deployment"
-    cmds << "cd /tmp/console_deployment && unzip #{console_release_zip} -d ."
-    cmds << "cd /tmp/console_deployment/console && bundle install && bundle exec cap #{stage.name} deploy"
-    # run the command only on one host of this stage.
-    Deployer::Executor.new(stage.single_host_stage, verbose: verbose?) do |executor|
-      update_scm(executor)
-      cmds.each do |cmd|
-        executor.execute(cmd)
-      end
-    end
+  def console_dir
+    Eh::Settings.current.console_source_dir
   end
 
-  def execute_in_clean_env(cmd)
-    puts "Will run #{cmd} on your local machine"
-    Bundler.with_clean_env do
-      system cmd
-    end
+  def stage
+    @options.fetch(:stage, 'development')
   end
-
-
 end

data/lib/eh-commands.rb

@@ -4,12 +4,10 @@ if Eh::Settings.current.repository
   require 'eh/commands/package_ruby'
   require 'eh/commands/package_rails'
   require 'eh/commands/stage'
-  require 'eh/commands/deploy_config'
-  require 'eh/commands/deploy_ruby'
-  require 'eh/commands/deploy_mule'
   require 'eh/commands/dump'
   require 'eh/commands/db'
   require 'eh/commands/proxy'
+  require 'eh/commands/deploy'
   require 'eh/proxy/proxy'
 else
   # remove unused settings for this version

data/lib/eh/commands/deploy.rb

@@ -0,0 +1,111 @@
+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.command :all do |c|
+    c.desc 'deploy all'
+    c.action do |global_options, options, arguments|
+      forward_arguments = arguments.join(' ')
+      deploy_config(options, forward_arguments)
+      deploy_ruby(options, forward_arguments)
+      deploy_mule(options, forward_arguments)
+      deploy_console(options, forward_arguments)
+    end
+  end
+
+  c.command :config do |c|
+    c.desc 'distribute the configs to the nodes'
+    c.action do |global_options, options, args|
+      Deployer::ConfigDeployer.new(options).deploy!
+    end
+  end
+
+  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: '.')
+
+    c.action do |global_options, options, args|
+      Deployer::ConsoleDeployer.new(options).deploy!
+    end
+  end
+
+
+  c.command :mule do |c|
+    c.desc 'deploy a single channel adapter'
+    c.arg_name '[channel_adapter[,other_channel_adapter,pattern*]]'
+
+    c.action do |global_options, options, args|
+      begin
+        if args[0]
+          adapter_names = args[0].split(',').map(&:strip)
+        else
+          adapter_names = nil
+        end
+        Deployer::MuleDeployer.new(adapter_names, options).deploy!
+      rescue => e
+        puts e.message
+        puts e.backtrace.join("\n")
+      end
+    end
+  end
+
+  c.command :ruby do |c|
+    c.desc 'deploy a single ruby processor'
+    c.arg_name '[processor_name,[other_processor_name,pattern*]]'
+
+    c.action do |global_options, options, args|
+      begin
+        if args[0]
+          processor_names = args[0].split(',').map(&:strip)
+        else
+          processor_names = nil
+        end
+        Deployer::RubyDeployer.new(processor_names, options).deploy!
+      rescue => e
+        puts e.message
+        puts e.backtrace.join("\n")
+      end
+    end
+  end
+
+
+
+  private
+
+  def deploy_ruby(options, forward_arguments)
+    system "#{extend_command('deploy ruby')} #{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}"
+  end
+
+  def deploy_mule(options, 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}"
+  end
+
+  def copy_option(options, option)
+    if options[option]
+      "--#{option}=#{options[option]}"
+    end
+  end
+
+  def copy_options(options, *selected)
+    selected.map do |name|
+      copy_option(options, name)
+    end.compact.join(' ')
+  end
+
+  def extend_command(command)
+    "bundle exec eh #{command}"
+  end
+
+end

data/lib/eh/proxy/proxy.rb

@@ -1,5 +1,6 @@
 module Eh
   module Proxy
+    require 'uri'
     require_relative 'settings/git'
     require_relative 'settings/svn'
     require_relative 'settings/shell'

data/lib/eh/version.rb

@@ -1,3 +1,3 @@
 module Eh
-  VERSION = '0.3.14'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventhub-command
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.4.0
 platform: ruby
 authors:
 - Pascal Betz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -182,10 +182,7 @@ files:
 - lib/eh-commands.rb
 - lib/eh.rb
 - lib/eh/commands/db.rb
-- lib/eh/commands/deploy_config.rb
-- lib/eh/commands/deploy_console.rb
-- lib/eh/commands/deploy_mule.rb
-- lib/eh/commands/deploy_ruby.rb
+- lib/eh/commands/deploy.rb
 - lib/eh/commands/dump.rb
 - lib/eh/commands/generate_processor.rb
 - lib/eh/commands/package_rails.rb

data/lib/eh/commands/deploy_config.rb

@@ -1,13 +0,0 @@
-desc 'distribute the configs to the nodes'
-
-command :deploy_config 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.action do |global_options, options, args|
-    Deployer::ConfigDeployer.new(options).deploy!
-  end
-end

data/lib/eh/commands/deploy_console.rb

@@ -1,14 +0,0 @@
-desc 'deploy the console rails app'
-
-command :deploy_console 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.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.flag([:working_dir], desc: 'directory to execute commands in', type: String, default_value: '.')
-  c.switch([:v, :verbose], :desc => 'Show additional output.')
-
-  c.action do |global_options, options, args|
-    Deployer::ConsoleDeployer.new(options).deploy!
-  end
-end

data/lib/eh/commands/deploy_mule.rb

@@ -1,23 +0,0 @@
-desc 'deploy a single channel adapter'
-arg_name '[channel_adapter[,other_channel_adapter,pattern*]]'
-
-command :deploy_mule do |c|
-  c.flag([:stage], desc: 'stage', type: String, long_desc: 'Stage where channel adapter is deployed to', default_value: Eh::Settings.current.default_stage)
-  c.flag([:deploy_via], desc: 'how to get hold of the channel adapter: scm or scp', type: String, long_desc: 'copy the channel adapter zip file via scp from this machine or check it out from scm', default_value: 'svn')
-
-  c.switch([:v, :verbose], :desc => 'Show additional output.')
-
-  c.action do |global_options, options, args|
-    begin
-      if args[0]
-        adapter_names = args[0].split(',').map(&:strip)
-      else
-        adapter_names = nil
-      end
-      Deployer::MuleDeployer.new(adapter_names, options).deploy!
-    rescue => e
-      puts e.message
-      puts e.backtrace.join("\n")
-    end
-  end
-end

data/lib/eh/commands/deploy_ruby.rb

@@ -1,25 +0,0 @@
-desc 'deploy a single ruby processor'
-arg_name '[processor_name,[other_processor_name,pattern*]]'
-
-command :deploy_ruby 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([:deploy_via], desc: 'how to get hold of the processor: scm or scp', type: String, long_desc: 'copy the processor zip file via scp from this machine or check it out from scm', default_value: 'svn')
-  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.action do |global_options, options, args|
-    begin
-      if args[0]
-        processor_names = args[0].split(',').map(&:strip)
-      else
-        processor_names = nil
-      end
-      Deployer::RubyDeployer.new(processor_names, options).deploy!
-    rescue => e
-      puts e.message
-      puts e.backtrace.join("\n")
-    end
-  end
-end