eventhub-command 0.0.20 → 0.0.21

data/lib/eh/commands/generate_processor.rb

@@ -1,90 +1,90 @@
-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
+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.rb

@@ -1,97 +1,104 @@
-desc 'Packages processors to zip files'
-command :package 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([:p, :processors], :desc => "Specify what processors to package", :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
-
-    # only include processors specified by -p option, if option is given
-    if options['p']
-      included_processor_names = included_processor_names.select do |processor_name|
-        options['p'].include?(processor_name)
-      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)
-
-    # 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|
-
-        #zipfile.add(processor_name, directory)
-        [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, '**', '**')]
-              files.delete_if {|filename| ["log", "logs", "exceptions", "pids", "tmp"].include?(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
+desc 'Packages processors to zip files'
+command :package 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([:p, :processors], :desc => "Specify what processors to package", :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
+
+    # only include processors specified by -p option, if option is given
+    if options['p']
+      included_processor_names = included_processor_names.select do |processor_name|
+        options['p'].include?(processor_name)
+      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)}
+
+              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

data/lib/eh/commands/package_rails.rb

@@ -1,65 +1,67 @@
-desc 'Packages Rails Console to zip file'
-command :package_rails 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([:p, :processors], :desc => "Specify what processors to package", :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 file.", :default_value => Eh::Settings.current.rails_release_dir)
-  c.flag([:s, :source], :desc => "Source directory to read rails console from.", :default_value => Eh::Settings.current.rails_src_dir)
-
-  c.action do |global_options, options, args|
-    source_dir = options['s']
-    destination_dir = options['d']
-
-    puts "Will package rails console from #{source_dir} to #{destination_dir}"
-
-    console = Dir["#{source_dir}"]
-
-    FileUtils.mkdir_p(destination_dir)
-
-    options = {"directories-recursively"=>true}
-
-    zipfile_name = File.join(destination_dir, "console.zip")
-    directory = source_dir
-
-    # remove zip before we create a new one
-    FileUtils.rm zipfile_name, :force => true
-
-    Zip::File.open(zipfile_name, Zip::File::CREATE) do |zipfile|
-
-      #zipfile.add(processor_name, directory)
-      [directory].each do |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, '**', '**')]
-
-            files.delete_if do |filename|
-              ["#{source_dir}/log", "#{source_dir}/logs", "#{source_dir}/exceptions", "#{source_dir}/tmp"].any? do |prefix|
-                filename.start_with?(prefix)
-              end
-            end
-
-            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 rails"
-  end
-end
+desc 'Packages Rails Console to zip file'
+command :package_rails 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([:p, :processors], :desc => "Specify what processors to package", :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 file.", :default_value => Eh::Settings.current.rails_release_dir)
+  c.flag([:s, :source], :desc => "Source directory to read rails console from.", :default_value => Eh::Settings.current.rails_src_dir)
+
+  c.action do |global_options, options, args|
+    source_dir = options['s']
+    destination_dir = options['d']
+
+    skip_files = ["#{source_dir}/config/database.yml"]
+
+    puts "Will package rails console from #{source_dir} to #{destination_dir}"
+
+    console = Dir["#{source_dir}"]
+
+    FileUtils.mkdir_p(destination_dir)
+
+    zipfile_name = File.join(destination_dir, "console.zip")
+    directory = source_dir
+
+    # remove zip before we create a new one
+    FileUtils.rm zipfile_name, :force => true
+
+    Zip::File.open(zipfile_name, Zip::File::CREATE) do |zipfile|
+
+      #zipfile.add(processor_name, directory)
+      [directory].each do |file_to_be_zipped|
+        if File.directory?(file_to_be_zipped)
+          # should skip directories
+          next if options["directories-skip"]
+
+          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, '**', '**')]
+
+          files.delete_if do |filename|
+            ["#{source_dir}/log", "#{source_dir}/logs", "#{source_dir}/exceptions", "#{source_dir}/tmp"].any? do |prefix|
+              filename.start_with?(prefix)
+            end
+          end
+
+          files.each do |file|
+            next if skip_files.include? 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
+
+        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 rails"
+  end
+end

data/lib/eh/settings.rb

@@ -1,66 +1,69 @@
-class Eh::Settings
-  attr_reader :data
-  def self.load(file)
-    data = File.read(file)
-    json = JSON.parse(data)
-    Eh::Settings.new(json)
-  end
-
-  def self.current=(value)
-    Thread.current[:eh_settings] = value
-  end
-
-  def self.current
-    Thread.current[:eh_settings]
-  end
-
-  def initialize(data)
-    @data = data
-  end
-
-
-  def repository_root_dir
-    File.expand_path(data['repository_root_dir'])
-  end
-
-  def releases_dir
-    File.join(repository_root_dir, 'releases')
-  end
-
-  def rails_release_dir
-    File.join(releases_dir, 'rails')
-  end
-
-  def ruby_release_dir
-    File.join(releases_dir, 'ruby')
-  end
-
-  def processors_src_dir
-    File.join(repository_root_dir, 'src', 'ruby')
-  end
-
-  def deployment_dir
-    File.join(repository_root_dir, 'src', 'deployment')
-  end
-
-  def rails_src_dir
-    File.join(repository_root_dir, 'src', 'rails', 'console')
-  end
-
-  def source_config_dir
-    File.join(repository_root_dir, 'config')
-  end
-
-  def processor_template_repository_url
-    "https://github.com/thomis/eventhub-processor-template.git"
-  end
-
-  def package_tmp_dir
-    './tmp'
-  end
-
-  def template_tmp_dir
-    "/tmp/eventhub-processor-template/"
-  end
-
-end
+class Eh::Settings
+  attr_reader :data
+  def self.load(file)
+    data = File.read(file)
+    json = JSON.parse(data)
+    Eh::Settings.new(json)
+  end
+
+  def self.current=(value)
+    Thread.current[:eh_settings] = value
+  end
+
+  def self.current
+    Thread.current[:eh_settings]
+  end
+
+  def initialize(data)
+    @data = data
+  end
+
+
+  def repository_root_dir
+    File.expand_path(data['repository_root_dir'])
+  end
+
+  def releases_dir
+    File.join(repository_root_dir, 'releases')
+  end
+
+  def rails_release_dir
+    File.join(releases_dir, 'rails')
+  end
+
+  def ruby_release_dir
+    File.join(releases_dir, 'ruby')
+  end
+
+  def processors_src_dir
+    File.join(repository_root_dir, 'src', 'ruby')
+  end
+
+  def deployment_dir
+    File.join(repository_root_dir, 'src', 'deployment')
+  end
+
+  def rails_src_dir
+    File.join(repository_root_dir, 'src', 'rails', 'console')
+  end
+
+  def source_config_dir
+    File.join(repository_root_dir, 'config')
+  end
+
+  def processor_template_repository_url
+    'https://github.com/thomis/eventhub-processor-template.git'
+  end
+
+  def package_tmp_dir
+    './tmp'
+  end
+
+  def template_tmp_dir
+    '/tmp/eventhub-processor-template/'
+  end
+
+  def deployment_management_files
+    [ File.join(deployment_dir, 'management', 'launcher.rb') ]
+  end
+end

data/lib/eh/version.rb

@@ -1,3 +1,3 @@
-module Eh
-  VERSION = '0.0.20'
-end
+module Eh
+  VERSION = '0.0.21'
+end