xezat 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e515798ac8ff0a0f6f60ba790faa9ee4e7b3c2fdbe70f55484d7c180929961a7
-  data.tar.gz: d5159b3b559a9bd19f9f67bf14e1d0e496c052d83579286289446ece688c2be9
+  metadata.gz: 5ce894f06157cf37deb9e4e97f41da557c51a0a4af3b6c81caede3ee88f2f018
+  data.tar.gz: 5dba5ffae008660e41e8f2ec9c0e8940f05e5d1b7be432d013be58b84439627d
 SHA512:
-  metadata.gz: b1dae9f8ee739e65769e5466d973c02876c5dc7e170aa7f52d3c3c6f014cf74fe200fd9300dd2db27df0ad6c49ddbf4dfade8f7f0986382a76e127e4932cca75
-  data.tar.gz: 81d6a0943f8f8160bfd0ac4b16b6517700392a91119b5472f2c78721f2f99ba71a35ae7d2925059da12b8c376bb2296f051b9e14910ac79cd4e2aca104a11597
+  metadata.gz: 1bb76ee8cc4c1a9717f6f07403c741eb9d09e819db8f08505a34f55a04374834bf1f0b45d724b968450f9d48a3c772214305f036fe5b39400d02338fe5207ae3
+  data.tar.gz: 4eb4b364e0e5baf15de4a9c5b486494c8efe84c4ffa71624b55a78c30cd34d224a66c9beb8ae759c7b688347d75eb9a4d5d0ad615bcbad5167551ea8326e9a64

data/.circleci/config.yml

@@ -73,3 +73,6 @@ jobs:
       # Collect reports
       - store_test_results:
           path: /tmp/test-results
+      - store_artifacts:
+          path: ~/repo/coverage
+          destination: coverage

data/.rubocop.yml

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

data/lib/xezat.rb

@@ -7,7 +7,7 @@ module Xezat
   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'))
+  CONFIG_FILE = File.expand_path(File.join(Dir.home, '.xezat', 'config.yml'))
 
   class << self
     attr_accessor :logger

data/lib/xezat/command/bump.rb

@@ -32,7 +32,7 @@ module Xezat
 
         info = {
           src_uri: get_src_uri(vars),
-          runtimes: get_runtime_packages(@cygport),
+          runtimes: get_runtime_packages(vars, @cygport),
           developments: get_development_packages(vars, pkgs),
           files: get_files(vars),
           changelog: get_changelog(vars, @options, readme_file)
@@ -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/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(vars, cygport)
+        candidate_files = Find.find(vars[: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/runtime_package.rb

@@ -7,9 +7,9 @@ require 'xezat/variables'
 module Xezat
   module Command
     class Bump
-      def get_runtime_packages(cygport)
+      def get_runtime_packages(vars, cygport)
         Xezat.logger.debug('Collect runtime packages from cygport dep')
-        result = invoke_cygport_dep(cygport)
+        result = invoke_cygport_dep(vars, cygport)
         result.gsub(/^.*\*\*\*.*$/, '').split($INPUT_RECORD_SEPARATOR).map(&:lstrip)
       end
     end

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/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/detectors.rb

@@ -8,7 +8,7 @@ module Xezat
     def initialize(detector_dir = File.expand_path(File.join(File.dirname(__FILE__), 'detector')))
       Xezat.logger.debug('Load detectors')
       @detectors = {}
-      Dir.glob(File.join(detector_dir, '*.rb')) do |rb|
+      Dir.glob(File.join(detector_dir, '*.rb')).sort.each do |rb|
         require rb
         @detectors[File.basename(rb, '.rb').intern] = Object.const_get("Xezat::Detector::#{File.basename(rb, '.rb').camelize}").new
       end
@@ -25,6 +25,10 @@ module Xezat
           Xezat.logger.debug("  #{name} ... no")
         end
       end
+      if tools.include?(:python27) && (tools.include?(:python36) || tools.include?(:python37))
+        Xezat.logger.debug('    Remove python27 because of detecting python3x')
+        tools.delete(:python27)
+      end
       tools
     end
   end

data/lib/xezat/generator/pkgconfig.rb

@@ -44,13 +44,13 @@ module Xezat
 
       def get_pkg_config(variables)
         erb = File.expand_path(File.join(TEMPLATE_DIR, 'pkgconfig.erb'))
-        ERB.new(File.readlines(erb).join(nil), nil, '%-').result(binding)
+        ERB.new(File.readlines(erb).join(nil), trim_mode: '%-').result(binding)
       end
 
       def append_commands_to_cmakelists(variables)
         srcdir = variables[:CYGCMAKE_SOURCE] || variables[:S]
         cmakelists = File.expand_path(File.join(srcdir, 'CMakeLists.txt'))
-        return if File.read(cmakelists) =~ %r!DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig!
+        return if %r!DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig!.match?(File.read(cmakelists))
 
         File.atomic_open(cmakelists, 'a') do |f|
           f.write(get_cmakelists(variables))
@@ -59,7 +59,7 @@ module Xezat
 
       def get_cmakelists(variables)
         erb = File.expand_path(File.join(TEMPLATE_DIR, 'cmake.erb'))
-        ERB.new(File.readlines(erb).join(nil), nil, '%-').result(binding)
+        ERB.new(File.readlines(erb).join(nil), trim_mode: '%-').result(binding)
       end
 
       def append_commands_to_autotools(variables)
@@ -71,7 +71,7 @@ module Xezat
 
         original_ac = File.read(configure_ac)
 
-        return if original_ac =~ /#{pn}.pc/
+        return if /#{pn}.pc/.match?(original_ac)
 
         original_ac.gsub!(/(AC_CONFIG_FILES\(\[)/, '\1' + "#{pn}.pc ")
         File.atomic_write(configure_ac) do |fa|
@@ -80,7 +80,7 @@ module Xezat
           makefile_am = File.expand_path(File.join(srcdir, 'Makefile.am'))
           raise AutotoolsFileNotFoundError unless File.exist?(makefile_am)
 
-          break if File.read(makefile_am) =~ /pkgconfig_DATA/
+          break if /pkgconfig_DATA/.match?(File.read(makefile_am))
 
           commands_am = File.read(File.expand_path(File.join(TEMPLATE_DIR, 'Makefile.am')))
           File.atomic_open(makefile_am, 'a') do |fm|

data/lib/xezat/main.rb

@@ -8,7 +8,7 @@ require 'xezat/version'
 module Xezat
   class Main < Thor
     include ZshCompletion::Command
-    class_option :config, type: :string, aliases: '-c', desc: 'specify config', default: INI_FILE
+    class_option :config, type: :string, aliases: '-c', desc: 'specify config', default: CONFIG_FILE
     class_option :help, type: :boolean, aliases: '-h', desc: 'help message'
 
     desc 'version', 'Print version'

data/lib/xezat/variables.rb

@@ -16,8 +16,8 @@ module Xezat
 
     if File.exist?(cache_file) && File.ctime(cache_file) > File.ctime(cygport)
       Xezat.logger.debug('  Read cache for variables')
-      return YAML.safe_load(File.open(cache_file), [Symbol]).each_value do |v|
-        v.strip! if v.respond_to?(:strip)
+      return YAML.safe_load(File.open(cache_file), [Symbol]).each do |k, v|
+        v.strip! if v.respond_to?(:strip) && k != :DESCRIPTION
       end
     end
 

data/lib/xezat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Xezat
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/share/xezat/compilers.json

@@ -22,6 +22,13 @@
       "gcc-core"
     ]
   },
+  "Fortran Free Form": {
+    "package": "gcc-fortran",
+    "dependencies": [
+      "binutils",
+      "gcc-core"
+    ]
+  },
   "Lex": {
     "package": "flex"
   },

data/xezat.gemspec

@@ -21,21 +21,21 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.3.6'
+  spec.required_ruby_version = '>= 2.6.4'
 
   spec.add_runtime_dependency 'facets', '>= 3.1.0'
-  spec.add_runtime_dependency 'github-linguist', '>= 7.6.1'
-  spec.add_runtime_dependency 'inifile', '>= 3.0.0'
-  spec.add_runtime_dependency 'io-console', '>= 0.4.6'
-  spec.add_runtime_dependency 'pkg-config', '>= 1.3.9'
+  spec.add_runtime_dependency 'github-linguist', '>= 7.11.0'
+  spec.add_runtime_dependency 'io-console', '>= 0.5.6'
+  spec.add_runtime_dependency 'pkg-config', '>= 1.4.2'
   spec.add_runtime_dependency 'thor', '>= 0.20.3'
-  spec.add_runtime_dependency 'thor-zsh_completion', '>= 0.1.5'
+  spec.add_runtime_dependency 'thor-zsh_completion', '>= 0.1.7'
 
   spec.add_development_dependency 'bundler', '>= 1.15.3'
-  spec.add_development_dependency 'fasterer', '>= 0.7.1'
+  spec.add_development_dependency 'fasterer', '>= 0.8.3'
   spec.add_development_dependency 'rake', '>= 13.0'
   spec.add_development_dependency 'rspec', '>= 3.9.0'
   spec.add_development_dependency 'rspec_junit_formatter', '<= 0.4.1'
-  spec.add_development_dependency 'rubocop', '>= 0.75.0'
-  spec.add_development_dependency 'rubocop-performance', '>= 1.5.0'
+  spec.add_development_dependency 'rubocop', '>= 0.90.0'
+  spec.add_development_dependency 'rubocop-performance', '>= 1.8.0'
+  spec.add_development_dependency 'simplecov', '>= 0.19.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xezat
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Daisuke Fujimura (fd0)
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2020-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
@@ -30,56 +30,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.6.1
+        version: 7.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.6.1
-- !ruby/object:Gem::Dependency
-  name: inifile
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 7.11.0
 - !ruby/object:Gem::Dependency
   name: io-console
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.5.6
 - !ruby/object:Gem::Dependency
   name: pkg-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.9
+        version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.9
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -184,28 +170,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.75.0
+        version: 0.90.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.75.0
+        version: 0.90.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 0.19.0
 description: xezat helps you win at cygport.
 email:
 - booleanlabel@gmail.com
@@ -295,7 +295,7 @@ homepage: https://github.com/fd00/xezat
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -303,16 +303,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.6
+      version: 2.6.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: xezat helps you win at cygport.
 test_files: []