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

data/lib/packo/cli/files.rb

@@ -61,7 +61,7 @@ class Files < Thor
       require 'packo/models'
 
       package = Models.search_installed(name).first
-      root    = Pathname.new(package.destination || '/')
+      root    = Path.new(package.destination || '/')
 
       if !package
         fatal "No package matches #{name}"
@@ -70,9 +70,9 @@ class Files < Thor
 
       package.model.contents.each {|content| content.check!
         case content.type
-          when :dir; puts "--- #{(root + content.path).cleanpath}"
-          when :sym; puts ">>> #{(root + content.path).cleanpath} -> #{content.meta}".cyan.bold
-          when :obj; puts ">>> #{(root + content.path).cleanpath}".bold
+          when :dir; puts "--- #{Path.clean(root + content.path)}"
+          when :sym; puts ">>> #{Path.clean(root + content.path)} -> #{content.meta}".cyan.bold
+          when :obj; puts ">>> #{Path.clean(root + content.path)}".bold
         end
       }
     end
@@ -82,7 +82,7 @@ class Files < Thor
   def belongs (file)
     require 'packo/models'
 
-    path    = Pathname.new(file).realpath.to_s
+    path    = Path.new(file).realpath.to_s
     path[0] = ''
 
     if content = Models::InstalledPackage::Content.first(path: path)
@@ -119,7 +119,7 @@ class Files < Thor
       print "\n"
 
       package.model.contents.each {|content|
-        path = (Pathname.new(package.model.destination || '/') + content.path[1, content.path.length]).cleanpath.to_s
+        path = Path.clean((package.model.destination || '/') + content.path[1, content.path.length])
 
         case content.type
           when :dir
@@ -137,7 +137,7 @@ class Files < Thor
             end
 
           when :obj
-            if content.meta != (Do.digest(path) rescue nil)
+            if content.meta != (Packo.digest(path) rescue nil)
               puts "#{'FAIL ' if System.env[:NO_COLORS]}>>> #{path}".red
             else
               puts "#{'OK   ' if System.env[:NO_COLORS]}>>> #{path}".green

data/lib/packo/cli/repository.rb

@@ -37,6 +37,7 @@ class Repository < Thor
 
   desc 'add URI...', 'Add repositories'
   map '-a' => :add
+  method_option :ignore, type: :boolean, default: true, aliases: '-i', desc: 'Do not add the packages of a virtual repository to the index'
   def add (*uris)
     uris.each {|uri|
       uri  = URI.parse(uri)
@@ -139,7 +140,11 @@ class Repository < Thor
 
       begin
         Models.transaction {
-          _add type, name, uri, path
+          if type == :virtual && options[:ignore]
+            _add type, name, uri, path, false
+          else
+            _add type, name, uri, path
+          end
         }
 
         CLI.info "Added #{type}/#{name}"
@@ -151,7 +156,6 @@ class Repository < Thor
     }
   end
 
-
   desc 'delete REPOSITORY...', 'Delete installed repositories'
   map '-d' => :delete, '-R' => :delete
   def delete (*names)
@@ -178,9 +182,11 @@ class Repository < Thor
       begin
         repositories.each {|repository|
           Models.transaction {
+            path = repository.path
+
             _delete(repository.type, repository.name)
 
-            FileUtils.rm_rf repository.path, secure: true
+            FileUtils.rm_rf path, secure: true
           }
         }
       rescue Exception => e
@@ -191,11 +197,14 @@ class Repository < Thor
     }
   end
 
-  desc 'update', 'Update installed repositories'
+  desc 'update [REPOSITORY...]', 'Update installed repositories'
   map '-u' => :update
   method_option :force, type: :boolean, default: false, aliases: '-f', desc: 'Force the update'
-  def update
+  method_option :ignore, type: :boolean, default: true, aliases: '-i', desc: 'Do not add the packages of a virtual repository to the index'
+  def update (*repositories)
     Models::Repository.all.each {|repository|
+      next if !repositories.empty? && !repositories.member?(Packo::Repository.wrap(repository).to_s)
+        
       updated = false
 
       type = repository.type
@@ -223,6 +232,13 @@ class Repository < Thor
             end
 
           when :virtual
+            if (content = open(uri).read != File.read(path)) || options[:force]
+              _delete(:virtual, name)
+              File.write(path, content)
+              _add(:vitual, name, uri, path, !options[:ignore])
+
+              update = true
+            end
         end
       }
 
@@ -251,7 +267,9 @@ class Repository < 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 ')'
@@ -261,7 +279,9 @@ class Repository < 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(', ')
 
@@ -403,19 +423,11 @@ class Repository < Thor
     puts repository.URI
   end
 
-  desc 'rehash REPOSITORY...', 'Rehash the repository caches'
-  def rehash (*names)
-    repositories = []
-
-    if names.empty?
-      repositories << Models::Repository.all
-    else
-      names.each {|name|
-        repositories << Models::Repository.all(name: name)
-      }
-    end
+  desc 'rehash [REPOSITORY...]', 'Rehash the repository caches'
+  def rehash (*repositories)
+    Models::Repository.all.each {|repository|
+      next if !repositories.empty? && !repositories.member?(Packo::Repository.wrap(repository).to_s)
 
-    repositories.flatten.compact.each {|repository|
       type = repository.type
       name = repository.name
       uri  = repository.uri
@@ -475,7 +487,7 @@ class Repository < Thor
           )
 
           build.xpath('.//digest').each {|node| node.remove}
-          build.add_child dom.create_element('digest', Do.digest(pko))
+          build.add_child dom.create_element('digest', Packo.digest(pko))
 
           FileUtils.mkpath "#{options[:output]}/#{dom.root['name']}/#{package.tags.to_s(true)}"
           FileUtils.mv pko, "#{options[:output]}/#{dom.root['name']}/#{package.tags.to_s(true)}"
@@ -508,14 +520,16 @@ class Repository < Thor
     }
   end
 
-  def _add (type, name, uri, path)
-    Helpers::Repository.wrap(Models::Repository.create(
+  def _add (type, name, uri, path, populate=true)
+    repo = Helpers::Repository.wrap(Models::Repository.create(
       type: type,
       name: name,
 
       uri:  uri,
       path: path
-    )).populate
+    ))
+
+    repo.populate if populate
   end
 
   def _delete (type, name)
@@ -544,12 +558,12 @@ class Repository < Thor
   end
 
   def _update (path)
-    result = false
+    done = false
 
     old = Dir.pwd; Dir.chdir(path)
 
-    if !result && (`git reset --hard`) && (`git pull`.strip != 'Already up-to-date.' rescue nil)
-      result = true
+    if !done && (`git reset --hard`) && (`git pull`.strip != 'Already up-to-date.' rescue nil)
+      done = true
     end
 
     Dir.chdir(old)

data/lib/packo/do.rb

@@ -17,16 +17,11 @@
 # along with packo. If not, see <http://www.gnu.org/licenses/>.
 #++
 
-require 'fileutils'
-require 'digest/sha1'
+require 'packo/utils'
 
 module Packo
 
 class Do
-  def self.digest (path)
-    Digest::SHA1.hexdigest(File.read(path))
-  end
-
   def self.cd (path=nil)
     if block_given?
       tmp = Dir.pwd
@@ -52,12 +47,14 @@ class Do
     files.flatten!
     files.compact!
 
-    if files.length == 1
-      Do.dir(File.dirname(to))
-      FileUtils.cp_r(files.first, to)
-    else
+    type = (path.first.is_a?(Symbol) ? path.shift : :f).to_s
+
+    if type.include?('r')
       Do.dir(to)
-      FileUtils.cp_r(files, to)
+      FileUtils.cp_r(files, to, :force => type.include?('f'))
+    else
+      Do.dir(File.dirname(to))
+      FileUtils.cp(files, to, :force => type.include?('f'))
     end
   end
 
@@ -74,17 +71,25 @@ class Do
     end
   end
 
-  def self.rm (*path)
-    path.flatten!
-    path.compact!
+  def self.rm (*files)
+    files.flatten!
+    files.compact!
+
+    type = (files.first.is_a?(Symbol) ? files.shift : :f).to_s
+
+    files.each {|file|
+      next unless File.exists?(file)
 
-    path.each {|path|
-      next unless File.exists?(path)
+      case type
+        when /r/
+          FileUtils.rm_r(file, :force => type.include?('f'), :secure => true)
 
-      if File.directory?(path)
-        Dir.delete(path) rescue nil
-      else
-        FileUtils.rm_f(path) rescue nil
+        else
+          if File.directory?(file)
+            Dir.delete(file) rescue nil
+          else
+            FileUtils.rm(file, :force => type.include?('f')) rescue nil
+          end
       end
     }
   end
@@ -103,7 +108,7 @@ class Do
     content = File.read(file)
 
     seds.each {|(regexp, sub)|
-      content.gsub!(regexp, sub || '')
+      content.gsub!(regexp, sub.to_s)
     }
 
     File.write(file, content)
@@ -114,7 +119,6 @@ class Do
   def initialize (package)
     @package = package
 
-    @relative = '/usr'
     @opts     = nil
     @verbose  = true
   end
@@ -124,7 +128,7 @@ class Do
   def not_verbose!; @verbose = false end
 
   def root
-    "#{@root ? @root : package.distdir}/#{@relative}".gsub(%r{/*/}, '/')
+    @root || package.distdir
   end
 
   def root= (path)
@@ -134,7 +138,7 @@ class Do
   def into (path)
     tmp, @relative = @relative, path
 
-    Do.dir root if root != "/"
+    Do.dir "#{root}/#{@relative}"
 
     yield
 
@@ -143,15 +147,10 @@ class Do
 
   def opts (value)
     tmp, @opts = @opts, value
+
     yield
-    @opts = tmp
-  end
 
-  def ins (*files)
-    files.map {|file| Dir.glob(file)}.flatten.each {|file|
-      FileUtils.cp_r file, "#{root}/#{File.basename(file)}", preserve: true, verbose: @verbose
-      FileUtils.chmod @opts || 0644, "#{root}/#{File.basename(file)}", verbose: @verbose
-    }
+    @opts = tmp
   end
 
   def dir (path)
@@ -159,91 +158,125 @@ class Do
     FileUtils.chmod @opts || 0755, "#{root}/#{path}", verbose: @verbose
   end
 
-  def bin (*bins)
-    FileUtils.mkpath "#{root}/bin"
+  def ins (*files)
+    files.map {|file|
+      file.is_a?(Array) ? [file] : Dir.glob(file)
+    }.flatten(1).each {|(file, name)|
+      path = Path.clean("#{root}/#{@relative || 'usr'}/#{File.basename(name || file)}")
 
-    bins.map {|bin| Dir.glob(bin)}.flatten.each {|(file, name)|
-      FileUtils.cp_r file, "#{root}/bin/#{File.basename(name || file)}", preserve: true, verbose: @verbose
-      FileUtils.chmod @opts || 0755, "#{root}/bin/#{File.basename(name || file)}", verbose: @verbose
+      FileUtils.cp_r file, path, preserve: true, verbose: @verbose
+      FileUtils.chmod @opts || 0644, path, verbose: @verbose
     }
   end
 
-  def sbin (*sbins)
-    FileUtils.mkpath "#{root}/sbin"
+  def bin (*bins)
+    bins.map {|bin|
+      bin.is_a?(Array) ? [bin] : Dir.glob(bin)
+    }.flatten(1).each {|(file, name)|
+      path = Path.clean("#{root}/#{@relative || '/'}/bin/#{File.basename(name || file)}")
+
+      FileUtils.mkpath File.dirname(path)
+      FileUtils.cp_r file, path, preserve: true, verbose: @verbose
+      FileUtils.chmod @opts || 0755, path, verbose: @verbose
+    }
+  end
 
-    sbins.map {|sbin| Dir.glob(sbin)}.flatten.each {|(file, name)|
-      FileUtils.cp_r file, "#{root}/sbin/#{File.basename(name || file)}", preserve: true, verbose: @verbose
-      FileUtils.chmod @opts || 0755, "#{root}/sbin/#{File.basename(name || file)}", verbose: @verbose
+  def sbin (*sbins)
+    sbins.map {|sbin|
+      sbin.is_a?(Array) ? [sbin] : Dir.glob(sbin)
+    }.flatten(1).each {|(file, name)|
+      path = Path.clean("#{root}/#{@relative || '/'}/sbin/#{File.basename(name || file)}")
+
+      FileUtils.mkpath File.dirname(path)
+      FileUtils.cp_r file, path, preserve: true, verbose: @verbose
+      FileUtils.chmod @opts || 0755, path, verbose: @verbose
     }
   end
 
   def lib (*libs)
-     FileUtils.mkpath "#{root}/lib"
-
-    libs.map {|lib| Dir.glob(lib)}.flatten.each {|(file, name)|
-      FileUtils.cp_r file, "#{root}/lib/#{File.basename(name || file)}", preserve: true, verbose: @verbose
-      FileUtils.chmod @opts || (file.match(/\.a(\.|$)/) ? 0644 : 0755), "#{root}/lib/#{File.basename(name || file)}", verbose: @verbose
+    libs.map {|lib|
+      lib.is_a?(Array) ? [lib] : Dir.glob(lib)
+    }.flatten(1).each {|(file, name)|
+      path = Path.clean("#{root}/#{@relative || '/usr'}/lib/#{File.basename(name || file)}")
+
+      FileUtils.mkpath File.dirname(path)
+      FileUtils.cp_r file, path, preserve: true, verbose: @verbose
+      FileUtils.chmod @opts || (file.match(/\.a(\.|$)/) ? 0644 : 0755), path, verbose: @verbose
     }
   end
 
   def doc (*docs)
     into("/usr/share/doc/#{package.name}-#{package.version}") {
-      docs.map {|doc| Dir.glob(doc)}.flatten.each {|(file, name)|
-        FileUtils.cp_r file, "#{root}/#{File.basename(name || file)}", preserve: true, verbose: @verbose
-        FileUtils.chmod @opts || 0644, "#{root}/#{File.basename(name || file)}", verbose: @verbose
+      docs.map {|doc|
+        doc.is_a?(Array) ? [doc] : Dir.glob(doc)
+      }.flatten(1).each {|(file, name)|
+        path = "#{root}/#{@relative}/#{File.basename(name || file)}"
+
+        FileUtils.cp_r file, path, preserve: true, verbose: @verbose
+        FileUtils.chmod @opts || 0644, path, verbose: @verbose
       }
     }
   end
 
   def html (*htmls)
     into("/usr/share/doc/#{package.name}-#{package.version}/html") {
-      htmls.map {|html| Dir.glob(html)}.flatten.each {|(file, name)|
-        FileUtils.cp_r file, "#{root}/#{File.basename(name || file)}", preserve: true, verbose: @verbose
-        FileUtils.chmod @opts || 0644, "#{root}/#{File.basename(name || file)}", verbose: @verbose
+      htmls.map {|html|
+        html.is_a?(Array) ? [html] : Dir.glob(html)
+      }.flatten(1).each {|(file, name)|
+        path = "#{root}/#{@relative}/#{File.basename(name || file)}"
+
+        FileUtils.cp_r file, path, preserve: true, verbose: @verbose
+        FileUtils.chmod @opts || 0644, path, verbose: @verbose
       }
     }
   end
 
   def man (*mans)
-    mans.map {|man| Dir.glob(man)}.flatten.each {|man|
-      into("/usr/share/man/man#{man[-1]}") {
-        FileUtils.cp_r man, "#{root}/#{File.basename(man)}", preserve: true, verbose: @verbose
-        FileUtils.chmod @opts || 0644, "#{root}/#{File.basename(man)}", verbose: @verbose
+    into("/usr/share/man/man#{man[-1]}") {
+      mans.map {|man|
+        man.is_a?(Array) ? [man] : Dir.glob(man)
+      }.flatten(1).each {|(file, name)|
+        path = "#{root}/#{@relative}/#{File.basename(name || file)}"
+
+        FileUtils.cp_r file, path, preserve: true, verbose: @verbose
+        FileUtils.chmod @opts || 0644, path, verbose: @verbose
       }
     }
   end
 
   def info (*infos)
-    infos.map {|info| Dir.glob(info)}.flatten.each {|info|
-      into("/usr/share/info/#{info[-1]}") {
-        FileUtils.cp_r info, "#{root}/#{File.basename(info)}", preserve: true, verbose: @verbose
-        Packo.sh 'gzip', '-9', "#{root}/#{File.basename(info)}", silent: !@verbose rescue nil
-        FileUtils.chmod @opts || 0644, "#{root}/#{File.basename(info)}", verbose: @verbose
+    into("/usr/share/info/#{info[-1]}") {
+      infos.map {|info|
+        info.is_a?(Array) ? [info] : Dir.glob(info)
+      }.flatten(1).each {|(file, name)|
+        path = "#{root}/#{@relative}/#{File.basename(name || file)}"
+
+        FileUtils.cp_r file, path, preserve: true, verbose: @verbose
+        Packo.sh 'gzip', '-9', path, silent: !@verbose rescue nil
+        FileUtils.chmod @opts || 0644, path, verbose: @verbose
       }
     }
   end
 
   def sym (link, to)
-    FileUtils.mkpath "#{root}/#{File.dirname(to)}"
-    FileUtils.ln_sf link, "#{root}/#{to}", verbose: @verbose
+    path = Path.clean("#{root}/#{@relative}/#{to}")
+
+    FileUtils.mkpath File.dirname(path)
+    FileUtils.ln_sf link, path, verbose: @verbose
   end
 
   def hard (link, to)
-    FileUtils.mkpath "#{root}/#{File.dirname(to)}"
-    FileUtils.ln_f link, "#{root}/#{to}", verbose: @verbose
+    path = Path.clean("#{root}/#{@relative}/#{to}")
+
+    FileUtils.mkpath File.dirname(path) 
+    FileUtils.ln_f link, path, verbose: @verbose
   end
 
   def own (user, group, *files)
-    infos.map {|info| Dir.glob(info)}.flatten.each {|info|
-      into("/usr/share/info/#{info[-1]}") {
-        FileUtils.cp_r info, "#{root}/#{File.basename(info)}", preserve: true, verbose: @verbose
-        Packo.sh 'gzip', '-9', "#{root}/#{File.basename(info)}", silent: !@verbose rescue nil
-        FileUtils.chmod @opts || 0644, "#{root}/#{File.basename(info)}", verbose: @verbose
-      }
+    files.flatten.compact.each {|file|
+      FileUtils.chown user, group, files, :verbose => @verbose
     }
   end
-
-  # TODO: wrappers
 end
 
 end