nginxbrew 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f7df4fe4a967276dae08916ee18bf23ef9e4809
-  data.tar.gz: 19513d63f260cb095c430188f351bd67c3216261
+  metadata.gz: 683c60590845811ab4de45a8032f7a1c8b3d88c6
+  data.tar.gz: aca6e131adc5ab8fa59e2e9d6d8c3265ef6604de
 SHA512:
-  metadata.gz: ae73e62e8c7e7d7ce6243d43c2c9a3646e46f6fbb6b7504aebbc14a12879e9833f5193a064f53b6c226dbca73eb3ee1ac54b89bea98882c9bea2d75445fad219
-  data.tar.gz: 8e71707dd3a4580728380bbec00ec163e41ff9f483bd301e95edb4a4583a2de803efafba1738bec3c662f48aee506ce1c306ed39acc6e21fafc9d4e83a418e4c
+  metadata.gz: ba7f63e4f0ec209a2b61fb66119349297d940f18dc4363708de44a61db93fa60845a213c8ee128bcdf81dc0e7c49dfb0b788f537bd25b6a166bce33815c56403
+  data.tar.gz: 4e70c1e80a9758d86c369f9eda988c1c40bc45735f2b89e0acfb02c7f257973e258f3068eb0e87dd98c8be772c1a173ddc77e727d43e2e17ba7d9d2ffc31dbc9

data/CHANGES.txt

@@ -1,5 +1,11 @@
 Nginxbrew changes
 
+Nginxbrew 0.0.7
+ - Cache result of nginxes/openresties.
+ - Limit min version of nginx to support to upper v0.5.38.
+ - Bug fixes.
+
+
 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.

data/bin/nginxbrew

@@ -61,7 +61,7 @@ begin
         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 })
+            Nginxbrew.run(:makeconf, envs={ "MAKECONF_OUTPUT_TO" => output_to })
         else
             raise Exception.new("Unknown command '#{command}'")
     end

data/lib/nginxbrew.rb

@@ -1,7 +1,7 @@
 require "rake"
 
 require "nginxbrew/version"
-require "nginxbrew/nginxes"
+require "nginxbrew/catalog"
 require "nginxbrew/local"
 require "nginxbrew/convention"
 require "nginxbrew/rake_tools"

data/lib/nginxbrew/catalog.rb

@@ -0,0 +1,141 @@
+require "net/http"
+require "uri"
+require "fileutils"
+
+include Nginxbrew
+
+
+module Nginxbrew
+
+    class VersionNotFoundError < StandardError
+
+        def initialize(v)
+            super("version '#{v}' is not found in all versions of nginxes/openresties")
+        end
+
+    end
+
+    class Catalog
+
+        TypeNginx = "nginx"
+
+        TypeOpenresty = "openresty"
+
+        CacheExpireDays = 1
+
+        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.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 unsupport_under!(version)
+            min_version = Gem::Version.new(version)
+            @versions = @versions.select do |v|
+                Gem::Version.new(v) >= min_version
+            end
+        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(cache_dir=nil)
+            catalog_cache_or(cache_dir, "nginxes") do
+                versions = html_body_of("http://nginx.org", "/download/").
+                    gsub(/href="nginx\-([0-9\.]+?)\.tar\.gz"/).inject([]) do |memo, match|
+                        memo << $1
+                        memo
+                end
+                c = Catalog.new(TypeNginx, versions)
+                c.unsupport_under!("0.5.38") # can not build under this version
+                c
+            end
+        end
+
+        def self.openresties(cache_dir=nil)
+            catalog_cache_or(cache_dir, "openresties") do
+                versions = html_body_of("http://openresty.org", "/").
+                    gsub(/ngx_openresty\-([0-9\.]+?)\.tar\.gz/).inject([]) do |memo, match|
+                        memo << $1
+                        memo
+                end
+                Catalog.new(TypeOpenresty, versions)
+            end
+        end
+
+        private
+
+        def self.catalog_cache_or(dir, key, &block)
+            return block.call if !dir || !key
+
+            cache_dir = File.join(dir, "catalog")
+            FileUtils.mkdir_p(cache_dir) unless FileTest.directory?(cache_dir)
+
+            cache_file = File.join(cache_dir, "#{key}.ca")
+
+            if FileTest.file?(cache_file)
+                expired = File.mtime(cache_file) + CacheExpireDays * 24 * 60 * 60
+                if Time.now < expired
+                    $logger.debug("Cache file: #{cache_file}")
+                    begin
+                        return Marshal.load(File.binread(cache_file))
+                    rescue Exception => e
+                        File.delete(cache_file)
+                        $logger.error("#{e}")
+                        $logger.error("#{cache_file} removed")
+                    end
+                else
+                    File.delete(cache_file)
+                end
+            end
+
+            dest = block.call
+            File.binwrite(cache_file, Marshal.dump(dest))
+            $logger.debug("Cache saved to #{cache_file}")
+
+            dest
+        end
+
+        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

@@ -9,15 +9,14 @@ $stdout.puts("using '#{HOME_DIR}' as nginxbrew home") if ENV["NGINXBREW_HOME"]
 
 
 CONFIG_FILE = ENV["NGINXBREW_CONFIG"]
-if CONFIG_FILE && !FileTest.file?(CONFIG_FILE)
-    raise Exception.new("Specified configuration file #{CONFIG_FILE} is not found")
-end
+$stdout.puts("using '#{CONFIG_FILE}' as nginxbrew config") if CONFIG_FILE
 
 
 SOURCE_DIR = "#{HOME_DIR}/.src"
 DIST_DIR = "#{HOME_DIR}/versions"
 BIN_DIR = "#{HOME_DIR}/bin"
 NGINX_BIN = "#{BIN_DIR}/nginx"
+CACHE_DIR = "#{HOME_DIR}/.cache"
 
 
 [HOME_DIR, SOURCE_DIR, BIN_DIR, DIST_DIR].each do |dir|
@@ -30,7 +29,10 @@ if ENV["VERSION"]
 
     $stdout.puts("checking version ...")
     raw_version, is_openresty = NamingConvention.resolve(ENV["VERSION"])
-    nginxes = is_openresty ? Nginxbrew::Nginxes.openresties : Nginxbrew::Nginxes.nginxes
+
+    nginxes = is_openresty ? Nginxbrew::Catalog.openresties(cache_dir=CACHE_DIR) :
+        Nginxbrew::Catalog.nginxes(cache_dir=CACHE_DIR)
+
     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}")
@@ -105,7 +107,6 @@ if ENV["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
@@ -149,7 +150,7 @@ end
 desc "list nginx versions"
 task :nginxes do
     HEAD_VERSION = ENV["HEAD_VERSION"]
-    nginxes = Nginxbrew::Nginxes.nginxes
+    nginxes = Nginxbrew::Catalog.nginxes(cache_dir=CACHE_DIR)
     ((HEAD_VERSION) ? nginxes.filter_versions(HEAD_VERSION) : nginxes.versions).each do |v|
         $stdout.puts("[nginx-]#{v}")
     end
@@ -158,18 +159,17 @@ end
 
 desc "list openresty versions"
 task :openresties do
-    require "nginxbrew/nginxes"
     HEAD_VERSION = ENV["HEAD_VERSION"]
-    nginxes = Nginxbrew::Nginxes.openresties
+    nginxes = Nginxbrew::Catalog.openresties(cache_dir=CACHE_DIR)
     ((HEAD_VERSION) ? nginxes.filter_versions(HEAD_VERSION) : nginxes.versions).each do |v|
         $stdout.puts("[ngx_openresty-]#{v}")
     end
 end
 
 
-desc "Output  new configfile for nginxbrew into specified path as {makeconf_OUTPUT_TO}"
+desc "Output  new configfile for nginxbrew into specified path as {MAKECONF_OUTPUT_TO}"
 task :makeconf do
-    output_to = ENV["makeconf_OUTPUT_TO"]
+    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)

data/lib/nginxbrew/version.rb

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

data/spec/{nginxes_spec.rb → catalog_spec.rb}

@@ -1,31 +1,58 @@
 require "spec_helper"
 require "nginxbrew"
-require "nginxbrew/nginxes"
+require "nginxbrew/catalog"
 
+require "fileutils"
 
-describe Nginxbrew::Nginxes, "scraping ngx versions in their page" do
+
+describe Nginxbrew::Catalog, "scraping ngx versions in their page" do
+
+    before(:each) do
+        @cache_dir = File.join("/tmp", File.dirname(__FILE__), "cache")
+        FileUtils.mkdir_p(@cache_dir)
+    end
+    
+    after(:each) do
+        FileUtils.rm_rf(@cache_dir)
+    end
 
     it "should return list of nginx versions" do
-        ret = Nginxbrew::Nginxes.nginxes
+        ret = Nginxbrew::Catalog.nginxes
         expect(ret.size).to be > 0
-        expect(ret.ngx_type).to eq Nginxbrew::Nginxes::TypeNginx
+        expect(ret.ngx_type).to eq Nginxbrew::Catalog::TypeNginx
     end
 
     it "version text in nginxes is [0-9.]+" do
-        ret = Nginxbrew::Nginxes.nginxes
+        ret = Nginxbrew::Catalog.nginxes
         ret.versions.each do |v|
             expect(v).to match(/[0-9.]+/)
         end
     end
 
+    it "cache of nginxes should be created and can read it" do
+        Nginxbrew::Catalog.nginxes(cache_dir=@cache_dir)
+        expect(FileTest.file?(File.join(@cache_dir, "catalog/nginxes.ca"))).to be_truthy
+
+        ret = Nginxbrew::Catalog.nginxes
+        expect(ret.size).to be > 0
+    end
+
+    it "cache of openresties should be created and can read it" do
+        Nginxbrew::Catalog.openresties(cache_dir=@cache_dir)
+        expect(FileTest.file?(File.join(@cache_dir, "catalog/openresties.ca"))).to be_truthy
+
+        ret = Nginxbrew::Catalog.openresties
+        expect(ret.size).to be > 0
+    end
+
     it "should return list of openresty versions" do
-        ret = Nginxbrew::Nginxes.openresties
+        ret = Nginxbrew::Catalog.openresties
         expect(ret.size).to be > 0
-        expect(ret.ngx_type).to eq Nginxbrew::Nginxes::TypeOpenresty
+        expect(ret.ngx_type).to eq Nginxbrew::Catalog::TypeOpenresty
     end
 
     it "version text in openresties is [0-9.]+" do
-        ret = Nginxbrew::Nginxes.openresties
+        ret = Nginxbrew::Catalog.openresties
         ret.versions.each do |v|
             expect(v).to match(/[0-9.]+/)
         end
@@ -34,40 +61,40 @@ describe Nginxbrew::Nginxes, "scraping ngx versions in their page" do
 end
 
 
-describe Nginxbrew::Nginxes, "version control" do
+describe Nginxbrew::Catalog, "version control" do
 
     it "should be raised exception when input invalid ngx type" do
         expect {
-            Nginxbrew::Nginxes.new("INVALID_NGX_TYPE", ["1", "2", "3"])
+            Nginxbrew::Catalog.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, [])
+            Nginxbrew::Catalog.new(Nginxbrew::Catalog::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")
+            Nginxbrew::Catalog.new(Nginxbrew::Catalog::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")
+            Nginxbrew::Catalog.new(Nginxbrew::Catalog::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"])
+        nginxes = Nginxbrew::Catalog.new(Nginxbrew::Catalog::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,
+        nginxes = Nginxbrew::Catalog.new(
+            Nginxbrew::Catalog::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"]
@@ -75,16 +102,16 @@ describe Nginxbrew::Nginxes, "version control" do
     end
 
     it "versions should be sorted order by version-number desc" do
-        nginxes = Nginxbrew::Nginxes.new(
-            Nginxbrew::Nginxes::TypeNginx,
+        nginxes = Nginxbrew::Catalog.new(
+            Nginxbrew::Catalog::TypeNginx,
             %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.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
-        nginxes = Nginxbrew::Nginxes.new(
-            Nginxbrew::Nginxes::TypeNginx,
+        nginxes = Nginxbrew::Catalog.new(
+            Nginxbrew::Catalog::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"
@@ -93,12 +120,21 @@ describe Nginxbrew::Nginxes, "version control" do
     end
 
     it "head_of is first element of versions which sorted by version number" do
-        nginxes = Nginxbrew::Nginxes.new(
-            Nginxbrew::Nginxes::TypeNginx,
+        nginxes = Nginxbrew::Catalog.new(
+            Nginxbrew::Catalog::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
 
+    it "limit the active version" do
+        catalog = Nginxbrew::Catalog.new(
+            Nginxbrew::Catalog::TypeNginx,
+            %w(0.1 0.2 0.3)
+        )
+        catalog.unsupport_under!("0.2")
+        expect(catalog.versions).to eq %w(0.3 0.2)
+    end
+
 end

data/spec/spec_helper.rb

@@ -1,2 +1,6 @@
 require "rubygems"
 
+require "logger"
+
+$logger = Logger.new(STDOUT)
+$logger.level = Logger::DEBUG

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nginxbrew
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - takumakanari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,17 +69,17 @@ files:
 - Rakefile
 - bin/nginxbrew
 - lib/nginxbrew.rb
+- lib/nginxbrew/catalog.rb
 - 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
 - lib/nginxbrew/version.rb
 - nginxbrew.gemspec
+- spec/catalog_spec.rb
 - spec/convention_spec.rb
-- spec/nginxes_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -106,6 +106,6 @@ signing_key:
 specification_version: 4
 summary: Multi installation for nginx.
 test_files:
+- spec/catalog_spec.rb
 - spec/convention_spec.rb
-- spec/nginxes_spec.rb
 - spec/spec_helper.rb

data/lib/nginxbrew/nginxes.rb

@@ -1,93 +0,0 @@
-require "net/http"
-require "uri"
-
-include Nginxbrew
-
-
-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.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
-            @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
-