rhc 0.96.9 → 0.97.17

data/lib/rhc/commands/server.rb

@@ -2,6 +2,7 @@ require 'rhc/commands/base'
 
 module RHC::Commands
   class Server < Base
+    suppress_wizard
 
     summary "Display information about the status of the OpenShift service."
     description "Retrieves any open issues or notices about the operation of the OpenShift service and displays them in the order they were opened."

data/lib/rhc/commands/setup.rb

@@ -4,18 +4,11 @@ require 'rhc/config'
 
 module RHC::Commands
   class Setup < Base
-    summary "Runs the setup wizard to configure your OpenShift account."
+    suppress_wizard
 
+    summary "Runs the setup wizard to configure your OpenShift account."
     def run
-      # TODO: make help subcommand global
-      if args[0] == 'help'
-        say Commander::Runner.instance.help_formatter.render_command(@command)
-        return 0
-      end
-
-      w = RHC::RerunWizard.new(config.config_path)
-      # exit 0 on success 1 otherwise
-      w.run ? 0 : 1
+      RHC::RerunWizard.new(config).run ?  0 : 1
     end
   end
 end

data/lib/rhc/config.rb

@@ -3,20 +3,11 @@ require 'rhc/core_ext'
 
 module RHC
   module Config
-    # FIXME: Config shouldn't really exit
-    #        stub this out for now so we can test it
-    def self.exit(code)
-      # :nocov:
-      Kernel.exit(code)
-      # :nocov:
-    end
-
     def self.read_config_files
       @@global_config = RHC::Vendor::ParseConfig.new(@@global_config_path) if File.exists?(@@global_config_path)
       @@local_config = RHC::Vendor::ParseConfig.new(File.expand_path(@@local_config_path)) if File.exists?(@@local_config_path)
     rescue Errno::EACCES => e
-      say "Could not open config file: #{e.message}"
-      exit 253
+      raise Errno::EACCES.new("Could not open config file: #{e.message}")
     end
 
     def self.set_defaults
@@ -95,6 +86,10 @@ module RHC
       self[key]
     end
 
+    def self.username
+      self['default_rhlogin']
+    end
+
     # Public: configures the default user for this session
     def self.config_user(username)
       @@defaults.add('default_rhlogin', username)
@@ -113,14 +108,23 @@ module RHC
       @@opts['password']
     end
 
-    def self.set_local_config(confpath)
+    def self.noprompt(bool)
+      @@opts.add('noprompt', bool)
+    end
+
+    def self.noprompt?
+      @@opts['noprompt']
+    end
+
+    def self.set_local_config(confpath, must_exist=true)
       begin
         @@local_config_path = File.expand_path(confpath)
         @@config_path = @@local_config_path if @@opts_config_path.nil?
         @@local_config = RHC::Vendor::ParseConfig.new(@@local_config_path)
       rescue Errno::EACCES => e
-        say "Could not open config file: #{e.message}"
-        exit 253
+        if must_exist
+          raise Errno::EACCES.new "Could not open config file: #{e.message}"
+        end
       end
     end
 
@@ -130,8 +134,7 @@ module RHC
         @@config_path = @@opts_config_path
         @@opts_config = RHC::Vendor::ParseConfig.new(@@opts_config_path) if File.exists?(@@opts_config_path)
       rescue Errno::EACCES => e
-        say "Could not open config file: #{e.message}"
-        exit 253
+        raise Errno::EACCES.new "Could not open config file: #{e.message}"
       end
     end
 
@@ -139,8 +142,7 @@ module RHC
       unless opts["config"].nil?
         opts_config_path = File.expand_path(opts["config"])
         if !File.readable?(opts_config_path)
-          say "Could not open config file: #{@opts_config_path}"
-          exit 253
+          raise Errno::EACCES.new "Could not open config file: #{@opts_config_path}"
         else
           set_opts_config(opts_config_path)
         end
@@ -161,7 +163,7 @@ module RHC
 
     # Public: convinience function to see if we should run the wizard
     def self.should_run_wizard?
-      not (has_local_config? or has_opts_config?)
+      not (has_local_config? or has_opts_config? or noprompt?)
     end
 
     def self.should_run_ssh_wizard?

data/lib/rhc/exceptions.rb

@@ -0,0 +1,20 @@
+require 'rhc-rest/exceptions/exceptions'
+module RHC
+  class DomainNotFoundException < Rhc::Rest::ResourceNotFoundException
+    def initialize(message="Domain not found")
+      super message, 127
+    end
+  end
+
+  class ApplicationNotFoundException < Rhc::Rest::ResourceNotFoundException
+    def initialize(message="Application not found")
+      super message, 101
+    end
+  end
+
+  class KeyNotFoundException < Rhc::Rest::ResourceNotFoundException
+    def initialize(message="SSHKey not found")
+      super message, 118
+    end
+  end
+end

data/lib/rhc/help_formatter.rb

@@ -1,28 +1,9 @@
 require 'commander/help_formatters/base'
 
 module RHC
-  class UsageHelpFormatter < Commander::HelpFormatter::Base
-    def global_options_output
-      result = "Global Options:\n"
-      @runner.options.each { |o|
-        result += o[:switches].join('|')
-        result += "\t#{o[:description]}\n"
-      }
-      result
-    end
-
-    def render
-      # TODO: render the rhc usage when we move 100% to using Commander
-      result = "#{@runner.program(:name)} - #{@runner.program(:description)}\n\n"
-      result += global_options_output
-      result
-    end
-
-    def render_command command
-      result = ""
-      result = "Usage: #{@runner.program(:name)} #{command.name}\n"
-      result += "#{command.summary}\n\n"
-      result += global_options_output
+  class UsageHelpFormatter < Commander::HelpFormatter::Terminal
+    def template name
+      ERB.new(File.read(File.join(File.dirname(__FILE__), 'usage_templates', "#{name}.erb")), nil, '-')
     end
   end
 

data/lib/rhc/helpers.rb

@@ -8,8 +8,8 @@ module RHC
 
   module Helpers
     private
-      def self.global_option(*args)
-        RHC::Commands.global_option *args
+      def self.global_option(switches, description)
+        RHC::Commands.global_option switches, description
       end
   end
 
@@ -56,13 +56,15 @@ module RHC
     # Global config
     #
 
-    global_option '-c', '--config FILE', "Path of a different config file"
+    global_option ['--config FILE'], "Path of a different config file"
     def config
       raise "Operations requiring configuration must define a config accessor"
     end
 
-    global_option '-l', '--rhlogin login', "Red Hat login (RedHat Network or OpenShift)"
-    global_option '-p', '--password password', "Red Hat password"
+    global_option ['--noprompt'], "Bypass first run wizard"
+    global_option ['-l', '--rhlogin login'], "Red Hat login (RedHat Network or OpenShift)"
+    global_option ['-p', '--password password'], "Red Hat password"
+    global_option ['-d', '--debug'], "Turn on debugging"
 
     def openshift_server
       config.get_value('libra_server')
@@ -70,7 +72,23 @@ module RHC
     def openshift_url
       "https://#{openshift_server}"
     end
+    def openshift_rest_node
+      "#{openshift_url}/broker/rest/api"
+    end
+
+    def rest_client
+      return @rest_client if @rest_client
+
+      username = config.username
+      unless username
+        username = ask "To connect to #{openshift_server} enter your OpenShift login (email or Red Hat login id): "
+        config.config_user(username)
+      end
+
+      password = RHC::Config.password || RHC::get_password
 
+      @rest_client = Rhc::Rest::Client.new(openshift_rest_node, username, password, @options.debug)
+    end
 
     #
     # Output helpers
@@ -181,6 +199,19 @@ module RHC
       section(:top => 1, :bottom => 1, &block)
     end
 
+    ##
+    # results
+    #
+    # highline helper which creates a paragraph with a header
+    # to distinguish the final results of a command from other output
+    #
+    def results(&block)
+      paragraph do
+        say "RESULT:"
+        yield
+      end
+    end
+
     # Platform helpers
     def jruby? ; RUBY_PLATFORM =~ /java/i end
     def windows? ; RUBY_PLATFORM =~ /win(32|dows|ce)|djgpp|(ms|cyg|bcc)win|mingw32/i end

data/lib/rhc/json.rb

@@ -2,50 +2,50 @@ require 'rhc/vendor/okjson'
 
 module RHC
 
-	module Json
-
-		def self.decode(string, options={})
-		  string = string.read if string.respond_to?(:read)
-		  result = RHC::Vendor::OkJson.decode(string)
-		  options[:symbolize_keys] ? symbolize_keys(result) : result
-		end
-
-		def self.encode(object, options={})
-		  RHC::Vendor::OkJson.valenc(stringify_keys(object))
-		end
-
-		def self.symbolize_keys(object)
-		  modify_keys(object) do |key|
-		    key.is_a?(String) ? key.to_sym : key
-		  end
-		end
-
-		def self.stringify_keys(object)
-		  modify_keys(object) do |key|
-		    key.is_a?(Symbol) ? key.to_s : key
-		  end
-		end
-
-		def self.modify_keys(object, &modifier)
-		  case object
-		  when Array
-		    object.map do |value|
-		      modify_keys(value, &modifier)
-		    end
-		  when Hash
-		    object.inject({}) do |result, (key, value)|
-		      new_key   = modifier.call(key)
-		      new_value = modify_keys(value, &modifier)
-		      result.merge! new_key => new_value
-		    end
-		  else
-		    object
-		  end
-		end
-
-	end
-
-	class JsonError < ::StandardError; end
+  module Json
+
+    def self.decode(string, options={})
+      string = string.read if string.respond_to?(:read)
+      result = RHC::Vendor::OkJson.decode(string)
+      options[:symbolize_keys] ? symbolize_keys(result) : result
+    end
+
+    def self.encode(object, options={})
+      RHC::Vendor::OkJson.valenc(stringify_keys(object))
+    end
+
+    def self.symbolize_keys(object)
+      modify_keys(object) do |key|
+        key.is_a?(String) ? key.to_sym : key
+      end
+    end
+
+    def self.stringify_keys(object)
+      modify_keys(object) do |key|
+        key.is_a?(Symbol) ? key.to_s : key
+      end
+    end
+
+    def self.modify_keys(object, &modifier)
+      case object
+      when Array
+        object.map do |value|
+          modify_keys(value, &modifier)
+        end
+      when Hash
+        object.inject({}) do |result, (key, value)|
+          new_key   = modifier.call(key)
+          new_value = modify_keys(value, &modifier)
+          result.merge! new_key => new_value
+        end
+      else
+        object
+      end
+    end
+
+  end
+
+  class JsonError < ::StandardError; end
 
 end
 

data/lib/rhc/targz.rb

@@ -7,7 +7,7 @@ TAR_BIN = File.executable?('/usr/bin/gnutar') ? '/usr/bin/gnutar' : 'tar'
 
 module RHC
 
-	module TarGz
+  module TarGz
 
     def self.contains(filename, search, force_ruby=false)
       
@@ -30,12 +30,12 @@ module RHC
           return false
         end
       else
-        `#{TAR_BIN} --wildcards -tf #{filename} '#{search.to_s}'`
+        `#{TAR_BIN} --wildcards -tf #{filename} '#{search.to_s}' 2> /dev/null`
         contains = $?.exitstatus == 0
       end
       contains
     end
 
-	end
+  end
 
 end

data/lib/rhc/usage_templates/command_help.erb

@@ -0,0 +1,26 @@
+Usage: rhc <%= @command.name %> <%= @command.syntax %>
+<%= @command.description || @command.summary || 'No description.' %>
+<% unless @actions.nil? or @actions.empty? -%>
+
+List of Actions
+<% for action in @actions -%>
+  <%= "%-18s %s\n" % [action[:name], action[:summary]] -%>
+<% end -%>
+<% end -%>
+<% unless @command.options.nil? or @command.options.empty? -%>
+
+Options for <%= @command.name %>
+<% for option in @command.options -%>
+  <%= "%-25s %s\n" % [option[:switches].join('|'), option[:description]] -%>
+<% end -%>
+<% end -%>
+
+Global Options
+<% for option in @global_options -%>
+  <%= "%-25s %s\n" % [option[:switches].join('|'), option[:description]] -%>
+<% end -%>
+<%#-
+  Other Attrs we may wish to use:
+
+   * @examples - for description, command in @examples
+-%>

data/lib/rhc/usage_templates/help.erb

@@ -0,0 +1,27 @@
+Usage: <%= program :name %> (<resource> | --help) [<action>] [<args>]
+<%= program :description %>
+
+List of Resources
+  <%# remove these as they are added to commander%>
+  app                Manage applications within the rhcloud account.
+  sshkey             Manage multiple keys for the registered rhcloud user.
+  port-forward       Forward remote ports to the workstation
+<% for name, command in @commands.sort -%>
+	<%- unless alias? name or name == "help" or name.include?(" ") -%>  <%="%-18s %s\n" % [command.name, command.summary || command.description] %><%- end -%>
+<%- end -%>
+
+Global Options
+<%- unless @options.nil? or @options.empty?  -%>
+<% for option in @options -%>
+  <%= "%-25s %s\n" % [option[:switches].join('|'), option[:description]] -%>
+<% end -%>
+<%- end -%>
+
+See '<%= program :name %> <resource> --help' for more applicable commands and arguments on a specific resource.
+<% if program :help -%>
+  <% for title, body in program(:help) %>
+  <%= $terminal.color title.to_s.upcase, :bold %>:
+
+    <%= body %>
+  <% end -%>
+<% end -%>

data/lib/rhc/vendor/zliby.rb

@@ -5,7 +5,7 @@ module Vendor
 module Zlib
 
 ZLIBY_VERSION = "0.0.5"
-ZLIB_VERSION = "1.2.3"	
+ZLIB_VERSION = "1.2.3"  
 VERSION = "0.6.0" #For compatibility with Ruby-core Zlib
 MAXBITS = 15
 MAXLCODES = 286
@@ -16,597 +16,597 @@ MAX_WBITS = 15
 Z_DEFLATED = 8 
 
 def self.adler32 string="", adler=1
-	if adler > (2**128) - 1 then raise RangeError.new end 
-	accum1 = adler & 0xffff
-	accum2 = (adler >> 16) & 0xffff
-	
-	len = string.length
-	x = -1
-	while len > 0 
-		tlen = len > 5552 ? 5552 : len
-		len -= tlen
-		while tlen >0
-			x += 1
-			accum1 += string[x]
-			accum2 += accum1
-			tlen -= 1
-		end
-		accum1 %= 65521
-		accum2 %= 65521
-	end
-	accum2 << 16 | accum1
+  if adler > (2**128) - 1 then raise RangeError.new end 
+  accum1 = adler & 0xffff
+  accum2 = (adler >> 16) & 0xffff
+  
+  len = string.length
+  x = -1
+  while len > 0 
+    tlen = len > 5552 ? 5552 : len
+    len -= tlen
+    while tlen >0
+      x += 1
+      accum1 += string[x]
+      accum2 += accum1
+      tlen -= 1
+    end
+    accum1 %= 65521
+    accum2 %= 65521
+  end
+  accum2 << 16 | accum1
 end
 
 def self.crc_table
-	[0, 1996959894, 3993919788, 2567524794, 124634137, 1886057615, 3915621685, 2657392035, 249268274, 2044508324, 3772115230, 2547177864, 162941995, 2125561021, 3887607047, 2428444049, 498536548, 1789927666, 4089016648, 2227061214, 450548861, 1843258603, 4107580753, 2211677639, 325883990, 1684777152, 4251122042, 2321926636, 335633487, 1661365465, 4195302755, 2366115317, 997073096, 1281953886, 3579855332, 2724688242, 1006888145, 1258607687, 3524101629, 2768942443, 901097722, 1119000684, 3686517206, 2898065728, 853044451, 1172266101, 3705015759, 2882616665, 651767980, 1373503546, 3369554304, 3218104598, 565507253, 1454621731, 3485111705, 3099436303, 671266974, 1594198024, 3322730930, 2970347812, 795835527, 1483230225, 3244367275, 3060149565, 1994146192, 31158534, 2563907772, 4023717930, 1907459465, 112637215, 2680153253, 3904427059, 2013776290, 251722036, 2517215374, 3775830040, 2137656763, 141376813, 2439277719, 3865271297, 1802195444, 476864866, 2238001368, 4066508878, 1812370925, 453092731, 2181625025, 4111451223, 1706088902, 314042704, 2344532202, 4240017532, 1658658271, 366619977, 2362670323, 4224994405, 1303535960, 984961486, 2747007092, 3569037538, 1256170817, 1037604311, 2765210733, 3554079995, 1131014506, 879679996, 2909243462, 3663771856, 1141124467, 855842277, 2852801631, 3708648649, 1342533948, 654459306, 3188396048, 3373015174, 1466479909, 544179635, 3110523913, 3462522015, 1591671054, 702138776, 2966460450, 3352799412, 1504918807, 783551873, 3082640443, 3233442989, 3988292384, 2596254646, 62317068, 1957810842, 3939845945, 2647816111, 81470997, 1943803523, 3814918930, 2489596804, 225274430, 2053790376, 3826175755, 2466906013, 167816743, 2097651377, 4027552580, 2265490386, 503444072, 1762050814, 4150417245, 2154129355, 426522225, 1852507879, 4275313526, 2312317920, 282753626, 1742555852, 4189708143, 2394877945, 397917763, 1622183637, 3604390888, 2714866558, 953729732, 1340076626, 3518719985, 2797360999, 1068828381, 1219638859, 3624741850, 2936675148, 906185462, 1090812512, 3747672003, 2825379669, 829329135, 1181335161, 3412177804, 3160834842, 628085408, 1382605366, 3423369109, 3138078467, 570562233, 1426400815, 3317316542, 2998733608, 733239954, 1555261956, 3268935591, 3050360625, 752459403, 1541320221, 2607071920, 3965973030, 1969922972, 40735498, 2617837225, 3943577151, 1913087877, 83908371, 2512341634, 3803740692, 2075208622, 213261112, 2463272603, 3855990285, 2094854071, 198958881, 2262029012, 4057260610, 1759359992, 534414190, 2176718541, 4139329115, 1873836001, 414664567, 2282248934, 4279200368, 1711684554, 285281116, 2405801727, 4167216745, 1634467795, 376229701, 2685067896, 3608007406, 1308918612, 956543938, 2808555105, 3495958263, 1231636301, 1047427035, 2932959818, 3654703836, 1088359270, 936918000, 2847714899, 3736837829, 1202900863, 817233897, 3183342108, 3401237130, 1404277552, 615818150, 3134207493, 3453421203, 1423857449, 601450431, 3009837614, 3294710456, 1567103746, 711928724, 3020668471, 3272380065, 1510334235, 755167117]
+  [0, 1996959894, 3993919788, 2567524794, 124634137, 1886057615, 3915621685, 2657392035, 249268274, 2044508324, 3772115230, 2547177864, 162941995, 2125561021, 3887607047, 2428444049, 498536548, 1789927666, 4089016648, 2227061214, 450548861, 1843258603, 4107580753, 2211677639, 325883990, 1684777152, 4251122042, 2321926636, 335633487, 1661365465, 4195302755, 2366115317, 997073096, 1281953886, 3579855332, 2724688242, 1006888145, 1258607687, 3524101629, 2768942443, 901097722, 1119000684, 3686517206, 2898065728, 853044451, 1172266101, 3705015759, 2882616665, 651767980, 1373503546, 3369554304, 3218104598, 565507253, 1454621731, 3485111705, 3099436303, 671266974, 1594198024, 3322730930, 2970347812, 795835527, 1483230225, 3244367275, 3060149565, 1994146192, 31158534, 2563907772, 4023717930, 1907459465, 112637215, 2680153253, 3904427059, 2013776290, 251722036, 2517215374, 3775830040, 2137656763, 141376813, 2439277719, 3865271297, 1802195444, 476864866, 2238001368, 4066508878, 1812370925, 453092731, 2181625025, 4111451223, 1706088902, 314042704, 2344532202, 4240017532, 1658658271, 366619977, 2362670323, 4224994405, 1303535960, 984961486, 2747007092, 3569037538, 1256170817, 1037604311, 2765210733, 3554079995, 1131014506, 879679996, 2909243462, 3663771856, 1141124467, 855842277, 2852801631, 3708648649, 1342533948, 654459306, 3188396048, 3373015174, 1466479909, 544179635, 3110523913, 3462522015, 1591671054, 702138776, 2966460450, 3352799412, 1504918807, 783551873, 3082640443, 3233442989, 3988292384, 2596254646, 62317068, 1957810842, 3939845945, 2647816111, 81470997, 1943803523, 3814918930, 2489596804, 225274430, 2053790376, 3826175755, 2466906013, 167816743, 2097651377, 4027552580, 2265490386, 503444072, 1762050814, 4150417245, 2154129355, 426522225, 1852507879, 4275313526, 2312317920, 282753626, 1742555852, 4189708143, 2394877945, 397917763, 1622183637, 3604390888, 2714866558, 953729732, 1340076626, 3518719985, 2797360999, 1068828381, 1219638859, 3624741850, 2936675148, 906185462, 1090812512, 3747672003, 2825379669, 829329135, 1181335161, 3412177804, 3160834842, 628085408, 1382605366, 3423369109, 3138078467, 570562233, 1426400815, 3317316542, 2998733608, 733239954, 1555261956, 3268935591, 3050360625, 752459403, 1541320221, 2607071920, 3965973030, 1969922972, 40735498, 2617837225, 3943577151, 1913087877, 83908371, 2512341634, 3803740692, 2075208622, 213261112, 2463272603, 3855990285, 2094854071, 198958881, 2262029012, 4057260610, 1759359992, 534414190, 2176718541, 4139329115, 1873836001, 414664567, 2282248934, 4279200368, 1711684554, 285281116, 2405801727, 4167216745, 1634467795, 376229701, 2685067896, 3608007406, 1308918612, 956543938, 2808555105, 3495958263, 1231636301, 1047427035, 2932959818, 3654703836, 1088359270, 936918000, 2847714899, 3736837829, 1202900863, 817233897, 3183342108, 3401237130, 1404277552, 615818150, 3134207493, 3453421203, 1423857449, 601450431, 3009837614, 3294710456, 1567103746, 711928724, 3020668471, 3272380065, 1510334235, 755167117]
 end
 
 def self.crc32 string="", crc=0
-	if crc > 2**128 - 1 then raise RangeError.new end
-	crc = crc ^ 0xffffffff
-	string.each_byte do |byte|
-		index = (crc ^ byte) & 0xff
-		crc = (crc >> 8) ^ crc_table[index] 
-	end
-	crc ^ 0xffffffff
+  if crc > 2**128 - 1 then raise RangeError.new end
+  crc = crc ^ 0xffffffff
+  string.each_byte do |byte|
+    index = (crc ^ byte) & 0xff
+    crc = (crc >> 8) ^ crc_table[index] 
+  end
+  crc ^ 0xffffffff
 end
 
 
 class ZStream
-	
-	def initialize
-		@input_buffer = []
-		@output_buffer = []
-		@out_pos = -1
-		@in_pos = -1
-		@bit_bucket = 0
-		@bit_count = 0
-
-	end
-	#Returns the adler-32 checksum of the input data.
-	def adler
-	end
-	
-	#Returns the number of bytes read. Normally 0 since all bytes are read at once.
-	def avail_in
-		@input_buffer.length - @in_pos
-	end
-	
-	#Returns number of free bytes in the output buffer.  As the output buffer is self expanding this normally returns 0.
-	def avail_out
-		@output_buffer.length - @out_pos
-	end
-	
-	#Allocates size bytes in output buffer.  If size < avail_out it truncates the buffer.
-	def avail_out= size
-		size.times do 
-			if size > avail_out
-				@output_buffer.push nil
-			else
-				@output_buffer.pop
-			end
-		end
-	end
-	
-	#Closes stream.  Further operations will raise Zlib::StreamError
-	def close
-		@closed = true
-	end
-	
-	#True if stream closed, otherwise False.
-	def closed?
-		@closed
-	end
-	
-	#Best guess of input data, one of Zlib::BINARY, Zlib::ASCII, or Zlib::UNKNOWN
-	def data_type
-	end
-	
-	#See close
-	def end
-		close
-	end
-	
-	#See closed?
-	def ended?
-		closed?
-	end
-	
-	#Finishes the stream, flushes output buffer, implemented by child classes
-	def finish
-		close
-	end
-	
-	#True if stream is finished, otherwise False
-	def finished?
-		if @finished.nil? then
-			false
-		else
-			@finished
-		end
-	end
-	
-	#Flushes input buffer and returns the data therein.
-	def flush_next_in
-		@in_pos = @input_buffer.length
-		@finished = true
-		ret = @input_buffer.pack("c*")
-		@input_buffer = []
-		ret
-	end
-	
-	#Flushes the output buffer and returns all the data
-	def flush_next_out
-		@out_pos = @output_buffer.length
-		@finished = true
-		ret = @output_buffer.pack("c*")
-		@output_buffer = []
-		ret
-	end
-	
-	#Reset stream.  Input and Output buffers are reset.
-	def reset
-		@out_pos = -1
-		@in_pos = -1
-		@input_buffer = []
-		@output_buffer = []
-	end
-	
-	#See finished.
-	def stream_end?
-		finished?
-	end
-	
-	#Size of input buffer.
-	def total_in
-		@input_buffer.length
-	end
-	
-	#Size of output buffer.
-	def total_out
-		@output_buffer.length
-	end
-	
-	private
-	#returns need bits from the input buffer
-	# == Format Notes
-	# bits are stored LSB to MSB 
-	def get_bits need
-		val = @bit_bucket
-		while @bit_count < need
-			val |= (@input_buffer[@in_pos+=1] << @bit_count)
-			@bit_count += 8
-		end
-		
-		@bit_bucket = val >> need
-		@bit_count -= need
-		val & ((1 << need) - 1)
-	end
-public	
+  
+  def initialize
+    @input_buffer = []
+    @output_buffer = []
+    @out_pos = -1
+    @in_pos = -1
+    @bit_bucket = 0
+    @bit_count = 0
+
+  end
+  #Returns the adler-32 checksum of the input data.
+  def adler
+  end
+  
+  #Returns the number of bytes read. Normally 0 since all bytes are read at once.
+  def avail_in
+    @input_buffer.length - @in_pos
+  end
+  
+  #Returns number of free bytes in the output buffer.  As the output buffer is self expanding this normally returns 0.
+  def avail_out
+    @output_buffer.length - @out_pos
+  end
+  
+  #Allocates size bytes in output buffer.  If size < avail_out it truncates the buffer.
+  def avail_out= size
+    size.times do 
+      if size > avail_out
+        @output_buffer.push nil
+      else
+        @output_buffer.pop
+      end
+    end
+  end
+  
+  #Closes stream.  Further operations will raise Zlib::StreamError
+  def close
+    @closed = true
+  end
+  
+  #True if stream closed, otherwise False.
+  def closed?
+    @closed
+  end
+  
+  #Best guess of input data, one of Zlib::BINARY, Zlib::ASCII, or Zlib::UNKNOWN
+  def data_type
+  end
+  
+  #See close
+  def end
+    close
+  end
+  
+  #See closed?
+  def ended?
+    closed?
+  end
+  
+  #Finishes the stream, flushes output buffer, implemented by child classes
+  def finish
+    close
+  end
+  
+  #True if stream is finished, otherwise False
+  def finished?
+    if @finished.nil? then
+      false
+    else
+      @finished
+    end
+  end
+  
+  #Flushes input buffer and returns the data therein.
+  def flush_next_in
+    @in_pos = @input_buffer.length
+    @finished = true
+    ret = @input_buffer.pack("c*")
+    @input_buffer = []
+    ret
+  end
+  
+  #Flushes the output buffer and returns all the data
+  def flush_next_out
+    @out_pos = @output_buffer.length
+    @finished = true
+    ret = @output_buffer.pack("c*")
+    @output_buffer = []
+    ret
+  end
+  
+  #Reset stream.  Input and Output buffers are reset.
+  def reset
+    @out_pos = -1
+    @in_pos = -1
+    @input_buffer = []
+    @output_buffer = []
+  end
+  
+  #See finished.
+  def stream_end?
+    finished?
+  end
+  
+  #Size of input buffer.
+  def total_in
+    @input_buffer.length
+  end
+  
+  #Size of output buffer.
+  def total_out
+    @output_buffer.length
+  end
+  
+  private
+  #returns need bits from the input buffer
+  # == Format Notes
+  # bits are stored LSB to MSB 
+  def get_bits need
+    val = @bit_bucket
+    while @bit_count < need
+      val |= (@input_buffer[@in_pos+=1] << @bit_count)
+      @bit_count += 8
+    end
+    
+    @bit_bucket = val >> need
+    @bit_count -= need
+    val & ((1 << need) - 1)
+  end
+public  
 end
 
 #== DEFLATE Decompression
 #Implements decompression of a RFC-1951[ftp://ftp.rfc-editor.org/in-notes/rfc1951.txt] compatible stream.
 class Inflate < ZStream
 
-	def initialize window_bits=MAX_WBITS
-		@w_bits = window_bits	
-		if @w_bits < 0 then 
-			@rawdeflate = true
-			@w_bits *= -1 
-		end	
-		super()
-		@zstring = ""
-	end
-	
-	#Appends data to the input stream
-	def <<(string)
-		@zstring << string
-		inflate
-	end
-	
-	#Sets the inflate dictionary
-	def set_dictionary string
-		@dict = string
-		reset
-	end
-		
-	#==Example
-	# f = File.open "example.z"
-	# i = Inflate.new
-	# i.inflate f.read
-	def inflate zstring=nil
-		@zstring = zstring unless zstring.nil?
-		#We can't use unpack, IronRuby doesn't have it yet.
-		@zstring.each_byte {|b| @input_buffer << b}
-		
-	 	unless @rawdeflate then
-
-		compression_method_and_flags = @input_buffer[@in_pos+=1]
-		flags = @input_buffer[@in_pos+=1]
-		
-		#CMF and FLG, when viewed as a 16-bit unsigned integer stored inMSB order (CMF*256 + FLG), is a multiple of 31
-		if ((compression_method_and_flags << 0x08) + flags) % 31 != 0 then raise Zlib::DataError.new("incorrect header check") end
-		
-		#CM = 8 denotes the �deflate� compression method with a window size up to 32K. (RFC's only specify CM 8)
-		compression_method = compression_method_and_flags & 0x0F 
-		
-		if compression_method != Z_DEFLATED then raise Zlib::DataError.new("unknown compression method") end
-		
-		#For CM = 8, CINFO is the base-2 logarithm of the LZ77 window size,minus eight (CINFO=7 indicates a 32K window size)
-		compression_info = compression_method_and_flags >> 0x04 
-		
-		if (compression_info + 8) > @w_bits then raise Zlib::DataError.new("invalid window size") end
-		
-		preset_dictionary_flag = ((flags & 0x20) >> 0x05) == 1
-		compression_level = (flags & 0xC0) >> 0x06
-		
-		if preset_dictionary_flag and @dict.nil? then raise Zlib::NeedDict.new "Preset dictionary needed!" end
-		
-		#TODO:  Add Preset dictionary support
-		if preset_dictionary_flag then 
-			@dict_crc = @input_buffer[@in_pos+=1] << 24 | @input_buffer[@in_pos+=1] << 16 | @input_buffer[@in_pos+=1] << 8 | @input_buffer[@in_pos+=1]
-		 end
-		
-		end
-		last_block = false
-		#Begin processing DEFLATE stream
-		until last_block
-			last_block = (get_bits(1) == 1)
-			block_type = get_bits(2)
-			case block_type
-				when 0 then no_compression
-				when 1 then fixed_codes
-				when 2 then dynamic_codes
- 				when 3 then raise Zlib::DataError.new("invalid block type")	 
-			end	
-		end
-		finish
-	end
-	
-	#Finishes inflating and flushes the buffer
-	def finish
-		output = ""
-		inflate unless @output_buffer.length > 0
-		@output_buffer.each {|c| output << c } 
-		super
-		output
-	end
-	
-	private
-
-	def no_compression
-		@bit_bucket = 0
-		@bit_count = 0
-		if @in_pos + 4 > @input_buffer.length then raise Zlib::DataError.new("not enough input to read length code") end
-		length = @input_buffer[@in_pos+=1] | (@input_buffer[@in_pos+=1] << 8)
-			
-		if (~length & 0xff != @input_buffer[@in_pos+=1]) || (((~length >> 8) & 0xff) != @input_buffer[@in_pos+=1]) then raise Zlib::DataError.new("invalid stored block lengths") end
-		
-		if @in_pos + length > @input_buffer.length then raise Zlib::DataError.new("ran out of input") end
-				
-		
-		length.times do
-			@output_buffer[@out_pos += 1] = @input_buffer[@in_pos += 1]
-		end
-		   	
-			
-	end
-	
-	def fixed_codes
-		if @fixed_length_codes.nil? && @fixed_distance_codes.nil? then generate_huffmans end 
-		codes @fixed_length_codes, @fixed_distance_codes	
-	end
-	
-	def dynamic_codes
-		
-		order = [16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15]
-		nlen = get_bits(5) + 257
-		ndist = get_bits(5) + 1
-		ncode = get_bits(4) + 4
-
-				
-		lengths=[]
-		dynamic_length_codes = Zlib::Inflate::HuffmanTree.new
-		dynamic_distance_codes = Zlib::Inflate::HuffmanTree.new
-		
-		if (nlen > MAXLCODES || ndist > MAXDCODES) then raise Zlib::DataError.new("too many length or distance codes") end
-		idx = 0
-		
-		while idx < ncode
-			lengths[order[idx]] = get_bits(3)
-			idx += 1
-		end
-		while idx < 19
-			lengths[order[idx]] = 0
-			idx += 1
-		end
-		err = construct_tree dynamic_length_codes, lengths, 18
-		if err != 0 then raise Zlib::DataError.new("code lengths codes incomplete") end
-		
-		idx = 0
-		while idx < (nlen + ndist)
-			symbol = decode(dynamic_length_codes)
-			if symbol < 16 then 
-				lengths[idx] = symbol 
-				idx  += 1;
-			else
-				len = 0
-					if symbol == 16 then 
-						if idx == 0 then raise Zlib::DataError.new("repeat lengths with no first length") end
-						len = lengths[idx - 1]
-						symbol = 3 + get_bits(2)
-					elsif symbol == 17 then
-						symbol = 3 + get_bits(3)
-					elsif symbol == 18 then 
-						symbol = 11 + get_bits(7)
-					else
-						raise Zlib::DataError.new("invalid repeat length code")
-					end
-				if (idx + symbol) > (nlen + ndist) then raise Zlib::DataError.new("repeat more than specified lengths") end
-				until symbol == 0
-					lengths[idx] = len
-					idx+=1
-					symbol -= 1
-				end
-			end
-		end
-
-		err = construct_tree dynamic_length_codes, lengths, nlen-1
-		
-		if err < 0 || (err > 0 && (nlen - dynamic_length_codes.count[0] != 1)) then raise Zlib::DataError.new("invalid literal/length code lengths") end
-		
-		nlen.times { lengths.delete_at 0 } #We do this since we don't have pointer arithmetic in ruby
-		
-		err = construct_tree dynamic_distance_codes, lengths, ndist-1
-		if err < 0 || (err > 0 && (ndist - dynamic_distance_codes.count[0] != 1)) then raise Zlib::DataError.new("invalid distance code lengths") end
-			
-		codes dynamic_length_codes, dynamic_distance_codes
-	end
-	
-	def generate_huffmans
-		
-		lengths = []
-		
-		#literal/length table
-		for idx in (000..143)
-			lengths[idx] = 8
-		end
-		for idx in (144..255) 
-			lengths[idx] = 9
-		end
-		for idx in (256..279)
-			lengths[idx] = 7
-		end
-		for idx in (280..287)
-			lengths[idx] = 8
-		end
-			@fixed_length_codes = Zlib::Inflate::HuffmanTree.new
-			construct_tree @fixed_length_codes, lengths, 287
-		
-		for idx in (00..29)
-			lengths[idx] = 5
-		end
-			@fixed_distance_codes = Zlib::Inflate::HuffmanTree.new
-			construct_tree @fixed_distance_codes, lengths, 29
-		
-	end
-	
-	def codes length_codes, distance_codes
-	lens = [3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258]
-	lext = [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0]
-	dists = [1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577]
-	dext = [0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13]
-	
-	symbol = 0
-	
-	until symbol == 256
-		symbol = decode(length_codes)
-		if symbol < 0 then return symbol end
-		if symbol < 256 then @output_buffer[@out_pos+=1] = symbol end
-		if symbol > 256 then
-			symbol -= 257
-			if symbol >= 29 then raise Zlib::DataError.new("invalid literal/length or distance code in fixed or dynamic block") end
-			len = lens[symbol] + get_bits(lext[symbol])
-			symbol = decode(distance_codes)
-			if symbol < 0 then return symbol end
-			dist = dists[symbol] + get_bits(dext[symbol])
-			if dist > @output_buffer.length then raise Zlib::DataError.new("distance is too far back in fixed or dynamic block") end
-			while len > 0
-				@output_buffer[@out_pos+=1] = @output_buffer[@out_pos - dist]
-				len -= 1
-			end
-	end
-	end
-	return 0
-	end
-	
-	def decode huffman_tree
-		code = 0
-		first = 0
-		index = 0 
-		for len in (1..15)
-			code |= get_bits(1)
-			count = huffman_tree.count[len]
-			if code < (first + count) then return huffman_tree.symbol[index + (code - first)] end
-			index += count
-			first += count
-			first <<= 1
-			code <<= 1
-		end
-		-9
-	end
-	
-	def construct_tree huffman_tree, lengths, n_symbols
-		offs = []
-	
-		for len in (000..MAXBITS)
-			huffman_tree.count[len] = 0
-		end
-
-		for symbol in (000..n_symbols)
-			huffman_tree.count[lengths[symbol]] += 1
-		end
-		
-		if huffman_tree.count[0] == n_symbols then return 0 end
-		
-		left = 1
-		for len in (1..MAXBITS)
-			left <<= 1
-			left -= huffman_tree.count[len];
-			if left < 0 then return left end
-		end
-		
-		offs[1] = 0
-		
-		for len in (1..(MAXBITS-1))
-			offs[len+1] = offs[len] + huffman_tree.count[len]
-		end
-		
-		for symbol in (0..n_symbols)
-			if lengths[symbol] != 0 then 
-				huffman_tree.symbol[offs[lengths[symbol]]] = symbol 
-				offs[lengths[symbol]] += 1
-				end
-			
-		end
-	left
-	end
+  def initialize window_bits=MAX_WBITS
+    @w_bits = window_bits  
+    if @w_bits < 0 then 
+      @rawdeflate = true
+      @w_bits *= -1 
+    end  
+    super()
+    @zstring = ""
+  end
+  
+  #Appends data to the input stream
+  def <<(string)
+    @zstring << string
+    inflate
+  end
+  
+  #Sets the inflate dictionary
+  def set_dictionary string
+    @dict = string
+    reset
+  end
+    
+  #==Example
+  # f = File.open "example.z"
+  # i = Inflate.new
+  # i.inflate f.read
+  def inflate zstring=nil
+    @zstring = zstring unless zstring.nil?
+    #We can't use unpack, IronRuby doesn't have it yet.
+    @zstring.each_byte {|b| @input_buffer << b}
+    
+     unless @rawdeflate then
+
+    compression_method_and_flags = @input_buffer[@in_pos+=1]
+    flags = @input_buffer[@in_pos+=1]
+    
+    #CMF and FLG, when viewed as a 16-bit unsigned integer stored inMSB order (CMF*256 + FLG), is a multiple of 31
+    if ((compression_method_and_flags << 0x08) + flags) % 31 != 0 then raise Zlib::DataError.new("incorrect header check") end
+    
+    #CM = 8 denotes the "deflate" compression method with a window size up to 32K. (RFC's only specify CM 8)
+    compression_method = compression_method_and_flags & 0x0F 
+    
+    if compression_method != Z_DEFLATED then raise Zlib::DataError.new("unknown compression method") end
+    
+    #For CM = 8, CINFO is the base-2 logarithm of the LZ77 window size,minus eight (CINFO=7 indicates a 32K window size)
+    compression_info = compression_method_and_flags >> 0x04 
+    
+    if (compression_info + 8) > @w_bits then raise Zlib::DataError.new("invalid window size") end
+    
+    preset_dictionary_flag = ((flags & 0x20) >> 0x05) == 1
+    compression_level = (flags & 0xC0) >> 0x06
+    
+    if preset_dictionary_flag and @dict.nil? then raise Zlib::NeedDict.new "Preset dictionary needed!" end
+    
+    #TODO:  Add Preset dictionary support
+    if preset_dictionary_flag then 
+      @dict_crc = @input_buffer[@in_pos+=1] << 24 | @input_buffer[@in_pos+=1] << 16 | @input_buffer[@in_pos+=1] << 8 | @input_buffer[@in_pos+=1]
+     end
+    
+    end
+    last_block = false
+    #Begin processing DEFLATE stream
+    until last_block
+      last_block = (get_bits(1) == 1)
+      block_type = get_bits(2)
+      case block_type
+        when 0 then no_compression
+        when 1 then fixed_codes
+        when 2 then dynamic_codes
+         when 3 then raise Zlib::DataError.new("invalid block type")   
+      end  
+    end
+    finish
+  end
+  
+  #Finishes inflating and flushes the buffer
+  def finish
+    output = ""
+    inflate unless @output_buffer.length > 0
+    @output_buffer.each {|c| output << c } 
+    super
+    output
+  end
+  
+  private
+
+  def no_compression
+    @bit_bucket = 0
+    @bit_count = 0
+    if @in_pos + 4 > @input_buffer.length then raise Zlib::DataError.new("not enough input to read length code") end
+    length = @input_buffer[@in_pos+=1] | (@input_buffer[@in_pos+=1] << 8)
+      
+    if (~length & 0xff != @input_buffer[@in_pos+=1]) || (((~length >> 8) & 0xff) != @input_buffer[@in_pos+=1]) then raise Zlib::DataError.new("invalid stored block lengths") end
+    
+    if @in_pos + length > @input_buffer.length then raise Zlib::DataError.new("ran out of input") end
+        
+    
+    length.times do
+      @output_buffer[@out_pos += 1] = @input_buffer[@in_pos += 1]
+    end
+         
+      
+  end
+  
+  def fixed_codes
+    if @fixed_length_codes.nil? && @fixed_distance_codes.nil? then generate_huffmans end 
+    codes @fixed_length_codes, @fixed_distance_codes  
+  end
+  
+  def dynamic_codes
+    
+    order = [16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15]
+    nlen = get_bits(5) + 257
+    ndist = get_bits(5) + 1
+    ncode = get_bits(4) + 4
+
+        
+    lengths=[]
+    dynamic_length_codes = Zlib::Inflate::HuffmanTree.new
+    dynamic_distance_codes = Zlib::Inflate::HuffmanTree.new
+    
+    if (nlen > MAXLCODES || ndist > MAXDCODES) then raise Zlib::DataError.new("too many length or distance codes") end
+    idx = 0
+    
+    while idx < ncode
+      lengths[order[idx]] = get_bits(3)
+      idx += 1
+    end
+    while idx < 19
+      lengths[order[idx]] = 0
+      idx += 1
+    end
+    err = construct_tree dynamic_length_codes, lengths, 18
+    if err != 0 then raise Zlib::DataError.new("code lengths codes incomplete") end
+    
+    idx = 0
+    while idx < (nlen + ndist)
+      symbol = decode(dynamic_length_codes)
+      if symbol < 16 then 
+        lengths[idx] = symbol 
+        idx  += 1;
+      else
+        len = 0
+          if symbol == 16 then 
+            if idx == 0 then raise Zlib::DataError.new("repeat lengths with no first length") end
+            len = lengths[idx - 1]
+            symbol = 3 + get_bits(2)
+          elsif symbol == 17 then
+            symbol = 3 + get_bits(3)
+          elsif symbol == 18 then 
+            symbol = 11 + get_bits(7)
+          else
+            raise Zlib::DataError.new("invalid repeat length code")
+          end
+        if (idx + symbol) > (nlen + ndist) then raise Zlib::DataError.new("repeat more than specified lengths") end
+        until symbol == 0
+          lengths[idx] = len
+          idx+=1
+          symbol -= 1
+        end
+      end
+    end
+
+    err = construct_tree dynamic_length_codes, lengths, nlen-1
+    
+    if err < 0 || (err > 0 && (nlen - dynamic_length_codes.count[0] != 1)) then raise Zlib::DataError.new("invalid literal/length code lengths") end
+    
+    nlen.times { lengths.delete_at 0 } #We do this since we don't have pointer arithmetic in ruby
+    
+    err = construct_tree dynamic_distance_codes, lengths, ndist-1
+    if err < 0 || (err > 0 && (ndist - dynamic_distance_codes.count[0] != 1)) then raise Zlib::DataError.new("invalid distance code lengths") end
+      
+    codes dynamic_length_codes, dynamic_distance_codes
+  end
+  
+  def generate_huffmans
+    
+    lengths = []
+    
+    #literal/length table
+    for idx in (000..143)
+      lengths[idx] = 8
+    end
+    for idx in (144..255) 
+      lengths[idx] = 9
+    end
+    for idx in (256..279)
+      lengths[idx] = 7
+    end
+    for idx in (280..287)
+      lengths[idx] = 8
+    end
+      @fixed_length_codes = Zlib::Inflate::HuffmanTree.new
+      construct_tree @fixed_length_codes, lengths, 287
+    
+    for idx in (00..29)
+      lengths[idx] = 5
+    end
+      @fixed_distance_codes = Zlib::Inflate::HuffmanTree.new
+      construct_tree @fixed_distance_codes, lengths, 29
+    
+  end
+  
+  def codes length_codes, distance_codes
+  lens = [3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258]
+  lext = [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0]
+  dists = [1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577]
+  dext = [0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13]
+  
+  symbol = 0
+  
+  until symbol == 256
+    symbol = decode(length_codes)
+    if symbol < 0 then return symbol end
+    if symbol < 256 then @output_buffer[@out_pos+=1] = symbol end
+    if symbol > 256 then
+      symbol -= 257
+      if symbol >= 29 then raise Zlib::DataError.new("invalid literal/length or distance code in fixed or dynamic block") end
+      len = lens[symbol] + get_bits(lext[symbol])
+      symbol = decode(distance_codes)
+      if symbol < 0 then return symbol end
+      dist = dists[symbol] + get_bits(dext[symbol])
+      if dist > @output_buffer.length then raise Zlib::DataError.new("distance is too far back in fixed or dynamic block") end
+      while len > 0
+        @output_buffer[@out_pos+=1] = @output_buffer[@out_pos - dist]
+        len -= 1
+      end
+  end
+  end
+  return 0
+  end
+  
+  def decode huffman_tree
+    code = 0
+    first = 0
+    index = 0 
+    for len in (1..15)
+      code |= get_bits(1)
+      count = huffman_tree.count[len]
+      if code < (first + count) then return huffman_tree.symbol[index + (code - first)] end
+      index += count
+      first += count
+      first <<= 1
+      code <<= 1
+    end
+    -9
+  end
+  
+  def construct_tree huffman_tree, lengths, n_symbols
+    offs = []
+  
+    for len in (000..MAXBITS)
+      huffman_tree.count[len] = 0
+    end
+
+    for symbol in (000..n_symbols)
+      huffman_tree.count[lengths[symbol]] += 1
+    end
+    
+    if huffman_tree.count[0] == n_symbols then return 0 end
+    
+    left = 1
+    for len in (1..MAXBITS)
+      left <<= 1
+      left -= huffman_tree.count[len];
+      if left < 0 then return left end
+    end
+    
+    offs[1] = 0
+    
+    for len in (1..(MAXBITS-1))
+      offs[len+1] = offs[len] + huffman_tree.count[len]
+    end
+    
+    for symbol in (0..n_symbols)
+      if lengths[symbol] != 0 then 
+        huffman_tree.symbol[offs[lengths[symbol]]] = symbol 
+        offs[lengths[symbol]] += 1
+        end
+      
+    end
+  left
+  end
 
 class HuffmanTree
-	attr_accessor :count, :symbol
-	def initialize
-		@count = []
-		@symbol = []
-	end
+  attr_accessor :count, :symbol
+  def initialize
+    @count = []
+    @symbol = []
+  end
 end
 
-	class << self
-		def inflate zstring
-			d = self.new
-			d.inflate zstring
-		end
-	end
+  class << self
+    def inflate zstring
+      d = self.new
+      d.inflate zstring
+    end
+  end
 
 end
 
 
 class GzipFile
-	
-	def initialize
-		@input_buffer = []
-		@output_buffer = []
-		@out_pos = -1
-		@in_pos = -1
-	end
-	
-	def close
-	end
-	
-	class Error < Exception
-	end
+  
+  def initialize
+    @input_buffer = []
+    @output_buffer = []
+    @out_pos = -1
+    @in_pos = -1
+  end
+  
+  def close
+  end
+  
+  class Error < Exception
+  end
 
 end
 
 class GzipReader < GzipFile
-	OSES = ['FAT filesystem', 
-			'Amiga', 
-			'VMS (or OpenVMS)', 
-			'Unix', 
-			'VM/CMS', 
-			'Atari TOS', 
-			'HPFS fileystem (OS/2, NT)', 
-			'Macintosh', 
-			'Z-System',
-			'CP/M',
-			'TOPS-20',
-			'NTFS filesystem (NT)',
-			'QDOS',
-			'Acorn RISCOS',
-			'unknown']
-			
-	def initialize io
-		
-		#Add a helper method to check bits
-		::Fixnum.module_eval do
-			def isbitset? bit_to_check
-			if self & (2 ** bit_to_check)  == (2 ** bit_to_check) then true else false end
-		end
-		end
-
-		super()
-		@io = io
-		io.read.each_byte {|b| @input_buffer << b}
-		if @input_buffer[@in_pos+=1] != 0x1f || @input_buffer[@in_pos+=1] != 0x8b then raise Zlib::GzipFile::Error.new("not in gzip format") end
-		if @input_buffer[@in_pos+=1] != 0x08 then raise Zlib::GzipFile::Error.new("unknown compression method") end
-		flg = @input_buffer[@in_pos+=1]
-		@ftext = flg.isbitset? 0
-		@fhcrc = flg.isbitset? 1
-		@fextra = flg.isbitset? 2
-		@fname = flg.isbitset? 3
-		@fcomment = flg.isbitset? 4
-		@mtime = Time.at(@input_buffer[@in_pos+=1] | (@input_buffer[@in_pos+=1] << 8) | (@input_buffer[@in_pos+=1] << 16) | (@input_buffer[@in_pos+=1] << 24))
-		@xfl = @input_buffer[@in_pos+=1]
-		@os = OSES[@input_buffer[@in_pos+=1]]
-		if @fextra then 
-			@xlen = (@input_buffer[@in_pos+=1] | (@input_buffer[@in_pos+=1] << 8)) 
-			@xtra_field = []
-			@xlen.times {@xtra_field << @input_buffer[@in_pos+=1]}
-		end
-		if @fname then
-			@original_name = ""
-			until @original_name["\0"].nil? == false
-				@original_name.concat(@input_buffer[@in_pos+=1])
-			end
-			@original_name.chop!
-		end
-		if @fcomment then
-			@comment = ""
-			until @comment["\0"].nil? == false
-				@comment.concat(@input_buffer[@in_pos+=1])
-			end
-			@comment.chop!
-		end
-		if @fhcrc then
-			@header_crc = @input_buffer[@in_pos+=1] | (@input_buffer[@in_pos+=1] << 8)
-		end	
-		@contents = ""
-		until @in_pos == @input_buffer.length-1
-			@contents.concat(@input_buffer[@in_pos+=1])
-		end
-
-		#we do raw deflate, no headers
-		@zstream = Zlib::Inflate.new -MAX_WBITS
-		@inflated = StringIO.new(@zstream.inflate @contents)
-		 
-	end
-		
-	def read length=nil
-		@inflated.read length
-	end
-	
-	def eof?
-		@inflated.eof?
-	end
-	
-	def pos
-		@inflated.pos
-	end
-	
-	def rewind
-		@inflated.rewind
-		@io.seek 0, IO::SEEK_SET
-	end
-
-	class << self
-
-		def open filename
-			io = File.open filename, 'rb'
-			gz = self.new io
-			if block_given? then yield gz else gz end
-		end
-		
-	end
+  OSES = ['FAT filesystem', 
+      'Amiga', 
+      'VMS (or OpenVMS)', 
+      'Unix', 
+      'VM/CMS', 
+      'Atari TOS', 
+      'HPFS fileystem (OS/2, NT)', 
+      'Macintosh', 
+      'Z-System',
+      'CP/M',
+      'TOPS-20',
+      'NTFS filesystem (NT)',
+      'QDOS',
+      'Acorn RISCOS',
+      'unknown']
+      
+  def initialize io
+    
+    #Add a helper method to check bits
+    ::Fixnum.module_eval do
+      def isbitset? bit_to_check
+      if self & (2 ** bit_to_check)  == (2 ** bit_to_check) then true else false end
+    end
+    end
+
+    super()
+    @io = io
+    io.read.each_byte {|b| @input_buffer << b}
+    if @input_buffer[@in_pos+=1] != 0x1f || @input_buffer[@in_pos+=1] != 0x8b then raise Zlib::GzipFile::Error.new("not in gzip format") end
+    if @input_buffer[@in_pos+=1] != 0x08 then raise Zlib::GzipFile::Error.new("unknown compression method") end
+    flg = @input_buffer[@in_pos+=1]
+    @ftext = flg.isbitset? 0
+    @fhcrc = flg.isbitset? 1
+    @fextra = flg.isbitset? 2
+    @fname = flg.isbitset? 3
+    @fcomment = flg.isbitset? 4
+    @mtime = Time.at(@input_buffer[@in_pos+=1] | (@input_buffer[@in_pos+=1] << 8) | (@input_buffer[@in_pos+=1] << 16) | (@input_buffer[@in_pos+=1] << 24))
+    @xfl = @input_buffer[@in_pos+=1]
+    @os = OSES[@input_buffer[@in_pos+=1]]
+    if @fextra then 
+      @xlen = (@input_buffer[@in_pos+=1] | (@input_buffer[@in_pos+=1] << 8)) 
+      @xtra_field = []
+      @xlen.times {@xtra_field << @input_buffer[@in_pos+=1]}
+    end
+    if @fname then
+      @original_name = ""
+      until @original_name["\0"].nil? == false
+        @original_name.concat(@input_buffer[@in_pos+=1])
+      end
+      @original_name.chop!
+    end
+    if @fcomment then
+      @comment = ""
+      until @comment["\0"].nil? == false
+        @comment.concat(@input_buffer[@in_pos+=1])
+      end
+      @comment.chop!
+    end
+    if @fhcrc then
+      @header_crc = @input_buffer[@in_pos+=1] | (@input_buffer[@in_pos+=1] << 8)
+    end  
+    @contents = ""
+    until @in_pos == @input_buffer.length-1
+      @contents.concat(@input_buffer[@in_pos+=1])
+    end
+
+    #we do raw deflate, no headers
+    @zstream = Zlib::Inflate.new -MAX_WBITS
+    @inflated = StringIO.new(@zstream.inflate @contents)
+     
+  end
+    
+  def read length=nil
+    @inflated.read length
+  end
+  
+  def eof?
+    @inflated.eof?
+  end
+  
+  def pos
+    @inflated.pos
+  end
+  
+  def rewind
+    @inflated.rewind
+    @io.seek 0, IO::SEEK_SET
+  end
+
+  class << self
+
+    def open filename
+      io = File.open filename, 'rb'
+      gz = self.new io
+      if block_given? then yield gz else gz end
+    end
+    
+  end
 end