xezat 0.1.2 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e515798ac8ff0a0f6f60ba790faa9ee4e7b3c2fdbe70f55484d7c180929961a7
-  data.tar.gz: d5159b3b559a9bd19f9f67bf14e1d0e496c052d83579286289446ece688c2be9
+  metadata.gz: 6183648a65f69a1fc1c1a85779066ba529614681aeb56fa78979ba9d9536c625
+  data.tar.gz: 20589012624b3e1690014d2b03ad2dda3fe01c464f5c3fb03223572a856a8dc4
 SHA512:
-  metadata.gz: b1dae9f8ee739e65769e5466d973c02876c5dc7e170aa7f52d3c3c6f014cf74fe200fd9300dd2db27df0ad6c49ddbf4dfade8f7f0986382a76e127e4932cca75
-  data.tar.gz: 81d6a0943f8f8160bfd0ac4b16b6517700392a91119b5472f2c78721f2f99ba71a35ae7d2925059da12b8c376bb2296f051b9e14910ac79cd4e2aca104a11597
+  metadata.gz: e94a00970240eb104ba88a2126a4fbd04d97820977a383a0498e584b3373b69e8dd98260c30cb59853e36f792949c5fa527a910345b19582ea1332541f2b2a48
+  data.tar.gz: b01a34f4cc54b8967e765045048d8759612de6653602c0833ff6b252b8302563ea286fcfde36eefb4d1ab58f623a3c32f299aedb5b741aef681363840f719e63

data/.circleci/config.yml

@@ -1,13 +1,10 @@
-# Ruby CircleCI 2.0 configuration file
-#
-# Check https://circleci.com/docs/2.0/language-ruby/ for more details
-#
-version: 2
+version: 2.1
+orbs:
+  ruby: circleci/ruby@1.4.0
 jobs:
-  build:
+  test:
     docker:
-      # specify the version you desire here
-       - image: circleci/ruby
+      - image: cimg/ruby:2.6
 
     working_directory: ~/repo
 
@@ -73,3 +70,41 @@ jobs:
       # Collect reports
       - store_test_results:
           path: /tmp/test-results
+      - store_artifacts:
+          path: ~/repo/coverage
+          destination: coverage
+
+  deploy:
+    docker:
+      - image: cimg/ruby:2.6
+    steps:
+      - checkout
+      - run:
+          name: Install native libraries
+          command: |
+            sudo apt-get install cmake libicu-dev
+
+      - run:
+          name: Install dependencies
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+
+      - run:
+          name: Publish gem to Rubygems
+          command: bundle exec rake release
+
+workflows:
+  test:
+    jobs:
+      - test:
+          filters:
+            tags:
+              only: /.*/
+      - deploy:
+          requires:
+            - test
+          filters:
+            tags:
+              only: /^v.*/
+            branches:
+              ignore: /.*/

data/.rubocop.yml

@@ -1,11 +1,16 @@
 require: rubocop-performance
 
 AllCops:
-  TargetRubyVersion: 2.3
+  NewCops: enable
+  SuggestExtensions: false
+  TargetRubyVersion: 2.6
   Exclude:
     - 'spec/cygport/**/*'
     - 'vendor/**/*'
 
+Layout/LineLength:
+  Max: 160
+
 Metrics/AbcSize:
   Max: 40
 Metrics/BlockLength:
@@ -14,8 +19,6 @@ Metrics/BlockLength:
     - 'spec/**/*'
 Metrics/CyclomaticComplexity:
   Max: 10
-Metrics/LineLength:
-  Max: 160
 Metrics/MethodLength:
   Max: 35
 Metrics/ParameterLists:

data/.ruby-version

@@ -0,0 +1 @@
+2.6.4

data/lib/xezat/command/announce.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'xezat/variables'
+
+module Xezat
+  module Command
+    class Announce
+      include Xezat
+
+      def initialize(options, cygport)
+        @options = options
+        @cygport = cygport
+      end
+
+      def execute
+        variables = variables(@cygport)
+        erb = File.expand_path(File.join(TEMPLATE_DIR, 'announce.erb'))
+        print ERB.new(File.readlines(erb).join(nil), trim_mode: '%-').result(binding).chop # remove redundant new line
+      end
+    end
+  end
+end

data/lib/xezat/command/bump/changelog.rb

@@ -9,7 +9,7 @@ module Xezat
   module Command
     class Bump
       def get_changelog(variables, options, readme_file)
-        Xezat.logger.debug('Append latest log to changelog')
+        Xezat.logger.debug('  Try to append latest log to changelog...')
         current_version = variables[:PVR].intern
         if FileTest.exist?(readme_file)
           raise FilePermissionError, "Cannot read #{readme_file}" unless FileTest.readable?(readme_file)
@@ -17,10 +17,16 @@ module Xezat
 
           changelog = Cygchangelog.new(File.read(readme_file))
           message = options['message'] || 'Version bump.'
-          changelog[current_version] = message unless changelog.key?(current_version)
+          if changelog.length > 1 || !changelog.key?(current_version)
+            changelog[current_version] = message # overwrite unless initial package
+            Xezat.logger.debug("    '#{message}' appended")
+          else
+            Xezat.logger.warn('    Initial release protected')
+          end
         else
           changelog = Cygchangelog.new
           changelog[current_version] = 'Initial release by fd0 <https://github.com/fd00/>'
+          Xezat.logger.debug('    Initial release by you')
         end
         changelog
       end

data/lib/xezat/command/bump/compiler.rb

@@ -6,7 +6,7 @@ module Xezat
   module Command
     class Bump
       def get_compilers(languages, _variables)
-        Xezat.logger.debug('Collect compilers')
+        Xezat.logger.debug('  Collect compilers')
         compiler_file = File.expand_path(File.join(DATA_DIR, 'compilers.json'))
         compiler_candidates = JSON.parse(File.read(compiler_file))
         compilers = []

data/lib/xezat/command/bump/cygport_dep.rb

@@ -1,14 +1,21 @@
 # frozen_string_literal: true
 
+require 'find'
 require 'open3'
 require 'xezat'
 
 module Xezat
   module Command
     class Bump
-      def invoke_cygport_dep(cygport)
+      def invoke_cygport_dep(variables, cygport)
+        candidate_files = Find.find(variables[:D]).select do |file|
+          file.end_with?('.exe', '.dll', '.so')
+        end
+        additional_path = candidate_files.map do |file|
+          File.dirname(file)
+        end.sort.uniq.join(':')
         command = ['bash', File.expand_path(File.join(DATA_DIR, 'invoke_cygport_dep.sh')), cygport]
-        result, error, status = Open3.capture3(command.join(' '))
+        result, error, status = Open3.capture3({ 'PATH' => "#{ENV['PATH']}:#{additional_path}" }, command.join(' '))
         raise CygportProcessError, error unless status.success?
 
         result

data/lib/xezat/command/bump/development_package.rb

@@ -9,10 +9,12 @@ module Xezat
   module Command
     class Bump
       def get_development_packages(variables, packages)
-        Xezat.logger.debug('Collect development packages')
+        Xezat.logger.debug('  Collect development packages')
         compilers = get_compilers(get_languages(variables[:S]), variables)
         tools = get_tools(variables)
-        development_packages = (compilers + tools + [:cygport]).uniq.sort
+        build_requires = variables[:BUILD_REQUIRES].nil? ? [] : variables[:BUILD_REQUIRES].split.map(&:to_sym)
+        development_packages = (compilers + tools + build_requires + [:cygport]).uniq.sort
+        development_packages.delete(:'libssl-devel') if development_packages.include?(:'libssl1.0-devel')
         development_packages.map! do |package|
           packages[package] || ''
         end

data/lib/xezat/command/bump/file.rb

@@ -9,10 +9,10 @@ module Xezat
   module Command
     class Bump
       def get_files(variables)
-        Xezat.logger.debug('Collect files')
+        Xezat.logger.debug('  Collect files')
         pkg2files = {}
         variables[:pkg_name].each do |pkg_name|
-          Xezat.logger.debug("  Collect #{pkg_name}")
+          Xezat.logger.debug("    Collect #{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)
 

data/lib/xezat/command/bump/language.rb

@@ -7,7 +7,7 @@ module Xezat
   module Command
     class Bump
       def get_languages(top_src_dir)
-        Xezat.logger.debug('Collect languages')
+        Xezat.logger.debug('  Collect languages')
         languages_file = File.expand_path(File.join(DATA_DIR, 'languages.json'))
         languages_candidates = JSON.parse(File.read(languages_file))
         languages = []

data/lib/xezat/command/bump/runtime_package.rb

@@ -7,10 +7,16 @@ require 'xezat/variables'
 module Xezat
   module Command
     class Bump
-      def get_runtime_packages(cygport)
-        Xezat.logger.debug('Collect runtime packages from cygport dep')
-        result = invoke_cygport_dep(cygport)
-        result.gsub(/^.*\*\*\*.*$/, '').split($INPUT_RECORD_SEPARATOR).map(&:lstrip)
+      def get_runtime_packages(variables, pkgs, cygport)
+        Xezat.logger.debug('  Collect runtime packages from cygport dep')
+        result = invoke_cygport_dep(variables, cygport)
+        runtime_packages = result.gsub(/^.*\*\*\*.*$/, '').split($INPUT_RECORD_SEPARATOR).map(&:lstrip)
+        build_requires = variables[:BUILD_REQUIRES].nil? ? [] : variables[:BUILD_REQUIRES].split.map(&:to_sym)
+        runtime_packages.delete(pkgs[:'libssl-devel']) if build_requires.include?(:'libssl1.0-devel')
+        variables[:REQUIRES]&.split&.each do |req|
+          runtime_packages << pkgs[req.to_sym]
+        end
+        runtime_packages.sort
       end
     end
   end

data/lib/xezat/command/bump/src_uri.rb

@@ -6,15 +6,15 @@ require 'xezat/cygclasses'
 module Xezat
   module Command
     class Bump
-      def get_src_uri(vars, cygclasses = CygclassManager.new)
-        Xezat.logger.debug('Collect SRC_URI')
+      def get_src_uri(variables, cygclasses = CygclassManager.new)
+        Xezat.logger.debug('  Collect SRC_URI')
         cygclasses.vcs.each do |vcs|
-          next unless vars.key?("_#{vcs}_CYGCLASS_".intern)
+          next unless variables.key?("_#{vcs}_CYGCLASS_".intern)
 
           src_uri_key = "#{vcs.to_s.upcase}_URI".intern
-          return vars[src_uri_key].split if vars.key?(src_uri_key)
+          return variables[src_uri_key].split if variables.key?(src_uri_key)
         end
-        vars[:SRC_URI].split
+        variables[:SRC_URI].split
       end
     end
   end

data/lib/xezat/command/bump.rb

@@ -32,13 +32,13 @@ module Xezat
 
         info = {
           src_uri: get_src_uri(vars),
-          runtimes: get_runtime_packages(@cygport),
+          runtimes: get_runtime_packages(vars, pkgs, @cygport),
           developments: get_development_packages(vars, pkgs),
           files: get_files(vars),
           changelog: get_changelog(vars, @options, readme_file)
         }
 
-        Xezat.logger.debug('Write ChangeLog atomically')
+        Xezat.logger.debug('  Write ChangeLog atomically')
         File.atomic_write(readme_file) do |f|
           f.write(get_embedded_contents(vars, info))
         end
@@ -48,7 +48,7 @@ module Xezat
 
       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).chop # remove redundant new line
+        ERB.new(File.readlines(erb).join(nil), trim_mode: '%-').result(binding).chop # remove redundant new line
       end
     end
   end

data/lib/xezat/command/doctor.rb

@@ -7,8 +7,6 @@ module Xezat
     class Doctor
       include Xezat
 
-      def initialize; end
-
       def execute
         get_contents_uniqueness.each do |path, pkg|
           puts "#{path} is not unique: #{pkg}" if pkg.length > 1

data/lib/xezat/command/init.rb

@@ -74,7 +74,7 @@ module Xezat
 
       def get_cygport(template_variables, category, summary, description, cygclasses, cygport)
         erb = File.expand_path(File.join(TEMPLATE_DIR, 'cygport.erb'))
-        ERB.new(File.readlines(erb).join(nil), nil, '%-').result(binding)
+        ERB.new(File.readlines(erb).join(nil), trim_mode: '%-').result(binding)
       end
     end
   end

data/lib/xezat/command/port.rb

@@ -43,6 +43,7 @@ module Xezat
         port_dir = conf['xezat']['portdir'] || options[:portdir]
         raise NoPortDirectoryError if port_dir.nil?
 
+        Xezat.logger.debug("  Port directory: #{port_dir}")
         port_dir
       end
     end

data/lib/xezat/command/validate.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
+require 'net/http'
 require 'pkg-config'
+require 'uri'
+require 'xezat/packages'
 require 'xezat/variables'
 
 module Xezat
@@ -16,22 +19,103 @@ module Xezat
       def execute
         Xezat.logger.debug('Start validating')
         vars = variables(@cygport)
+        pkgs = packages
+
+        Xezat.logger.debug('  Validate .cygport')
+        validate_cygport(@cygport)
+
+        Xezat.logger.debug('  Validate category')
+        validate_category(vars[:CATEGORY])
+
+        Xezat.logger.debug('  Validate homepage')
+        validate_homepage(vars[:HOMEPAGE])
+
+        Xezat.logger.debug('  Validate BUILD_REQUIRES')
+        validate_build_requires(vars[:BUILD_REQUIRES], pkgs)
+
+        Xezat.logger.debug('  Validate *.pc')
         validate_pkgconfig(vars)
+
         Xezat.logger.debug('End validating')
       end
 
+      def validate_cygport(cygport)
+        original_string = File.read(cygport)
+        stripped_string = original_string.gsub(/^\xEF\xBB\xBF/, '')
+        Xezat.logger.error('    .cygport contains BOM') unless original_string == stripped_string
+      end
+
+      def validate_category(category)
+        categories_file = File.expand_path(File.join(DATA_DIR, 'categories.yaml'))
+        Xezat.logger.error("    Category is invalid : #{category}") unless YAML.safe_load(File.open(categories_file), [Symbol]).include?(category.downcase)
+      end
+
+      def validate_homepage(homepage)
+        response = Net::HTTP.get_response(URI.parse(homepage))
+        code = response.code
+        if code == '200'
+          Xezat.logger.debug("    code = #{response.code}")
+        else
+          Xezat.logger.error("    code = #{response.code}")
+        end
+      rescue OpenSSL::SSL::SSLError => e
+        raise e unless @options[:ignore]
+
+        Xezat.logger.error('    Ignore SSLError')
+      end
+
+      def validate_build_requires(build_requires, pkgs)
+        return if build_requires.nil?
+
+        build_requires.split.each do |build_require|
+          build_require_pkg = pkgs[build_require.to_sym]
+          if build_require_pkg.nil?
+            Xezat.logger.error("    #{build_require} not found")
+          else
+            Xezat.logger.debug("    #{build_require_pkg}")
+          end
+        end
+      end
+
       def validate_pkgconfig(variables)
         pkgconfig_path = File.join(variables[:D], 'usr', 'lib', 'pkgconfig')
         PKGConfig.add_path(pkgconfig_path)
         Dir.glob('*.pc', 0, base: pkgconfig_path).each do |pc|
           basename = File.basename(pc, '.pc')
-          Xezat.logger.debug("  #{basename}.pc found")
+          Xezat.logger.debug("    #{basename}.pc found")
           modversion = PKGConfig.modversion(basename)
-          Xezat.logger.debug("    modversion = #{modversion}")
-          pv = variables[:PV][0]
-          Xezat.logger.error("      modversion differs from $PN = #{pv}") unless modversion == pv
-          Xezat.logger.debug("    cflags = #{PKGConfig.cflags(basename)}")
-          Xezat.logger.debug("    libs = #{PKGConfig.libs(basename)}")
+          Xezat.logger.debug("      modversion = #{modversion}")
+          pv = variables[:PV][0].gsub(/\+.+$/, '')
+          Xezat.logger.error("        modversion differs from $PN = #{pv}") unless modversion == pv
+          Xezat.logger.debug("      cflags = #{PKGConfig.cflags(basename)}")
+          libs = PKGConfig.libs(basename)
+          Xezat.logger.debug("      libs = #{libs}")
+          validate_libs(variables, libs)
+        end
+      end
+
+      def validate_libs(variables, libs)
+        lib_dirs = [File.join(variables[:D], '/usr/lib'), '/usr/lib', '/usr/lib/w32api', '/usr/lib/gcc/x86_64-pc-cygwin/11']
+        libs.split do |option|
+          if option.start_with?('-l')
+            lib_name = option[2, 255] # Assume file length limit
+            found = false
+            lib_dirs.each do |dir|
+              archive_path = File.join(dir, "lib#{lib_name}.dll.a")
+              if File.exist?(archive_path)
+                Xezat.logger.debug("        #{lib_name} -> #{archive_path.gsub(variables[:D], '$D')}")
+                found = true
+                break
+              end
+              static_path = File.join(dir, "lib#{lib_name}.a")
+              next unless File.exist?(static_path)
+
+              Xezat.logger.debug("        #{lib_name} -> #{static_path}")
+              found = true
+              break
+            end
+            Xezat.logger.error("        #{lib_name} not found") unless found
+          end
         end
       end
     end

data/lib/xezat/config.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require 'inifile'
+require 'yaml'
 
 module Xezat
   def config(filepath = nil)
-    config = IniFile.new
+    config = {}
     config['cygwin'] = {
       'cygclassdir' => '/usr/share/cygport/cygclass'
     }
     config['xezat'] = {
     }
-    config.merge!(IniFile.load(filepath)) if filepath
+    config.merge!(YAML.load_file(filepath)) if filepath
     config
   end
 end

data/lib/xezat/cygchangelog.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'English'
 require 'xezat/cygversion'
 
 module Xezat
@@ -24,7 +25,7 @@ module Xezat
           next
         end
         matched_content = /^(.+)$/.match(line)
-        next unless matched_content
+        next if matched_content.nil?
         raise ReadmeSyntaxError, 'Version missing' if version.nil?
 
         if @changelogs.key?(version)
@@ -48,13 +49,15 @@ module Xezat
       @changelogs.key?(key)
     end
 
-    def each
+    def each(&block)
       logs = @changelogs.sort do |a, b|
         -(Cygversion.new(a[0].to_s) <=> Cygversion.new(b[0].to_s))
       end
-      logs.each do |k, v|
-        yield(k, v)
-      end
+      logs.each(&block)
+    end
+
+    def length
+      @changelogs.length
     end
   end
 end

data/lib/xezat/cygversion.rb

@@ -15,6 +15,8 @@ module Xezat
 
     def to_v
       [Gem::Version.new(@version), @revision, @release]
+    rescue ArgumentError
+      to_a
     end
 
     def to_a
@@ -22,7 +24,10 @@ module Xezat
     end
 
     def <=>(other)
-      to_v <=> other.to_v
+      result = (to_v <=> other.to_v)
+      return result unless result.nil?
+
+      (to_a <=> other.to_a)
     end
   end
 end

data/lib/xezat/detector/asciidoc.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'find'
+
+module Xezat
+  module Detector
+    class Asciidoc
+      def detect(variables)
+        Find.find(variables[:S]) do |file|
+          next unless file.end_with?("#{File::SEPARATOR}configure.ac", "#{File::SEPARATOR}configure.in")
+
+          File.foreach(file) do |line|
+            return true if line.include?('asciidoc')
+          end
+        end
+        false
+      end
+    end
+  end
+end

data/lib/xezat/detector/autoconf.rb

@@ -7,7 +7,7 @@ module Xezat
     class Autoconf
       def detect(variables)
         Find.find(variables[:S]) do |file|
-          return true if file.end_with?(File::SEPARATOR + 'configure.ac') || file.end_with?(File::SEPARATOR + 'configure.in')
+          return true if file.end_with?("#{File::SEPARATOR}configure.ac", "#{File::SEPARATOR}configure.in")
         end
         false
       end

data/lib/xezat/detector/boost.m4.rb

@@ -7,7 +7,7 @@ module Xezat
     class BoostM4
       def detect(variables)
         Find.find(variables[:S]) do |file|
-          next unless file.end_with?(File::SEPARATOR + 'configure.ac') || file.end_with?(File::SEPARATOR + 'configure.in')
+          next unless file.end_with?("#{File::SEPARATOR}configure.ac", "#{File::SEPARATOR}configure.in")
 
           File.foreach(file) do |line|
             return true if line.lstrip.start_with?('BOOST_REQUIRE')

data/lib/xezat/detector/cmake.rb

@@ -7,7 +7,7 @@ module Xezat
     class Cmake
       def detect(variables)
         Find.find(variables[:S]) do |file|
-          return true if file.end_with?(File::SEPARATOR + 'CMakeLists.txt')
+          return true if file.end_with?("#{File::SEPARATOR}CMakeLists.txt")
         end
         false
       end

data/lib/xezat/detector/libtool.rb

@@ -7,10 +7,10 @@ module Xezat
     class Libtool
       def detect(variables)
         Find.find(variables[:S]) do |file|
-          return true if file.end_with?(File::SEPARATOR + 'ltmain.sh')
+          return true if file.end_with?("#{File::SEPARATOR}ltmain.sh")
         end
         Find.find(variables[:S]) do |file|
-          next unless file.end_with?(File::SEPARATOR + 'Makefile') || file.end_with?(File::SEPARATOR + 'makefile')
+          next unless file.end_with?("#{File::SEPARATOR}Makefile", "#{File::SEPARATOR}makefile")
           next if File.directory?(file)
 
           File.foreach(file) do |line|

data/lib/xezat/detector/make.rb

@@ -7,7 +7,7 @@ module Xezat
     class Make
       def detect(variables)
         Find.find(variables[:B]) do |file|
-          return true if file.end_with?(File::SEPARATOR + 'Makefile') || file.end_with?(File::SEPARATOR + 'makefile')
+          return true if file.end_with?("#{File::SEPARATOR}Makefile", "#{File::SEPARATOR}makefile")
         end
         File.foreach(File.join(variables[:top], variables[:cygportfile])) do |line|
           return true if line.index('cygmake')

data/lib/xezat/detector/nasm.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Xezat
+  module Detector
+    class Nasm
+      def detect(variables)
+        if variables.key?(:_meson_CYGCLASS_)
+          File.foreach(File.join(variables[:S], 'meson.build')) do |line|
+            return true if line.include?("find_program('nasm')")
+          end
+        end
+        false
+      end
+    end
+  end
+end

data/lib/xezat/detector/ninja.rb

@@ -9,7 +9,7 @@ module Xezat
         return true if variables.key?(:_meson_CYGCLASS_)
 
         Find.find(variables[:B]) do |file|
-          return true if file.end_with?(File::SEPARATOR + 'build.ninja')
+          return true if file.end_with?("#{File::SEPARATOR}build.ninja")
         end
         false
       end

data/lib/xezat/detector/python27.rb

@@ -11,11 +11,11 @@ module Xezat
         Find.find(variables[:D]) do |file|
           next unless file.end_with?('.py')
 
-          File.foreach(file) do |line|
-            return true if line.strip == '#!/usr/bin/env python' || line.strip.start_with?('#!/usr/bin/env python2')
-
-            break
-          end
+          first_line = File.readlines(file).first
+          return true if %r{^#!\s*/usr/bin/env\s*python2\s*$}.match?(first_line)
+          return true if %r{^#!\s*/usr/bin/env\s*python2.7\s*$}.match?(first_line)
+          return true if %r{^#!\s*/usr/bin/python2\s*$}.match?(first_line)
+          return true if %r{^#!\s*/usr/bin/python2.7\s*$}.match?(first_line)
         end
         false
       end