xezat 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37e5c3e340fd440548e19f1c141f7e98098007a4
-  data.tar.gz: 2beec1b142223c633dc6ba867115d9eda5c20c3e
+  metadata.gz: 232d133a72ddf6d202df40c66764960972d57c45
+  data.tar.gz: 58bc0d8f834b0ea48eb71f49ae1085a0cb6643e9
 SHA512:
-  metadata.gz: 886a4a0057fd8afb3d4ccb99f0afc2e622377b580a1b1bb571b38937520741e555797fcc71c76625ec2d5479351b88afe51c5ff7218c617fbe74b28c2ec9c074
-  data.tar.gz: 65b2630f54a628da9158d7dabf10995b8a1cef7625e90271e2809aee5f9962c8f48a14fa9c3e09831d795b33e00fb720c3543e33d6c94626c5ef2e3c14c7f311
+  metadata.gz: 47fd5be715978a678b9030ac424f7dedba6a4c13745535e06e4feba5300de6e14dc7b91e42b69c3234be1ed68dcb0e5785ac4ef01acbf06eca05f0db95d25082
+  data.tar.gz: 2bca806c8f4b0aea539d130ba5cfe585fc86addf7b06920adbcb9640ad0a5149115268eb445bf6b0bdb5a64b0f10f59964b5c6ff98f217a4996a1729d8581c24

data/.gitignore

@@ -7,8 +7,6 @@
 /pkg/
 /spec/reports/
 /tmp/
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
+
+# rspec failure tracking
+.rspec_status

data/.gitmodules

@@ -1,3 +1,3 @@
-[submodule "test/cygport"]
-	path = test/cygport
-	url = git://git.code.sf.net/p/cygwin-ports/cygport
+[submodule "spec/cygport"]
+	path = spec/cygport
+	url = https://github.com/cygwinports/cygport.git

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/.travis.yml

@@ -1,4 +1,6 @@
+sudo: false
 language: ruby
-cache: bundler
-rvm: 2.2.0
-script: bundle exec ruby ./test/test.rb
+rvm:
+  - 2.3.6
+before_install: gem install bundler -v 1.15.3
+script: bundle exec rspec

data/Gemfile

@@ -1,4 +1,6 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in xezat.gemspec
 gemspec

data/LICENSE.txt

@@ -1,22 +1,21 @@
-Copyright (c) 2015 fd0
+The MIT License (MIT)
 
-MIT License
+Copyright (c) 2017 Daisuke Fujimura (fd0)
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,9 +1,6 @@
-[![Build Status](https://travis-ci.org/fd00/xezat.svg?branch=master)](https://travis-ci.org/fd00/xezat)
-[![Coverage Status](https://coveralls.io/repos/fd00/xezat/badge.svg?branch=master)](https://coveralls.io/r/fd00/xezat?branch=master)
-
 # Xezat
 
-Complement of cygport
+xezat helps you win at cygport.
 
 ## Installation
 
@@ -23,242 +20,18 @@ Or install it yourself as:
 
 ## Usage
 
-    xezat 0.0.3 -- Xezat is the complement of cygport
-
-    Usage:
-
-      xezat <subcommand> [options]
-
-    Options:
-            -h, --help         Show this message
-            -v, --version      Print the name and version
-            -t, --trace        Show the full backtrace when an error occurs
-
-    Subcommands:
-      bump                  update CYGWIN-PATCHES/README
-      create                create new cygport
-      debug                 show cygport variables
-      doctor                diagnose installed packages
-      generate              generate additional files
-      port                  copy cygport to git repository
-      validate              validate package contents
-
-
-### create
-
-    xezat create -- create new cygport
-
-    Usage:
-
-      xezat create [options] cygport
-
-    Options:
-            -a, --app-only     application only
-            -c, --category category  specify category
-            -d, --description description  specify description
-            -i, --inherit cygclass  inherit cygclasses
-            -o, --overwrite    overwrite cygport
-            -r, --repository repository  specify repository (github, google, sourceforge)
-            -s, --summary summary  specify summary
-            -h, --help         Show this message
-            -v, --version      Print the name and version
-            -t, --trace        Show the full backtrace when an error occurs
-
-Example.1
-
-    % xezat create xezat-0.0.3-1bl1.cygport
-    % cat xezat-0.0.3-1bl1.cygport
-
-```bash
-HOMEPAGE=""
-SRC_URI=""
-
-CATEGORY=""
-SUMMARY=""
-DESCRIPTION=""
-
-PKG_NAMES="
-  ${PN}
-  lib${PN}0
-  lib${PN}-devel
-"
-xezat_CONTENTS="
-  usr/bin/*.exe
-  usr/share
-"
-libxezat0_CONTENTS="
-  usr/bin/*.dll
-"
-libxezat_devel_CONTENTS="
-  usr/include
-  usr/lib
-"
-xezat_SUMMARY="${SUMMARY} (licensing & readmes)"
-libxezat0_SUMMARY="${SUMMARY} (runtime)"
-libxezat_devel_SUMMARY="${SUMMARY} (development)"
-```
-
-Example.2 
-
-    % xezat create -a -c Libs -i git --repository=github -s 'Complement of Cygport' -o xezat-0.0.3-1bl1.cygport
-    % cat xezat-0.0.3-1bl1.cygport
-
-```bash
-HOMEPAGE="https://github.com/fd00/${PN}"
-GIT_URI="https://github.com/fd00/${PN}.git"
-
-CATEGORY="Libs"
-SUMMARY="Complement of Cygport"
-DESCRIPTION=""
-
-inherit git
-```
-
-### debug
-
-    xezat debug -- show cygport variables
-
-    Usage:
-
-      xezat debug cygport
-
-    Options:
-            -h, --help         Show this message
-            -v, --version      Print the name and version
-            -t, --trace        Show the full backtrace when an error occurs
-
-Example.1
-
-    % xezat debug xezat-0.0.3-1bl1.cygport
-    #<Xezat::VariableManager:0x000006011ba808
-     @variables=
-      {:AR=>"ar",
-       :ARCH=>"x86_64",
-       :ARCH_x86_64=>"1",
-       :B=>"/usr/src/xezat-0.0.3-1bl1.x86_64/build",
-       :BASH=>"/usr/bin/bash",
-    (snip)
-       :mirror_apache=>"http://www.apache.org/dist",
-       :mirror_berlios=>"http://download.berlios.de http://download2.berlios.de",
-       :mirror_cpan=>"http://search.cpan.org/CPAN",
-       :mirror_cran=>"http://cran.r-project.org",
-       :mirror_ctan=>"http://mirror.ctan.org/",
-    (snip)
-       :src_patchfile=>"xezat-0.0.3-1bl1.src.patch",
-       :srcdir=>"/usr/src/xezat-0.0.3-1bl1.x86_64/src",
-       :top=>"/usr/src",
-       :workdir=>"/usr/src/xezat-0.0.3-1bl1.x86_64"}>
-    %
-
-### doctor
-
-    xezat doctor -- diagnose installed packages
-
-    Usage:
-
-      xezat doctor
-
-    Options:
-            -h, --help         Show this message
-            -v, --version      Print the name and version
-            -t, --trace        Show the full backtrace when an error occurs
-
-Example.1
-
-    % xezat doctor
-    xezat doctor | Warn:   usr/include/attr/xattr.h is in multiple packages: [:"cygwin-devel", :"libattr-devel"]
-    xezat doctor | Warn:   usr/share/man/man1/sha.1.gz is in multiple packages: [:openssl, :sha]
-    xezat doctor | Warn:   usr/share/man/man3/Socket.3pm.gz is in multiple packages: [:"perl-Socket", :perl]
-    xezat doctor | Warn:   usr/share/man/man3/Unicode.Collate.3pm.gz is in multiple packages: [:"perl-Unicode-Collate", :perl]
-    xezat doctor | Warn:   usr/share/man/man3/Unicode.Collate.CJK.Big5.3pm.gz is in multiple packages: [:"perl-Unicode-Collate", :perl]
-    xezat doctor | Warn:   usr/share/man/man3/Unicode.Collate.CJK.GB2312.3pm.gz is in multiple packages: [:"perl-Unicode-Collate", :perl]
-    xezat doctor | Warn:   usr/share/man/man3/Unicode.Collate.CJK.JISX0208.3pm.gz is in multiple packages: [:"perl-Unicode-Collate", :perl]
-    xezat doctor | Warn:   usr/share/man/man3/Unicode.Collate.CJK.Korean.3pm.gz is in multiple packages: [:"perl-Unicode-Collate", :perl]
-    xezat doctor | Warn:   usr/share/man/man3/Unicode.Collate.CJK.Pinyin.3pm.gz is in multiple packages: [:"perl-Unicode-Collate", :perl]
-    xezat doctor | Warn:   usr/share/man/man3/Unicode.Collate.CJK.Stroke.3pm.gz is in multiple packages: [:"perl-Unicode-Collate", :perl]
-    xezat doctor | Warn:   usr/share/man/man3/Unicode.Collate.Locale.3pm.gz is in multiple packages: [:"perl-Unicode-Collate", :perl]
-    %
-
-### generate
-
-    xezat generate -- generate additional files
-
-    Usage:
-
-      xezat generate [options] cygport
-
-    Options:
-            -o, --overwrite    overwrite file
-            -p, --pkg-config   generate *.pc
-            -h, --help         Show this message
-            -v, --version      Print the name and version
-            -t, --trace        Show the full backtrace when an error occurs
-
-Example.1
-
-    % xezat generate xezat-0.0.3-1bl1.cygport -p
-    % cat xezat-0.0.3-1bl1.x86_64/src/xezat-0.0.3/xezat.pc
-    prefix=@prefix@
-    exec_prefix=@exec_prefix@
-    libdir=@libdir@
-    includedir=@includedir@
-     
-    Name: xezat
-    Description: Complement of cygport
-    Version: @VERSION@
-    Libs: -L${libdir} -lxezat
-    Cflags: -I${includedir}
-    %
-
-### validate
-
-    xezat validate -- validate package contents
-
-    Usage:
-
-      xezat validate [options] cygport
-
-    Options:
-            -h, --help         Show this message
-            -v, --version      Print the name and version
-            -t, --trace        Show the full backtrace when an error occurs
-
-### bump
-
-    xezat bump -- update CYGWIN-PATCHES/README
-
-    Usage:
-
-      xezat bump cygport
-
-    Options:
-            -h, --help         Show this message
-            -v, --version      Print the name and version
-            -t, --trace        Show the full backtrace when an error occurs
+TODO: Write usage instructions here
 
-### port
+## Development
 
-    xezat port -- copy cygport to git repository
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-    Usage:
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
-      xezat port cygport
+## Contributing
 
-    Options:
-            -V, --verbose      print the results verbosely
-            -n, --no-operation  print the results without actually copying any files
-            -i, --inifile *.ini  specify inifile
-            -t, --target portdir  specify git repository directory
-            -h, --help         Show this message
-            -v, --version      Print the name and version
-            -t, --trace        Show the full backtrace when an error occurs
+Bug reports and pull requests are welcome on GitHub at https://github.com/fd00/xezat.
 
-Example.1
+## License
 
-    % cat ~/.xezat
-    [xezat]
-    distdir = /cygdrive/e/dist
-    portdir = /cygdrive/e/yacp
-    % xezat port xezat-0.0.3-1bl1.cygport
-    % ls /cygdrive/e/yacp/xezat
-    README xezat-0.0.3-1bl1.cygport xezat-0.0.3-1bl1.src.patch
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/Rakefile

@@ -1,2 +1,6 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "xezat"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/exe/xezat

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+Encoding.default_external = 'UTF-8'
+
+self_file =
+  if File.symlink?(__FILE__)
+    require 'pathname'
+    Pathname.new(__FILE__).realpath
+  else
+    __FILE__
+  end
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(self_file), '..', 'lib'))
+
+require 'xezat/main'
+
+Xezat::Main.start(ARGV)

data/lib/xezat.rb

@@ -1,7 +1,11 @@
+require 'logger'
+
 module Xezat
-  ROOT_DIR = File::expand_path(File::join(File::dirname(__FILE__), '..'))
-  DATA_DIR = File::expand_path(File::join(ROOT_DIR, 'share', 'xezat'))
-  REPOSITORY_DIR = File::expand_path(File::join(DATA_DIR, 'repository'))
-  TEMPLATE_DIR = File::expand_path(File::join(DATA_DIR, 'template'))
-  INI_FILE = File::expand_path(File::join(Dir::home, '.xezat'))
+  ROOT_DIR = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+  DATA_DIR = File.expand_path(File.join(ROOT_DIR, 'share', 'xezat'))
+  REPOSITORY_DIR = File.expand_path(File.join(DATA_DIR, 'repository'))
+  TEMPLATE_DIR = File.expand_path(File.join(DATA_DIR, 'template'))
+  INI_FILE = File.expand_path(File.join(Dir.home, '.xezat'))
+
+  LOG = Logger.new(STDOUT)
 end

data/lib/xezat/command/bump.rb

@@ -1,101 +1,71 @@
-require 'erb'
 require 'facets/file/atomic_write'
 require 'find'
-require 'fileutils'
+require 'json'
 require 'xezat'
-require 'xezat/commands'
 require 'xezat/cygchangelog'
 require 'xezat/cygclasses'
 require 'xezat/detectors'
-require 'xezat/refine/linguist/file_blob'
+require 'xezat/ext/linguist/file_blob'
 require 'xezat/packages'
 require 'xezat/variables'
 
 module Xezat
-  # ファイルのパーミッションが適切でない場合に投げられる例外
+
   class FilePermissionError < StandardError
   end
 
-  # cygport の他のコマンドが終わっておらずに呼び出すべき状態ではない場合に投げられる例外
   class IllegalStateError < StandardError
   end
 
   module Command
-    # README を生成または更新する
     class Bump
-      def initialize(program)
-        program.command(:bump) do |c|
-          c.syntax 'bump cygport'
-          c.description 'update CYGWIN-PATCHES/README'
-          c.option 'message', '-m', '--message message', String, 'specify changelog message'
-          c.action do |args, options|
-            execute(c, args, options)
-          end
-        end
-      end
-
-      CommandManager::register(:bump, self)
-
-      def execute(c, args, options)
-        cygport = args.shift
-        raise ArgumentError, 'wrong number of arguments (0 for 1)' unless cygport
-        c.logger.info "ignore extra arguments: #{args.to_s}" unless args.empty?
+      include Xezat
 
-        variables = VariableManager::get_default_variables(cygport)
-        packages = PackageManager::get_installed_packages()
-        readme_file = File::expand_path(File::join(variables[:C], 'README'))
-
-        info = {}
-        info[:src_uri] = get_src_uri(variables)
-        info[:runtimes] = get_runtime_packages(cygport)
-        info[:developments] = get_development_packages(variables, packages)
-        info[:files] = get_files(variables)
-        info[:changelog] = get_changelog(variables, options, readme_file)
-
-        File::atomic_write(readme_file) do |f|
-          f.write(get_embedded_contents(variables, info))
-        end
+      def initialize(options, cygport)
+        @options = options
+        @cygport = cygport
       end
 
-      # changelog を取得する
-      def get_changelog(variables, options, readme_file)
-        current_version = variables[:PVR].intern
-        if FileTest::exist?(readme_file)
-          raise FilePermissionError, "Cannot read #{readme_file}" unless FileTest::readable?(readme_file)
-          raise FilePermissionError, "Cannot write #{readme_file}" unless FileTest::writable?(readme_file)
-          changelog = Cygchangelog.new(File::read(readme_file))
-          options['message'] ||= 'Version bump.'
-          changelog[current_version] = options['message'] unless changelog.key?(current_version)
-        else
-          changelog = Cygchangelog.new
-          changelog[current_version] = 'Initial release by fd0 <https://github.com/fd00/>'
+      def execute
+        pkgs = packages()
+        vars = variables(@cygport)
+        readme_file = File.expand_path(File.join(vars[:C], 'README'))
+
+        info = {
+            src_uri: get_src_uri(vars),
+            runtimes: get_runtime_packages(@cygport),
+            developments: get_development_packages(vars, pkgs),
+            files: get_files(vars),
+            changelog: get_changelog(vars, @options, readme_file)
+        }
+
+        File.atomic_write(readme_file) do |f|
+          f.write(get_embedded_contents(vars, info))
         end
-        changelog
       end
 
-      # vcs に対応した SRC_URI を取得する
-      def get_src_uri(variables, cygclass_manager = CygclassManager.new)
-        cygclass_manager.vcs.each do |vcs|
+
+      def get_src_uri(vars, cygclasses = CygclassManager.new)
+        cygclasses.vcs.each do |vcs|
+          next unless vars.key?("_#{vcs}_CYGCLASS_".intern)
           src_uri_key = "#{vcs.to_s.upcase}_URI".intern
-          return variables[src_uri_key].split if variables.key?(src_uri_key)
+          return vars[src_uri_key].split if vars.key?(src_uri_key)
         end
-        variables[:SRC_URI].split
+        vars[:SRC_URI].split
       end
 
-      # package が依存している runtime のリストを取得する
+
       def get_runtime_packages(cygport)
         command = ['bash', File.expand_path(File.join(DATA_DIR, 'invoke_cygport_dep.sh')), cygport]
         result, error, status = Open3.capture3(command.join(' '))
         raise CygportProcessError, error unless status.success?
         result.gsub!(/^.*\*\*\*.*$/, '')
-        result.split($/).map! do |runtime|
-          runtime.lstrip
-        end
+        result.split($INPUT_RECORD_SEPARATOR).map!(&:lstrip)
       end
 
-      # package を build するために必要な development package のリストを取得する
+
       def get_development_packages(variables, packages)
-        compilers = get_compilers(get_languages(variables))
+        compilers = get_compilers(get_languages(variables[:S]), variables)
         tools = get_tools(variables)
         development_packages = (compilers + tools + [:cygport]).uniq.sort
         development_packages.map! do |package|
@@ -103,68 +73,63 @@ module Xezat
         end
       end
 
-      # source tree に存在するソースコードの言語を特定する
-      def get_languages(variables)
-        languages = []
-        Find::find(variables[:S]) do |path|
-          unless FileTest::directory?(path)
-            language = Xezat::Refine::Linguist::FileBlob.new(path).language
-            unless language.nil?
-              name = language.name
-              if name == 'Objective-C' # Objective-C は誤検知があるため suffix で再確認
-                next unless path.end_with?('.m')
-              end
-              if name == 'Ruby' # Ruby は誤検知があるため suffix で再確認
-                next unless path.end_with?('.rb')
-              end
-              if name == 'C++' # C++ は誤検知があるため suffix で再確認
-                name = 'C' if path.end_with?('.h')
-              end
-              if name == 'C' # suffix で再確認
-                name = 'C++' if path.end_with?('.C')
-              end
-              languages << name
-            end
-          end
-        end
-        languages
-      end
-
-      # package を build するために必要な compiler package のリストを取得する
-      def get_compilers(languages)
+      def get_compilers(languages, variables)
         compiler_file = File.expand_path(File.join(DATA_DIR, 'compilers.json'))
-        compiler_candidates = JSON.parse(File::read(compiler_file))
+        compiler_candidates = JSON.parse(File.read(compiler_file))
         compilers = []
         languages.uniq.each do |language|
-          if compiler_candidates.key?(language)
-            compiler_candidate = compiler_candidates[language]
-            compilers << compiler_candidate['package'].intern
-            if compiler_candidate.key?('dependencies')
-              compiler_candidate['dependencies'].each do |dependency|
-                compilers << dependency.intern
-              end
+          next unless compiler_candidates.key?(language)
+          compiler_candidate = compiler_candidates[language]
+          if compiler_candidate['package'] == 'python'
+            pkg_names = variables[:PKG_NAMES] || variables[:PN]
+            if pkg_names.include?('python3-')
+              compilers << :'python3'
+            elsif pkg_names.include?('pypi-')
+              compilers << :'pypi'
+            else
+              compilers << compiler_candidate['package'].intern
             end
+          else
+            compilers << compiler_candidate['package'].intern
+          end
+          next unless compiler_candidate.key?('dependencies')
+          compiler_candidate['dependencies'].each do |dependency|
+            compilers << dependency.intern
           end
         end
         compilers.uniq
       end
 
-      # packages を build するために必要な tool package のリストを取得する
+      def get_languages(top_src_dir)
+        languages_file = File.expand_path(File.join(DATA_DIR, 'languages.json'))
+        languages_candidates = JSON.parse(File.read(languages_file))
+        languages = []
+        Find.find(top_src_dir) do |path|
+          next if FileTest.directory?(path)
+          name = languages_candidates[File.extname(path)]
+          if name.nil?
+            language = Xezat::Linguist::FileBlob.new(path).language
+            next if language.nil?
+            name = language.name
+          end
+          languages << name
+        end
+        languages
+      end
+
       def get_tools(variables)
-        DetectorManager::load_default_detectors
-        DetectorManager::detect(variables)
+        DetectorManager.new().detect(variables)
       end
 
-      # package で生成されるチェック用の *.lst から README に埋め込むファイルのリストを取得する
       def get_files(variables)
         pkg2files = {}
         variables[:pkg_name].each do |pkg_name|
-          lst_file = File::expand_path(File::join(variables[:T], ".#{pkg_name}.lst"))
-          raise IllegalStateError, "No such file: #{lst_file}" unless FileTest::readable?(lst_file)
-          lines = File::readlines(lst_file)
+          lst_file = File.expand_path(File.join(variables[:T], ".#{pkg_name}.lst"))
+          raise IllegalStateError, "No such file: #{lst_file}" unless FileTest.readable?(lst_file)
+          lines = File.readlines(lst_file)
           lines.delete_if do |path|
             path.strip!
-            path[-1] == File::SEPARATOR
+            path[-1] == File::SEPARATOR # ignore directory
           end.map! do |path|
             File::SEPARATOR + path
           end
@@ -177,10 +142,24 @@ module Xezat
         pkg2files
       end
 
-      # テンプレートにデータを埋め込んだ結果の文字列を取得する
+      def get_changelog(variables, options, readme_file)
+        current_version = variables[:PVR].intern
+        if FileTest.exist?(readme_file)
+          raise FilePermissionError, "Cannot read #{readme_file}" unless FileTest.readable?(readme_file)
+          raise FilePermissionError, "Cannot write #{readme_file}" unless FileTest.writable?(readme_file)
+          changelog = Cygchangelog.new(File.read(readme_file))
+          message = options['message'] || 'Version bump.'
+          changelog[current_version] = message unless changelog.key?(current_version)
+        else
+          changelog = Cygchangelog.new
+          changelog[current_version] = 'Initial release by fd0 <https://github.com/fd00/>'
+        end
+        changelog
+      end
+
       def get_embedded_contents(variables, info)
-        erb = File::expand_path(File::join(TEMPLATE_DIR, 'README.erb'))
-        ERB.new(File::readlines(erb).join(nil), nil, '%-').result(binding)
+        erb = File.expand_path(File.join(TEMPLATE_DIR, 'README.erb'))
+        ERB.new(File.readlines(erb).join(nil), nil, '%-').result(binding).chop # remove redundant new line
       end
     end
   end