nginxbrew 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aabc418d552ab2bf54ddc4abea78611304b1054f
-  data.tar.gz: 3e5c0bc01e29256503496c75ba812c9b4423d930
+  metadata.gz: a3799667578a5c727746f7e909d6fed330883248
+  data.tar.gz: 7dc63e4e01c90743aee52c1e08b851d098672900
 SHA512:
-  metadata.gz: 88e879d44a09080b6b86bad2239fbddbd404cbfc7889a265db05cbf218c918b0fedf5523b6a2f3db57f83b92f2c0fb1f9122e0e1ce1dd1de13a23ab96ab3aa88
-  data.tar.gz: 74d913c3335dfe272a6aafb513ec998dd3c0234d0e1caf539d4e484259905dbdd211adbf7a651ea35c251f04ecf7e0d7a0d1b11ddd5e7155bb38962d3ec2e084
+  metadata.gz: b3bed7f44b4598dd7ede862342dfcb5abd8f701617c6154d7124981f530f273a19ac2efe0cf0a4c34111577831af87a136ab8649077109e48627c45b5f1c4f68
+  data.tar.gz: 39872bdf3f1692d21237469540fa2372111edb2aa740cfaae12be887908a9acbab1c1f3d6526b167142245e16d6ba2e9f3e367e7b605cc5a70c79058c5c31141

data/CHANGES.txt

@@ -1,5 +1,11 @@
 Nginxbrew changes
 
+Nginxbrew 0.0.5
+ - Changed some directory/path for installation.
+ - Quiet shell outs.
+ - Hide src directory.
+ - Bug fixes.
+
 
 Nginxbrew 0.0.4
  - New command nginxies, openresties to show up available nginx versions.

data/README.md

@@ -31,13 +31,15 @@ If you need to install openresty,
     $ nginxbrew install openresty-1.7.0.1
 
 
-After the command execution, ~/nginxbrew will be created into your machine and nginx is installed as follows
+After the command execution, ~/nginxbrew (or path which set NGINXBREW_HOME in env) will be created into your machine and nginx is installed as follows
+
+    ~/nginxbrew/bin/nginx                           -- current sbin
+    ~/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>/bin/nginx    -- nginx bin for each version
 
-    ~/nginxbrew/bin/nginx -- current sbin
-    ~/nginxbrew/logs/<version> -- logfiles
-    ~/nginxbrew/versions/ngx-<version>/nginx.conf -- root config file
-    ~/nginxbrew/versions/ngx-<version> -- configs, sbin|pid of each version
-    ~/nginxbrew/versions/ngx-<version>/user/share -- $prefix directory of each version
 
 Then you can start up nginx by command which same as original nginx as follows
 

data/bin/nginxbrew

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 require "nginxbrew"
+require "logger"
+
 
 usage =<<-EOF
 Usage: nginxbrew [-v] [-h] command [<args>]
@@ -38,6 +40,12 @@ end
 ENV["HOME"] ||= File.dirname(__FILE__) # recover $HOME if empty
 
 
+$debug = ENV["NGINXBREW_DEBUG"].to_i == 1
+
+$logger = Logger.new(STDOUT)
+$logger.level = $debug ? Logger::DEBUG : Logger::ERROR
+
+
 begin
     command = ARGV.shift
     case command
@@ -55,8 +63,10 @@ begin
             raise Exception.new("Unknown command '#{command}'")
     end
 rescue SystemExit => e # from rake.abort
+    $stderr.puts e.backtrace if $debug
     exit 255
 rescue Exception => e
+    $stderr.puts e.backtrace if $debug
     $stderr.puts "ERROR: #{e.message}"
     exit 255
 end

data/lib/nginxbrew.rb

@@ -1,6 +1,11 @@
-require "nginxbrew/version"
 require "rake"
 
+require "nginxbrew/version"
+require "nginxbrew/nginxes"
+require "nginxbrew/convention"
+require "nginxbrew/rake_tools"
+
+
 module Nginxbrew
 
     def run(command, env={})

data/lib/nginxbrew/config/base.rb

@@ -15,7 +15,7 @@ module Nginxbrew
         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, :version_name
+            :ngx_sbin_path, :package_name
 
         def initialize(opts={})
             @home_dir = opts[:home_dir]
@@ -24,17 +24,17 @@ module Nginxbrew
             @is_openresty = opts[:is_openresty]
             @ngx_user = opts[:ngx_user]
             @ngx_group = opts[:ngx_group]
-            @version_name = create_version_name(@ngx_version, @is_openresty)
-            @dist_to = File.join(@dist_dir, "ngx-#{@version_name}")
-            @nginx_log_dir = File.join(@home_dir, "logs", @version_name)
+            @package_name = opts[:package_name]
+            @dist_to = File.join(@dist_dir, @package_name)
+            @nginx_log_dir = File.join(@home_dir, "logs", @package_name)
             @src = src_name(@ngx_version, @is_openresty)
             @tarball = "#{@src}.tar.gz"
             @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, "nginx.conf")
-            @ngx_prefix = File.join(@dist_to, "user/share")
+            @ngx_conf_path = File.join(@dist_to, "conf/nginx.conf")
+            @ngx_prefix = @dist_to
         end
 
         def configure_command
@@ -59,10 +59,6 @@ module Nginxbrew
 
         private
 
-        def create_version_name(v, is_openresty)
-            is_openresty ? "openresty-#{v}" : v
-        end
-
         def src_name(v, is_openresty)
             is_openresty ? "ngx_openresty-#{v}" : "nginx-#{v}"
         end

data/lib/nginxbrew/config/default.rb

@@ -1,5 +1,5 @@
 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_conf_path = File.join(config.home_dir, "conf/nginx.conf")
 end
 

data/lib/nginxbrew/convention.rb

@@ -0,0 +1,43 @@
+require "pathname"
+require "fileutils"
+
+
+module Nginxbrew
+
+    class NamingConvention
+
+        NGX = "ngx-"
+
+        OPENRESTY = "openresty-" # <NGX>-<OPENRESTY>-x.x.x
+
+        def self.resolve(version)
+            is_openresty = openresty?(version)
+            raw_version = is_openresty ? openresty_to_raw_version(version) : version
+            [raw_version, is_openresty]
+        end
+
+        def self.openresty?(v)
+            v.index(OPENRESTY) == 0
+        end
+
+        def self.openresty_to_raw_version(v)
+            v.slice(OPENRESTY.size, v.size - 1)
+        end
+
+        def self.package_name_from(raw_version, is_openresty)
+            "#{NGX}#{is_openresty ? OPENRESTY : ''}#{raw_version}"
+        end
+
+        def self.version_from_package(name)
+            idx = name.index(NGX)
+            if idx > -1
+                ret = name.slice(NGX.size, name.size - 1).strip
+                return ret if ret.size > 0
+            end
+            raise Exception.new("Invalid version name '#{name}'")
+        end
+
+    end
+
+end
+

data/lib/nginxbrew/nginxes.rb

@@ -1,6 +1,8 @@
 require "net/http"
 require "uri"
 
+include Nginxbrew
+
 
 module Nginxbrew
 
@@ -12,6 +14,48 @@ 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"
@@ -25,7 +69,11 @@ module Nginxbrew
             end
             raise Exception.new("No versions of nginx!") if versions.size == 0
             @ngx_type = ngx_type
-            @versions = versions.uniq.sort.reverse
+            @versions = versions.uniq.map do |v|
+                Gem::Version.new(v) # 1.15.x <> 1.8.x should be 1.15.x > 1.8.x
+            end.sort.reverse.map do |v|
+                v.to_s
+            end
         end
 
         def size

data/lib/nginxbrew/rake_tools.rb

@@ -0,0 +1,12 @@
+def sh_exc(cmd, *opts)
+    line = cmd
+    line += " " + opts.join(" ")
+    $logger.debug("#{line} dir=[#{Dir.pwd}]")
+    line += " >/dev/null" unless $debug
+    sh line
+end
+
+
+def raise_abort(msg)
+    abort "[aborted] #{msg}"
+end

data/lib/nginxbrew/tasks.rb

@@ -1,54 +1,11 @@
 #!/usr/bin/env ruby
-require "logger"
 require "pathname"
 require "fileutils"
-require "nginxbrew/nginxes"
 
-
-$logger = Logger.new(STDOUT)
-$logger.level = (ENV["NGINXBREW_DEBUG"].to_i == 1) ? Logger::DEBUG : Logger::ERROR
-
-
-def package_name_from(version)
-    "ngx-#{version}"
-end
-
-
-def version_from_package(name)
-    prefix = "ngx-"
-    idx = name.index(prefix)
-    raise_abort "Invalid name #{name}" if idx < 0
-    name.slice(prefix.size, name.size - 1)
-end
-
-
-def installed_packages(root)
-    dest = {}
-    return dest unless FileTest.directory?(root)
-    Pathname.new(root).children.select{|e| e.directory? }.inject(dest) do |memo, d|
-        version = version_from_package(File.basename(d))
-        memo[version] = d
-        memo
-    end
-end
-
-
-def sh_exc(cmd, *opts)
-    line = cmd
-    line += " " + opts.join(" ")
-    $logger.debug("exec: #{line}")
-    sh line
-end
-
-
-def raise_abort(msg)
-    abort "[aborted] #{msg}"
-end
-
-
-OPENRESTY = "openresty-"
+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"
@@ -59,41 +16,35 @@ if CONFIG_FILE && !FileTest.file?(CONFIG_FILE)
 end
 
 
-SOURCE_DIR = "#{HOME_DIR}/src"
+SOURCE_DIR = "#{HOME_DIR}/.src"
 DIST_DIR = "#{HOME_DIR}/versions"
 BIN_DIR = "#{HOME_DIR}/bin"
-NGINX_CURRENT_BIN_NAME = "#{BIN_DIR}/nginx"
+NGINX_BIN = "#{BIN_DIR}/nginx"
 
 
 [HOME_DIR, SOURCE_DIR, BIN_DIR, DIST_DIR].each do |dir|
     directory dir
 end
 
+local_env = Nginxbrew::LocalEnv.new(DIST_DIR)
+
 
 if VERSION
     require "nginxbrew/config/base"
 
-    is_openresty = VERSION.index(OPENRESTY) == 0
-
-    # resolve version name
     $stdout.puts("checking version ...")
+    raw_version, is_openresty = NamingConvention.resolve(VERSION)
     nginxes = is_openresty ? Nginxbrew::Nginxes.openresties : Nginxbrew::Nginxes.nginxes
-    version = nil
-    raw_version = nil
-    if is_openresty
-        raw_version = nginxes.head_of(VERSION.slice(OPENRESTY.size, VERSION.size - 1))
-        version = "#{OPENRESTY}#{raw_version}"
-    else
-        raw_version = nginxes.head_of(VERSION)
-        version = raw_version
-    end
+    raw_version = nginxes.head_of(raw_version)
+    package_name = NamingConvention.package_name_from(raw_version, is_openresty)
     $stdout.puts("resolved version: [#{is_openresty ? 'openresty' : 'nginx'}-]#{raw_version}")
-
+    $stdout.puts("nginx package: #{package_name}")
 
     Nginxbrew.config = Nginxbrew::Configuration.new(
         :home_dir => HOME_DIR,
         :dist_dir => DIST_DIR,
         :ngx_version => raw_version,
+        :package_name => package_name,
         :is_openresty => is_openresty,
         :ngx_user => NGINX_USER,
         :ngx_group => NGINX_GROUP
@@ -107,28 +58,30 @@ if VERSION
 
     directory config.dist_to
 
-    TARBALL_DOWNLOADED_TO = File.join(SOURCE_DIR, config.tarball)
-    SOURCE_EXTRACTED_TO = File.join(SOURCE_DIR, config.src)
+    tarball_download_to = File.join(SOURCE_DIR, config.tarball)
+    source_extract_to = File.join(SOURCE_DIR, config.src)
 
-    desc "get nginx tarball version:#{version}"
-    file TARBALL_DOWNLOADED_TO => SOURCE_DIR do
+    desc "get nginx tarball version:#{config.package_name}"
+    file tarball_download_to => SOURCE_DIR do
+        $stdout.puts("download #{config.package_name} from #{config.url}")
         Dir.chdir(SOURCE_DIR) do
-            sh_exc("wget", config.url)
+            sh_exc("wget", config.url, "-q")
         end
     end
 
 
-    desc "extract tarball, #{SOURCE_EXTRACTED_TO} will be created"
-    directory SOURCE_EXTRACTED_TO => TARBALL_DOWNLOADED_TO do
+    desc "extract tarball, #{source_extract_to} will be created"
+    directory source_extract_to => tarball_download_to do
         Dir.chdir(SOURCE_DIR) do
-            sh_exc("tar", "zxf", TARBALL_DOWNLOADED_TO)
+            sh_exc("tar", "zxf", tarball_download_to)
         end
     end
 
 
     desc "do build/install, after that create file:built to keep status of build"
-    file config.builtfile => [SOURCE_EXTRACTED_TO, config.dist_to] do
-        Dir.chdir(SOURCE_EXTRACTED_TO) do
+    file config.builtfile => [source_extract_to, config.dist_to] do
+        $stdout.puts("building #{config.package_name} ...")
+        Dir.chdir(source_extract_to) do
             [config.configure_command, "gmake -j2", "gmake install"].each do |cmd|
                 sh_exc(cmd)
             end
@@ -139,8 +92,8 @@ if VERSION
 
     desc "check nginx version duplication before install"
     task :check_duplicatate do
-        if installed_packages(config.dist_dir).keys.include?(version)
-            raise_abort "#{config.version_name} is already installed"
+        if local_env.exists?(raw_version, is_openresty)
+            warn "#{config.package_name} is already installed"
         end
     end
 
@@ -148,8 +101,8 @@ if VERSION
     desc "install nginx"
     task :install => [:check_duplicatate, config.builtfile] do
         Rake::Task[:chown].invoke
-        if installed_packages(DIST_DIR).size == 1
-            $logger.debug("this is first install, use this version as default")
+        if local_env.has_one_build?
+            $stdout.puts("this is first install, use this version as default")
             Rake::Task[:use].invoke
         end
     end
@@ -157,11 +110,13 @@ if VERSION
 
     desc "switch nginx version"
     task :use => [BIN_DIR, :chown] do
-        raise_abort "#{config.version_name} is not installed!" unless FileTest.directory?(config.dist_to)
-        FileUtils.ln_s(config.ngx_sbin_path, NGINX_CURRENT_BIN_NAME, :force => true)
+        unless FileTest.directory?(config.dist_to)
+            raise_abort "#{config.package_name} is not installed!"
+        end
+        FileUtils.ln_s(config.ngx_sbin_path, NGINX_BIN, :force => true)
         Rake::Task[:chown].invoke
-        $stdout.puts("#{version} default to use")
-        $stdout.puts("bin: #{config.ngx_sbin_path}")
+        $stdout.puts("#{config.package_name} default to use")
+        $stdout.puts("bin linked to #{config.ngx_sbin_path}")
     end
 end
 
@@ -181,13 +136,13 @@ end
 desc "list installed nginx"
 task :list => DIST_DIR do
     used_version = nil
-    if FileTest.file?(NGINX_CURRENT_BIN_NAME)
-        target_path = File.readlink(NGINX_CURRENT_BIN_NAME)
+    if FileTest.file?(NGINX_BIN)
+        target_path = File.readlink(NGINX_BIN)
         path_list = target_path.split("/")
         2.times {|i| path_list.pop } # remove bin/nginx
-        used_version = version_from_package(path_list.pop)
+        used_version = NamingConvention.version_from_package(path_list.pop)
     end
-    installed_packages(DIST_DIR).keys.sort.each do |v|
+    local_env.installed_packages.keys.sort.each do |v|
         prefix = (v == used_version) ? "*" : " "
         $stdout.puts("#{prefix} #{v}")
     end

data/lib/nginxbrew/version.rb

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

data/nginxbrew.gemspec

@@ -21,4 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
+
+  spec.required_ruby_version = ">= 2.0.0"
 end

data/spec/convention_spec.rb

@@ -0,0 +1,57 @@
+require "spec_helper"
+require "nginxbrew"
+require "nginxbrew/convention"
+
+include Nginxbrew
+
+
+describe Nginxbrew::NamingConvention, "controls versions/builds in local env" do
+
+    it "make package name from version for nginx" do
+        ret = NamingConvention.package_name_from("1.1.1", false)
+        expect(ret).to eq "ngx-1.1.1"
+    end
+
+    it "make package name from version for openresty" do
+        ret = NamingConvention.package_name_from("1.1.1", true)
+        expect(ret).to eq "ngx-openresty-1.1.1"
+    end
+
+    it "can get correct version from package name" do
+        ret = NamingConvention.version_from_package("ngx-1.1.1")
+        expect(ret).to eq "1.1.1"
+    end
+
+    it "raise error if package name is invalid (prefix is wrong)" do
+        expect {
+            NamingConvention.version_from_package("INVALID-1.1.1")
+        }.to raise_error
+    end
+
+    it "raise error if package name is invalid (only prefix)" do
+        expect {
+            NamingConvention.version_from_package("ngx-")
+        }.to raise_error
+    end
+
+    it "true/false from openresty?" do
+        expect(NamingConvention.openresty?("openresty-1.1.1")).to be_truthy
+        expect(NamingConvention.openresty?("NOTOPENRESTY-1.1.1")).to be_falsey
+    end
+
+    it "can get raw version from openresty" do
+        ret = NamingConvention.openresty_to_raw_version("openresty-1.1.1")
+        expect(ret).to eq "1.1.1"  
+    end
+
+    it "resolve ngx versions" do
+        ret = NamingConvention.resolve("1.1.1")
+        expect(ret).to match_array ["1.1.1", false]
+    end
+
+    it "resolve openresty versions" do
+        ret = NamingConvention.resolve("openresty-1.1.1")
+        expect(ret).to match_array ["1.1.1", true]
+    end
+
+end

data/spec/nginxes_spec.rb

@@ -77,9 +77,9 @@ describe Nginxbrew::Nginxes, "version control" do
     it "versions should be sorted order by version-number desc" do
         nginxes = Nginxbrew::Nginxes.new(
             Nginxbrew::Nginxes::TypeNginx,
-            %w(0.0.1 0.0.2 0.1.0 0.1.1 1.0.0 1.0.1 1.1.0 2.0.0)
+            %w(0.0.1 0.0.2 0.1.0 0.1.1 1.0.0 1.0.1 1.1.0 2.15.1 2.8.15)
         )
-        expect(nginxes.versions).to eq %w(2.0.0 1.1.0 1.0.1 1.0.0 0.1.1 0.1.0 0.0.2 0.0.1)
+        expect(nginxes.versions).to eq %w(2.15.1 2.8.15 1.1.0 1.0.1 1.0.0 0.1.1 0.1.0 0.0.2 0.0.1)
     end
 
     it "head_of should returns head of versions" do
@@ -92,4 +92,13 @@ describe Nginxbrew::Nginxes, "version control" do
         expect(nginxes.head_of("0")).to eq "0.1.1"
     end
 
+    it "head_of is first element of versions which sorted by version number" do
+        nginxes = Nginxbrew::Nginxes.new(
+            Nginxbrew::Nginxes::TypeNginx,
+            %w(1.5.8.1 1.5.12.1 1.5.11.1)
+        )
+        expect(nginxes.head_of("1.5")).to eq "1.5.12.1"
+        expect(nginxes.head_of("1")).to eq "1.5.12.1"
+    end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nginxbrew
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - takumakanari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-25 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,10 +71,13 @@ files:
 - lib/nginxbrew.rb
 - lib/nginxbrew/config/base.rb
 - lib/nginxbrew/config/default.rb
+- lib/nginxbrew/convention.rb
 - lib/nginxbrew/nginxes.rb
+- lib/nginxbrew/rake_tools.rb
 - lib/nginxbrew/tasks.rb
 - lib/nginxbrew/version.rb
 - nginxbrew.gemspec
+- spec/convention_spec.rb
 - spec/nginxes_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -89,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -102,5 +105,6 @@ signing_key:
 specification_version: 4
 summary: Multi installation for nginx.
 test_files:
+- spec/convention_spec.rb
 - spec/nginxes_spec.rb
 - spec/spec_helper.rb