fluent_command_builder 0.6.0 → 0.7.0

data/lib/fluent_command_builder/command_builders/security_osx.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
-require File.expand_path(File.dirname(__FILE__) + '/../util')
+require File.expand_path(File.dirname(__FILE__) + '/../version')
 
 module FluentCommandBuilder
   def security_osx(&block)

data/lib/fluent_command_builder/command_builders/security_osx_107.rb

@@ -7,6 +7,7 @@ module FluentCommandBuilder
   end
   module SecurityOSX
     module V107
+      VERSION = '10.7'
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::SecurityOSX::COMMAND_NAME
         c = SecurityOSX.new(b)
@@ -21,154 +22,154 @@ module FluentCommandBuilder
           super underlying_builder
         end
         def delete_certificate
-          DeleteCertificate.new b
+          DeleteCertificate.new @b
         end
         def find_certificate
-          FindCertificate.new b
+          FindCertificate.new @b
         end
         def import(input_file)
-          Import.new b, input_file
+          Import.new @b, input_file
         end
         def unlock_keychain
-          UnlockKeychain.new b
+          UnlockKeychain.new @b
         end
       end
       class DeleteCertificate < CommandBase
         def initialize(underlying_builder)
           super underlying_builder
-          b.append ' delete-certificate'
+          @b.append ' delete-certificate'
         end
         def common_name(name)
-          b.append " -c #{b.format name}"
-          yield b if block_given?
+          @b.append " -c #{@b.format name}"
+          yield @b if block_given?
           self
         end
         def hash(hash)
-          b.append " -Z #{b.format hash}"
-          yield b if block_given?
+          @b.append " -Z #{@b.format hash}"
+          yield @b if block_given?
           self
         end
         def delete_user_trust_settings
-          b.append ' -t'
-          yield b if block_given?
+          @b.append ' -t'
+          yield @b if block_given?
           self
         end
         def keychain(keychain)
-          b.append " #{b.format keychain}"
-          yield b if block_given?
+          @b.append " #{@b.format keychain}"
+          yield @b if block_given?
           self
         end
       end
       class FindCertificate < CommandBase
         def initialize(underlying_builder)
           super underlying_builder
-          b.append ' find-certificate'
+          @b.append ' find-certificate'
         end
         def all
-          b.append ' -a'
-          yield b if block_given?
+          @b.append ' -a'
+          yield @b if block_given?
           self
         end
         def name(name)
-          b.append " -c #{b.format name}"
-          yield b if block_given?
+          @b.append " -c #{@b.format name}"
+          yield @b if block_given?
           self
         end
         def email_address(email_address)
-          b.append " -e #{b.format email_address}"
-          yield b if block_given?
+          @b.append " -e #{@b.format email_address}"
+          yield @b if block_given?
           self
         end
         def show_email_addresses
-          b.append ' -m'
-          yield b if block_given?
+          @b.append ' -m'
+          yield @b if block_given?
           self
         end
         def output_pem_format
-          b.append ' -p'
-          yield b if block_given?
+          @b.append ' -p'
+          yield @b if block_given?
           self
         end
         def print_sha1_hash
-          b.append ' -Z'
-          yield b if block_given?
+          @b.append ' -Z'
+          yield @b if block_given?
           self
         end
         def keychain(keychain)
-          b.append " #{b.format keychain}"
-          yield b if block_given?
+          @b.append " #{@b.format keychain}"
+          yield @b if block_given?
           self
         end
       end
       class Import < CommandBase
         def initialize(underlying_builder, input_file)
           super underlying_builder
-          b.append " import #{b.format input_file}"
+          @b.append " import #{@b.format input_file}"
         end
         def keychain(keychain)
-          b.append " -k #{b.format keychain}"
-          yield b if block_given?
+          @b.append " -k #{@b.format keychain}"
+          yield @b if block_given?
           self
         end
         def type(type)
-          b.append " -t #{b.format type}"
-          yield b if block_given?
+          @b.append " -t #{@b.format type}"
+          yield @b if block_given?
           self
         end
         def format(format)
-          b.append " -f #{b.format format}"
-          yield b if block_given?
+          @b.append " -f #{@b.format format}"
+          yield @b if block_given?
           self
         end
         def wrapped
-          b.append ' -w'
-          yield b if block_given?
+          @b.append ' -w'
+          yield @b if block_given?
           self
         end
         def not_extractable
-          b.append ' -x'
-          yield b if block_given?
+          @b.append ' -x'
+          yield @b if block_given?
           self
         end
         def passphrase(passphrase)
-          b.append " -P #{b.format passphrase}"
-          yield b if block_given?
+          @b.append " -P #{@b.format passphrase}"
+          yield @b if block_given?
           self
         end
         def attribute(name, value)
-          b.append " -a #{b.format name} #{b.format value}"
-          yield b if block_given?
+          @b.append " -a #{@b.format name} #{@b.format value}"
+          yield @b if block_given?
           self
         end
         def allow_without_warning
-          b.append ' -A'
-          yield b if block_given?
+          @b.append ' -A'
+          yield @b if block_given?
           self
         end
         def allow_application(app_path)
-          b.append " -T #{b.format app_path}"
-          yield b if block_given?
+          @b.append " -T #{@b.format app_path}"
+          yield @b if block_given?
           self
         end
       end
       class UnlockKeychain < CommandBase
         def initialize(underlying_builder)
           super underlying_builder
-          b.append ' unlock-keychain'
+          @b.append ' unlock-keychain'
         end
         def no_password
-          b.append ' -u'
-          yield b if block_given?
+          @b.append ' -u'
+          yield @b if block_given?
           self
         end
         def password(password)
-          b.append " -p #{b.format password}"
-          yield b if block_given?
+          @b.append " -p #{@b.format password}"
+          yield @b if block_given?
           self
         end
         def keychain(keychain)
-          b.append " #{b.format keychain}"
-          yield b if block_given?
+          @b.append " #{@b.format keychain}"
+          yield @b if block_given?
           self
         end
       end

data/lib/fluent_command_builder/command_builders/sevenzip.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../underlying_builder')
-require File.expand_path(File.dirname(__FILE__) + '/../util')
+require File.expand_path(File.dirname(__FILE__) + '/../version')
 
 module FluentCommandBuilder
   def sevenzip(&block)

data/lib/fluent_command_builder/command_builders/sevenzip_92.rb

@@ -7,6 +7,7 @@ module FluentCommandBuilder
   end
   module SevenZip
     module V92
+      VERSION = '9.2'
       def self.create
         b = UnderlyingBuilder.new FluentCommandBuilder::SevenZip::COMMAND_NAME
         c = SevenZip.new(b)
@@ -21,494 +22,494 @@ module FluentCommandBuilder
           super underlying_builder
         end
         def add(archive, file_ref)
-          Add.new b, archive, file_ref
+          Add.new @b, archive, file_ref
         end
         def bench(number_of_iterations)
-          Bench.new b, number_of_iterations
+          Bench.new @b, number_of_iterations
         end
         def delete(archive, files)
-          Delete.new b, archive, files
+          Delete.new @b, archive, files
         end
         def extract(archive, files)
-          Extract.new b, archive, files
+          Extract.new @b, archive, files
         end
         def list(archive)
-          List.new b, archive
+          List.new @b, archive
         end
         def test(archive, files)
-          Test.new b, archive, files
+          Test.new @b, archive, files
         end
         def update(archive, files)
-          Update.new b, archive, files
+          Update.new @b, archive, files
         end
         def extract_with_full_paths(archive, files=nil)
-          ExtractWithFullPaths.new b, archive, files
+          ExtractWithFullPaths.new @b, archive, files
         end
       end
       class Add < CommandBase
         def initialize(underlying_builder, archive, file_ref)
           super underlying_builder
-          b.append " a #{b.format archive} #{b.format file_ref}"
+          @b.append " a #{@b.format archive} #{@b.format file_ref}"
         end
         def include(file_ref, recurse_type=nil)
-          b.append ' -i'
-          b.append "#{b.format recurse_type}" unless recurse_type.nil?
-          b.append "#{b.format file_ref}"
-          yield b if block_given?
+          @b.append ' -i'
+          @b.append "#{@b.format recurse_type}" unless recurse_type.nil?
+          @b.append "#{@b.format file_ref}"
+          yield @b if block_given?
           self
         end
         def set_compression_method(method_parameters)
-          b.append " -m#{b.format method_parameters}"
-          yield b if block_given?
+          @b.append " -m#{@b.format method_parameters}"
+          yield @b if block_given?
           self
         end
         def password(password)
-          b.append " -p#{b.format password}"
-          yield b if block_given?
+          @b.append " -p#{@b.format password}"
+          yield @b if block_given?
           self
         end
         def recursive(modifier=nil)
-          b.append ' -r'
-          b.append "#{b.format modifier}" unless modifier.nil?
-          yield b if block_given?
+          @b.append ' -r'
+          @b.append "#{@b.format modifier}" unless modifier.nil?
+          yield @b if block_given?
           self
         end
         def create_sfx_archive(sfx_module=nil)
-          b.append ' -sfx'
-          b.append "#{b.format sfx_module}" unless sfx_module.nil?
-          yield b if block_given?
+          @b.append ' -sfx'
+          @b.append "#{@b.format sfx_module}" unless sfx_module.nil?
+          yield @b if block_given?
           self
         end
         def read_data_from_stdin(file_name=nil)
-          b.append ' -si'
-          b.append "#{b.format file_name}" unless file_name.nil?
-          yield b if block_given?
+          @b.append ' -si'
+          @b.append "#{@b.format file_name}" unless file_name.nil?
+          yield @b if block_given?
           self
         end
         def write_data_to_stdout
-          b.append ' -so'
-          yield b if block_given?
+          @b.append ' -so'
+          yield @b if block_given?
           self
         end
         def compress_files_open_for_writing
-          b.append ' -ssw'
-          yield b if block_given?
+          @b.append ' -ssw'
+          yield @b if block_given?
           self
         end
         def type(archive_type)
-          b.append " -t#{b.format archive_type}"
-          yield b if block_given?
+          @b.append " -t#{@b.format archive_type}"
+          yield @b if block_given?
           self
         end
         def update_options(args)
-          b.append " -u#{b.format args}"
-          yield b if block_given?
+          @b.append " -u#{@b.format args}"
+          yield @b if block_given?
           self
         end
         def create_volumes(size, unit_of_measure=nil)
-          b.append " -v#{b.format size}"
-          b.append "#{b.format unit_of_measure}" unless unit_of_measure.nil?
-          yield b if block_given?
+          @b.append " -v#{@b.format size}"
+          @b.append "#{@b.format unit_of_measure}" unless unit_of_measure.nil?
+          yield @b if block_given?
           self
         end
         def working_dir(dir_path=nil)
-          b.append ' -w'
-          b.append "#{b.format dir_path}" unless dir_path.nil?
-          yield b if block_given?
+          @b.append ' -w'
+          @b.append "#{@b.format dir_path}" unless dir_path.nil?
+          yield @b if block_given?
           self
         end
         def exclude(file_ref, recurse_type=nil)
-          b.append ' -x'
-          b.append "#{b.format recurse_type}" unless recurse_type.nil?
-          b.append "#{b.format file_ref}"
-          yield b if block_given?
+          @b.append ' -x'
+          @b.append "#{@b.format recurse_type}" unless recurse_type.nil?
+          @b.append "#{@b.format file_ref}"
+          yield @b if block_given?
           self
         end
       end
       class Bench < CommandBase
         def initialize(underlying_builder, number_of_iterations)
           super underlying_builder
-          b.append " b #{b.format number_of_iterations}"
+          @b.append " b #{@b.format number_of_iterations}"
         end
         def mmt(n)
-          b.append " -mmt#{b.format n}"
-          yield b if block_given?
+          @b.append " -mmt#{@b.format n}"
+          yield @b if block_given?
           self
         end
         def md(n)
-          b.append " -md#{b.format n}"
-          yield b if block_given?
+          @b.append " -md#{@b.format n}"
+          yield @b if block_given?
           self
         end
         def mm(method)
-          b.append " -mm=#{b.format method}"
-          yield b if block_given?
+          @b.append " -mm=#{@b.format method}"
+          yield @b if block_given?
           self
         end
       end
       class Delete < CommandBase
         def initialize(underlying_builder, archive, files)
           super underlying_builder
-          b.append " d #{b.format archive} #{b.format files}"
+          @b.append " d #{@b.format archive} #{@b.format files}"
         end
         def include(file_ref, recurse_type=nil)
-          b.append ' -i'
-          b.append "#{b.format recurse_type}" unless recurse_type.nil?
-          b.append "#{b.format file_ref}"
-          yield b if block_given?
+          @b.append ' -i'
+          @b.append "#{@b.format recurse_type}" unless recurse_type.nil?
+          @b.append "#{@b.format file_ref}"
+          yield @b if block_given?
           self
         end
         def set_compression_method(method_parameters)
-          b.append " -m#{b.format method_parameters}"
-          yield b if block_given?
+          @b.append " -m#{@b.format method_parameters}"
+          yield @b if block_given?
           self
         end
         def password(password)
-          b.append " -p#{b.format password}"
-          yield b if block_given?
+          @b.append " -p#{@b.format password}"
+          yield @b if block_given?
           self
         end
         def recursive(modifier=nil)
-          b.append ' -r'
-          b.append "#{b.format modifier}" unless modifier.nil?
-          yield b if block_given?
+          @b.append ' -r'
+          @b.append "#{@b.format modifier}" unless modifier.nil?
+          yield @b if block_given?
           self
         end
         def update_options(args)
-          b.append " -u#{b.format args}"
-          yield b if block_given?
+          @b.append " -u#{@b.format args}"
+          yield @b if block_given?
           self
         end
         def working_dir(dir_path=nil)
-          b.append ' -w'
-          b.append "#{b.format dir_path}" unless dir_path.nil?
-          yield b if block_given?
+          @b.append ' -w'
+          @b.append "#{@b.format dir_path}" unless dir_path.nil?
+          yield @b if block_given?
           self
         end
         def exclude(file_ref, recurse_type=nil)
-          b.append ' -x'
-          b.append "#{b.format recurse_type}" unless recurse_type.nil?
-          b.append "#{b.format file_ref}"
-          yield b if block_given?
+          @b.append ' -x'
+          @b.append "#{@b.format recurse_type}" unless recurse_type.nil?
+          @b.append "#{@b.format file_ref}"
+          yield @b if block_given?
           self
         end
       end
       class Extract < CommandBase
         def initialize(underlying_builder, archive, files)
           super underlying_builder
-          b.append " e #{b.format archive} #{b.format files}"
+          @b.append " e #{@b.format archive} #{@b.format files}"
         end
         def ai
-          b.append ' -ai'
-          yield b if block_given?
+          @b.append ' -ai'
+          yield @b if block_given?
           self
         end
         def an
-          b.append ' -an'
-          yield b if block_given?
+          @b.append ' -an'
+          yield @b if block_given?
           self
         end
         def ao
-          b.append ' -ao'
-          yield b if block_given?
+          @b.append ' -ao'
+          yield @b if block_given?
           self
         end
         def ax
-          b.append ' -ax'
-          yield b if block_given?
+          @b.append ' -ax'
+          yield @b if block_given?
           self
         end
         def include(file_ref, recurse_type=nil)
-          b.append ' -i'
-          b.append "#{b.format recurse_type}" unless recurse_type.nil?
-          b.append "#{b.format file_ref}"
-          yield b if block_given?
+          @b.append ' -i'
+          @b.append "#{@b.format recurse_type}" unless recurse_type.nil?
+          @b.append "#{@b.format file_ref}"
+          yield @b if block_given?
           self
         end
         def output(dir_path)
-          b.append " -o#{b.format dir_path}"
-          yield b if block_given?
+          @b.append " -o#{@b.format dir_path}"
+          yield @b if block_given?
           self
         end
         def password(password)
-          b.append " -p#{b.format password}"
-          yield b if block_given?
+          @b.append " -p#{@b.format password}"
+          yield @b if block_given?
           self
         end
         def recursive(modifier=nil)
-          b.append ' -r'
-          b.append "#{b.format modifier}" unless modifier.nil?
-          yield b if block_given?
+          @b.append ' -r'
+          @b.append "#{@b.format modifier}" unless modifier.nil?
+          yield @b if block_given?
           self
         end
         def write_data_to_stdout
-          b.append ' -so'
-          yield b if block_given?
+          @b.append ' -so'
+          yield @b if block_given?
           self
         end
         def type(archive_type)
-          b.append " -t#{b.format archive_type}"
-          yield b if block_given?
+          @b.append " -t#{@b.format archive_type}"
+          yield @b if block_given?
           self
         end
         def exclude(file_ref, recurse_type=nil)
-          b.append ' -x'
-          b.append "#{b.format recurse_type}" unless recurse_type.nil?
-          b.append "#{b.format file_ref}"
-          yield b if block_given?
+          @b.append ' -x'
+          @b.append "#{@b.format recurse_type}" unless recurse_type.nil?
+          @b.append "#{@b.format file_ref}"
+          yield @b if block_given?
           self
         end
         def y
-          b.append ' -y'
-          yield b if block_given?
+          @b.append ' -y'
+          yield @b if block_given?
           self
         end
       end
       class List < CommandBase
         def initialize(underlying_builder, archive)
           super underlying_builder
-          b.append " l #{b.format archive}"
+          @b.append " l #{@b.format archive}"
         end
         def ai
-          b.append ' -ai'
-          yield b if block_given?
+          @b.append ' -ai'
+          yield @b if block_given?
           self
         end
         def an
-          b.append ' -an'
-          yield b if block_given?
+          @b.append ' -an'
+          yield @b if block_given?
           self
         end
         def ax
-          b.append ' -ax'
-          yield b if block_given?
+          @b.append ' -ax'
+          yield @b if block_given?
           self
         end
         def include(file_ref, recurse_type=nil)
-          b.append ' -i'
-          b.append "#{b.format recurse_type}" unless recurse_type.nil?
-          b.append "#{b.format file_ref}"
-          yield b if block_given?
+          @b.append ' -i'
+          @b.append "#{@b.format recurse_type}" unless recurse_type.nil?
+          @b.append "#{@b.format file_ref}"
+          yield @b if block_given?
           self
         end
         def slt
-          b.append ' -slt'
-          yield b if block_given?
+          @b.append ' -slt'
+          yield @b if block_given?
           self
         end
         def password(password)
-          b.append " -p#{b.format password}"
-          yield b if block_given?
+          @b.append " -p#{@b.format password}"
+          yield @b if block_given?
           self
         end
         def recursive(modifier=nil)
-          b.append ' -r'
-          b.append "#{b.format modifier}" unless modifier.nil?
-          yield b if block_given?
+          @b.append ' -r'
+          @b.append "#{@b.format modifier}" unless modifier.nil?
+          yield @b if block_given?
           self
         end
         def type(archive_type)
-          b.append " -t#{b.format archive_type}"
-          yield b if block_given?
+          @b.append " -t#{@b.format archive_type}"
+          yield @b if block_given?
           self
         end
         def exclude(file_ref, recurse_type=nil)
-          b.append ' -x'
-          b.append "#{b.format recurse_type}" unless recurse_type.nil?
-          b.append "#{b.format file_ref}"
-          yield b if block_given?
+          @b.append ' -x'
+          @b.append "#{@b.format recurse_type}" unless recurse_type.nil?
+          @b.append "#{@b.format file_ref}"
+          yield @b if block_given?
           self
         end
       end
       class Test < CommandBase
         def initialize(underlying_builder, archive, files)
           super underlying_builder
-          b.append " t #{b.format archive} #{b.format files}"
+          @b.append " t #{@b.format archive} #{@b.format files}"
         end
         def ai
-          b.append ' -ai'
-          yield b if block_given?
+          @b.append ' -ai'
+          yield @b if block_given?
           self
         end
         def an
-          b.append ' -an'
-          yield b if block_given?
+          @b.append ' -an'
+          yield @b if block_given?
           self
         end
         def ax
-          b.append ' -ax'
-          yield b if block_given?
+          @b.append ' -ax'
+          yield @b if block_given?
           self
         end
         def include(file_ref, recurse_type=nil)
-          b.append ' -i'
-          b.append "#{b.format recurse_type}" unless recurse_type.nil?
-          b.append "#{b.format file_ref}"
-          yield b if block_given?
+          @b.append ' -i'
+          @b.append "#{@b.format recurse_type}" unless recurse_type.nil?
+          @b.append "#{@b.format file_ref}"
+          yield @b if block_given?
           self
         end
         def password(password)
-          b.append " -p#{b.format password}"
-          yield b if block_given?
+          @b.append " -p#{@b.format password}"
+          yield @b if block_given?
           self
         end
         def recursive(modifier=nil)
-          b.append ' -r'
-          b.append "#{b.format modifier}" unless modifier.nil?
-          yield b if block_given?
+          @b.append ' -r'
+          @b.append "#{@b.format modifier}" unless modifier.nil?
+          yield @b if block_given?
           self
         end
         def exclude(file_ref, recurse_type=nil)
-          b.append ' -x'
-          b.append "#{b.format recurse_type}" unless recurse_type.nil?
-          b.append "#{b.format file_ref}"
-          yield b if block_given?
+          @b.append ' -x'
+          @b.append "#{@b.format recurse_type}" unless recurse_type.nil?
+          @b.append "#{@b.format file_ref}"
+          yield @b if block_given?
           self
         end
       end
       class Update < CommandBase
         def initialize(underlying_builder, archive, files)
           super underlying_builder
-          b.append " u #{b.format archive} #{b.format files}"
+          @b.append " u #{@b.format archive} #{@b.format files}"
         end
         def include(file_ref, recurse_type=nil)
-          b.append ' -i'
-          b.append "#{b.format recurse_type}" unless recurse_type.nil?
-          b.append "#{b.format file_ref}"
-          yield b if block_given?
+          @b.append ' -i'
+          @b.append "#{@b.format recurse_type}" unless recurse_type.nil?
+          @b.append "#{@b.format file_ref}"
+          yield @b if block_given?
           self
         end
         def set_compression_method(method_parameters)
-          b.append " -m#{b.format method_parameters}"
-          yield b if block_given?
+          @b.append " -m#{@b.format method_parameters}"
+          yield @b if block_given?
           self
         end
         def password(password)
-          b.append " -p#{b.format password}"
-          yield b if block_given?
+          @b.append " -p#{@b.format password}"
+          yield @b if block_given?
           self
         end
         def recursive(modifier=nil)
-          b.append ' -r'
-          b.append "#{b.format modifier}" unless modifier.nil?
-          yield b if block_given?
+          @b.append ' -r'
+          @b.append "#{@b.format modifier}" unless modifier.nil?
+          yield @b if block_given?
           self
         end
         def create_sfx_archive(sfx_module=nil)
-          b.append ' -sfx'
-          b.append "#{b.format sfx_module}" unless sfx_module.nil?
-          yield b if block_given?
+          @b.append ' -sfx'
+          @b.append "#{@b.format sfx_module}" unless sfx_module.nil?
+          yield @b if block_given?
           self
         end
         def read_data_from_stdin(file_name=nil)
-          b.append ' -si'
-          b.append "#{b.format file_name}" unless file_name.nil?
-          yield b if block_given?
+          @b.append ' -si'
+          @b.append "#{@b.format file_name}" unless file_name.nil?
+          yield @b if block_given?
           self
         end
         def write_data_to_stdout
-          b.append ' -so'
-          yield b if block_given?
+          @b.append ' -so'
+          yield @b if block_given?
           self
         end
         def compress_files_open_for_writing
-          b.append ' -ssw'
-          yield b if block_given?
+          @b.append ' -ssw'
+          yield @b if block_given?
           self
         end
         def type(archive_type)
-          b.append " -t#{b.format archive_type}"
-          yield b if block_given?
+          @b.append " -t#{@b.format archive_type}"
+          yield @b if block_given?
           self
         end
         def update_options(args)
-          b.append " -u#{b.format args}"
-          yield b if block_given?
+          @b.append " -u#{@b.format args}"
+          yield @b if block_given?
           self
         end
         def working_dir(dir_path=nil)
-          b.append ' -w'
-          b.append "#{b.format dir_path}" unless dir_path.nil?
-          yield b if block_given?
+          @b.append ' -w'
+          @b.append "#{@b.format dir_path}" unless dir_path.nil?
+          yield @b if block_given?
           self
         end
         def exclude(file_ref, recurse_type=nil)
-          b.append ' -x'
-          b.append "#{b.format recurse_type}" unless recurse_type.nil?
-          b.append "#{b.format file_ref}"
-          yield b if block_given?
+          @b.append ' -x'
+          @b.append "#{@b.format recurse_type}" unless recurse_type.nil?
+          @b.append "#{@b.format file_ref}"
+          yield @b if block_given?
           self
         end
       end
       class ExtractWithFullPaths < CommandBase
         def initialize(underlying_builder, archive, files=nil)
           super underlying_builder
-          b.append " x #{b.format archive}"
-          b.append " #{b.format files}" unless files.nil?
+          @b.append " x #{@b.format archive}"
+          @b.append " #{@b.format files}" unless files.nil?
         end
         def ai
-          b.append ' -ai'
-          yield b if block_given?
+          @b.append ' -ai'
+          yield @b if block_given?
           self
         end
         def an
-          b.append ' -an'
-          yield b if block_given?
+          @b.append ' -an'
+          yield @b if block_given?
           self
         end
         def ao
-          b.append ' -ao'
-          yield b if block_given?
+          @b.append ' -ao'
+          yield @b if block_given?
           self
         end
         def ax
-          b.append ' -ax'
-          yield b if block_given?
+          @b.append ' -ax'
+          yield @b if block_given?
           self
         end
         def include(file_ref, recurse_type=nil)
-          b.append ' -i'
-          b.append "#{b.format recurse_type}" unless recurse_type.nil?
-          b.append "#{b.format file_ref}"
-          yield b if block_given?
+          @b.append ' -i'
+          @b.append "#{@b.format recurse_type}" unless recurse_type.nil?
+          @b.append "#{@b.format file_ref}"
+          yield @b if block_given?
           self
         end
         def output(dir_path)
-          b.append " -o#{b.format dir_path}"
-          yield b if block_given?
+          @b.append " -o#{@b.format dir_path}"
+          yield @b if block_given?
           self
         end
         def password(password)
-          b.append " -p#{b.format password}"
-          yield b if block_given?
+          @b.append " -p#{@b.format password}"
+          yield @b if block_given?
           self
         end
         def recursive(modifier=nil)
-          b.append ' -r'
-          b.append "#{b.format modifier}" unless modifier.nil?
-          yield b if block_given?
+          @b.append ' -r'
+          @b.append "#{@b.format modifier}" unless modifier.nil?
+          yield @b if block_given?
           self
         end
         def write_data_to_stdout
-          b.append ' -so'
-          yield b if block_given?
+          @b.append ' -so'
+          yield @b if block_given?
           self
         end
         def type(archive_type)
-          b.append " -t#{b.format archive_type}"
-          yield b if block_given?
+          @b.append " -t#{@b.format archive_type}"
+          yield @b if block_given?
           self
         end
         def exclude(file_ref, recurse_type=nil)
-          b.append ' -x'
-          b.append "#{b.format recurse_type}" unless recurse_type.nil?
-          b.append "#{b.format file_ref}"
-          yield b if block_given?
+          @b.append ' -x'
+          @b.append "#{@b.format recurse_type}" unless recurse_type.nil?
+          @b.append "#{@b.format file_ref}"
+          yield @b if block_given?
           self
         end
         def y
-          b.append ' -y'
-          yield b if block_given?
+          @b.append ' -y'
+          yield @b if block_given?
           self
         end
       end