redirus 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 956920b5a2b187d43ffc475d478a7baa00139206
-  data.tar.gz: fd00a3f1d54e8601f6b22a9cffbc785002bac863
+  metadata.gz: 6cfe9358cbab8a40e740d8b2c42232df70928d75
+  data.tar.gz: b8ea9e748cdb5e362a328b1b9d650092724b80bc
 SHA512:
-  metadata.gz: 057063d0c94cd37502b27949dc3f8ace2e5bac69920078a9999bdeb7aa21556a73e4e9315ceef10515a125a00e570d9fcf9e4e1cd1b9847187b3e02d9ba86d64
-  data.tar.gz: da1615d53261279f36fc8e2a84f7a688ab55191adea4f1ea9b9059ab1493bf281fd89f5c7e7fa607c489e8f2a4828e22ffd348f8354433d7cf85f02ccc4c9a09
+  metadata.gz: 611a265d2a01903cd6d988d9426d03795579869a489c2d150f6e50fb45a61cf7b9bae925b9cd3da02226a25d6cefe0d76bf380c26043120bfcc19c46b7eb40bd
+  data.tar.gz: 7c02473a3e4e35cf8a8d41dde3e7956976b6e61bb3f6e106fb6caa1e98584a218ac94405b7a039743cf78e120543f5346d8dcc12e89ff2d3dea100e24f41c792

data/.ruby-version

@@ -1 +1 @@
-2.1.4
+2.3.1

data/.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.3.1

data/CHANGELOG

@@ -1,3 +1,11 @@
+v 0.3.1
+  - fix problem with loading sidekiq by redirus cli server
+
+v 0.3.0
+  - fix misspelled proxy_send_timeout nginx directive in config.yml template
+  - change default https configuration from https->http into https->https
+  - update to sidekiq 4.2
+
 v 0.2.1
   - set minimal dependency versions in gemspec
 
@@ -20,4 +28,4 @@ v 0.1.0
   - Add/Remove nginx redirection
   - redirus executable
   - redirus-client executable
-  - Possibility to add redirection properties
+  - Possibility to add redirection properties

data/Gemfile.lock

@@ -1,102 +1,108 @@
 PATH
   remote: .
   specs:
-    redirus (0.2.0)
-      sidekiq (~> 3.2)
+    redirus (0.3.0.pre)
+      redis-namespace
+      sidekiq (~> 4.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.6)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
+    activesupport (5.0.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    coderay (1.1.0)
-    connection_pool (2.0.0)
-    coveralls (0.7.1)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
+    coderay (1.1.1)
+    concurrent-ruby (1.0.2)
+    connection_pool (2.2.1)
+    coveralls (0.8.16)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.12.0)
+      term-ansicolor (~> 1.3.0)
+      thor (~> 0.19.1)
+      tins (>= 1.6.0, < 2)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    ffi (1.9.6)
+    ffi (1.9.14)
     formatador (0.2.5)
-    guard (2.6.1)
+    guard (2.14.0)
       formatador (>= 0.2.4)
-      listen (~> 2.7)
+      listen (>= 2.7, < 4.0)
       lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
       pry (>= 0.9.12)
+      shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-rspec (4.3.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
       guard (~> 2.1)
-      rspec (>= 2.14, < 4.0)
-    i18n (0.6.11)
-    json (1.8.1)
-    listen (2.7.11)
-      celluloid (>= 0.15.2)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.9)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    i18n (0.7.0)
+    json (2.0.2)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    lumberjack (1.0.10)
     method_source (0.8.2)
-    mime-types (2.4.2)
-    minitest (5.4.2)
-    multi_json (1.10.1)
-    netrc (0.7.8)
-    pry (0.10.1)
+    minitest (5.9.1)
+    nenv (0.3.0)
+    notiffany (0.1.1)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (10.4.2)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.5)
+    rack (2.0.1)
+    rack-protection (1.5.3)
+      rack
+    rake (10.5.0)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    redis (3.1.0)
-    redis-namespace (1.5.1)
+    redis (3.3.2)
+    redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
-    rest-client (1.7.2)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-sidekiq (2.0.0)
+      rspec-support (~> 3.5.0)
+    rspec-sidekiq (2.2.0)
       rspec (~> 3.0, >= 3.0.0)
       sidekiq (>= 2.4.0)
-    rspec-support (3.1.2)
-    shoulda-matchers (2.7.0)
+    rspec-support (3.5.0)
+    ruby_dep (1.5.0)
+    shellany (0.0.1)
+    shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    sidekiq (3.2.5)
-      celluloid (= 0.15.2)
-      connection_pool (>= 2.0.0)
-      json
-      redis (>= 3.0.6)
-      redis-namespace (>= 1.3.1)
-    simplecov (0.9.1)
+    sidekiq (4.2.7)
+      concurrent-ruby (~> 1.0)
+      connection_pool (~> 2.2, >= 2.2.0)
+      rack-protection (>= 1.5.0)
+      redis (~> 3.2, >= 3.2.1)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     slop (3.6.0)
-    term-ansicolor (1.3.0)
+    term-ansicolor (1.3.2)
       tins (~> 1.0)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    timers (1.1.0)
-    tins (1.3.3)
+    thor (0.19.4)
+    thread_safe (0.3.5)
+    tins (1.13.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -111,3 +117,6 @@ DEPENDENCIES
   redirus!
   rspec-sidekiq (~> 2.0)
   shoulda-matchers (~> 2.7)
+
+BUNDLED WITH
+   1.13.6

data/lib/redirus/cli/server.rb

@@ -51,7 +51,7 @@ module Redirus
         module_path = File.expand_path(File.join(
                         File.dirname(__FILE__), '..', '..'))
 
-        File.join(module_path, 'redirus.rb')
+        File.join(module_path, 'redirus', 'sidekiq.rb')
       end
 
       def init_options(args)

data/lib/redirus/sidekiq.rb

@@ -0,0 +1,2 @@
+# Dumy ruby file to fool sidekiq require check. We are loading redirus workers
+# already by the Redirus::Cli::Server.

data/lib/redirus/version.rb

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

data/redirus.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'sidekiq', '~>3.2'
+  spec.add_dependency 'sidekiq', '~> 4.2'
+  spec.add_dependency 'redis-namespace', '~> 1.2'
 
   spec.add_development_dependency 'bundler', '~>1.7'
   spec.add_development_dependency 'rake', '~>10'

data/spec/redirus/worker/add_proxy_spec.rb

@@ -69,7 +69,7 @@ describe Redirus::Worker::AddProxy do
 
     it 'sets https upstream name in proxy pass section' do
       expect(proxy_file).to have_received(:write).
-        with(/.*proxy_pass http:\/\/subdomain_https;.*/)
+        with(/.*proxy_pass https:\/\/subdomain_https;.*/)
     end
 
     it 'has https upstream section with upstream server' do
@@ -113,4 +113,4 @@ describe Redirus::Worker::AddProxy do
     subject.perform('options', ['10.100.10.112:80'], :http, [],
                     load_balancing: :ip_hash)
   end
-end
+end

data/spec/resources/https.erb.conf

@@ -13,7 +13,7 @@ server {
   ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
 
   location / {
-    proxy_pass http://<%= @name %>_https;
+    proxy_pass https://<%= @name %>_https;
 <% for property in @location_properties -%>
     <%= property %>;
 <% end -%>

data/templates/https.conf.erb

@@ -13,9 +13,9 @@ server {
   ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
 
   location / {
-    proxy_pass http://<%%= @name %>_https;
+    proxy_pass https://<%%= @name %>_https;
 <%% for property in @location_properties -%>
     <%%= property %>;
 <%% end -%>
   }
-}
+}

data/templates/nginx.conf

@@ -17,8 +17,8 @@ http {
     types_hash_max_size 2048;
     server_names_hash_bucket_size  128;
 
-    access_log <%= @options[:configs_dir] %>/access.log;
-    error_log  <%= @options[:configs_dir] %>/error.log;
+    access_log <%= @options[:log_dir] %>/access.log;
+    error_log  <%= @options[:log_dir] %>/error.log;
 
     include <%= @options[:configs_dir] %>/*;
-}
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redirus
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Marek Kasztelnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: redis-namespace
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +154,7 @@ files:
 - lib/redirus/cli/server.rb
 - lib/redirus/config.rb
 - lib/redirus/proxy.rb
+- lib/redirus/sidekiq.rb
 - lib/redirus/utils.rb
 - lib/redirus/version.rb
 - lib/redirus/worker.rb
@@ -183,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Redirus is responsible for managing http/https redirections