nginx_utils 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjU5NmIzZjlmY2YyOWU3ZTliMjE1NzVlMjY5MTY5OTAyYzNlMDNmOA==
-  data.tar.gz: !binary |-
-    Y2YyYTYwNmI1NTAzZjU0OTNhYTE0NWIyMjdkOWY5ODE5YWFhMTBkOQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZGJiMzBmMzY2OTY3M2IzMmRiMjliMTMxNDhmMjNlODNkMmEwZmU4MjU4ZTY3
-    Mjc5ZDNhMTg4NWM5ODYzMmI0Y2VjMThjMTM4NTcwY2M1MjcwOGE4ZmQ2MTcw
-    ODRmOGJlNWFiZmU2YzFmMmQyZjY4ODU3YzFjNzA3MDJkYjNiYWU=
-  data.tar.gz: !binary |-
-    ZTY3Mzg5N2Q4NGZlOTNiZDc0NjA1OTFkOWM4ZTRkMDI5NGNhYTEzYjA5OTFl
-    Y2Q1ZTY5OTVhZTA4MjUxYmJiZmY2NTgwYjhkMTU2Mjg3MzkzYTE3OGRlNjBl
-    N2RkNGJiNTZjYjQ2N2I1NGU4MDQwYWJhYzRjZGVmMmU3NzY3ZTU=
+SHA1:
+  metadata.gz: cf5488e608925ed21642a11030049b886a369d63
+  data.tar.gz: ea2d9f31581ed7adedea3771e36af73058ee3225
+SHA512:
+  metadata.gz: 4c5cab54b88e8a94344c9ec2165b7aa25e63bb0144df44c6438c0339fbb22b2d67c9925fee74104f64a3a783a686b6c38cf4ef210a33d131b22392854beea26e
+  data.tar.gz: 1c224216d8b3684e562e206fbd623eb3ba1aa9be65a540134ba95110dd85c96d628657fd28a9ad2ca94b5780431e1023c73dd8dfdcb9df95240166016dd010de

data/.travis.yml

@@ -5,11 +5,6 @@ rvm:
 gemfile:
   - Gemfile
 script: bundle exec rake spec
-branches:
-  only:
-    - master
 notifications:
   mails:
-    - i2bskn@gmail.com
-  on_sucess: always
-  on_failure: always
+    - i2bskn@gmail.com

data/bin/nginx_utils

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 # coding: utf-8
 
+path = File.expand_path("../../lib", __FILE__)
+$:.unshift(path) unless $:.include?(path)
 require "nginx_utils"
 
 NginxUtils::CLI.start

data/lib/nginx_utils/logreader.rb

@@ -8,14 +8,11 @@ module NginxUtils
       @log = File.open(log)
 
       if options[:parser]
-        if options[:parser].is_a? Regexp
-          @format = :custom
-          @parser = options[:parser]
-        else
-          raise ArgumentError, "invalid argument"
-        end
+        raise ArgumentError, "invalid argument" unless options[:parser].is_a? Regexp
+        @format = :custom
+        @parser = options[:parser]
       else
-        @format = options[:format] || :ltsv
+        @format = options.fetch(:format, :ltsv)
       end
     end
 

data/lib/nginx_utils/status.rb

@@ -4,9 +4,9 @@ module NginxUtils
   module Status
     class << self
       def get(options={})
-        host = options[:host] || "localhost"
-        port = options[:port] || 80
-        path = options[:path] || "/nginx_status"
+        host = options.fetch(:host, "localhost")
+        port = options.fetch(:port, 80)
+        path = options.fetch(:path, "/nginx_status")
 
         req = Net::HTTP::Get.new(path)
         res = Net::HTTP.start(host, port){|http| http.request(req)}

data/lib/nginx_utils/version.rb

@@ -1,3 +1,3 @@
 module NginxUtils
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/nginx_utils/virtual_host.rb

@@ -20,10 +20,10 @@ module NginxUtils
         case options[:vhost_type].to_sym
         when :unicorn then
           @vhost_type = :unicorn
-          @destination = options[:destination] || "127.0.0.1:8080"
+          @destination = options.fetch(:destination, "127.0.0.1:8080")
         when :proxy then
           @vhost_type = :proxy
-          @destination = options[:destination] || "127.0.0.1:8080"
+          @destination = options.fetch(:destination, "127.0.0.1:8080")
         when :passenger then
           @vhost_type = :passenger
         else
@@ -38,13 +38,13 @@ module NginxUtils
 
     def set_common_params(options)
       # Arguments: prefix, server_name, root, index, auth_basic, auth_basic_user_file in options
-      @prefix = options[:prefix] || "/usr/local/nginx"
-      @server_name = options[:server_name] || "example.com"
-      @root = options[:root] || File.join(@prefix, "vhosts", @server_name, "html")
-      @index = options[:index] || ["index.html", "index.htm"].join(" ")
+      @prefix = options.fetch(:prefix, "/usr/local/nginx")
+      @server_name = options.fetch(:server_name, "example.com")
+      @root = options.fetch(:root, File.join(@prefix, "vhosts", @server_name, "html"))
+      @index = options.fetch(:index, ["index.html", "index.htm"].join(" "))
       @auth_basic = options[:auth_basic]
       if @auth_basic
-        @auth_basic_user_file = options[:auth_basic_user_file] || File.join(@prefix, "vhosts", @server_name, "etc", "users")
+        @auth_basic_user_file = options.fetch(:auth_basic_user_file, File.join(@prefix, "vhosts", @server_name, "etc", "users"))
       end
     end
 
@@ -55,16 +55,16 @@ module NginxUtils
       @http = false if options[:only_https]
       @https = false if options[:only_http]
       if @https
-        @ssl_certificate = options[:ssl_certificate] || File.join(@prefix, "vhosts", @server_name, "ssl.crt", "server.crt")
-        @ssl_certificate_key = options[:ssl_certificate_key] || File.join(@prefix, "vhosts", @server_name, "ssl.key", "server.key")
+        @ssl_certificate = options.fetch(:ssl_certificate, File.join(@prefix, "vhosts", @server_name, "ssl.crt", "server.crt"))
+        @ssl_certificate_key = options.fetch(:ssl_certificate_key, File.join(@prefix, "vhosts", @server_name, "ssl.key", "server.key"))
       end
     end
 
     def set_log_params(options)
       # Arguments: log_dir, access_log_format, error_log_level in options
-      @log_dir = options[:log_dir] || File.join(@prefix, "vhosts", @server_name, "logs")
-      @access_log_format = options[:access_log_format] || :ltsv
-      @error_log_level = options[:error_log_level] || :info
+      @log_dir = options.fetch(:log_dir, File.join(@prefix, "vhosts", @server_name, "logs"))
+      @access_log_format = options.fetch(:access_log_format, :ltsv)
+      @error_log_level = options.fetch(:error_log_level, :info)
     end
 
     def config

data/spec/nginx_utils/cli_spec.rb

@@ -1,21 +1,8 @@
 # coding: utf-8
 
 require "spec_helper"
-require "stringio"
 
 describe NginxUtils::CLI do
-  def capture(stream)
-    begin
-      stream = stream.to_s
-      eval "$#{stream} = StringIO.new"
-      yield
-      result = eval("$#{stream}").string
-    ensure
-      eval("$#{stream} = #{stream.upcase}")
-    end
-    result
-  end
-
   describe "#status" do
     let(:result) {
       {

data/spec/nginx_utils/virtual_host_spec.rb

@@ -179,67 +179,146 @@ describe NginxUtils::VirtualHost do
   end
 
   describe "#config" do
-    subject {
-      virtual_host = NginxUtils::VirtualHost.new(
-        vhost_type: :unicorn,
-        destination: "/usr/local/rails/app/tmp/unicorn.sock",
-        prefix: "/opt/nginx",
-        server_name: "nginx_utils.example.com",
-        index: "index.rb",
-        log_dir: "/var/log",
-        access_log_format: "combined",
-        error_log_level: "error",
-        auth_basic: "Auth"
-      )
-      virtual_host.config
-    }
-
-    it "upstream block should be defined" do
-      should match(/upstream backend-unicorn/)
-    end
+    context "for unicron" do
+      subject {
+        virtual_host = NginxUtils::VirtualHost.new(
+          vhost_type: :unicorn,
+          destination: "/usr/local/rails/app/tmp/unicorn.sock",
+          prefix: "/opt/nginx",
+          server_name: "nginx_utils.example.com",
+          index: "index.rb",
+          log_dir: "/var/log",
+          access_log_format: "combined",
+          error_log_level: "error",
+          auth_basic: "Auth"
+        )
+        virtual_host.config
+      }
+
+      it "upstream block should be defined" do
+        should match(/upstream backend-unicorn/)
+      end
 
-    it "http block should be defined" do
-      should match(/listen 80;/)
-    end
+      it "http block should be defined" do
+        should match(/listen 80;/)
+      end
 
-    it "https block should be defined" do
-      should match(/listen 443 ssl;/)
-    end
+      it "https block should be defined" do
+        should match(/listen 443 ssl;/)
+      end
 
-    it "unix domain socket should be defined" do
-      should match(/server unix:\/usr\/local\/rails\/app\/tmp\/unicorn\.sock;/)
-    end
+      it "unix domain socket should be defined" do
+        should match(/server unix:\/usr\/local\/rails\/app\/tmp\/unicorn\.sock;/)
+      end
 
-    it "server_name should be defined" do
-      should match(/server_name nginx_utils.example.com;/)
-    end
+      it "server_name should be defined" do
+        should match(/server_name nginx_utils.example.com;/)
+      end
 
-    it "index should be defined" do
-      should match(/index index.rb;/)
-    end
+      it "index should be defined" do
+        should match(/index index.rb;/)
+      end
 
-    it "access_log should be defined" do
-      should match(/access_log \/var\/log\/access.log combined;/)
-    end
+      it "access_log should be defined" do
+        should match(/access_log \/var\/log\/access.log combined;/)
+      end
 
-    it "error_log should be defined" do
-      should match(/error_log \/var\/log\/error.log error;/)
-    end
+      it "error_log should be defined" do
+        should match(/error_log \/var\/log\/error.log error;/)
+      end
 
-    it "auth_basic should be defined" do
-      should match(/auth_basic "Auth";/)
-    end
+      it "auth_basic should be defined" do
+        should match(/auth_basic "Auth";/)
+      end
+
+      it "auth_basic_user_file should be defined" do
+        should match(/auth_basic_user_file \/opt\/nginx\/vhosts\/nginx_utils\.example\.com\/etc\/users;/)
+      end
+
+      it "try_files should be defined" do
+        should match(/try_files/)
+      end
 
-    it "auth_basic_user_file should be defined" do
-      should match(/auth_basic_user_file \/opt\/nginx\/vhosts\/nginx_utils\.example\.com\/etc\/users;/)
+      it "proxy_pass should be defined" do
+        should match(/proxy_pass http:\/\/backend-unicorn;/)
+      end
     end
 
-    it "try_files should be defined" do
-      should match(/try_files/)
+    context "for passenger" do
+      subject {
+        virtual_host = NginxUtils::VirtualHost.new(
+          vhost_type: :passenger,
+          only_https: true
+        )
+        virtual_host.config
+      }
+
+      it "upstream block should not defined" do
+        should_not match(/upstream backend-unicorn/)
+      end
+
+      it "http block should not defined" do
+        should_not match(/listen 80/)
+      end
+
+      it "auth_basic should not defined" do
+        should_not match(/auth_basic/)
+      end
+
+      it "proxy_pass should not defined" do
+        should_not match(/proxy_pass/)
+      end
+
+      it "https block should be defined" do
+        should match(/listen 443 ssl/)
+      end
+
+      it "server_name should be default" do
+        should match(/server_name example.com;/)
+      end
+
+      it "index should be default" do
+        should match(/index index.html index.htm;/)
+      end
+
+      it "passenger_enabled should be defined" do
+        should match(/passenger_enabled on/)
+      end
     end
 
-    it "proxy_pass should be defined" do
-      should match(/proxy_pass http:\/\/backend-unicorn;/)
+    context "for proxy" do
+      subject {
+        virtual_host = NginxUtils::VirtualHost.new(
+          vhost_type: :proxy,
+          destination: "192.168.10.241:8080",
+          only_http: true
+        )
+        virtual_host.config
+      }
+
+      it "upstream block should not defined" do
+        should_not match(/upstream backend-unicorn/)
+      end
+
+      it "http block should defined" do
+        should match(/listen 80/)
+      end
+
+      it "https block should not defined" do
+        should_not match(/listen 443 ssl/)
+      end
+
+      it "proxy_pass should defined" do
+        should match(/proxy_pass http:\/\/192\.168\.10\.241:8080/)
+      end
+
+      it "proxy_redirect should defined" do
+        should match(/proxy_redirect default/)
+      end
+
+      it "passenger_enabled should be defined" do
+        should_not match(/passenger_enabled on/)
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -2,8 +2,22 @@ require "simplecov"
 require "coveralls"
 Coveralls.wear!
 
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+
 SimpleCov.start do
   add_filter "spec"
+  add_filter ".bundle"
 end
 
 require "nginx_utils"
+
+support_files = File.join(File.expand_path("..", __FILE__), "support/*.rb")
+Dir[support_files].each {|f| require f}
+
+RSpec.configure do |config|
+  config.order = "random"
+  config.include(SpecUtils)
+end

data/spec/support/spec_utils.rb

@@ -0,0 +1,15 @@
+require "stringio"
+
+module SpecUtils
+  def capture(stream)
+    begin
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
+      yield
+      result = eval("$#{stream}").string
+    ensure
+      eval("$#{stream} = #{stream.upcase}")
+    end
+    result
+  end
+end

data/template/virtual_host.erb

@@ -38,7 +38,6 @@ server {
   location @proxy {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header Host $http_host;
-    proxy_set_header X-Forwarded-Proto https;
     proxy_redirect off;
 
     <% if @vhost_type == :passenger %>

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: nginx_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - i2bskn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -42,28 +42,28 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: The various utilities on nginx
@@ -96,6 +96,7 @@ files:
 - spec/nginx_utils/status_spec.rb
 - spec/nginx_utils/virtual_host_spec.rb
 - spec/spec_helper.rb
+- spec/support/spec_utils.rb
 - template/virtual_host.erb
 homepage: https://github.com/i2bskn/nginx_utils
 licenses:
@@ -107,17 +108,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.6
 signing_key: 
 specification_version: 4
 summary: Nginx utilities
@@ -128,3 +129,4 @@ test_files:
 - spec/nginx_utils/status_spec.rb
 - spec/nginx_utils/virtual_host_spec.rb
 - spec/spec_helper.rb
+- spec/support/spec_utils.rb