nginxbrew 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3799667578a5c727746f7e909d6fed330883248
-  data.tar.gz: 7dc63e4e01c90743aee52c1e08b851d098672900
+  metadata.gz: 2f7df4fe4a967276dae08916ee18bf23ef9e4809
+  data.tar.gz: 19513d63f260cb095c430188f351bd67c3216261
 SHA512:
-  metadata.gz: b3bed7f44b4598dd7ede862342dfcb5abd8f701617c6154d7124981f530f273a19ac2efe0cf0a4c34111577831af87a136ab8649077109e48627c45b5f1c4f68
-  data.tar.gz: 39872bdf3f1692d21237469540fa2372111edb2aa740cfaae12be887908a9acbab1c1f3d6526b167142245e16d6ba2e9f3e367e7b605cc5a70c79058c5c31141
+  metadata.gz: ae73e62e8c7e7d7ce6243d43c2c9a3646e46f6fbb6b7504aebbc14a12879e9833f5193a064f53b6c226dbca73eb3ee1ac54b89bea98882c9bea2d75445fad219
+  data.tar.gz: 8e71707dd3a4580728380bbec00ec163e41ff9f483bd301e95edb4a4583a2de803efafba1738bec3c662f48aee506ce1c306ed39acc6e21fafc9d4e83a418e4c

data/CHANGES.txt

@@ -1,5 +1,12 @@
 Nginxbrew changes
 
+Nginxbrew 0.0.6
+ - You can change ngx-user/group by config file which specified in env {NGINXBREW_CONFIG}.
+ - Add/update build options by hash in ruby.
+ - Change default conf path to prefix dir.
+ - We got new command 'makeconf' to make basic configuration file of nginxbrew.
+
+
 Nginxbrew 0.0.5
  - Changed some directory/path for installation.
  - Quiet shell outs.

data/README.md

@@ -37,7 +37,7 @@ After the command execution, ~/nginxbrew (or path which set NGINXBREW_HOME in en
     ~/nginxbrew/run/                                -- directory for pid file, be shared
     ~/nginxbrew/logs/<version>/                     -- log files
     ~/nginxbrew/versions/ngx-<version>/             -- $prefix directory of each version
-    ~/nginxbrew/versions/ngx-<version>/conf/        -- nginx.conf and other configuration files
+    ~/nginxbrew/versions/ngx-<version>/nginx.conf    -- nginx.conf and also pther .conf files are installed here
     ~/nginxbrew/versions/ngx-<version>/bin/nginx    -- nginx bin for each version
 
 
@@ -82,28 +82,47 @@ If you specify prefix of version, the version will be filtered.
 
 ## Customize configuration
 
-You can customize Nginxbrew behavior by changing ENV.
+### Change home directory of nginxbrew
+
+You can choose other home dir for nginxbrew by the following env.
 
     NGINXBREW_HOME   # change nginxbrew root directory from ~/nginxbrew to somewhere
-    NGINXBREW_USER   # linux user for nginx
-    NGINXBREW_GROUP  # linux group for nginx
 
-You can change directory/options for nginx if you write configfile for nginxbrew.
+### Change options to build nginx
+
+Some build options for can be changed by config file.
+
+This is in ruby DSL format, so you can change some build options easily.
+
+First, you can create new configfile by using *makeconf* command.
+
+    $ nginxbrew makeconf `pwd`/myconfig.rb
 
-The following my_config.rb is configuration to share $prefix of nginx & nginx.conf troughout all builds of nginx.
+The following myconfig.rb is configuration to share $prefix of nginx & nginx.conf troughout all builds of nginx, and changing user/group, build options.
 
 ```ruby
 Nginxbrew.configure do |config|
+
     config.ngx_prefix = File.join(config.home_dir, "share")
     config.ngx_conf_path = File.join(config.home_dir, "share/nginx.conf")
-    config.ngx_configure =<<-EOF
-        # --- options for ./configure, starts from ./configure ...
-    EOF
+
+    config.ngx_user = "somebody"
+    config.ngx_group = "somebody"
+
+    # add(or update) flags in this section
+    config.ngx_configure.merge!({
+        "--with-lua51" => nil,
+        "--pid-path" => "/tmp/nginx.pid",
+        "--http-fastcgi-temp-path" => File.join(config.home_dir, "/tmp/fastcgi"),
+        "--http-uwsgi-temp-path" => File.join(config.home_dir, "/tmp/uwsgi"),
+        "--with-select_module" => nil,
+    })
+
 end
 ```
 
 
-after that, specify path to config file which you wrote as follows
+then, specify path to config file which you wrote as follows
 
     $ export NGINXBREW_CONFIG=/path/to/my_config.rb
 
@@ -115,11 +134,11 @@ then nginxbrew starts to using this configuration.
  - write tests completely
  - installable the same version of nginx with defferent labels like as follows
 
-    $ nginxbrew install prj1 1.7.6
+    $ nginxbrew install 1.7.6:prj1
 
-    $ nginxbrew install prj2 1.7.6
+    $ nginxbrew install 1.7.6:prj2
 
-    $ nginxbrew use 1.7.6-prj1
+    $ nginxbrew use prj1
 
  - multiple install
 

data/bin/nginxbrew

@@ -15,11 +15,10 @@ Available subcommands:
     list                             Show list of installed nginx versions.
     nginxes                          Show list of available nginx versions.
     openresties                      Show list of available openresty versions.
+    makeconf <path/to/config>         Output new configfile for nginxbrew into specified path.
 
 Optional environments:
     NGINXBREW_HOME                   Path to nginxbrew (will be) installed, ~/nginxbrew is default.
-    NGINXBREW_USER                   User for nginx (enabled in `install`), "nginx" is default.
-    NGINXBREW_GROUP                  Group for nginx (enable in `install`), "nginx" is default.
     NGINXBREW_DEBUG                  if 1, use DEBUG level for logging.
     NGINXBREW_CONFIG                 /path/to/configfile written in ruby DSL for build nginx.
 EOF
@@ -59,6 +58,10 @@ begin
             Nginxbrew.run(:nginxes, envs={ "HEAD_VERSION" => ARGV.shift })
         when "openresties"
             Nginxbrew.run(:openresties, envs={ "HEAD_VERSION" => ARGV.shift })
+        when "makeconf"
+            output_to = ARGV.shift
+            raise Exception.new("output directory/file for config is required!") unless output_to
+            Nginxbrew.run(:makeconf, envs={ "makeconf_OUTPUT_TO" => output_to })
         else
             raise Exception.new("Unknown command '#{command}'")
     end

data/lib/nginxbrew/config/base.rb

@@ -9,21 +9,21 @@ module Nginxbrew
     end
 
     class Configuration
+
         NGX_URL = "http://nginx.org/download"
+
         OPENRESTY_URL = "http://openresty.org/download"
 
-        attr_accessor :ngx_configure, :ngx_conf_path, :ngx_prefix
-        attr_reader :ngx_user, :ngx_group, :nginx_log_dir,
-            :builtfile, :dist_to, :tarball, :src, :url, :home_dir, :dist_dir,
-            :ngx_sbin_path, :package_name
+        attr_accessor :ngx_configure, :ngx_conf_path, :ngx_prefix, :ngx_user, :ngx_group
+
+        attr_reader :ngx_user, :ngx_group, :nginx_log_dir, :ngx_sbin_path, :package_name,
+            :builtfile, :dist_to, :tarball, :src, :url, :home_dir, :dist_dir, :is_openresty, :ngx_version
 
         def initialize(opts={})
             @home_dir = opts[:home_dir]
             @dist_dir = opts[:dist_dir]
             @ngx_version = opts[:ngx_version]
             @is_openresty = opts[:is_openresty]
-            @ngx_user = opts[:ngx_user]
-            @ngx_group = opts[:ngx_group]
             @package_name = opts[:package_name]
             @dist_to = File.join(@dist_dir, @package_name)
             @nginx_log_dir = File.join(@home_dir, "logs", @package_name)
@@ -32,15 +32,23 @@ module Nginxbrew
             @url = "#{@is_openresty ? OPENRESTY_URL : NGX_URL}/#{@tarball}"
             @ngx_sbin_path = File.join(@dist_to, "bin/nginx")
             @builtfile = File.join(@dist_to, "built")
-            @ngx_configure = nil
-            @ngx_conf_path = File.join(@dist_to, "conf/nginx.conf")
+            @ngx_conf_path = File.join(@dist_to, "nginx.conf")
+            @ngx_configure = {}
             @ngx_prefix = @dist_to
+            @ngx_user = "nginx"
+            @ngx_group = "nginx"
         end
 
         def configure_command
-            return @ngx_configure if @ngx_configure
+            dest = ["./configure"]
+            configure_options.inject(dest) do |memo, opt|
+                memo << "#{opt[0]}" + (opt[1].nil? ? "" : "=#{opt[1]}")
+                memo
+            end.join(" ")
+        end
+
+        def configure_options
             cmd =<<-EOF
-                ./configure \
                 --user=#{@ngx_user} \
                 --group=#{@ngx_group} \
                 --prefix=#{@ngx_prefix} \
@@ -50,11 +58,15 @@ module Nginxbrew
                 --http-log-path=#{@nginx_log_dir}/access.log \
                 --http-client-body-temp-path=#{@home_dir}/tmp/client_body \
                 --http-proxy-temp-path=#{@home_dir}/tmp/proxy \
-                --http-fastcgi-temp-path=#{@home_dir}/tmp/fastcgi \
-                --http-uwsgi-temp-path=#{@home_dir}/tmp/uwsgi \
                 --pid-path=#{@home_dir}/run/nginx.pid
             EOF
-            cmd.split(" ").join(" ")
+            dest = cmd.split(" ").inject({}) do |memo, opt|
+                kv = opt.split("=")
+                memo[kv[0]] = (kv.size == 2) ? kv[1] : nil
+                memo
+            end
+            dest.merge!(@ngx_configure) if @ngx_configure
+            dest
         end
 
         private

data/lib/nginxbrew/config/default.rb

@@ -1,5 +1,14 @@
 Nginxbrew.configure do |config|
     # config.ngx_prefix = File.join(config.home_dir, "share")
     # config.ngx_conf_path = File.join(config.home_dir, "conf/nginx.conf")
+    # config.ngx_user = "nobody"
+    # config.ngx_group = "nobody"
+    # config.ngx_configure.merge!({
+    #     "--with-lua51" => nil,
+    #     "--pid-path" => "/tmp/nginx.pid",
+    #     "--http-fastcgi-temp-path" => File.join(config.home_dir, "/tmp/fastcgi"),
+    #     "--http-uwsgi-temp-path" => File.join(config.home_dir, "/tmp/uwsgi"),
+    #     "--with-select_module" => nil,
+    # })
 end
 

data/lib/nginxbrew/local.rb

@@ -0,0 +1,66 @@
+require "fileutils"
+
+module Nginxbrew
+
+    module Local
+    
+        class Ngx
+        
+            attr_reader :is_openresty, :raw_version, :version
+
+            def initialize(opts={})
+                @is_openresty = opts[:is_openresty]
+                @raw_version = opts[:raw_version]
+                @version = opts[:version]
+            end
+
+            def is?(version)
+                @version == version
+            end
+
+            def openresty?
+                @is_openresty
+            end
+
+            def name
+                @version
+            end
+
+        end
+
+        def builds(dist_dir)
+            dest = []
+            return dest unless FileTest.directory?(dist_dir)
+            child_dirs = Pathname.new(dist_dir).children.select{|e| e.directory? }
+            child_dirs.inject(dest) do |memo, d|
+                version = NamingConvention.version_from_package(File.basename(d))
+                is_openresty = NamingConvention.openresty?(version)
+                raw_version = is_openresty ?
+                    NamingConvention.openresty_to_raw_version(version) : version
+                $logger.debug("built package: #{d} -> #{is_openresty}, #{raw_version}")
+                memo << Ngx.new(
+                    :is_openresty => is_openresty,
+                    :raw_version => raw_version,
+                    :version => version
+                )
+                memo
+            end
+        end
+
+        def find(config)
+            builds(config.dist_dir).detect do |b|
+                b.raw_version == config.ngx_version &&
+                    b.is_openresty == config.is_openresty
+            end
+        end
+
+        def count_of_builds(dist_dir)
+            builds(dist_dir).size
+        end
+
+        module_function :builds, :find, :count_of_builds
+
+    end
+
+end
+

data/lib/nginxbrew/nginxes.rb

@@ -14,48 +14,6 @@ module Nginxbrew
 
     end
 
-    class LocalEnv
-
-        def initialize(dist_dir)
-            @dist_dir = dist_dir
-        end
-
-        def exists?(raw_version, is_openresty)
-            ret = installed_packages.detect do |v, data|
-                v == raw_version && data[:openresty] == is_openresty
-            end
-            !ret.nil?
-        end
-
-        def installed_packages
-            dest = {}
-            return dest unless FileTest.directory?(@dist_dir)
-            child_dirs.inject(dest) do |memo, d|
-                version = NamingConvention.version_from_package(File.basename(d))
-                is_openresty = NamingConvention.openresty?(version)
-                raw_version = is_openresty ?
-                    NamingConvention.openresty_to_raw_version(version) : version
-                memo[version] = {
-                    :openresty => is_openresty,
-                    :raw_version => raw_version,
-                    :version => version
-                }
-                memo
-            end
-        end
-
-        def has_one_build?
-            installed_packages.size == 1
-        end
-
-        private
-
-        def child_dirs
-            Pathname.new(@dist_dir).children.select{|e| e.directory? }
-        end
-
-    end
-
     class Nginxes
 
         TypeNginx = "nginx"

data/lib/nginxbrew/tasks.rb

@@ -1,14 +1,12 @@
 #!/usr/bin/env ruby
-require "pathname"
 require "fileutils"
 
 verbose(false) # stop verbosing by rake
 
-VERSION = ENV["VERSION"]
 
 HOME_DIR = ENV["NGINXBREW_HOME"] || File.join(ENV["HOME"], "nginxbrew")
-NGINX_USER = ENV["NGINXBREW_USER"] || "nginx"
-NGINX_GROUP = ENV["NGINXBREW_GROUP"] || "nginx"
+$stdout.puts("using '#{HOME_DIR}' as nginxbrew home") if ENV["NGINXBREW_HOME"]
+
 
 CONFIG_FILE = ENV["NGINXBREW_CONFIG"]
 if CONFIG_FILE && !FileTest.file?(CONFIG_FILE)
@@ -26,14 +24,12 @@ NGINX_BIN = "#{BIN_DIR}/nginx"
     directory dir
 end
 
-local_env = Nginxbrew::LocalEnv.new(DIST_DIR)
-
 
-if VERSION
+if ENV["VERSION"]
     require "nginxbrew/config/base"
 
     $stdout.puts("checking version ...")
-    raw_version, is_openresty = NamingConvention.resolve(VERSION)
+    raw_version, is_openresty = NamingConvention.resolve(ENV["VERSION"])
     nginxes = is_openresty ? Nginxbrew::Nginxes.openresties : Nginxbrew::Nginxes.nginxes
     raw_version = nginxes.head_of(raw_version)
     package_name = NamingConvention.package_name_from(raw_version, is_openresty)
@@ -45,9 +41,7 @@ if VERSION
         :dist_dir => DIST_DIR,
         :ngx_version => raw_version,
         :package_name => package_name,
-        :is_openresty => is_openresty,
-        :ngx_user => NGINX_USER,
-        :ngx_group => NGINX_GROUP
+        :is_openresty => is_openresty
     )
 
     require "nginxbrew/config/default"
@@ -92,7 +86,7 @@ if VERSION
 
     desc "check nginx version duplication before install"
     task :check_duplicatate do
-        if local_env.exists?(raw_version, is_openresty)
+        unless Nginxbrew::Local.find(config).nil?
             warn "#{config.package_name} is already installed"
         end
     end
@@ -101,7 +95,7 @@ if VERSION
     desc "install nginx"
     task :install => [:check_duplicatate, config.builtfile] do
         Rake::Task[:chown].invoke
-        if local_env.has_one_build?
+        if Nginxbrew::Local.count_of_builds(config.dist_dir) == 1
             $stdout.puts("this is first install, use this version as default")
             Rake::Task[:use].invoke
         end
@@ -110,6 +104,8 @@ if VERSION
 
     desc "switch nginx version"
     task :use => [BIN_DIR, :chown] do
+        ngx = Nginxbrew::Local.find(config)
+        puts "ngx=#{ngx}"
         unless FileTest.directory?(config.dist_to)
             raise_abort "#{config.package_name} is not installed!"
         end
@@ -118,6 +114,7 @@ if VERSION
         $stdout.puts("#{config.package_name} default to use")
         $stdout.puts("bin linked to #{config.ngx_sbin_path}")
     end
+
 end
 
 
@@ -142,9 +139,9 @@ task :list => DIST_DIR do
         2.times {|i| path_list.pop } # remove bin/nginx
         used_version = NamingConvention.version_from_package(path_list.pop)
     end
-    local_env.installed_packages.keys.sort.each do |v|
-        prefix = (v == used_version) ? "*" : " "
-        $stdout.puts("#{prefix} #{v}")
+    Nginxbrew::Local.builds(DIST_DIR).each do |ngx|
+        prefix = ngx.is?(used_version) ? "*" : " "
+        $stdout.puts("#{prefix} #{ngx.name}")
     end
 end
 
@@ -168,3 +165,34 @@ task :openresties do
         $stdout.puts("[ngx_openresty-]#{v}")
     end
 end
+
+
+desc "Output  new configfile for nginxbrew into specified path as {makeconf_OUTPUT_TO}"
+task :makeconf do
+    output_to = ENV["makeconf_OUTPUT_TO"]
+
+    from_file = File.join(File.dirname(__FILE__), "config/default.rb")
+    abort "crit, #{from_file} is not found" unless FileTest.file?(from_file)
+
+    to_file = FileTest.directory?(output_to) ?
+        File.join(output_to, "nginxbrew_conf.rb") : output_to
+    to_file = File.expand_path(to_file)
+    abort "config:'#{to_file}' is alrady exists!" if FileTest.file?(to_file)
+    abort "extname is must be '.rb'" if File.extname(to_file) != ".rb"
+
+    sh_exc("cp", from_file, to_file)
+
+    msg =<<-EOF
+'#{to_file}' is created, successfully.
+You can use this configuration by env NGINXBREW_CONFIG like as follows.
+
+ $ export NGINXBREW_CONFIG=#{to_file}
+
+  or
+
+ $ echo "export NGINXBREW_CONFIG=#{to_file}" >> ~/.bashrc && source ~/.bashrc
+    EOF
+
+    $stdout.puts(msg)
+end
+

data/lib/nginxbrew/version.rb

@@ -1,3 +1,3 @@
 module Nginxbrew
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/nginxbrew.rb

@@ -2,6 +2,7 @@ require "rake"
 
 require "nginxbrew/version"
 require "nginxbrew/nginxes"
+require "nginxbrew/local"
 require "nginxbrew/convention"
 require "nginxbrew/rake_tools"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nginxbrew
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - takumakanari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,7 @@ files:
 - lib/nginxbrew/config/base.rb
 - lib/nginxbrew/config/default.rb
 - lib/nginxbrew/convention.rb
+- lib/nginxbrew/local.rb
 - lib/nginxbrew/nginxes.rb
 - lib/nginxbrew/rake_tools.rb
 - lib/nginxbrew/tasks.rb
@@ -100,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Multi installation for nginx.