purplepkg 0.0.4 → 0.0.5

data/lib/purple/debian.rb

@@ -50,7 +50,7 @@ module Purple
 
         def deploy
             package_list = Dir.new(packagedir).to_a.reject{|s| s =~ /^\.{1,2}/}
-            puts "DEBUG PurpleCabinet#deploy(debian.rb): #{package_list.inspect}"
+            puts "DEBUG PurpleCabinet#deploy(debian.rb): #{package_list.inspect}" if $DEBUG
             system "cd #{packagedir}; sudo dpkg -i #{package_list.collect{|s| '"'+s+'"'}.join(' ')}"
         end
     end

data/lib/purple/getter.rb

@@ -3,7 +3,7 @@ require 'uri'
 module Purple
     module Getter
         def self.new url, destdir
-            puts "DEBUG Getter##new: url=#{url}"
+            puts "DEBUG Getter##new: url=#{url}" if $DEBUG
             @uri = URI.parse url
             plugin = case @uri.scheme
                 when /http|ftp/

data/lib/purple/getter_wget.rb

@@ -11,7 +11,7 @@ module Purple
             def get
                 @thread = Thread.new do
                     filename = File.basename uri.path
-                    Open3.popen3 "wget --progress dot -O '#{@destdir}/#{filename}' #{@uri.to_s} 2>&1" do
+                    Open3.popen3 "wget --passive-ftp --progress dot -O '#{@destdir}/#{filename}' #{@uri.to_s} 2>&1" do
                         |pw, pr, pe|
                         parse_input pw, pr, pe
                     end
@@ -25,27 +25,26 @@ module Purple
             # wget specific methods
 
             def parse_input pw, pr, pe
-                #puts "DEBUG Getter_wget#parse_input: Start"
+                puts "DEBUG Getter_wget#parse_input: Start" if $DEBUG
 
                 loop do
                     # Start line
                     2.times { pr.gets }
 
                     # Host lookup
-                    #puts "DEBUG Getter_wget#parse_input: Host lookup"
+                    puts "DEBUG Getter_wget#parse_input: Host lookup" if $DEBUG
                     line = pr.gets
-                    #puts "->#{line}"
+                    puts "->#{line}" if $DEBUG
                     if line =~ /failed:/
                         @status = 'Host lookup failed'
                         return
                     end
 
                     # Connecting
-                    #puts "DEBUG Getter_wget#parse_input: Connecting"
+                    puts "DEBUG Getter_wget#parse_input: Connecting" if $DEBUG
                     line = pr.gets
-                    #puts "->#{line}"
+                    puts "->#{line}" if $DEBUG
                     md = /^Connecting to (.*?)... (.*?)$/.match line
-                    #puts "DEBUG Getter_wget#parse_input: md[2]=#{md[2].inspect}"
 
                     unless 'connected.' == md[2]
                         @status = 'Connection failed'
@@ -53,41 +52,51 @@ module Purple
                     end
 
                     # Request
-                    #puts "DEBUG Getter_wget#parse_input: Sending request"
+                    puts "DEBUG Getter_wget#parse_input: Sending request" if $DEBUG
                     line = pr.gets
-                    #puts "->#{line}"
-                    md = /HTTP request sent, awaiting response... (.*)/.match line
-                    case md[1]
-                    when '200 OK'
-                        # Okay. Continue
-                    when /^3\d{2}/
-                        # Redirection
-                        pr.gets # Location line
-                        redo
-                    else
-                        @status = md[1]
-                        return
+                    puts "->#{line}" if $DEBUG
+                    case line
+                    when /HTTP request sent, awaiting response\.\.\. (.*)/
+                        case $1
+                        when '200 OK'
+                            # Okay. Continue
+                        when /^3\d{2}/
+                            # Redirection
+                            pr.gets # Location line
+                            redo
+                        else
+                            @status = $1
+                            return
+                        end
+                    when /Logging in as anonymous \.\.\. (.*)/
+                        case $1
+                        when 'Logged in!'
+                            # Okay. Go ahead.
+                        else
+                            @status = $1
+                            return
+                        end
                     end
-
                     break
                 end
 
                 # Content details
-                line = pr.gets
-                #puts "->#{line}"
-                md = /Length: (.*?) \[(.*?)\]/.match line
-                @length = md[1].gsub(',', '').to_i
-                @content_type = md[2]
+                loop do
+                    line = pr.gets
+                    puts "->#{line}" if $DEBUG
+                    break if line =~ /^Length: /
+                end
+                #@length = md[1].gsub(',', '').to_i
+                #@content_type = md[3]
 
                 # Empty line
                 pr.gets
 
                 # Data incoming
                 pr.each do |line|
-                    #puts "->#{line}"
+                    puts "->#{line}" if $DEBUG
                          
                     md = / *([0-9]+)K[ \.]+([0-9]+)% +([0-9\.,]+ KB\/s)/.match line
-                    #puts (md ? "DEBUG #{md.to_a.inspect}" : "DEBUG nil")
                     if md
                         @done = md[2]
                         @rate = md[3]

data/lib/purple/makefile.rb

@@ -15,7 +15,7 @@ module Purple
         def makefilename
             return @makefilename if defined? @makefilename
             @makefilename = ['GNUmakefile', 'makefile', 'Makefile'].find do |name|
-                puts "DEBUG MakefileMaven#makefilename: testing #{File.join(@srcdir, name)}"
+                puts "DEBUG MakefileMaven#makefilename: testing #{File.join(@srcdir, name)}" if $DEBUG
                 FileTest.exist? File.join(@srcdir, name)
             end
         end
@@ -43,7 +43,7 @@ module Purple
             while files.size > 0
                 filename = File.join(@srcdir, files.shift)
                 if FileTest.exist? filename
-                    puts "DEBUG MakefileMaven#makefile_contents: loop->if"
+                    puts "DEBUG MakefileMaven#makefile_contents: loop->if" if $DEBUG
                     text = File.open(filename) { |f| f.read }
                     @contents << text
                     text.grep(/^include /).each do |s|
@@ -52,7 +52,7 @@ module Purple
                     end
                 end
             end
-            puts "DEBUG MakefileMaven#makefile_contents: #{@contents.to_a.size} lines"
+            puts "DEBUG MakefileMaven#makefile_contents: #{@contents.to_a.size} lines" if $DEBUG
             @contents
         end
     end

data/lib/purple/matches.rb

@@ -11,7 +11,7 @@ module Purple
         def self.match_filename filename
             md = nil
             REGEXPS.find { |r| md = r.match filename }
-            #puts "DEBUG Matches#match_filename: filename=#{filename.inspect} md=#{md.to_a.inspect}"
+            puts "DEBUG Matches#match_filename: filename=#{filename.inspect} md=#{md.to_a.inspect}" if $DEBUG
             raise 'filename does not match pattern' if not (md and not md.to_a[0..1].include? nil)
 
             { :name => md[1], :version => md[2] } 

data/lib/purple/pkg_actions.rb

@@ -46,7 +46,7 @@ module Purple
         package_method :make
 
         def default_prepare
-            puts "DEBUG PackageActions#default_prepare"
+            puts "DEBUG PackageActions#default_prepare" if $DEBUG
             files.each do |f|
                 unpack = case f
                     when /gz$/; '-z'
@@ -73,7 +73,7 @@ module Purple
 
             require 'purple/makefile'
 
-            puts "DEBUG PackageActions#default_stage: srcdir=#{srcdir}"
+            puts "DEBUG PackageActions#default_stage: srcdir=#{srcdir}" if $DEBUG
             mkm = MakefileMaven.new srcdir
             if mkm.uses_prefix?
                 if mkm.uses_destdir?

data/lib/purple/process.rb

@@ -19,9 +19,9 @@ module Purple
                 end
                 Thread.new do
                     begin
-                        #puts "DEBUG Purple::Process::Child#start: HERE"
+                        #puts "DEBUG Purple::Process::Child#start: HERE" if $DEBUG
                         @exit_code = Process.waitpid2(pid)[1].exitstatus
-                        #puts "DEBUG Purple::Process::Child#start: status=#{@exit_code}"
+                        #puts "DEBUG Purple::Process::Child#start: status=#{@exit_code}" if $DEBUG
                     ensure
                         @status = :done
                     end

data/lib/purple/script.rb

@@ -45,7 +45,7 @@ module Purple
         def self.parse string
             script = self.new
             script.instance_eval string
-            puts "DEBUG Purple::Script##parse: cabinet=#{script.cabinet}"
+            puts "DEBUG Purple::Script##parse: cabinet=#{script.cabinet}" if $DEBUG
             script.cabinet
         end
 
@@ -86,10 +86,9 @@ module Purple
 
         def infer_all
             @package_scripts.each { |pkg|
-                puts "DEBUG PurpleScript#infer_all"
+                puts "DEBUG PurpleScript#infer_all" if $DEBUG
                 pkg.infer
             }
-            puts "DEBUG PurpleScript#infer_all: b4end"
             infer
         end
 
@@ -116,7 +115,7 @@ module Purple
             def initialize cabinet
                 @package = cabinet.create_package
                 @cabinet = cabinet
-                puts "DEBUG PackageScript#initialize: @package=#{@package}"
+                puts "DEBUG PackageScript#initialize: @package=#{@package}" if $DEBUG
             end
 
             callthrough :long_name, :name, :identifier, :version, :major, :minor
@@ -131,12 +130,12 @@ module Purple
             end
 
             def infer
-                puts "DEBUG #infer"
-                puts "DEBUG PackageScript#infer: pkg=#{pkg}"
+                puts "DEBUG #infer" if $DEBUG
+                puts "DEBUG PackageScript#infer: pkg=#{pkg}" if $DEBUG
                 # Take a guess at the filename
                 if 0 == pkg.files.size
                     files = @cabinet.files
-                    puts "DEBUG #infer: cabinet_files=#{files.inspect}"
+                    puts "DEBUG #infer: cabinet_files=#{files.inspect}" if $DEBUG
                     if 0 == files.size
                         warn 'Cabinet files section is empty. Did you not specify any urls?'
                     else
@@ -151,11 +150,11 @@ module Purple
                     end
                 end
 
-                #puts "DEBUG #infer: pkg.files=#{pkg.files.inspect}"
-                #puts "DEBUG #infer: long_name=#{pkg.long_name}"
+                puts "DEBUG #infer: pkg.files=#{pkg.files.inspect}" if $DEBUG
+                puts "DEBUG #infer: long_name=#{pkg.long_name}" if $DEBUG
                 # Take a guess at properties long_name, name, version, major, and minor
                 md = Matches.match_filename pkg.files[0]
-                puts "DEBUG #infer: filename match result  #{md.inspect}"
+                puts "DEBUG #infer: filename match result  #{md.inspect}" if $DEBUG
 
                 pkg.long_name = "#{md[:name]}-#{md[:version]}" if not pkg.long_name
                 pkg.name = md[:name] if not pkg.name

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.1
 specification_version: 1
 name: purplepkg
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
-date: 2004-11-19
+  version: 0.0.5
+date: 2004-11-23
 summary: A simple pre-packing tool with meta-package plugin support.
 require_paths: 
   - lib