redirus 0.1.2 → 0.2.1

data/lib/redirus/cli/init.rb

@@ -0,0 +1,173 @@
+require 'optparse'
+require 'singleton'
+require 'erb'
+
+module Redirus
+  module Cli
+    class Init
+      include Singleton
+
+      attr_reader :options
+
+      def parse(args = ARGV)
+        init_options(args)
+        validate!
+      end
+
+      def run
+        generate_templates
+        mkdir(@options[:configs_dir])
+        mkdir(@options[:log_dir])
+      end
+
+      private
+
+      def generate_templates
+        Dir[File.join(tmpl_dir, '*')].each { |tmpl| generate(tmpl) }
+      end
+
+      def mkdir(dir)
+        Dir.mkdir(dir) unless Dir.exist?(dir)
+      end
+
+      def tmpl_dir
+        @templates ||= File.join(Redirus.root, 'templates')
+      end
+
+      def init_options(args)
+        opts = parse_options(args)
+        @options = defaults.merge(opts)
+        @options[:http_template] = target('http.conf.erb')
+        @options[:https_template] = target('https.conf.erb')
+      end
+
+      def parse_options(args)
+        opts = {}
+
+        parser = OptionParser.new do |o|
+          o.on('-t', '--target PATH',
+               'Target path (default current dir)') do |arg|
+            opts[:target] = arg
+            opts[:pid] = File.join(arg, 'nginx.pid')
+            opts[:configs_dir] = File.join(arg, 'configurations')
+            opts[:log_dir] = File.join(arg, 'log')
+          end
+
+          o.on('--ip IP', 'Server IP address (default *)') do |arg|
+            opts[:ip] = arg
+          end
+
+          o.on('--server-name NAME', 'Server name') do |arg|
+            opts[:server_name] = arg
+          end
+
+          o.on('--ssl-cert PATH', 'Server certificate path') do |arg|
+            opts[:ssl_cert] = arg
+          end
+
+          o.on('--ssl-cert-key PATH', 'Server certificate key path') do |arg|
+            opts[:ssl_cert_key] = arg
+          end
+
+          o.on('--nginx-pid PATH',
+               'Nginx pid location (default nginx.pid in '\
+               'current dir)') do |arg|
+            opts[:pid] = arg
+          end
+
+          o.on('--configurations DIR',
+               'Directory where nginx configs will be generated '\
+               '(default "configurations" in current directory)') do |arg|
+            opts[:configs_dir] = arg
+          end
+
+          o.on('--logs DIR', 'Directory where nginx logs will be placed'\
+               '(default "log" dir in current dirrectory)') do |arg|
+            opts[:log_dir] = arg
+          end
+
+          o.on('--redis URL',
+               'Redis location (default "redis://localhost:6379")') do |arg|
+            opts[:redis] = arg
+          end
+
+          o.on('--queues', Array,
+               'List of redirs queues (default ["redirus"]') do |arg|
+            opts[:queues] = arg
+          end
+
+          o.on_tail('-h', '--help', 'Show this message') do
+            puts o
+            exit
+          end
+
+          o.on_tail('-v', '--version', 'Show version') do
+            puts "Redirus #{Redirus::VERSION}"
+            exit
+          end
+        end
+
+        parser.banner = 'redirus-init [options]'
+        parser.parse!(args)
+
+        opts
+      end
+
+      def defaults
+        {
+          target: Dir.pwd,
+          ip: '*',
+          server_name: 'CHANGE_ME',
+          pid: File.join(Dir.pwd, 'nginx.pid'),
+          configs_dir: File.join(Dir.pwd, 'configurations'),
+          log_dir: File.join(Dir.pwd, 'log'),
+          redis: 'redis://localhost:6379',
+          queues: ['redirus']
+        }
+      end
+
+      def validate!
+        check_target_dir!
+        check_ip!
+        check_pid_dir!
+      end
+
+      def check_target_dir!
+        return if Dir.exist?(options[:target])
+
+        puts "ERROR: Directory #{options[:target]} does not exist"
+        exit(1)
+      end
+
+      def check_ip!
+        return if valid_id?
+
+        puts 'ERROR: Server IP is not valid'
+        exit(1)
+      end
+
+      def valid_id?
+        options[:ip] == '*' ||
+          options[:ip].match(/\A\d{1,3}\.\d{1,3}\.\d{1,3}.\d{1,3}:\d+\z/)
+      end
+
+      def check_pid_dir!
+        return if Dir.exist?(File.dirname(options[:pid]))
+
+        puts 'ERROR: Pid directory does not exist'
+        exit(1)
+      end
+
+      def generate(tmpl)
+        File.open(target(tmpl), 'w') do |file|
+          erb = ERB.new(File.read(tmpl), nil, '-')
+          file.write(erb.result(binding))
+        end
+      end
+
+      def target(tmpl)
+        File.join(@options[:target], File.basename(tmpl))
+      end
+    end
+  end
+end

data/lib/redirus/cli/server.rb

@@ -0,0 +1,101 @@
+require 'optparse'
+require 'singleton'
+require 'sidekiq/cli'
+
+module Redirus
+  module Cli
+    class Server
+      include Singleton
+
+      attr_reader :options
+
+      def parse(args = ARGV)
+        init_options(args)
+        validate!
+      end
+
+      def run
+        Redirus.config_path = options[:config_path]
+        init_sidekiq
+
+        sidekiq_cli = Sidekiq::CLI.instance
+        args = queues + [
+          '-c', '1',
+          '-r', runner_path,
+          options[:config_path]
+        ]
+
+        sidekiq_cli.parse(args)
+        sidekiq_cli.run
+      end
+
+      private
+
+      def init_sidekiq
+        Sidekiq.configure_server do |config|
+          config.redis = {
+            namespace: Redirus.config.namespace,
+            url: Redirus.config.redis_url
+          }
+        end
+      end
+
+      def queues
+        Redirus.config.queues.inject([]) do |arr, q|
+          arr << '-q'
+          arr << q
+        end
+      end
+
+      def runner_path
+        module_path = File.expand_path(File.join(
+                        File.dirname(__FILE__), '..', '..'))
+
+        File.join(module_path, 'redirus.rb')
+      end
+
+      def init_options(args)
+        opts = parse_options(args)
+        opts[:config_path] ||= 'config.yml'
+
+        Redirus.config_path = opts[:config_path]
+
+        @options = opts
+      end
+
+      def parse_options(args)
+        opts = {}
+
+        OptionParser.new do |o|
+          o.banner = 'Usage: redirus [options]'
+
+          o.on('-c',
+               '--configuration PATH',
+               'Yaml redirus configuration path') do |arg|
+            opts[:config_path] = arg
+          end
+
+          o.on_tail('-h', '--help', 'Show this message') do
+            puts o
+            exit
+          end
+
+          o.on_tail('-v', '--version', 'Show version') do
+            puts "Redirus #{Redirus::VERSION}"
+            exit
+          end
+        end.parse!(args)
+
+        opts
+      end
+
+      def validate!
+        unless File.exist?(options[:config_path])
+          puts "ERROR: Configuration file #{options[:config_path]} "\
+               'does not exist'
+          exit(1)
+        end
+      end
+    end
+  end
+end

data/lib/redirus/cli.rb

@@ -1,144 +1,7 @@
-require 'optparse'
-require 'singleton'
-
-Sidekiq.configure_client do |c|
-  c.redis = {
-    namespace: Redirus.config.namespace,
-    url: Redirus.config.redis_url
-  }
-end
-
 module Redirus
-  class CLI
-    include Singleton
-
-    attr_reader :options
-
-    def parse(args = ARGV)
-      init_options(args)
-      validate!
-    end
-
-    def run
-      add? ? add : rm
-    end
-
-    private
-
-    def init_options(args)
-      opts = parse_options(args)
-      opts[:config_path] ||= 'config.yml'
-
-      Redirus.config_path = opts[:config_path]
-
-      @options = defaults.merge(opts)
-    end
-
-    def parse_options(args)
-      opts = {}
-
-      parser = OptionParser.new do |o|
-        o.on('-c', '--configuration PATH', 'Configuration path') do |arg|
-          opts[:config_path] = arg
-        end
-
-        o.on('-a',
-                '--action TYPE', [:add, :rm],
-                'Action type (add, rm)') do |arg|
-          opts[:action] = arg
-        end
-
-        o.on('-q', '--queue NAME', 'Queue name') do |arg|
-          opts[:queue] = arg
-        end
-
-        o.on(
-             '-t',
-             '--type TYPE',
-             [:http, :https],
-             'Rediraction type') do |arg|
-          opts[:type] = arg
-        end
-
-        o.on_tail("-h", "--help", "Show this message") do
-          puts o
-          exit
-        end
-
-        o.on_tail('-v', '--version', 'Show version') do
-          puts "Redirus #{Redirus.VERSION}"
-          exit
-        end
-      end
-
-      parser.banner = 'redirus-client [options] name [upstream1,upstream2,...]'
-      parser.parse!(args)
-
-      opts[:name] = args.shift
-
-      upstreams_str = args.shift
-      opts[:upstreams] = upstreams_str.split(',') if upstreams_str
-
-      opts
-    end
-
-    def defaults
-      {
-        config_path: 'config.yml',
-        type: :http,
-        action: :add,
-        queue: Redirus.config.queues.first
-      }
-    end
-
-    def validate!
-      unless File.exist?(options[:config_path])
-        puts "ERROR: Configuration file #{options[:config_path]} does not exist"
-        exit(1)
-      end
-
-      unless options[:name]
-        puts "ERROR: Redirection name is not set"
-        exit(1)
-      end
-
-      if add?
-        unless options[:upstreams]
-          puts "ERROR: Upstream locations are not set"
-          exit(1)
-        else
-          options[:upstreams].each do |u|
-            unless u.match(/\A\d{1,3}\.\d{1,3}\.\d{1,3}.\d{1,3}:\d+\z/)
-              puts "ERROR: #{u} is not valid upstream definition, use IP:PORT schema"
-              exit(1)
-            end
-          end
-        end
-      end
-
-      Redirus.config_path = options[:config_path]
-    end
-
-    def add?
-      options[:action] == :add
-    end
-
-    def add
-      puts "Adding new redirection #{options[:name]} with following upstreams #{options[:upstreams]}"
-
-      Sidekiq::Client.push(
-        'queue' => options[:queue],
-        'class' => Redirus::Worker::AddProxy,
-        'args' => [options[:name], options[:upstreams], options[:type]])
-    end
-
-    def rm
-      puts "Removing redirection #{options[:name]}"
-
-      Sidekiq::Client.push(
-        'queue' => options[:queue],
-        'class' => Redirus::Worker::RmProxy,
-        'args' => [options[:name], options[:type]])
-    end
+  module Cli
+    autoload :Client, 'redirus/cli/client'
+    autoload :Init,   'redirus/cli/init'
+    autoload :Server, 'redirus/cli/server'
   end
 end

data/lib/redirus/config.rb

@@ -33,30 +33,11 @@ module Redirus
     end
 
     def http_template
-      nginx_prop :http_template, 'listen *:80;'
+      nginx_prop :http_template, 'http.conf.erb'
     end
 
     def https_template
-      nginx_prop :https_template, %q[listen *:443 ssl;
-ssl_certificate     /usr/share/ssl/certs/localhost/host.cert;
-ssl_certificate_key /usr/share/ssl/certs/localhost/host.key;
-ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
-]
-    end
-
-    def config_template
-      nginx_prop :config_template, %q[#{upstream}
-
-server {
-  #{listen}
-
-  server_name #{name}.localhost;
-  server_tokens off;
-
-  location / {
-    proxy_pass http://#{upstream_name};
-  }
-}]
+      nginx_prop :https_template, 'https.conf.erb'
     end
 
     def allowed_properties

data/lib/redirus/proxy.rb

@@ -5,19 +5,12 @@ module Redirus
     include Sidekiq::Worker
 
     def perform(*params)
-      begin
-        perform_action(*params)
-        restart_nginx
-      rescue Errno::EACCES => e
-        $stderr << "Error: Cannot write to config files - continuing\n"
-        $stderr << "#{e}\n"
-      rescue Errno::ENOENT => e
-        $stderr << "Error: Trying to remove non existing config files - continuing\n"
-        $stderr << "#{e}\n"
-      rescue Errno::ESRCH => e
-        $stderr << "Warning: Nginx is dead - continuing\n"
-        $stderr << "#{e}\n"
-      end
+      perform_action(*params)
+      restart_nginx
+    rescue Errno::EACCES => e
+      error('Error: Cannot write to config files - continuing', e)
+    rescue Errno::ENOENT => e
+      error('Error: Remove non existing config files - continuing', e)
     end
 
     protected
@@ -26,23 +19,21 @@ module Redirus
       #by default do nothing
     end
 
-    def full_name(name, type)
-      "#{name}_#{type}"
-    end
-
-    def config_file_path(name, type)
-      File.join(config.configs_path, full_name(name, type))
-    end
-
-    def config
-      @config ||= Redirus.config
-    end
+    private
 
     def restart_nginx
-      File.open(config.nginx_pid_file) do |file|
+      File.open(Redirus.config.nginx_pid_file) do |file|
         pid = file.read.to_i
         Process.kill :SIGHUP, pid
       end
+    rescue Errno::ENOENT => e
+      error('Error: Nginx pid file does not exist - continuing', e)
+    rescue Errno::ESRCH => e
+      error('Warning: Nginx is dead - continuing', e)
+    end
+
+    def error(msg, e)
+      $stderr << "#{msg}\n  - #{e}\n"
     end
   end
 end

data/lib/redirus/utils.rb

@@ -0,0 +1,15 @@
+module Redirus
+  module Utils
+    def full_name(name, type)
+      "#{name}_#{type}"
+    end
+
+    def config_file_path(name, type)
+      File.join(config.configs_path, full_name(name, type))
+    end
+
+    def config
+      @config ||= Redirus.config
+    end
+  end
+end

data/lib/redirus/version.rb

@@ -1,3 +1,3 @@
 module Redirus
-  VERSION = '0.1.2'
+  VERSION = '0.2.1'
 end

data/lib/redirus/worker/add_proxy.rb

@@ -1,51 +1,62 @@
+require 'erb'
+
 module Redirus
   module Worker
     class AddProxy < Proxy
 
-      def perform_action(name, workers, type, props = nil)
-        params = config_propertie(name, workers, type, props)
-        File.open(config_file_path(name, type), 'w') do |file|
-          param_regexp = '#{\w*}'
-          file.write config.config_template
-            .gsub(/#{param_regexp}/) { |p| params[p[2..-2]] }
-        end
+      def perform_action(name, workers, type, location_props = nil, opt = {})
+        Action.new(name, workers, type, location_props, opt).execute
       end
 
       private
 
-      def config_propertie(name, workers, type, props)
-        {
-          'name' => name,
-          'listen' => https?(type) ? config.https_template : config.http_template,
-          'upstream' => upstream_conf(name, workers, type),
-          'upstream_name' => full_name(name, type),
-          'properties' => location_properties(props)
-        }
-      end
+      class Action
+        include Redirus::Utils
 
-      def https?(type)
-        type.to_s == 'https'
-      end
+        def initialize(name, workers, type, location_props, options = {})
+          @name = name
+          @workers = workers
+          @type = type
+          @location_properties = location_properties(location_props) || []
+          @options = options
+        end
 
-      def upstream_conf(name, workers, type)
-        "upstream #{name}_#{type} {\n#{workers_conf(workers)}\}\n"
-      end
+        attr_reader :name, :workers, :type
 
-      def workers_conf(workers)
-        workers.collect { |worker| "  server #{worker};\n" }.join
-      end
+        def execute
+          File.open(config_file_path(name, type), 'w') do |file|
+            erb = ERB.new(template, nil, '-')
+            file.write erb.result(binding)
+          end
+        end
 
-      def location_properties(props)
-        props.inject([]) do |tab, prop|
-          tab << "#{prop};\n" if allowed? prop
-          tab
-        end.join('') if props
-      end
+        private
 
-      def allowed?(prop)
-        config.allowed_properties
-          .any? { |prop_regexp| /#{prop_regexp}/.match(prop) }
+        def location_properties(props)
+          props.inject([]) do |tab, prop|
+            tab << prop if allowed? prop
+            tab
+          end if props
+        end
+
+        def allowed?(prop)
+          config.
+            allowed_properties.
+            any? { |prop_regexp| /#{prop_regexp}/.match(prop) }
+        end
+
+        def template
+          File.read(template_path)
+        end
+
+        def template_path
+          https? ? config.https_template : config.http_template
+        end
+
+        def https?
+          type.to_s == 'https'
+        end
       end
     end
   end
-end
+end

data/lib/redirus/worker/rm_proxy.rb

@@ -1,6 +1,7 @@
 module Redirus
   module Worker
     class RmProxy < Proxy
+      include Redirus::Utils
 
       def perform_action(name, type)
         File.delete(config_file_path(name, type))

data/lib/redirus.rb

@@ -1,11 +1,12 @@
 require 'sidekiq'
+require 'redirus/version'
 
 module Redirus
-  autoload :Version,   'redirus/version'
-  autoload :Config,    'redirus/config'
-  autoload :Proxy,     'redirus/proxy'
-  autoload :CLI,       'redirus/cli'
-  autoload :ServerCLI, 'redirus/server_cli'
+  autoload :Config,         'redirus/config'
+  autoload :Proxy,          'redirus/proxy'
+  autoload :Utils,          'redirus/utils'
+  autoload :Cli,            'redirus/cli'
+  autoload :ServerCLI,      'redirus/server_cli'
 
   def self.config
     @@config ||= Redirus::Config.new(config_path)
@@ -19,6 +20,10 @@ module Redirus
     @@config_path = path
     @@config = nil
   end
+
+  def self.root
+    File.dirname __dir__
+  end
 end
 
 require 'redirus/worker'

data/redirus.gemspec

@@ -18,12 +18,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'sidekiq'
+  spec.add_dependency 'sidekiq', '~>3.2'
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'guard-rspec'
-  spec.add_development_dependency 'shoulda-matchers'
-  spec.add_development_dependency 'rspec-sidekiq'
-  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'bundler', '~>1.7'
+  spec.add_development_dependency 'rake', '~>10'
+  spec.add_development_dependency 'guard-rspec', '~>4.3'
+  spec.add_development_dependency 'shoulda-matchers', '~>2.7'
+  spec.add_development_dependency 'rspec-sidekiq', '~>2.0'
+  spec.add_development_dependency 'coveralls', '~>0'
 end