xezat 0.1.0 → 0.1.1

data/lib/xezat/debugger/linguist.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'find'
 require 'pp'
 require 'xezat/ext/linguist/file_blob'
@@ -18,8 +20,10 @@ module Xezat
         top_src_dir = vars[:S]
         Find.find(top_src_dir) do |path|
           next if FileTest.directory?(path)
+
           language = Xezat::Linguist::FileBlob.new(path).language
           next if language.nil?
+
           name = language.name
           lang2files[name] = [] unless lang2files.key?(name)
           lang2files[name] << path.gsub("#{top_src_dir}/", '')

data/lib/xezat/debugger/variable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pp'
 require 'xezat/variables'
 

data/lib/xezat/detector/autoconf.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'find'
 
 module Xezat

data/lib/xezat/detector/automake.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'find'
 
 module Xezat

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'find'
 
 module Xezat
@@ -6,6 +8,7 @@ module Xezat
       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')
+
           File.foreach(file) do |line|
             return true if line.lstrip.start_with?('BOOST_REQUIRE')
           end

data/lib/xezat/detector/cmake.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'find'
 
 module Xezat

data/lib/xezat/detector/gengetopt.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'find'
 
 module Xezat

data/lib/xezat/detector/gnulib.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'find'
 
 module Xezat

data/lib/xezat/detector/gobject-introspection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'find'
 
 module Xezat

data/lib/xezat/detector/halibut.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'find'
 
 module Xezat

data/lib/xezat/detector/libQt5Core-devel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Xezat
   module Detector
     class LibQt5CoreDevel

data/lib/xezat/detector/libtool.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'find'
 
 module Xezat
@@ -7,6 +9,13 @@ module Xezat
         Find.find(variables[:S]) do |file|
           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')
+
+          File.foreach(file) do |line|
+            return true if line.lstrip.include?('libtool')
+          end
+        end
         false
       end
     end

data/lib/xezat/detector/make.rb

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
+
 require 'find'
 
 module Xezat
   module Detector
     class Make
       def detect(variables)
-        return true if variables.key?(:_cmake_CYGCLASS_)
         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.end_with?(File::SEPARATOR + 'makefile')
         end
         File.foreach(File.join(variables[:top], variables[:cygportfile])) do |line|
           return true if line.index('cygmake')

data/lib/xezat/detector/meson.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Xezat
   module Detector
     class Meson

data/lib/xezat/detector/ninja.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
+
 require 'find'
 
 module Xezat
   module Detector
     class Ninja
       def detect(variables)
+        return true if variables.key?(:_meson_CYGCLASS_)
+
         Find.find(variables[:B]) do |file|
           return true if file.end_with?(File::SEPARATOR + 'build.ninja')
         end

data/lib/xezat/detector/python27.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'find'
+
+module Xezat
+  module Detector
+    class Python27
+      def detect(variables)
+        return true if File.directory?(File.join(variables[:D], 'usr', 'lib', 'python2.7'))
+
+        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
+        end
+        false
+      end
+    end
+  end
+end

data/lib/xezat/detector/{python-docutils.rb → python3-docutils.rb}

@@ -1,13 +1,16 @@
+# frozen_string_literal: true
+
 require 'find'
 
 module Xezat
   module Detector
-    class PythonDocutils
+    class Python3Docutils
       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')
+
           File.foreach(file) do |line|
-            return true if (line.lstrip.start_with?('AC_CHECK_PROG') && line.index('rst2man').is_a?(Integer))
+            return true if line.strip.start_with?('AC_CHECK_PROG') && line.index('rst2man').is_a?(Integer)
           end
         end
         false

data/lib/xezat/detector/python36.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'find'
+
+module Xezat
+  module Detector
+    class Python36
+      def detect(variables)
+        return true if File.directory?(File.join(variables[:D], 'usr', 'lib', 'python3.6'))
+
+        Find.find(variables[:D]) do |file|
+          next unless file.end_with?('.py')
+
+          File.foreach(file) do |line|
+            return true if line.strip.start_with?('#!/usr/bin/env python3')
+
+            break
+          end
+        end
+        false
+      end
+    end
+  end
+end

data/lib/xezat/detector/roundup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'find'
 
 module Xezat

data/lib/xezat/detector/waf.rb

@@ -1,8 +1,16 @@
+# frozen_string_literal: true
+
 module Xezat
   module Detector
     class Waf
       def detect(variables)
-        variables.key?(:_waf_CYGCLASS_)
+        if variables.key?(:_waf_CYGCLASS_)
+          Find.find(variables[:S]) do |file|
+            return false if file.end_with?(File::SEPARATOR + 'waf')
+          end
+          return true
+        end
+        false
       end
     end
   end

data/lib/xezat/detectors.rb

@@ -1,6 +1,11 @@
+# frozen_string_literal: true
+
+require 'xezat'
+
 module Xezat
   class DetectorManager
     def initialize(detector_dir = File.expand_path(File.join(File.dirname(__FILE__), 'detector')))
+      LOG.debug('Load detectors')
       @detectors = {}
       Dir.glob(File.join(detector_dir, '*.rb')) do |rb|
         require rb
@@ -9,9 +14,15 @@ module Xezat
     end
 
     def detect(variables)
+      LOG.debug('Detect tools')
       tools = []
       @detectors.each do |name, detector|
-        tools << name if detector.detect(variables)
+        if detector.detect(variables)
+          tools << name
+          LOG.debug("  #{name} ... yes")
+        else
+          LOG.debug("  #{name} ... no")
+        end
       end
       tools
     end

data/lib/xezat/ext/linguist/file_blob.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'linguist'
 
 module Xezat
@@ -5,7 +7,7 @@ module Xezat
     class FileBlob < ::Linguist::FileBlob
       def data
         super.scrub
-      rescue
+      rescue StandardError
         ''
       end
     end

data/lib/xezat/generator/pkgconfig.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 require 'facets/file/atomic_open'
 require 'facets/file/atomic_write'
 require 'xezat/variables'
 
 module Xezat
-
   class UnregeneratableConfigurationError < StandardError
   end
 
@@ -31,10 +32,11 @@ module Xezat
       end
 
       def generate_pkg_config(variables, options)
-        srcdir = variables[:CYGCMAKE_SOURCE] || variables[:S]
+        srcdir = variables[:CYGCONF_SOURCE] || variables[:CYGCMAKE_SOURCE] || variables[:S]
         pn = variables[:PN]
         pc = File.expand_path(File.join(srcdir, "#{pn}.pc.in"))
-        raise UnregeneratableConfigurationError, "#{pn}.pc.in already exists" if (File.exist?(pc) && !options['overwrite'])
+        raise UnregeneratableConfigurationError, "#{pn}.pc.in already exists" if File.exist?(pc) && !options['overwrite']
+
         File.atomic_write(pc) do |f|
           f.write(get_pkg_config(variables))
         end
@@ -48,10 +50,10 @@ module Xezat
       def append_commands_to_cmakelists(variables)
         srcdir = variables[:CYGCMAKE_SOURCE] || variables[:S]
         cmakelists = File.expand_path(File.join(srcdir, 'CMakeLists.txt'))
-        unless File.read(cmakelists) =~ /DESTINATION \$\{CMAKE_INSTALL_PREFIX\}\/lib\/pkgconfig/
-          File.atomic_open(cmakelists, 'a') do |f|
-            f.write(get_cmakelists(variables))
-          end
+        return if File.read(cmakelists) =~ %r!DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig!
+
+        File.atomic_open(cmakelists, 'a') do |f|
+          f.write(get_cmakelists(variables))
         end
       end
 
@@ -66,25 +68,26 @@ module Xezat
         configure_ac = File.expand_path(File.join(srcdir, 'configure.ac'))
         configure_ac = File.expand_path(File.join(srcdir, 'configure.in')) unless File.exist?(configure_ac)
         raise AutotoolsFileNotFoundError unless File.exist?(configure_ac)
+
         original_ac = File.read(configure_ac)
 
-        unless original_ac =~ /#{pn}.pc/
-          original_ac.gsub!(/(AC_CONFIG_FILES\(\[)/, '\1' + "#{pn}.pc ")
-          File.atomic_write(configure_ac) do |fa|
-            fa.write(original_ac)
+        return if original_ac =~ /#{pn}.pc/
+
+        original_ac.gsub!(/(AC_CONFIG_FILES\(\[)/, '\1' + "#{pn}.pc ")
+        File.atomic_write(configure_ac) do |fa|
+          fa.write(original_ac)
+
+          makefile_am = File.expand_path(File.join(srcdir, 'Makefile.am'))
+          raise AutotoolsFileNotFoundError unless File.exist?(makefile_am)
 
-            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/
 
-            unless File.read(makefile_am) =~ /pkgconfig_DATA/
-              commands_am = File.read(File.expand_path(File.join(TEMPLATE_DIR, 'Makefile.am')))
-              File.atomic_open(makefile_am, 'a') do |fm|
-                fm.write(commands_am)
-              end
-            end
+          commands_am = File.read(File.expand_path(File.join(TEMPLATE_DIR, 'Makefile.am')))
+          File.atomic_open(makefile_am, 'a') do |fm|
+            fm.write(commands_am)
           end
         end
       end
     end
   end
-end
+end

data/lib/xezat/main.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thor'
 require 'thor/zsh_completion'
 require 'xezat'
@@ -11,7 +13,7 @@ module Xezat
 
     desc 'version', 'Print version'
 
-    def version()
+    def version
       puts "Xezat #{Xezat::VERSION}"
     end
 
@@ -37,7 +39,7 @@ module Xezat
 
     desc 'debug subcommand', 'Debug cygport'
     require 'xezat/command/debug'
-    subcommand 'debug',Command::Debug
+    subcommand 'debug', Command::Debug
 
     desc 'doctor', 'Check your system for potential problems'
 
@@ -58,6 +60,5 @@ module Xezat
       require 'xezat/command/port'
       Command::Port.new(options, cygport).execute
     end
-
   end
 end

data/lib/xezat/packages.rb

@@ -1,10 +1,17 @@
+# frozen_string_literal: true
+
+require 'xezat'
+
 module Xezat
   def packages(db_path = '/etc/setup/installed.db')
+    LOG.debug("Collect installed packages from #{db_path}")
     raise ArgumentError, "#{db_path} not found" unless File.exist?(db_path)
+
     packages = {}
     File.read(db_path).lines do |line|
       record = line.split(/\s+/)
       next unless record.size == 3 # /^hoge hoge-ver-rel.tar.bz2 0$/
+
       packages[record[0].intern] = record[1].gsub(/\.tar\.bz2$/, '')
     end
     packages

data/lib/xezat/variables.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+require 'facets/file/atomic_write'
 require 'facets/string/word_wrap'
 require 'open3'
 require 'uri'
@@ -5,19 +8,35 @@ require 'yaml'
 require 'xezat'
 
 module Xezat
-  class CygportProcessError < StandardError
-  end
-
   def variables(cygport)
+    cygport_dir = File.dirname(File.absolute_path(cygport))
+    cache_file = File.expand_path(File.join(cygport_dir, File.basename(cygport, '.cygport') + '.cache.yml'))
+
+    LOG.debug('Extract variables')
+
+    if File.exist?(cache_file) && File.ctime(cache_file) > File.ctime(cygport)
+      LOG.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)
+      end
+    end
+
     command = ['bash', File.expand_path(File.join(DATA_DIR, 'show_cygport_variable.sh')), cygport]
     result, error, status = Open3.capture3(command.join(' '))
     raise CygportProcessError, error unless status.success?
+
     result.gsub!(/^.*\*\*\*.*$/, '')
 
-    variables = YAML.load(result).each_value do |v|
+    variables = YAML.safe_load(result, [Symbol]).each_value do |v|
       v.strip! if v.respond_to?(:strip)
     end
     variables[:DESCRIPTION].word_wrap!(79)
+
+    File.atomic_write(cache_file) do |f|
+      LOG.debug('  Write cache for variables')
+      f.write(YAML.dump(variables))
+    end
+
     variables
   end
 end