ruby-xz 0.1.1 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0c48419b0caefc3d26a50fa3e9e421f3b5d86301
+  data.tar.gz: b69d305b6301a0520bf810b1e201026520a5b583
+SHA512:
+  metadata.gz: 9b8e7ed6086ae03303cab824e1df92dc96b95e5d00d42c770ed29be325dfe4b87a458e37c33c7c33de781d44f0667f0abf2c9c43d5eb873f07c037301e3e8b74
+  data.tar.gz: 6b5a55e8a3c16f4310b8fedca488edef9e99d9424064bccac16325e7de2f7e97aed1550b1716c365e6d807aa8259297bc5dd74f67ce4557dd00aae274217f3fb

data/COPYING

@@ -0,0 +1,26 @@
+(The MIT License)
+
+Basic liblzma-bindings for Ruby.
+
+Copyright © 2011-2013 Marvin Gülker
+
+Copyright © 2011 Christoph Plank
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+‘Software’), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/HISTORY.rdoc

@@ -1,3 +1,8 @@
+== 0.2.0
+
+* Fix #6 (errors on JRuby) by Ben Nagy
+* <b>Remove 1.8 compatibility</b>
+
 == 0.1.0
 
 * <b>Add XZ::StreamReader and XZ::StreamWriter for io-like behaviour.</b>

data/README.rdoc

@@ -20,10 +20,7 @@ Install it the way you install all your gems.
 
   # gem install ruby-xz
 
-Although it is designed for Ruby 1.9 (which I highly recommend),
-ruby-xz should also work with Ruby 1.8.7. However, the Ruby 1.8
-compatibility may be skipped anytime (causing at least a minor version
-bump), so you shouldn’t rely on it.
+Ruby 1.9+ is required.
 
 == Usage
 
@@ -66,7 +63,7 @@ what is possible.
 
 Basic liblzma-bindings for Ruby.
 
-Copyright © 2011,2012 Marvin Gülker
+Copyright © 2011-2013 Marvin Gülker
 
 Copyright © 2011 Christoph Plank
 
@@ -87,35 +84,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-
-==== require_relative
-
-This library includes the sourcecode of Steve Klabnik’s
-{require_relative gem}[http://steveklabnik.github.com/require_relative/]
-in order to make it 1.8-compatible. It’s licensed under the BSD license:
-
-Copyright (c) 2011, Steve Klabnik
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/xz.rb

@@ -24,68 +24,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-if RUBY_VERSION < "1.9"
-  require "rubygems"
-  
-  # The following is the complete sourcode of the require_relative gem
-  # by Steve Klabnik, licensed under the BSD license:
-  #
-  # Copyright (c) 2011, Steve Klabnik
-  # All rights reserved.
-  #
-  # Redistribution and use in source and binary forms, with or without
-  # modification, are permitted provided that the following conditions are
-  # met:
-  #
-  # * Redistributions of source code must retain the above copyright
-  #   notice, this list of conditions and the following disclaimer.
-  # * Redistributions in binary form must reproduce the above copyright
-  #   notice, this list of conditions and the following disclaimer in the
-  #   documentation and/or other materials provided with the distribution.
-  #
-  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-  # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-  # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-  # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-  # HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-  # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-  # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  # require\_relative has no effect on Ruby 1.9 (or other versions that provide Kernel#require_relative
-  # out of the box)
-  unless Object.new.respond_to?(:require_relative, true)
-    # Yep, you're looking at it! This gem is pretty small, and for good reason.
-    # There's not much to do! We use split to find the filename that we're
-    # looking to require, raise a LoadError if it's called in a context (like eval)
-    # that it shouldn't be, and then require it via regular old require.
-    #
-    # Now, in 1.9, "." is totally removed from the $LOAD_PATH. We don't do that
-    # here, because that would break a lot of other code! You're still vulnerable
-    # to the security hole that caused this change to happen in the first place.
-    # You will be able to use this gem to transition the code you write over to
-    # the 1.9 syntax, though.
-    def require_relative(relative_feature) # :nodoc:
-
-      file = caller.first.split(/:\d/,2).first
-
-      raise LoadError, "require_relative is called in #{$1}" if /\A\((.*)\)/ =~ file
-
-      require File.expand_path(relative_feature, File.dirname(file))
-    end
-  end
-
-  unless String.instance_methods.include?(:clear)
-    class String # :nodoc:
-      def clear
-        replace("")
-      end
-    end
-  end
-end
-
 require "pathname"
 require "ffi"
 require 'stringio'
@@ -163,7 +101,7 @@ module XZ
       LZMAError.raise_if_necessary(res)
       
       res = ""
-      res.encode!("BINARY") if RUBY_VERSION >= "1.9"
+      res.encode!("BINARY")
       if block_given?
         res = lzma_code(io, stream, &block)
       else
@@ -228,7 +166,7 @@ module XZ
       LZMAError.raise_if_necessary(res)
       
       res = ""
-      res.encode!("BINARY") if RUBY_VERSION >= "1.9"
+      res.encode!("BINARY")
       if block_given?
         res = lzma_code(io, stream, &block)
       else

data/lib/xz/lib_lzma.rb

@@ -71,7 +71,7 @@ module XZ
     :lzma_buf_error,
     :lzma_prog_error
     
-    ffi_lib ['lzma.so.2', 'lzma.so', 'lzma']
+    ffi_lib ['lzma.so.5', 'lzma.so', 'lzma']
     
     attach_function :lzma_easy_encoder, [:pointer, :uint32, :int], :int
     attach_function :lzma_code, [:pointer, :int], :int
@@ -125,11 +125,11 @@ module XZ
     #it is assumed to be a FFI::Pointer to a lzma_stream structure
     #and that structure is wrapped.
     def initialize(*args)
-      if args.empty? #Got a pointer, want to wrap it
+      if !args.empty? #Got a pointer, want to wrap it
         super
       else
         s = super()
-        s[:next]           = nil
+        s[:next_in]        = nil
         s[:avail_in]       = 0
         s[:total_in]       = 0
         s[:next_out]       = nil

metadata

@@ -1,74 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: ruby-xz
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Marvin Gülker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000 Z
+date: 2013-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &10032340 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10032340
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: io-like
-  requirement: &10031500 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10031500
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: hanna-nouveau
-  requirement: &10030640 !ruby/object:Gem::Requirement
-    none: false
+  name: emerald
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10030640
-description: ! 'This is a basic binding for liblzma that allows you to
-
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: turn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: |
+  This is a basic binding for liblzma that allows you to
   create and extract XZ-compressed archives. It can cope with big
-
-  files as well as small ones, but doesn''t offer much
-
+  files as well as small ones, but doesn't offer much
   of the possibilities liblzma itself has.
-
-'
-email: sutniuq@gmx.net
+email: quintus@quintilianus.eu
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.rdoc
+- HISTORY.rdoc
+- COPYING
 files:
+- lib/xz.rb
 - lib/xz/stream_reader.rb
-- lib/xz/stream.rb
 - lib/xz/lib_lzma.rb
+- lib/xz/stream.rb
 - lib/xz/stream_writer.rb
-- lib/xz.rb
-- README.rdoc
 - HISTORY.rdoc
+- README.rdoc
+- COPYING
 - VERSION
-homepage: 
-licenses: []
+homepage: https://github.com/Quintus/ruby-xz
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - -t
@@ -78,21 +101,19 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: XZ compression via liblzma for Ruby.
 test_files: []