packo 0.0.1.alpha.1 → 0.0.1.alpha.2

data/bin/packo

@@ -19,6 +19,8 @@
 # along with packo. If not, see <http://www.gnu.org/licenses/>.
 #++
 
+require 'shellwords'
+
 commands = Dir.glob('/usr/bin/packo-*').map {|path|
   File.basename(path).sub('packo-', '')
 }
@@ -49,12 +51,21 @@ if commands.member?(ARGV.first)
   warn "sandbox isn't installed"  if !sandbox
   warn "fakeroot isn't installed" if !fakeroot
 
-  exit system(*([((!trusted.include?(command.to_sym)) ? 'sandbox' : nil), 'fakeroot', "packo-#{command}"] + ARGV).compact)
+  through = []
+
+  if !trusted.include?(command.to_sym)
+    through << 'sandbox'
+  end 
+  
+  through << 'fakeroot' << "packo-#{command}"
+
+  exit Kernel.system(*(through + ARGV.map {|arg|
+    arg.shellescape
+  }))
 end
 
 require 'rubygems' unless defined?(Gem)
 
-require 'packo'
 require 'packo/cli/base'
 
 class Application < Packo::CLI::Base

data/lib/packo.rb

@@ -17,44 +17,10 @@
 # along with packo. If not, see <http://www.gnu.org/licenses/>.
 #++
 
-require 'ostruct'
+require 'packo/utils'
+require 'packo/extensions'
 
 module Packo
-  def self.sh (*cmd, &block)
-    options = (Hash === cmd.last) ? cmd.pop : {}
-
-    if !block_given?
-      show_command = cmd.join(' ')
-      show_command = show_command[0, 42] + '...' unless $trace
-
-      block = lambda {|ok, status|
-        ok or fail "Command failed with status (#{status.exitstatus}): [#{show_command}] in {#{Dir.pwd}}"
-      }
-    end
-
-    if options[:silent]
-      options[:out] = '/dev/null'
-      options[:err] = '/dev/null'
-    else
-      print "#{cmd.first} "
-      cmd[1 .. cmd.length].each {|cmd|
-        if cmd.match(/[ \$'`]/)
-          print %Q{"#{cmd}" }
-        else
-          print "#{cmd} "
-        end
-      }
-      print "\n"
-    end
-
-    options.delete :silent
-
-    result = Kernel.system(options[:env] || {}, *cmd, options)
-    status = $?
-
-    block.call(result, status)
-  end
-
   def self.debug (argument, options={})
     if !Packo.const_defined?(:System) || (!System.env[:DEBUG] && !options[:force])
       return
@@ -82,27 +48,26 @@ module Packo
       output << options[:separator]
     end
 
-    puts output
-  end
-
-  def self.load (path, options={})
-    if !File.readable? path
-      raise LoadError.new("no such file to load -- #{path}")
-    end
-
-    eval("#{options[:before]}#{File.read(path, encoding: 'utf-8').split(/^__END__$/).first}#{options[:after]}", options[:binding] || binding, path, 1)
+    $stderr.puts output
   end
 
   def self.loadPackage (path, package=nil)
     options = {
-      before: 'module ::Packo::RBuild;',
-      after:  ';end'
+      before: %{
+        module ::Packo::RBuild
+        include ::Packo::RBuild::Modules
+        include ::Packo::RBuild::Behaviors
+      },
+
+      after: %{
+        end
+      }
     }
 
     files = {}
 
     if package
-      if File.exists?("#{path}/digest.xml") && (digest = Nokogiri::XML.parse(File.read("#{path}/digest.xml")))
+      if File.exists?("#{path}/digest.xml") && (digest = Nokogiri::XML.parse(File.read("#{path}/digest.xml", encoding: 'utf-8')))
         features = digest.xpath("//build[@version = '#{package.version}'][@slot = '#{package.slot}']/features").first
 
         if features
@@ -137,7 +102,7 @@ module Packo
       begin
         Packo.load "#{path}/#{package.name}.rbuild", options
 
-        if (pkg = RBuild::Package.last) && (tmp = File.read("#{path}/#{package.name}.rbuild").split(/^__END__$/)).length > 1
+        if (pkg = RBuild::Package.last) && (tmp = File.read("#{path}/#{package.name}.rbuild", encoding: 'utf-8').split(/^__END__$/)).length > 1
           pkg.filesystem.parse(tmp.last.lstrip)
         end
       rescue Exception => e
@@ -149,7 +114,7 @@ module Packo
       if RBuild::Package.last.name == package.name && RBuild::Package.last.version == package.version
         RBuild::Package.last.filesystem.merge!(pkg.filesystem)
 
-        if (tmp = File.read("#{path}/#{package.name}-#{package.version}.rbuild").split(/^__END__$/)).length > 1
+        if (tmp = File.read("#{path}/#{package.name}-#{package.version}.rbuild", encoding: 'utf-8').split(/^__END__$/)).length > 1
           RBuild::Package.last.filesystem.parse(tmp.last.lstrip)
         end
 
@@ -165,7 +130,7 @@ module Packo
       begin
         Packo.load path, options
 
-        if (pkg = RBuild::Package.last) && (tmp = File.read(path).split(/^__END__$/)).length > 1
+        if (pkg = RBuild::Package.last) && (tmp = File.read(path, encoding: 'utf-8').split(/^__END__$/)).length > 1
           pkg.filesystem.parse(tmp.last.lstrip)
         end
       rescue Exception => e
@@ -178,7 +143,6 @@ module Packo
 end
 
 require 'packo/version'
-require 'packo/extensions'
 require 'packo/system'
 require 'packo/do'
 require 'packo/cli'

data/lib/packo/cli.rb

@@ -52,15 +52,21 @@ module Packo
 
 module CLI
   def self.info (text)
-    puts "#{'*'.green.bold} #{text}"
+    text.strip.lines.each {|line|
+      puts "#{'*'.green.bold} #{line.strip}"
+    }
   end
 
   def self.warn (text)
-    puts "#{'*'.yellow.bold} #{text}"
+    text.strip.lines.each {|line|
+      puts "#{'*'.yellow.bold} #{line.strip}"
+    }
   end
 
   def self.fatal (text)
-    puts "#{'*'.red} #{text}"
+    text.strip.lines.each {|line|
+      puts "#{'*'.red} #{line.strip}"
+    }
   end
 end
 

data/lib/packo/cli/base.rb

@@ -37,7 +37,7 @@ class Base < Thor
   method_option :ignore,      type: :boolean, default: false,                     aliases: '-x', desc: 'Ignore the installation and do not add the package to the database'
   method_option :nodeps,      type: :boolean, default: false,                     aliases: '-N', desc: 'Ignore blockers and dependencies'
   method_option :depsonly,    type: :boolean, default: false,                     aliases: '-D', desc: 'Install only dependencies'
-  method_option :repository,  type: :string,                                         aliases: '-r', desc: 'Set a specific repository'
+  method_option :repository,  type: :string,                                      aliases: '-r', desc: 'Set a specific repository'
   def install (*names)
     type = names.last.is_a?(Symbol) ? names.pop : :both
 
@@ -142,7 +142,7 @@ class Base < Thor
 
             name = "#{env[:TMP]}/#{name}"
 
-            if (digest = _digest(package, env)) && (result = Do.digest(name)) != digest
+            if (digest = _digest(package, env)) && (result = Packo.digest(name)) != digest
               CLI.fatal "Digest mismatch (got #{result} expected #{digest}), install this package from source, the mirror could be compromised"
               exit 13
             end
@@ -266,64 +266,56 @@ class Base < Thor
         old    = path
 
         begin
-          Find.find("#{path}/dist") {|file|
-            next unless file[length, file.length]
-
-            type = nil
-            path = (options[:destination] + file[length, file.length]).cleanpath.to_s
-            fake = path[options[:destination].cleanpath.to_s.length, path.length] || ''
-            meta = nil
-
-            if !options[:force] && File.exists?(path) && !File.directory?(path)
-              if (tmp = _exists?(fake))
-                CLI.fatal "#{path} belongs to #{tmp}, use --force to overwrite"
+          Packo.contents(Find.find("#{path}/dist")) {|file|
+            if !file[length, file.length]
+              { next: true }
+            else
+              { path: Path.clean(options[:destination] + file[length, file.length]) }
+            end
+          }.each {|file|
+            if !options[:force] && File.exists?(file.path) && !File.directory?(file.path)
+              if (tmp = _exists?(file.path))
+                CLI.fatal "#{file.path} belongs to #{tmp}, use --force to overwrite"
               else
-                CLI.fatal "#{path} doesn't belong to any package, use --force to overwrite"
+                CLI.fatal "#{file.path} doesn't belong to any package, use --force to overwrite"
               end
 
               raise RuntimeError.new 'File collision'
             end
 
-            if File.directory?(file)
-              type = :dir
+            case file.type
+              when :dir
+                begin
+                  FileUtils.mkpath(file.path)
+                  puts "--- #{file.path if file.path != '/'}/"
+                rescue
+                  puts "--- #{file.path if file.path != '/'}/".red
+                end
 
-              begin
-                FileUtils.mkpath(path)
-                puts "--- #{path if path != '/'}/"
-              rescue
-                puts "--- #{path if path != '/'}/".red
-              end
-            elsif File.symlink?(file)
-              type = :sym
-              meta = File.readlink(file)
-
-              begin
-                FileUtils.ln_sf meta, path
-                puts ">>> #{path} -> #{meta}".cyan.bold
-              rescue
-                puts ">>> #{path} -> #{meta}".red
-              end
-            elsif File.file?(file)
-              type = :obj
-              meta = Do.digest(file)
-
-              begin
-                FileUtils.cp file, path, preserve: true
-                puts ">>> #{path}".bold
-              rescue
-                puts ">>> #{path}".red
-              end
-            else
-              next
+              when :sym
+                begin
+                  FileUtils.ln_sf file.meta, file.path
+                  puts ">>> #{file.path} -> #{file.meta}".cyan.bold
+                rescue
+                  puts ">>> #{file.path} -> #{file.meta}".red
+                end
+
+              when :obj
+                begin
+                  FileUtils.cp file.source, file.path, preserve: true
+                  puts ">>> #{file.path}".bold
+                rescue
+                  puts ">>> #{file.path}".red
+                end
             end
 
             content = pkg.contents.first_or_create(
-              type: type,
-              path: fake
+              type: file.type,
+              path: file.path
             )
 
             content.update(
-              meta: meta
+              meta: file.meta
             )
           }
 
@@ -337,7 +329,7 @@ class Base < Thor
 
             case content.type
               when :obj
-                if File.exists?(path) && (options[:force] || content.meta == Do.digest(path))
+                if File.exists?(path) && (options[:force] || content.meta == Packo.digest(path))
                   puts "<<< #{path}".bold
                   FileUtils.rm_f(path) rescue nil
                 else
@@ -371,7 +363,7 @@ class Base < Thor
         if options[:ignore]
           t.rollback
         else
-          pkg.update(destination: options[:destination].cleanpath)
+          pkg.update(destination: Path.clean(options[:destination]))
         end
       }
     }
@@ -386,17 +378,22 @@ class Base < Thor
 
       if packages.empty?
         CLI.fatal "No installed packages match #{name}"
+
         exit 20
       end
 
       packages.each {|installed|
+        if installed.repository && installed.repository.type == :virtual
+          repository.uninstall(installed) or next
+        end
+
         Models.transaction {
           installed.model.contents.each {|content| content.check!
             path = "#{installed.model.destination}/#{content.path}".gsub(%r{/*/}, '/')
 
             case content.type
               when :obj
-                if File.exists?(path) && (options[:force] || content.meta == Do.digest(path))
+                if File.exists?(path) && (options[:force] || content.meta == Packo.digest(path))
                   puts "<<< #{path}".bold
                   FileUtils.rm_f(path) rescue nil
                 else
@@ -430,8 +427,8 @@ class Base < Thor
 
   desc 'search [EXPRESSION] [OPTIONS]', 'Search through installed packages'
   map '--search' => :search, '-Ss' => :search
-  method_option :type,       type: :string,                     aliases: '-t', desc: 'The repository type (binary, source, virtual)'
-  method_option :repository, type: :string,                     aliases: '-r', desc: 'Set a specific repository'
+  method_option :type,       type: :string,                  aliases: '-t', desc: 'The repository type (binary, source, virtual)'
+  method_option :repository, type: :string,                  aliases: '-r', desc: 'Set a specific repository'
   method_option :full,       type: :boolean, default: false, aliases: '-F', desc: 'Include the repository that owns the package, features and flavor'
   def search (expression='')
     Models.search_installed(expression, options[:repository], options[:type]).group_by {|package|
@@ -447,7 +444,9 @@ class Base < Thor
             print "#{"#{packages.first.tags}/" unless packages.first.tags.empty?}#{packages.first.name.bold}"
 
             print ' ('
-            print packages.map {|package|
+            print packages.sort {|a, b|
+              a.version <=> b.version
+            }.map {|package|
               "#{package.version.to_s.red}" + (package.slot ? "%#{package.slot.to_s.blue.bold}" : '')
             }.join(', ')
             print ')'
@@ -461,7 +460,9 @@ class Base < Thor
       else
         print "#{packages.first.tags}/#{packages.first.name.bold} ("
 
-        print packages.map {|package|
+        print packages.sort {|a, b|
+          a.version <=> b.version
+        }.map {|package|
           "#{package.version.to_s.red}" + (package.slot ? "%#{package.slot.to_s.blue.bold}" : '')
         }.join(', ')
 
@@ -503,21 +504,19 @@ class Base < Thor
   end
 
   def _build (package, env)
-    Do.cd {
-      FileUtils.rm_rf "#{System.env[:TMP]}/.__packo_build", secure: true rescue nil
-      FileUtils.mkpath "#{System.env[:TMP]}/.__packo_build" rescue nil
+    FileUtils.rm_rf "#{System.env[:TMP]}/.__packo_build", secure: true rescue nil
+    FileUtils.mkpath "#{System.env[:TMP]}/.__packo_build" rescue nil
 
-      require 'packo/cli/build'
+    require 'packo/cli/build'
 
-      begin
-        System.env.sandbox(env) {
-          Packo::CLI::Build.start(['package', package.to_s(:whole), "--output=#{System.env[:TMP]}/.__packo_build", "--repository=#{package.repository}"])
-        }
-      rescue
-      end
+    begin
+      System.env.sandbox(env) {
+        Packo::CLI::Build.start(['package', package.to_s(:whole), "--output=#{System.env[:TMP]}/.__packo_build", "--repository=#{package.repository}"])
+      }
+    rescue
+    end
 
-      Dir.glob("#{System.env[:TMP]}/.__packo_build/#{package.name}-#{package.version}*.pko").first
-    }
+    Dir.glob("#{System.env[:TMP]}/.__packo_build/#{package.name}-#{package.version}*.pko").first
   end
 
   def _manifest (package, env)

data/lib/packo/cli/build.rb

@@ -18,9 +18,6 @@
 # along with packo. If not, see <http://www.gnu.org/licenses/>.
 #++
 
-require 'nokogiri'
-require 'digest/sha1'
-
 require 'packo'
 require 'packo/rbuild'
 
@@ -35,131 +32,8 @@ class Build < Thor
   method_option :output,     type: :string,  default: System.env[:TMP], aliases: '-o', desc: 'The directory where to save packages'
   method_option :wipe,       type: :boolean, default: false,            aliases: '-w', desc: 'Wipes the package directory before building it'
   method_option :ask,        type: :boolean, default: false,            aliases: '-a', desc: 'Prompt the user if he want to continue building or not'
-  method_option :repository, type: :string,                                aliases: '-r', desc: 'Set a specific source repository'
-  method_option :execute,    type: :string,                                aliases: '-x', desc: 'Create a package from an executed command instead of from an RBuild'
-  method_option :bump,       type: :boolean, default: true,             aliases: '-b', desc: 'Bump revision when creating a package from command if package is installed'
-  method_option :inspect,    type: :boolean, default: false,            aliases: '-i', desc: 'Inspect the list of files that will be included in the package in EDITOR'
+  method_option :repository, type: :string,                             aliases: '-r', desc: 'Set a specific source repository'
   def package (*packages)
-    if command = options[:execute]
-      if System.env[:SANDBOX_ACTIVE] || System.env[:FAKED_MODE]
-        CLI.warn "`packo build -x` may not work properly, try with `packo-build -x` if it fails.\n\n"
-      end
-
-      package = Package.parse(packages.first)
-
-      unless package.name && package.version
-        CLI.fatal 'You have to pass a valid package name and version, like package-0.2'
-        exit 1
-      end
-
-      package = RBuild::Package.define(package.name, package.version) {
-        tags *package.tags
-
-        description "Built in: `#{Dir.pwd}` with `#{command}`"
-        maintainer  ENV['USER']
-      }
-
-      package.avoid RBuild::Behaviors::Default
-
-      package.clean!
-      package.create!
-
-      tmp = Tempfile.new('packo')
-      dir = "#{System.env[:TMP]}/#{Process.pid}"
-
-      tmp.write %{
-        #! /bin/sh
-
-        cd "#{Dir.pwd}"
-
-        #{command}
-
-        exit $?
-      }
-
-      tmp.chmod 0700
-      tmp.close
-
-      Packo.sh 'installwatch', "--logfile=#{package.tempdir}/newfiles.log", "--exclude=#{Dir.pwd}",
-        "--root=#{package.workdir}", '--transl=yes', '--backup=no', tmp.path
-
-      inspect = options[:inspect]
-
-      package.before :pack, priority: -42 do
-        files = File.new("#{tempdir}/newfiles", 'w')
-
-        files.print File.new("#{tempdir}/newfiles.log", 'r').lines.map {|line| line.strip!
-          whole, type = line.match(/^.*?\t(.*?)\t/).to_a
-
-          case type
-            when 'chmod', 'open'
-              whole, file = line.match(/.*?\t.*?\t(.*?)(\t|$)/).to_a
-
-              next if file.match(%r[^(/dev|#{Regexp.escape(Dir.pwd)}|/tmp)(/|$)])
-
-              file
-
-            when 'symlink'
-              whole, to, file = line.match(/.*?\t.*?\t(.*?)\t(.*?)(\t|$)/).to_a
-
-              "#{file} -> #{to}"
-          end
-        }.compact.uniq.sort.join("\n")
-
-        files.close
-
-        if inspect
-          Packo.sh System.env[:EDITOR] || 'vi', files.path
-        end
-
-        links = []
-
-        File.new("#{tempdir}/newfiles", 'r').lines.each {|line|
-          whole, file, link = line.match(/^(.*?)(?: -> (.*?))?$/).to_a
-
-          FileUtils.mkpath "#{distdir}/#{File.dirname(file)}"
-
-          if link
-            links << [link, file]
-          else
-            FileUtils.cp "#{workdir}/TRANSL/#{file}", "#{distdir}/#{file}"
-          end
-        }
-
-        links.each {|(link, file)|
-          FileUtils.ln_sf link, "#{distdir}/#{file}" rescue nil
-        }
-      end
-
-      package.before :pack! do
-        if inspect
-          Packo.sh System.env[:EDITOR] || 'vi', "#{directory}/manifest.xml"
-        end
-      end
-
-      if options[:bump]
-        require 'packo/models'
-
-        if !Models.search_installed(package.to_s).empty?
-          package.revision = Models.search_installed(package.to_s).first.revision + 1
-        end
-      end
-
-      begin
-        package.build {|stage|
-          CLI.info "Executing #{stage.name}"
-        }
-
-        CLI.info "Succesfully built #{package}"
-      rescue Exception => e
-        CLI.fatal "Failed to build #{package}"
-        CLI.fatal e.message
-        Packo.debug e
-      end
-
-      exit 0
-    end
-
     Environment.new {|env|
       if !env[:ARCH] || !env[:KERNEL] || !env[:LIBC] || !env[:COMPILER]
         CLI.fatal 'You have to set ARCH, KERNEL, LIBC and COMPILER to build packages.'
@@ -259,6 +133,128 @@ class Build < Thor
     }
   end
 
+
+  desc 'command PACKAGE COMMAND', 'Build package from an executed command'
+  method_option :bump,    type: :boolean, default: true,  aliases: '-b', desc: 'Bump revision when creating a package from command if package is installed'
+  method_option :inspect, type: :boolean, default: false, aliases: '-i', desc: 'Inspect the list of files that will be included in the package in EDITOR'
+  def command (package, command)
+    if Packo.protected?
+      CLI.warn "`packo build -x` may not work properly, try with `packo-build -x` if it fails.\n\n"
+    end
+
+    package = Package.parse(package)
+
+    unless package.name && package.version
+      CLI.fatal 'You have to pass a valid package name and version, like package-0.2'
+      exit 1
+    end
+
+    package = RBuild::Package.define(package.name, package.version) {
+      tags *package.tags
+
+      description "Built in: `#{Dir.pwd}` with `#{command}`"
+      maintainer  ENV['USER']
+    }
+
+    package.avoid RBuild::Behaviors::Default
+
+    package.clean!
+    package.create!
+
+    tmp = Tempfile.new('packo')
+    dir = "#{System.env[:TMP]}/#{Process.pid}"
+
+    tmp.write %{
+      #! /bin/sh
+
+      cd "#{Dir.pwd}"
+
+      #{command}
+
+      exit $?
+    }
+
+    tmp.chmod 0700
+    tmp.close
+
+    Packo.sh 'installwatch', "--logfile=#{package.tempdir}/newfiles.log", "--exclude=#{Dir.pwd}",
+      "--root=#{package.workdir}", '--transl=yes', '--backup=no', tmp.path
+
+    inspect = options[:inspect]
+
+    package.before :pack, priority: -42 do
+      files = File.new("#{tempdir}/newfiles", 'w')
+
+      files.print File.new("#{tempdir}/newfiles.log", 'r').lines.map {|line| line.strip!
+        whole, type = line.match(/^.*?\t(.*?)\t/).to_a
+
+        case type
+          when 'chmod', 'open'
+            whole, file = line.match(/.*?\t.*?\t(.*?)(\t|$)/).to_a
+
+            next if file.match(%r[^(/dev|#{Regexp.escape(Dir.pwd)}|/tmp)(/|$)])
+
+            file
+
+          when 'symlink'
+            whole, to, file = line.match(/.*?\t.*?\t(.*?)\t(.*?)(\t|$)/).to_a
+
+            "#{file} -> #{to}"
+        end
+      }.compact.uniq.sort.join("\n")
+
+      files.close
+
+      if inspect
+        Packo.sh System.env[:EDITOR] || 'vi', files.path
+      end
+
+      links = []
+
+      File.new("#{tempdir}/newfiles", 'r').lines.each {|line|
+        whole, file, link = line.match(/^(.*?)(?: -> (.*?))?$/).to_a
+
+        FileUtils.mkpath "#{distdir}/#{File.dirname(file)}"
+
+        if link
+          links << [link, file]
+        else
+          FileUtils.cp "#{workdir}/TRANSL/#{file}", "#{distdir}/#{file}"
+        end
+      }
+
+      links.each {|(link, file)|
+        FileUtils.ln_sf link, "#{distdir}/#{file}" rescue nil
+      }
+    end
+
+    package.before :pack! do
+      if inspect
+        Packo.sh System.env[:EDITOR] || 'vi', "#{directory}/manifest.xml"
+      end
+    end
+
+    if options[:bump]
+      require 'packo/models'
+
+      if !Models.search_installed(package.to_s).empty?
+        package.revision = Models.search_installed(package.to_s).first.revision + 1
+      end
+    end
+
+    begin
+      package.build {|stage|
+        CLI.info "Executing #{stage.name}"
+      }
+
+      CLI.info "Succesfully built #{package}"
+    rescue Exception => e
+      CLI.fatal "Failed to build #{package}"
+      CLI.fatal e.message
+      Packo.debug e
+    end
+  end
+
   desc 'clean PACKAGE... [OPTIONS]', 'Clean packages'
   method_option :repository, type: :string, aliases: '-r', desc: 'Set a specific source repository'
   def clean (*packages)
@@ -348,7 +344,7 @@ class Build < Thor
               package.distfiles.to_a.each {|(name, file)|
                 file ||= name
 
-                xml.file({ name: File.basename(file.path), url: file.url }, Do.digest(file.path))
+                xml.file({ name: File.basename(file.path), url: file.url }, Packo.digest(file.path))
               } if package.distfiles
             }
           }