crxmake 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51b7ae60790d87dde2e173105028ae9a84ef4d35
-  data.tar.gz: 97dcbe4fd38e5f9c631c81db272ef3097b89eba6
+  metadata.gz: 1896b138aaa3d78181c9843cace2c494207ace8d
+  data.tar.gz: 2e1ead40b42f5ec57fd669bd723d9e4e9ce74c7d
 SHA512:
-  metadata.gz: d9ce02f3dc7a96258cc4b99712d4dea14c7d013e190b2bd1001b4cd6191c74f9c2902c29acd2088dc7079011efea6b8bb9428c6f7452c7a6ac5d909eb4198d3a
-  data.tar.gz: 40b0e4b2b11c0c3bab0744e25a1c0851c52056179717130c5b8729523e3443e0ec40de81d8c1bbd9e74300d39d015b0a7228aa99fbaf49e2415adc08768bf789
+  metadata.gz: a82df144b2d407f48ce845cbc2fd7198093c9ce8d68844795b78e53a2ec071878de74d051b56e628452522bae784f98da0baf15bacdba72f86aba4bc3223047b
+  data.tar.gz: d29ab638a88d0ff6512137ffd60abb90ee1dacbf1dcb18cab20c2ebe2e840f56661f2746119dd4d9d7f63e8a16b89180bb664127798039f1241e10a5ffe8b924

data/lib/crxmake.rb

@@ -1,15 +1,24 @@
 #!/usr/bin/ruby
 # vim: fileencoding=utf-8
 require 'rubygems'
-require 'zip/zip'
+require 'zip'
 require 'openssl'
 require 'digest/sha1'
 require 'fileutils'
 require 'find'
 require 'pathname'
 
+begin
+	require 'openssl_pkcs8'
+	class OpenSSL::PKey::RSA
+		alias_method :to_pem, :to_pem_pkcs8
+	end
+rescue LoadError
+	$pkcs8_warning=1
+end
+
 class CrxMake < Object
-  VERSION = '2.1.2'
+  VERSION = '2.1.3'
   # thx masover
   MAGIC = 'Cr24'
 
@@ -31,11 +40,11 @@ class CrxMake < Object
     else
       generate_key
     end
-    create_zip
-    sign_zip
-    write_crx
+    zip_buffer = create_zip
+    sign_zip(zip_buffer)
+    write_crx(zip_buffer)
   ensure
-    remove_zip
+    #remove_zip
   end
 
   def zip
@@ -44,11 +53,12 @@ class CrxMake < Object
       generate_key
       @pkey = @pkey_o
     end
-    remove_zip
-    create_zip do |zip|
+    #remove_zip
+    zip_buffer = create_zip do |zip|
       puts "include pem key: \"#{@pkey}\"" if @verbose
       zip.add('key.pem', @pkey)
     end
+    File.open(@zip,'wb'){|f|f<<zip_buffer}
   end
 
   private
@@ -141,17 +151,21 @@ ext dir: \"#{@exdir}\"
   end
 
   def generate_key
+    if defined?($pkcs8_warning)&&@verbose
+      $stderr.puts 'Warn: generated pem must be converted into PKCS8 in order to upload to Chrome WebStore.'
+      $stderr.puts 'To suppress this message, do: gem install openssl_pkcs8'
+    end
     puts "generate pemkey to  \"#{@pkey_o}\"" if @verbose
     @key = OpenSSL::PKey::RSA.generate(KEY_SIZE)
     # save key
     File.open(@pkey_o, 'wb') do |file|
-      file << @key.export()
+      file << @key.to_pem
     end
   end
 
   def create_zip
     puts "create zip" if @verbose
-    Zip::ZipFile.open(@zip, Zip::ZipFile::CREATE) do |zip|
+    buffer = Zip::File.add_buffer do |zip|
       Find.find(@exdir) do |path|
         unless path == @exdir
           if File.directory?(path)
@@ -178,22 +192,24 @@ ext dir: \"#{@exdir}\"
 create zip...done
 zip file at \"#{@zip}\"
     EOS
+    return buffer.string
   end
 
   def get_relative base, target
     Pathname.new(target.to_s).relative_path_from(Pathname.new(base.to_s)).to_s
   end
 
-  def sign_zip
+  def sign_zip(zip_buffer)
     puts "sign zip" if @verbose
     plain = nil
-    File.open(@zip, 'rb') do |file|
-      plain = file.read
-    end
+    #File.open(@zip, 'rb') do |file|
+    #  plain = file.read
+    #end
+    plain = zip_buffer
     @sig = @key.sign(OpenSSL::Digest::SHA1.new, plain)
   end
 
-  def write_crx
+  def write_crx(zip_buffer)
     print "write crx..." if @verbose
     key = @key.public_key.to_der
     key.index(KEY) != 0 and key = KEY + key
@@ -204,9 +220,10 @@ zip file at \"#{@zip}\"
       file << to_sizet(@sig.size)
       file << key
       file << @sig
-      File.open(@zip, 'rb') do |zip|
-        file << zip.read
-      end
+      #File.open(@zip, 'rb') do |zip|
+      #  file << zip.read
+      #end
+      file << zip_buffer
     end
     puts "done at \"#{@crx}\"" if @verbose
   end
@@ -215,9 +232,9 @@ zip file at \"#{@zip}\"
     return [num].pack('V')
   end
 
-  def remove_zip
-    FileUtils.rm_rf(@zip) if @zip && File.exist?(@zip)
-  end
+  #def remove_zip
+  #  FileUtils.rm_rf(@zip) if @zip && File.exist?(@zip)
+  #end
 
   class << self
     def make opt

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crxmake
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Constellation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-14 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip