nginxbrew 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2f5664ba79c8666cfbbe84bc5439cc5927479fd
-  data.tar.gz: 5a6ecb595b467736b8bdc30950e1ec5516dbb36d
+  metadata.gz: aabc418d552ab2bf54ddc4abea78611304b1054f
+  data.tar.gz: 3e5c0bc01e29256503496c75ba812c9b4423d930
 SHA512:
-  metadata.gz: 053144c4e831fa606289cbd9482c136d15d69ae8de4c4b803f2738bb41c411cb6561b81bb428b4c8ba0c8988aba223ae834267b2e386bc0de3e7c6e2a4b525c8
-  data.tar.gz: e1927c314e0373385570ba85d582e458990e6b7c0f65337a4fd3d87c532289e997226c7ae94eb805f2c8fe4caf74fad4e2d979598cb510f8ebdadf7897c35279
+  metadata.gz: 88e879d44a09080b6b86bad2239fbddbd404cbfc7889a265db05cbf218c918b0fedf5523b6a2f3db57f83b92f2c0fb1f9122e0e1ce1dd1de13a23ab96ab3aa88
+  data.tar.gz: 74d913c3335dfe272a6aafb513ec998dd3c0234d0e1caf539d4e484259905dbdd211adbf7a651ea35c251f04ecf7e0d7a0d1b11ddd5e7155bb38962d3ec2e084

data/.gitignore

@@ -12,3 +12,4 @@
 *.o
 *.a
 mkmf.log
+/vendor/

data/CHANGES.txt

@@ -0,0 +1,13 @@
+Nginxbrew changes
+
+
+Nginxbrew 0.0.4
+ - New command nginxies, openresties to show up available nginx versions.
+ - Change `configure` option to share pid-file, tmp dir extend over all builds.
+ - Change `make` to add -j2, TODO get num of CPUs dynamically
+ - Bug fixes.
+
+
+Nginxbrew 0.0.3
+ - Initial commit.
+

data/README.md

@@ -62,6 +62,22 @@ If you want to use openresty-1.7.0.1 from other version of nginx, you can do thi
 
     $ nginxbrew use openresty-1.7.0.1
 
+
+You can see all exsiting versions of nginxes/openresties by the following command.
+
+    $ nginxbrew nginxes
+    $ nginxbrew openresties
+
+If you specify prefix of version, the version will be filtered. 
+
+    $ nginxbrew nginxes 1.7
+      [nginx-]1.7.6
+      [nginx-]1.7.5
+      [nginx-]1.7.4
+       ...
+      [nginx-]1.7.0
+
+
 ## Customize configuration
 
 You can customize Nginxbrew behavior by changing ENV.
@@ -95,14 +111,18 @@ then nginxbrew starts to using this configuration.
 ## TODO
 
  - write tests completely
- - share nginx.conf for every versions
- - list up available nginx versions like as follows
+ - installable the same version of nginx with defferent labels like as follows
+
+    $ nginxbrew install prj1 1.7.6
+
+    $ nginxbrew install prj2 1.7.6
+
+    $ nginxbrew use 1.7.6-prj1
 
-     $ nginxbrew nginxes
+ - multiple install
 
- - installable without specifying minor version of nginx like as follows
+    $ nginxbrew install 1.4 openresty-1.7 1.7.5
 
-     $ nginxbrew install 1.7 # head of 1.7 will be installed
 
 ## Contributing
 

data/bin/nginxbrew

@@ -10,7 +10,9 @@ Usage: nginxbrew [-v] [-h] command [<args>]
 Available subcommands:
     install <version>                Install nginx with specified version.
     use <version>                    Switch nginx into specified version.
-    list                             Show list of installed nginx versions
+    list                             Show list of installed nginx versions.
+    nginxes                          Show list of available nginx versions.
+    openresties                      Show list of available openresty versions.
 
 Optional environments:
     NGINXBREW_HOME                   Path to nginxbrew (will be) installed, ~/nginxbrew is default.
@@ -45,6 +47,10 @@ begin
             Nginxbrew.run(:"#{command}", envs={ "VERSION" => version })
         when "list"
             Nginxbrew.run(:list)
+        when "nginxes"
+            Nginxbrew.run(:nginxes, envs={ "HEAD_VERSION" => ARGV.shift })
+        when "openresties"
+            Nginxbrew.run(:openresties, envs={ "HEAD_VERSION" => ARGV.shift })
         else
             raise Exception.new("Unknown command '#{command}'")
     end

data/lib/nginxbrew/config/base.rb

@@ -14,7 +14,8 @@ 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, :ngx_sbin_path
+            :builtfile, :dist_to, :tarball, :src, :url, :home_dir, :dist_dir,
+            :ngx_sbin_path, :version_name
 
         def initialize(opts={})
             @home_dir = opts[:home_dir]
@@ -23,9 +24,10 @@ module Nginxbrew
             @is_openresty = opts[:is_openresty]
             @ngx_user = opts[:ngx_user]
             @ngx_group = opts[:ngx_group]
-            @dist_to = File.join(@dist_dir, "ngx-#{@ngx_version}")
-            @nginx_log_dir = File.join(@home_dir, "logs", @ngx_version)
-            @src = opts[:src]
+            @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)
+            @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")
@@ -46,15 +48,25 @@ module Nginxbrew
                 --conf-path=#{@ngx_conf_path} \
                 --error-log-path=#{@nginx_log_dir}/error.log \
                 --http-log-path=#{@nginx_log_dir}/access.log \
-                --http-client-body-temp-path=#{@dist_to}/tmp/client_body \
-                --http-proxy-temp-path=#{@dist_to}/tmp/proxy \
-                --http-fastcgi-temp-path=#{@dist_to}/tmp/fastcgi \
-                --http-uwsgi-temp-path=#{@dist_to}/tmp/uwsgi \
-                --pid-path=#{@dist_to}/run/nginx.pid
+                --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(" ")
         end
 
+        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
+
     end
 
 end

data/lib/nginxbrew/nginxes.rb

@@ -0,0 +1,87 @@
+require "net/http"
+require "uri"
+
+
+module Nginxbrew
+
+    class VersionNotFoundError < StandardError
+
+        def initialize(v)
+            super("version '#{v}' is not found in all versions of nginxes/openresties")
+        end
+
+    end
+
+    class Nginxes
+
+        TypeNginx = "nginx"
+        TypeOpenresty = "openresty"
+
+        attr_reader :ngx_type, :versions
+
+        def initialize(ngx_type, versions)
+            unless [TypeNginx, TypeOpenresty].include?(ngx_type)
+                raise Exception.new("Invalid ngx_type #{ngx_type}")
+            end
+            raise Exception.new("No versions of nginx!") if versions.size == 0
+            @ngx_type = ngx_type
+            @versions = versions.uniq.sort.reverse
+        end
+
+        def size
+            @versions.size
+        end
+
+        def filter_versions(head_of)
+            src_numbers = head_of.split(".")
+            src_numbers_size = src_numbers.size
+            r = @versions.select do |v|
+                v.split(".").slice(0, src_numbers_size) == src_numbers
+            end
+            raise VersionNotFoundError.new(head_of) if r.size == 0
+            r
+        end
+
+        def head_of(version)
+            src_numbers = version.split(".")
+            src_numbers_size = src_numbers.size
+            r = @versions.detect do |v|
+                v.split(".").slice(0, src_numbers_size) == src_numbers
+            end
+            raise VersionNotFoundError.new(version) unless r
+            r
+        end
+
+        def self.nginxes
+            versions = html_body_of("http://nginx.org", "/download/").
+                gsub(/href="nginx\-([0-9\.]+?)\.tar\.gz"/).inject([]) do |memo, match|
+                    memo << $1
+                    memo
+            end
+            Nginxes.new(TypeNginx, versions)
+        end
+
+        def self.openresties
+            versions = html_body_of("http://openresty.org", "/").
+                gsub(/ngx_openresty\-([0-9\.]+?)\.tar\.gz/).inject([]) do |memo, match|
+                    memo << $1
+                    memo
+            end
+            Nginxes.new(TypeOpenresty, versions)
+        end
+
+        private
+
+        def self.html_body_of(host, page)
+            url = URI.parse(host)
+            res = Net::HTTP.start(url.host, url.port) {|http|
+                http.get(page)
+            }
+            raise Exception.new("Failed get list of nginx") if res.code.to_i != 200
+            res.body
+        end
+
+    end
+
+end
+

data/lib/nginxbrew/tasks.rb

@@ -2,6 +2,7 @@
 require "logger"
 require "pathname"
 require "fileutils"
+require "nginxbrew/nginxes"
 
 
 $logger = Logger.new(STDOUT)
@@ -16,13 +17,15 @@ end
 def version_from_package(name)
     prefix = "ngx-"
     idx = name.index(prefix)
-    abort "Invalid name #{name}" if idx < 0
+    raise_abort "Invalid name #{name}" if idx < 0
     name.slice(prefix.size, name.size - 1)
 end
 
 
 def installed_packages(root)
-    Pathname.new(root).children.select{|e| e.directory? }.inject({}) do |memo, d|
+    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
@@ -38,10 +41,15 @@ def sh_exc(cmd, *opts)
 end
 
 
+def raise_abort(msg)
+    abort "[aborted] #{msg}"
+end
+
+
 OPENRESTY = "openresty-"
 
-HOME_DIR = ENV["NGINXBREW_HOME"] || File.join(ENV["HOME"], "nginxbrew")
 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"
 
@@ -66,15 +74,27 @@ if VERSION
     require "nginxbrew/config/base"
 
     is_openresty = VERSION.index(OPENRESTY) == 0
-    version_ = VERSION
-    version_ = version_.slice(OPENRESTY.size, version_.size - 1) if is_openresty
+
+    # resolve version name
+    $stdout.puts("checking 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
+    $stdout.puts("resolved version: [#{is_openresty ? 'openresty' : 'nginx'}-]#{raw_version}")
+
 
     Nginxbrew.config = Nginxbrew::Configuration.new(
         :home_dir => HOME_DIR,
         :dist_dir => DIST_DIR,
-        :ngx_version => VERSION,
+        :ngx_version => raw_version,
         :is_openresty => is_openresty,
-        :src => is_openresty ? "ngx_openresty-#{version_}" : "nginx-#{version_}",
         :ngx_user => NGINX_USER,
         :ngx_group => NGINX_GROUP
     )
@@ -90,7 +110,7 @@ if VERSION
     TARBALL_DOWNLOADED_TO = File.join(SOURCE_DIR, config.tarball)
     SOURCE_EXTRACTED_TO = File.join(SOURCE_DIR, config.src)
 
-    desc "get nginx tarball version:#{VERSION}"
+    desc "get nginx tarball version:#{version}"
     file TARBALL_DOWNLOADED_TO => SOURCE_DIR do
         Dir.chdir(SOURCE_DIR) do
             sh_exc("wget", config.url)
@@ -108,17 +128,26 @@ if VERSION
 
     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
-                [config.configure_command, "gmake", "gmake install"].each do |cmd|
-                    sh_exc(cmd)
-                end
+        Dir.chdir(SOURCE_EXTRACTED_TO) do
+            [config.configure_command, "gmake -j2", "gmake install"].each do |cmd|
+                sh_exc(cmd)
             end
-            sh_exc("touch", config.builtfile)
+        end
+        sh_exc("touch", config.builtfile)
+    end
+
+
+    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"
+        end
     end
 
 
     desc "install nginx"
-    task :install => [config.builtfile] do
+    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")
             Rake::Task[:use].invoke
@@ -128,9 +157,10 @@ if VERSION
 
     desc "switch nginx version"
     task :use => [BIN_DIR, :chown] do
-        abort "version:#{VERSION} is not installed!" unless FileTest.directory?(config.dist_to)
+        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)
-        $stdout.puts("#{VERSION} default to use")
+        Rake::Task[:chown].invoke
+        $stdout.puts("#{version} default to use")
         $stdout.puts("bin: #{config.ngx_sbin_path}")
     end
 end
@@ -142,7 +172,7 @@ task :chown do
     user = ENV["USER"]
     if sudo_user && sudo_user != user
         [HOME_DIR, DIST_DIR, BIN_DIR].each do |dir|
-            sh_exc("chown", "-R", sudo_user, dir)
+            sh_exc("chown", "-R", sudo_user, dir) if FileTest.directory?(dir)
         end    
     end
 end
@@ -163,3 +193,23 @@ task :list => DIST_DIR do
     end
 end
 
+
+desc "list nginx versions"
+task :nginxes do
+    HEAD_VERSION = ENV["HEAD_VERSION"]
+    nginxes = Nginxbrew::Nginxes.nginxes
+    ((HEAD_VERSION) ? nginxes.filter_versions(HEAD_VERSION) : nginxes.versions).each do |v|
+        $stdout.puts("[nginx-]#{v}")
+    end
+end
+
+
+desc "list openresty versions"
+task :openresties do
+    require "nginxbrew/nginxes"
+    HEAD_VERSION = ENV["HEAD_VERSION"]
+    nginxes = Nginxbrew::Nginxes.openresties
+    ((HEAD_VERSION) ? nginxes.filter_versions(HEAD_VERSION) : nginxes.versions).each do |v|
+        $stdout.puts("[ngx_openresty-]#{v}")
+    end
+end

data/lib/nginxbrew/version.rb

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

data/nginxbrew.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec"
 end

data/spec/nginxes_spec.rb

@@ -0,0 +1,95 @@
+require "spec_helper"
+require "nginxbrew"
+require "nginxbrew/nginxes"
+
+
+describe Nginxbrew::Nginxes, "scraping ngx versions in their page" do
+
+    it "should return list of nginx versions" do
+        ret = Nginxbrew::Nginxes.nginxes
+        expect(ret.size).to be > 0
+        expect(ret.ngx_type).to eq Nginxbrew::Nginxes::TypeNginx
+    end
+
+    it "version text in nginxes is [0-9.]+" do
+        ret = Nginxbrew::Nginxes.nginxes
+        ret.versions.each do |v|
+            expect(v).to match(/[0-9.]+/)
+        end
+    end
+
+    it "should return list of openresty versions" do
+        ret = Nginxbrew::Nginxes.openresties
+        expect(ret.size).to be > 0
+        expect(ret.ngx_type).to eq Nginxbrew::Nginxes::TypeOpenresty
+    end
+
+    it "version text in openresties is [0-9.]+" do
+        ret = Nginxbrew::Nginxes.openresties
+        ret.versions.each do |v|
+            expect(v).to match(/[0-9.]+/)
+        end
+    end
+
+end
+
+
+describe Nginxbrew::Nginxes, "version control" do
+
+    it "should be raised exception when input invalid ngx type" do
+        expect {
+            Nginxbrew::Nginxes.new("INVALID_NGX_TYPE", ["1", "2", "3"])
+        }.to raise_error
+    end
+
+    it "should be raised exception when version list is empty" do
+        expect {
+            Nginxbrew::Nginxes.new(Nginxbrew::Nginxes::TypeNginx, [])
+        }.to raise_error
+    end
+
+    it "should be raised exception when version is not found in head_of" do
+        expect {
+            Nginxbrew::Nginxes.new(Nginxbrew::Nginxes::TypeNginx, ["1", "2", "3"]).head_of("INVALID_VERSION")
+        }.to raise_error
+    end
+
+    it "should be raised exception when version is not found in filter_versions" do
+        expect {
+            Nginxbrew::Nginxes.new(Nginxbrew::Nginxes::TypeNginx, ["1", "2", "3"]).filter_versions("INVALID_VERSION")
+        }.to raise_error
+    end
+
+    it "can know size of versions" do
+        nginxes = Nginxbrew::Nginxes.new(Nginxbrew::Nginxes::TypeNginx, ["0.0.0", "0.0.1"])
+        expect(nginxes.size).to eq 2
+    end
+
+    it "filter_versions should return list of active versions" do
+        nginxes = Nginxbrew::Nginxes.new(
+            Nginxbrew::Nginxes::TypeNginx,
+            %w(0.1 0.2 0.3 1.1 1.2 1.3 2.0.0 2.0.1 2.1.0 2.1.1)
+        )
+        expect(nginxes.filter_versions("1")).to eq ["1.3", "1.2", "1.1"]
+        expect(nginxes.filter_versions("2.1")).to eq ["2.1.1", "2.1.0"]
+    end
+
+    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)
+        )
+        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)
+    end
+
+    it "head_of should returns head of versions" do
+        nginxes = Nginxbrew::Nginxes.new(
+            Nginxbrew::Nginxes::TypeNginx,
+            %w(0.0.0 0.0.1 0.1.0 0.1.1 1.0.0 2.0.0)
+        )
+        expect(nginxes.head_of("0.0")).to eq "0.0.1"
+        expect(nginxes.head_of("0.1")).to eq "0.1.1"
+        expect(nginxes.head_of("0")).to eq "0.1.1"
+    end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+require "rubygems"
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nginxbrew
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - takumakanari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.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: Nginxbrew is a tool for install multi-version of nginx/nginxopenresty
   into your local environment.
 email:
@@ -48,6 +62,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGES.txt
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -56,9 +71,12 @@ files:
 - lib/nginxbrew.rb
 - lib/nginxbrew/config/base.rb
 - lib/nginxbrew/config/default.rb
+- lib/nginxbrew/nginxes.rb
 - lib/nginxbrew/tasks.rb
 - lib/nginxbrew/version.rb
 - nginxbrew.gemspec
+- spec/nginxes_spec.rb
+- spec/spec_helper.rb
 homepage: ''
 licenses:
 - MIT
@@ -83,4 +101,6 @@ rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Multi installation for nginx.
-test_files: []
+test_files:
+- spec/nginxes_spec.rb
+- spec/spec_helper.rb