eventhub-command 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5609eec996f0117854462be52c608d6271920b83
-  data.tar.gz: 94fab3ac68ee8b55509323a03e4c26d1ecd7ad66
+  metadata.gz: 24eedb865c6d138112f24cc2ddde9eeb2d2c3169
+  data.tar.gz: 035a36ace907437d1b7c608f55c0f6360e73293d
 SHA512:
-  metadata.gz: 0bf66fe2949ab2a86117df3dad7a2d62f858985aa6297f56a4d0dd805f8eb65d9294a07da5a0956ac1004691b199acbdc29f09b76d30c964e9ef4c1de4fc2a39
-  data.tar.gz: 9ef51c5dc7eed88eb627787c18c96df7b50d5ca52cab784af35bc5fe2d7ef9a3a1c51271d37c69fe8bacd80ffad57576a68043f8f4a25b248abc69daf8984740
+  metadata.gz: e9e38cacb2d1eaee3855a9256af3aceac25515e547f2f16f27454f5d36e8016228a7d639c232fccb5e1748599eb9735973799c98116fdfdbfc8dbfa686158972
+  data.tar.gz: 14d58405c1e74c1643ae24cefedb38cb5f78705cfaff319309b27c4a80e6b60d270a73ead3e0266cf882916ad9271bdf8eadf632e4cf950c668489eb9a78843a

data/lib/eh/commands/generate.rb

@@ -0,0 +1,91 @@
+desc 'Generates a template for a processor'
+arg_name 'module_name processor_name'
+command :generate do |c|
+  c.command :processor 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"
+        exit -1
+      end
+
+      processor_module_name = args[0].camelcase
+      processor_class_name = args[1].camelcase
+      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 = File.join(destination_dir, "#{underscored_processor_module_name}.#{underscored_processor_class_name}")
+
+      if Dir.exists? destination_dir
+        puts "#{destination_dir} already exists!"
+        exit -1
+      end
+
+      template_tmp_dir = Eh::Settings.current.template_tmp_dir
+      checkout_git_repo(template_tmp_dir)
+
+      FileUtils.cp_r template_tmp_dir, destination_dir
+      FileUtils.rm_rf File.join(destination_dir, ".git")
+      FileUtils.rm File.join(destination_dir, 'README.md')
+
+      puts "Generating processor #{processor_module_name}::#{processor_class_name} in #{destination_dir}"
+      Dir.glob(destination_dir + "/**/*.erb") do |file|
+        template = ERB.new(File.read(file))
+
+        File.open(file, "w") do |writeable_file|
+          writeable_file.puts template.result(binding)
+        end
+
+        FileUtils.mv file, File.join(File.dirname(file), File.basename(file, ".erb"))
+      end
+
+      replacements = [
+        ["underscored_processor_module_name", underscored_processor_module_name],
+        ["underscored_processor_class_name", underscored_processor_class_name],
+        ["processor_module_name", processor_module_name],
+        ["processor_class_name", processor_class_name]
+      ]
+
+      rename_files_with_replacements(destination_dir, replacements)
+
+      FileUtils.rm_rf template_tmp_dir
+
+      puts "Done."
+    end
+  end
+
+  def shallow_clone_git_repository(source_url, destination_dir)
+    system("git clone --depth 1 #{source_url} #{destination_dir}")
+  end
+
+  def rename_files_with_replacements(destination_dir, replacements)
+    Dir.glob(destination_dir + "/**/*") do |src_file_path|
+      if File.file? src_file_path
+        dir = File.dirname src_file_path
+        file_with_replacements = File.basename src_file_path
+
+        replacements.each do |find_string, replace_string|
+          file_with_replacements.sub!(find_string, replace_string)
+        end
+
+        dest_file_path = File.join(dir, file_with_replacements)
+
+        if src_file_path != dest_file_path
+          FileUtils.mv src_file_path, dest_file_path
+        end
+      end
+    end
+  end
+
+  def checkout_git_repo(destination_dir)
+    template_repository_url = Eh::Settings.current.processor_template_repository_url
+    puts "Checking out latest template from #{template_repository_url}"
+    FileUtils.rm_rf(destination_dir)
+    FileUtils.mkdir(destination_dir)
+    shallow_clone_git_repository(template_repository_url, destination_dir)
+  end
+end

data/lib/eh/commands/package.rb

@@ -0,0 +1,37 @@
+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.")
+
+  c.desc 'Packages processors to zip files. '
+  c.arg_name '[processor_name,[other_processor_name,pattern*]]'
+  c.command :ruby do |c|
+    c.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 '*'")
+    c.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 '*'")
+
+    c.action do |global_options, options, args|
+      options['s'] ||= Eh::Settings.current.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]
+      exclude_pattern = options['x']
+      packager = Packager::Ruby.new(source_dir, destination_dir, include_pattern, exclude_pattern)
+      packager.package
+    end
+  end
+
+
+  c.command :rails do |c|
+    c.action do |global_options, options, args|
+      options['s'] ||= Eh::Settings.current.rails_src_dir
+      options['d'] ||= Eh::Settings.current.rails_release_dir
+      source_dir = options.fetch('s')
+      destination_dir = options.fetch('d')
+
+      packager = Packager::Rails.new(source_dir, destination_dir)
+      packager.package
+    end
+  end
+
+end

data/lib/eh/version.rb

@@ -1,3 +1,3 @@
 module Eh
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end

data/lib/eh-commands.rb

@@ -1,13 +1,12 @@
 # All commands are required here
 if Eh::Settings.current.repository
-  require 'eh/commands/generate_processor'
-  require 'eh/commands/package_ruby'
-  require 'eh/commands/package_rails'
+  require 'eh/commands/generate'
   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/proxy/proxy'
 else
   # remove unused settings for this version

data/lib/eh.rb

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

data/lib/packager/rails.rb

@@ -0,0 +1,60 @@
+class Packager::Rails
+  def initialize(source_dir, destination_dir)
+    @source_dir = source_dir
+    @destination_dir = destination_dir
+  end
+
+  def package
+
+    app_directories.each do |dir|
+      included = files_and_dirs.map do |s|
+        File.join(app_name(dir), s)
+      end.join(' ')
+      remove_destination_file(dir)
+      cmd = "cd #{File.join(dir, '..')} && zip -r #{destination_file_name(dir)} #{included} >> /dev/null"
+      ret = system cmd
+      puts "Packaged: #{app_name(dir).blue} to #{destination_file_name(dir)}: #{ret ? 'OK'.green : 'ERROR'.red}"
+    end
+  end
+
+  private
+
+  attr_reader :source_dir, :destination_dir
+
+  def app_directories
+    Dir.glob(source_dir)
+  end
+
+  def app_name(dir)
+    File.basename(dir)
+  end
+
+  def destination_file_name(dir)
+    app_name = app_name(dir)
+    File.join(destination_dir, "#{app_name}.zip")
+  end
+
+  def files_and_dirs
+    %w{Capfile Gemfile Gemfile.lock README.rdoc Rakefile app bin db lib public spec vendor}
+  end
+
+  def remove_destination_file(dir)
+    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

@@ -0,0 +1,137 @@
+class Packager::Ruby
+  def initialize(source_dir, destination_dir, include_pattern_string, exclude_pattern_string)
+    @source_dir = Pathname.new(source_dir)
+    @destination_dir = Pathname.new(destination_dir)
+    @include_pattern_string = include_pattern_string
+    @exclude_pattern_string = exclude_pattern_string
+  end
+
+  def package
+    assert_at_least_one_processor!
+    create_destination_dir
+    copy_deployment_management_files
+    package_processors
+  end
+
+  private
+
+  attr_reader :source_dir, :destination_dir, :include_pattern_string, :exclude_pattern_string
+
+  def package_processors
+    puts "Start packaging"
+    processor_names.each do |processor_name|
+      package_processor(processor_name)
+    end
+    puts "Done packaging #{processor_names.size} processors"
+  end
+
+  def package_processor(processor_name)
+    print "Package: #{processor_name.light_blue} "
+    remove_destination_file(processor_name)
+
+    Zip::File.open(destination_file_name(processor_name), Zip::File::CREATE) do |zipfile|
+      files = files_to_zip(processor_name)
+      files.each do |file|
+        relative_filename = file.relative_path_from(source_dir)
+        zipfile.add(relative_filename, file)
+      end
+    end
+    puts " done".green
+  end
+
+
+  def files_to_zip(processor_name)
+    exclude_directories = %w{logs/ log/ exceptions/ pids/ tmp/}
+    files = Dir.glob(File.join(processor_source_dir(processor_name), '**', '*')).select do |name|
+      exclude_directories.none? do |exclude|
+        prefix = File.join(processor_source_dir(processor_name), exclude)
+        name.start_with?(prefix)
+      end
+    end
+    files.map do |file|
+      Pathname.new(file)
+    end
+  end
+
+  def processor_source_dir(processor_name)
+    File.join(source_dir, processor_name)
+  end
+
+  def create_destination_dir
+    FileUtils.mkdir_p(destination_dir)
+  end
+
+  def remove_destination_file(processor_name)
+    FileUtils.rm destination_file_name(processor_name), force: true
+  end
+
+  def destination_file_name(processor_name)
+    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."
+    end
+  end
+
+  def processor_names
+    included_names = existing_processor_names
+    included_names = included_processor_names(included_names)
+    excluded_names  = excluded_processor_names(included_names)
+    included_names - excluded_names
+  end
+
+  def existing_processor_names
+    Dir["#{source_dir}/*"].map do |dir|
+      File.basename(dir)
+    end.delete_if do |item|
+      !File.directory?("#{source_dir}/#{item}")
+    end.sort
+  end
+
+  def included_processor_names(names)
+    # if processor names are given as arguments then use them.
+    # can contain wildcards like "console.*" to include all processors
+    # starting with "console.".
+    names.select do |name|
+      include_patterns.empty? || include_patterns.any? do |pattern|
+        wildcard_pattern_match?(pattern, name) || pattern_match?(pattern, name)
+      end
+    end
+  end
+
+  def excluded_processor_names(names)
+    names.select do |name|
+      exclude_patterns.any? && exclude_patterns.any? do |pattern|
+        wildcard_pattern_match?(pattern, name) || pattern_match?(pattern, name)
+      end
+    end
+  end
+
+  def include_patterns
+    (include_pattern_string || '').split(',').map { |part| part.strip }
+  end
+
+  def exclude_patterns
+    (exclude_pattern_string || '').split(',').map { |part| part.strip }
+  end
+
+  def wildcard_pattern?(pattern)
+    pattern.end_with?('*')
+  end
+
+  def wildcard_pattern_match?(pattern, name)
+    wildcard_pattern?(pattern) && name.start_with?(pattern.gsub('*', ''))
+  end
+
+  def pattern_match?(pattern, name)
+    pattern == name
+  end
+end

data/lib/packager.rb

@@ -0,0 +1,4 @@
+module Packager
+end
+require_relative 'packager/ruby'
+require_relative 'packager/rails'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventhub-command
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Pascal Betz
@@ -184,9 +184,8 @@ files:
 - lib/eh/commands/db.rb
 - lib/eh/commands/deploy.rb
 - lib/eh/commands/dump.rb
-- lib/eh/commands/generate_processor.rb
-- lib/eh/commands/package_rails.rb
-- lib/eh/commands/package_ruby.rb
+- lib/eh/commands/generate.rb
+- lib/eh/commands/package.rb
 - lib/eh/commands/proxy.rb
 - lib/eh/commands/repository.rb
 - lib/eh/commands/stage.rb
@@ -196,6 +195,9 @@ files:
 - lib/eh/proxy/settings/svn.rb
 - lib/eh/settings.rb
 - lib/eh/version.rb
+- lib/packager.rb
+- lib/packager/rails.rb
+- lib/packager/ruby.rb
 - test/default_test.rb
 - test/test_helper.rb
 - todo.txt

data/lib/eh/commands/generate_processor.rb

@@ -1,90 +0,0 @@
-desc 'Generates a template for a processor'
-arg_name 'module_name processor_name'
-
-command :generate_processor 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"
-      exit -1
-    end
-
-    processor_module_name = args[0].camelcase
-    processor_class_name = args[1].camelcase
-    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 = File.join(destination_dir, "#{underscored_processor_module_name}.#{underscored_processor_class_name}")
-
-    if Dir.exists? destination_dir
-      puts "#{destination_dir} already exists!"
-      exit -1
-    end
-
-    template_tmp_dir = Eh::Settings.current.template_tmp_dir
-    checkout_git_repo(template_tmp_dir)
-
-    FileUtils.cp_r template_tmp_dir, destination_dir
-    FileUtils.rm_rf File.join(destination_dir, ".git")
-    FileUtils.rm File.join(destination_dir, 'README.md')
-
-    puts "Generating processor #{processor_module_name}::#{processor_class_name} in #{destination_dir}"
-    Dir.glob(destination_dir + "/**/*.erb") do |file|
-      template = ERB.new(File.read(file))
-
-      File.open(file, "w") do |writeable_file|
-        writeable_file.puts template.result(binding)
-      end
-
-      FileUtils.mv file, File.join(File.dirname(file), File.basename(file, ".erb"))
-    end
-
-    replacements = [
-      ["underscored_processor_module_name", underscored_processor_module_name],
-      ["underscored_processor_class_name", underscored_processor_class_name],
-      ["processor_module_name", processor_module_name],
-      ["processor_class_name", processor_class_name]
-    ]
-
-    rename_files_with_replacements(destination_dir, replacements)
-
-    FileUtils.rm_rf template_tmp_dir
-
-    puts "Done."
-  end
-end
-
-def shallow_clone_git_repository(source_url, destination_dir)
-  system("git clone --depth 1 #{source_url} #{destination_dir}")
-end
-
-def rename_files_with_replacements(destination_dir, replacements)
-  Dir.glob(destination_dir + "/**/*") do |src_file_path|
-    if File.file? src_file_path
-      dir = File.dirname src_file_path
-      file_with_replacements = File.basename src_file_path
-
-      replacements.each do |find_string, replace_string|
-        file_with_replacements.sub!(find_string, replace_string)
-      end
-
-      dest_file_path = File.join(dir, file_with_replacements)
-
-      if src_file_path != dest_file_path
-        FileUtils.mv src_file_path, dest_file_path
-      end
-    end
-  end
-end
-
-def checkout_git_repo(destination_dir)
-  template_repository_url = Eh::Settings.current.processor_template_repository_url
-  puts "Checking out latest template from #{template_repository_url}"
-  FileUtils.rm_rf(destination_dir)
-  FileUtils.mkdir(destination_dir)
-  shallow_clone_git_repository(template_repository_url, destination_dir)
-end

data/lib/eh/commands/package_rails.rb

@@ -1,23 +0,0 @@
-desc 'Packages processors to zip files'
-command :package_rails do |c|
-  c.flag([:d, :destination], :desc => "Destination directory to place created zip files.", :default_value => Eh::Settings.current.rails_release_dir)
-  c.flag([:s, :source], :desc => "Source directory to read rails apps from.", :default_value => Eh::Settings.current.rails_src_dir)
-
-  c.action do |global_options, options, args|
-    files_and_dirs = %w{Capfile Gemfile Gemfile.lock README.rdoc Rakefile app bin db lib public spec vendor}
-    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
-  end
-
-end

data/lib/eh/commands/package_ruby.rb

@@ -1,113 +0,0 @@
-desc 'Packages processors to zip files. '
-arg_name '[processor_name,[other_processor_name,pattern*]]'
-command :package_ruby do |c|
-  c.flag([:x, :exclude], :desc => "Exclude processors by name.", :type => Array, :long_desc => "You can specify multiple processors by providing a comma-separated list.")
-  c.flag([:d, :destination], :desc => "Destination directory to place created zip files.", :default_value => Eh::Settings.current.ruby_release_dir)
-  c.flag([:s, :source], :desc => "Source directory to read processors from.", :default_value => Eh::Settings.current.processors_src_dir)
-
-  c.action do |global_options, options, args|
-    source_dir = options['s']
-    destination_dir = options['d']
-
-    puts "Will package processors from #{source_dir} to #{destination_dir}"
-    # find all processors in the base directory
-    processor_names = Dir["#{source_dir}/*"].map do |dir|
-      File.basename(dir)
-    end
-
-    # Drop files, only use directories
-    processor_names.delete_if do |item|
-      !File.directory?("#{source_dir}/#{item}")
-    end
-
-    included_processor_names = processor_names
-
-    # if processor names are given as arguments then use them.
-    # can contain wildcards like "console.*" to include all processors
-    # starting with "console.".
-    if args[0]
-      processor_names_from_arguments = args[0].split(',').map(&:strip)
-
-      included_processor_names = included_processor_names.select do |processor_name|
-        processor_names_from_arguments.any? do |query|
-          if query.end_with?('*')
-            processor_name.start_with?(query.gsub('*', ''))
-          else
-            processor_name == query
-          end
-        end
-      end
-    end
-
-    # exclude processors specified by -x option, if option is given
-    if options['x']
-      # check if any processor has been excluded from packaging
-      included_processor_names = included_processor_names.select do |processor_name|
-        !options['x'].include?(processor_name)
-      end
-    end
-
-    # make sure we have at least one processor
-    if included_processor_names.empty?
-      raise "There are no processor names. Either your -s directory is empty or you specified a strange combination of -x and -p"
-    end
-
-    # make sure destination directory exists
-    FileUtils.mkdir_p(destination_dir)
-
-    Eh::Settings.current.deployment_management_files.each do |file|
-      FileUtils.cp(file, destination_dir)
-    end
-
-    # Zip all processors
-    included_processor_names.each do |processor_name|
-
-      directory = File.join(source_dir, processor_name) # last slash could be omitted
-      zipfile_name = File.join(destination_dir, "#{processor_name}.zip")
-
-      # remove zip before we create a new one
-      FileUtils.rm zipfile_name, :force => true
-
-      options = {"directories-recursively" => true}
-
-      Zip::File.open(zipfile_name,Zip::File::CREATE) do |zipfile|
-
-        [directory].each{ |file_to_be_zipped|
-
-          if File.directory?(file_to_be_zipped)
-            # should skip directories
-            next if options["directories-skip"]
-
-            # should recursively add directory
-            if options["directories-recursively"]
-              directory = file_to_be_zipped
-              puts "zipper: archiving directory: #{directory}"
-              directory_chosen_pathname = options["directories-recursively-splat"] ? directory : File.dirname(directory)
-              directory_pathname = Pathname.new(directory_chosen_pathname)
-              files = Dir[File.join(directory, '**', '**')]
-
-              # pattern to exclude unwanted folders
-              re = Regexp.new("^#{directory}/(log|logs|exceptions|pids|tmp)")
-              files.delete_if {|filename| re.match(filename) if File.directory?(filename)}
-
-              files.each do |file|
-                file_pathname = Pathname.new(file)
-                file_relative_pathname = file_pathname.relative_path_from(directory_pathname)
-                zipfile.add(file_relative_pathname,file)
-              end
-              next
-            end
-          end
-
-          filename = File.basename(file_to_be_zipped)
-
-          puts "zipper: archiving #{file_to_be_zipped} as #{filename} into #{zipfile}"
-
-          zipfile.add(filename,file_to_be_zipped)
-        }
-      end
-    end
-
-    puts "Done packaging #{included_processor_names.size} processors"
-  end
-end