gjp 0.34.0 → 0.35.0

data/gjp.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
   
   s.add_runtime_dependency "clamp"
-  s.add_runtime_dependency "rubyzip"
+  s.add_runtime_dependency "rubyzip", ">= 1.0"
   s.add_runtime_dependency "rest-client"
   s.add_runtime_dependency "json"
   s.add_runtime_dependency "text"

data/lib/gjp/kit_checker.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 
 require "find"
+require "zip"
 
 module Gjp
   # checks kits for errors
@@ -25,7 +26,7 @@ module Gjp
           path. =~ /\.(zip)|([jwe]ar)$/
         end.map do |path, archive|
           result = []
-          Zip::ZipFile.foreach(path) do |entry|
+          Zip::File.foreach(path) do |entry|
             if entry.file?
               result << [entry.to_s, path]
             end

data/lib/gjp/pom_getter.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
 require "digest/sha1"
-require "zip/zip"
+require "zip"
 require "rest_client"
 require "json"
 require "pathname"
@@ -28,13 +28,13 @@ module Gjp
     def get_pom_from_jar(file)
       log.debug("Attempting unpack of #{file} to find a POM")
       begin
-        Zip::ZipFile.foreach(file) do |entry|
+        Zip::File.foreach(file) do |entry|
           if entry.name =~ /\/pom.xml$/
             log.info("pom.xml found in #{file}##{entry.name}")
             return entry.get_input_stream.read, :found_in_jar
           end
         end
-      rescue Zip::ZipError
+      rescue Zip::Error
         log.warn("#{file} does not seem to be a valid jar archive, skipping")
       rescue TypeError
         log.warn("#{file} seems to be a valid jar archive but is corrupt, skipping")

data/lib/gjp/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Gjp
-  VERSION = "0.34.0"
+  VERSION = "0.35.0"
 end

data/spec/lib/kit_checker_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 require "rubygems"
-require "zip/zip"
+require "zip"
 
 describe Gjp::KitChecker do
   include Gjp::Mockers
@@ -22,7 +22,7 @@ describe Gjp::KitChecker do
         FileUtils.touch("top_level")
         FileUtils.mkdir_p("directory")
         FileUtils.touch(File.join("directory","in_directory"))
-        Zip::ZipFile.open("zipped.zip", Zip::ZipFile::CREATE) do |zipfile|
+        Zip::File.open("zipped.zip", Zip::File::CREATE) do |zipfile|
           Dir[File.join("directory", "**", "**")].each do |file|
             zipfile.add(file.sub("/directory", ""), file)
           end
@@ -83,14 +83,14 @@ describe Gjp::KitChecker do
 
         FileUtils.mkdir_p("package2")
         FileUtils.touch(File.join("package2","SourcedClass.java"))
-        Zip::ZipFile.open("zipped-source-2.jar", Zip::ZipFile::CREATE) do |zipfile|
+        Zip::File.open("zipped-source-2.jar", Zip::File::CREATE) do |zipfile|
           Dir[File.join("package2", "**", "**")].each do |file|
             zipfile.add(file.sub("/package2", ""), file)
           end
         end
         FileUtils.rm(File.join("package2","SourcedClass.java"))
         FileUtils.touch(File.join("package2","SourcedClass.class"))
-        Zip::ZipFile.open("zipped-2.jar", Zip::ZipFile::CREATE) do |zipfile|
+        Zip::File.open("zipped-2.jar", Zip::File::CREATE) do |zipfile|
           Dir[File.join("package2", "**", "**")].each do |file|
             zipfile.add(file.sub("/package2", ""), file)
           end
@@ -99,7 +99,7 @@ describe Gjp::KitChecker do
         FileUtils.mkdir_p("package3")
         FileUtils.touch(File.join("package3","SourcedSameArchive.java"))
         FileUtils.touch(File.join("package3","SourcedSameArchive.class"))
-        Zip::ZipFile.open("zipped-3.zip", Zip::ZipFile::CREATE) do |zipfile|
+        Zip::File.open("zipped-3.zip", Zip::File::CREATE) do |zipfile|
           Dir[File.join("package3", "**", "**")].each do |file|
             zipfile.add(file.sub("/package3", ""), file)
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gjp
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.35.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement