xezat 0.1.0 → 0.1.1

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'xezat'
+require 'xezat/command/bump/compiler'
+require 'xezat/command/bump/language'
+require 'xezat/command/bump/tool'
+
+module Xezat
+  module Command
+    class Bump
+      def get_development_packages(variables, packages)
+        LOG.debug('Collect development packages')
+        compilers = get_compilers(get_languages(variables[:S]), variables)
+        tools = get_tools(variables)
+        development_packages = (compilers + tools + [:cygport]).uniq.sort
+        development_packages.map! do |package|
+          packages[package] || ''
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'xezat'
+
+module Xezat
+  class IllegalStateError < StandardError
+  end
+
+  module Command
+    class Bump
+      def get_files(variables)
+        LOG.debug('Collect files')
+        pkg2files = {}
+        variables[:pkg_name].each do |pkg_name|
+          LOG.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)
+
+          lines = File.readlines(lst_file)
+          lines.delete_if do |path|
+            path.strip!
+            path[-1] == File::SEPARATOR # ignore directory
+          end
+          lines.map! do |path|
+            File::SEPARATOR + path
+          end
+          if variables[:PN] == pkg_name
+            readme = File::SEPARATOR + File.join('usr', 'share', 'doc', 'Cygwin', "#{pkg_name}.README")
+            lines << readme.strip unless lines.include?(readme)
+          end
+          pkg2files[pkg_name.intern] = lines.sort
+        end
+        pkg2files
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'xezat'
+require 'xezat/ext/linguist/file_blob'
+
+module Xezat
+  module Command
+    class Bump
+      def get_languages(top_src_dir)
+        LOG.debug('Collect languages')
+        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.uniq
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'xezat'
+require 'xezat/command/bump/cygport_dep'
+require 'xezat/variables'
+
+module Xezat
+  module Command
+    class Bump
+      def get_runtime_packages(cygport)
+        LOG.debug('Collect runtime packages from cygport dep')
+        result = invoke_cygport_dep(cygport)
+        result.gsub(/^.*\*\*\*.*$/, '').split($INPUT_RECORD_SEPARATOR).map(&:lstrip)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'xezat'
+require 'xezat/cygclasses'
+
+module Xezat
+  module Command
+    class Bump
+      def get_src_uri(vars, cygclasses = CygclassManager.new)
+        LOG.debug('Collect SRC_URI')
+        cygclasses.vcs.each do |vcs|
+          next unless vars.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)
+        end
+        vars[:SRC_URI].split
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'xezat/detectors'
+
+module Xezat
+  module Command
+    class Bump
+      def get_tools(variables)
+        DetectorManager.new.detect(variables)
+      end
+    end
+  end
+end

data/lib/xezat/command/debug.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 require 'thor'
 
 module Xezat
   module Command
     class Debug < Thor
-
       desc 'linguist cygport', 'Show used programming languages'
 
       def linguist(cygport)
@@ -17,7 +18,6 @@ module Xezat
         require 'xezat/debugger/variable'
         Debugger::Variable.new(cygport).debug
       end
-
     end
   end
 end

data/lib/xezat/command/doctor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'zlib'
 
 module Xezat
@@ -5,8 +7,7 @@ module Xezat
     class Doctor
       include Xezat
 
-      def initialize
-      end
+      def initialize; end
 
       def execute
         get_contents_uniqueness.each do |path, pkg|
@@ -22,6 +23,7 @@ module Xezat
             gz.each_line do |line|
               line.strip!
               next if line.end_with?('/')
+
               path = line.intern
               content2pkg[path] = [] unless content2pkg.key?(path)
               content2pkg[path] << pkg

data/lib/xezat/command/generate.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 require 'thor'
 
 module Xezat
   module Command
     class Generate < Thor
-
       desc 'generate pkgconfig cygport', 'Generate *.pc'
       option :overwrite, type: :boolean, aliases: '-o', desc: 'overwrite *.pc'
 
@@ -11,7 +12,6 @@ module Xezat
         require 'xezat/generator/pkgconfig'
         Generator::Pkgconfig.new(options, cygport).generate
       end
-
     end
   end
 end

data/lib/xezat/command/init.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require 'facets/file/atomic_write'
 require 'json'
 require 'xezat/config'
 require 'xezat/cygclasses'
 
 module Xezat
-
   class NoSuchRepositoryError < StandardError
   end
 
@@ -29,7 +30,8 @@ module Xezat
       def execute
         cygclass_dir = config(@options[:config])['cygwin']['cygclassdir']
         repository_variables = get_repository_variables(@options['repository'])
-        raise UnoverwritableCygportError, "#{cygport} already exists" if (FileTest.exist?(@cygport) && !@options['overwrite'])
+        raise UnoverwritableCygportError, "#{cygport} already exists" if FileTest.exist?(@cygport) && !@options['overwrite']
+
         cygclasses = (@options['inherit'] || '').split(',')
         template_variables = get_template_variables(repository_variables, CygclassManager.new(cygclass_dir), cygclasses)
         File.atomic_write(@cygport) do |f|
@@ -40,12 +42,13 @@ module Xezat
       def get_repository_variables(repository)
         if repository
           repository_file = File.expand_path(File.join(REPOSITORY_DIR, "#{repository}.json"))
-          raise NoSuchRepositoryError, "No such repository: #{template}" unless (FileTest.exist?(repository_file) || FileTest.readable?(repository_file))
+          raise NoSuchRepositoryError, "No such repository: #{template}" unless FileTest.exist?(repository_file) || FileTest.readable?(repository_file)
+
           JSON.parse(File.read(repository_file), symbolize_names: true)
         else
           {
-              HOMEPAGE: '',
-              SRC_URI: ''
+            HOMEPAGE: '',
+            SRC_URI: ''
           }
         end
       end
@@ -55,16 +58,17 @@ module Xezat
         vcs_prefix = 'SRC'
         cygclasses.each do |cygclass|
           raise NoSuchCygclassError, "No such cygclass: #{cygclass}" unless cygclass_manager.include?(cygclass.intern)
-          if cygclass_manager.vcs?(cygclass.intern)
-            raise CygclassConflictError, "#{cygclass} conflict with #{vcs_class}" if vcs_class
-            vcs_class = cygclass
-          end
+
+          next unless cygclass_manager.vcs?(cygclass.intern)
+          raise CygclassConflictError, "#{cygclass} conflict with #{vcs_class}" if vcs_class
+
+          vcs_class = cygclass
         end
         vcs_prefix = vcs_class.to_s.upcase if vcs_class
         vcs_uri = "#{vcs_prefix}_URI".intern
         {
-            :HOMEPAGE => original_template_variables[:HOMEPAGE],
-            vcs_uri => original_template_variables[vcs_uri]
+          :HOMEPAGE => original_template_variables[:HOMEPAGE],
+          vcs_uri => original_template_variables[vcs_uri]
         }
       end
 

data/lib/xezat/command/port.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+require 'xezat'
 require 'xezat/config'
 require 'xezat/variables'
 
 module Xezat
-
   class NoPortDirectoryError < StandardError
   end
 
@@ -16,24 +19,30 @@ module Xezat
       end
 
       def execute
+        LOG.debug('Start porting')
         vars = variables(@cygport)
         d = File.expand_path(File.join(get_port_directory(@options), vars[:PN]))
+        cygport = File.expand_path(File.join(vars[:top], @cygport))
+        readme = File.expand_path(File.join(vars[:C], 'README'))
+        src_patch = File.expand_path(File.join(vars[:patchdir], "#{vars[:PF]}.src.patch"))
+
         fuo = {
-            noop: @options[:noop],
-            verbose: @options[:noop] || @options[:verbose]
+          noop: @options[:noop],
+          verbose: @options[:noop] || @options[:verbose]
         }
 
         FileUtils.mkdir_p(d, fuo)
-        FileUtils.cp(File.expand_path(File.join(vars[:top], @cygport)), d, fuo)
-        FileUtils.cp(File.expand_path(File.join(vars[:C], 'README')), d, fuo)
-        src_patch = File.expand_path(File.join(vars[:patchdir], "#{vars[:PF]}.src.patch"))
+        FileUtils.cp(cygport, d, fuo)
+        FileUtils.cp(readme, d, fuo)
         FileUtils.cp(src_patch, d, fuo) unless FileTest.zero?(src_patch)
+        LOG.debug('End porting')
       end
 
       def get_port_directory(options)
-        conf = config(@options[:config])
+        conf = config(options[:config])
         port_dir = conf['xezat']['portdir'] || options[:portdir]
         raise NoPortDirectoryError if port_dir.nil?
+
         port_dir
       end
     end

data/lib/xezat/config.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'inifile'
 
 module Xezat
   def config(filepath = nil)
     config = IniFile.new
     config['cygwin'] = {
-        'cygclassdir' => '/usr/share/cygport/cygclass'
+      'cygclassdir' => '/usr/share/cygport/cygclass'
     }
     config['xezat'] = {
     }

data/lib/xezat/cygchangelog.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'xezat/cygversion'
 
 module Xezat
@@ -6,29 +8,32 @@ module Xezat
 
   class Cygchangelog
     def initialize(str = '')
-      @changelogs = str.empty? ? {} : nil
+      @changelogs = nil
       version = nil
       str.each_line do |line|
         line.rstrip!
-        if /^Port Notes:$/ === line
+        if line == 'Port Notes:'
           @changelogs = {}
+          next
+        end
+        next if @changelogs.nil?
+
+        match_version = /^----- version (.+) -----$/.match(line)
+        if match_version
+          version = match_version[1].intern
+          next
+        end
+        match_content = /^(.+)$/.match(line)
+        next unless match_content
+        raise ReadmeSyntaxError, 'Version missing' if version.nil?
+
+        if @changelogs.key?(version)
+          @changelogs[version] << $INPUT_RECORD_SEPARATOR << match_content[1]
         else
-          unless @changelogs.nil?
-            if match_data = /^----- version (.+) -----$/.match(line)
-              version = match_data[1].intern
-            else
-              if match_data = /^(.+)$/.match(line)
-                raise ReadmeSyntaxError, 'Version missing' if version.nil?
-                if @changelogs.key?(version)
-                  @changelogs[version] << $INPUT_RECORD_SEPARATOR << match_data[1]
-                else
-                  @changelogs[version] = match_data[1]
-                end
-              end
-            end
-          end
+          @changelogs[version] = match_content[1]
         end
       end
+      @changelogs ||= {}
     end
 
     def [](key)
@@ -44,9 +49,10 @@ module Xezat
     end
 
     def each
-      @changelogs.sort do |a, b|
+      logs = @changelogs.sort do |a, b|
         -(Cygversion.new(a[0].to_s) <=> Cygversion.new(b[0].to_s))
-      end.each do |k, v|
+      end
+      logs.each do |k, v|
         yield(k, v)
       end
     end

data/lib/xezat/cygclasses.rb

@@ -1,14 +1,17 @@
+# frozen_string_literal: true
+
 module Xezat
   class CygclassManager
     def initialize(cygclass_dir = '/usr/share/cygport/cygclass')
       raise ArgumentError, "#{cygclass_dir} not found" unless Dir.exist?(cygclass_dir)
+
       @cygclasses = []
       @vcs_cygclasses = []
       Dir.glob(File.join(cygclass_dir, '*.cygclass')) do |filename|
         cygclass = File.basename(filename, '.cygclass')
         @cygclasses << cygclass.intern
         File.foreach(filename) do |line|
-          @vcs_cygclasses << cygclass.intern if "readonly -f #{cygclass}_fetch" == line.strip
+          @vcs_cygclasses << cygclass.intern if line.strip == "readonly -f #{cygclass}_fetch"
         end
       end
     end

data/lib/xezat/cygversion.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 
 module Xezat
@@ -7,7 +9,7 @@ module Xezat
       version = matched[1]
       @release = matched[2]
       splitted = version.split('+')
-      @version = splitted[0].gsub('_', '.')
+      @version = splitted[0].tr('_', '.')
       @revision = splitted.length >= 2 ? splitted[1].match(/(\d+)/)[0].to_i : Time.at(0).strftime('%Y%m%d').to_i
     end
 
@@ -19,8 +21,8 @@ module Xezat
       [@version, @revision, @release]
     end
 
-    def <=>(operand)
-      to_v <=> operand.to_v
+    def <=>(other)
+      to_v <=> other.to_v
     end
   end
 end