firebrew 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d60374125f704299bad2102f82186e95397ebd26
-  data.tar.gz: 11c9f75973a885d728e389f0383f0b33f2b690c2
+  metadata.gz: 64ff3a699d6eb6038ac49fad26c13ea38d20f9b7
+  data.tar.gz: ead1c868230eee2dc80afe8595f17430715978f4
 SHA512:
-  metadata.gz: d480f31e469ef6bd6b3f3fcd108138cc455b3cd4adf76e3c7c0308162011c5c7a18ea4ecd882ec8e82f6e11868932402f4ed64284f41fb46d7d0266f366e40e4
-  data.tar.gz: d513c0fcaf40b6fe92d32c522e2ea577a24727c446c6182715985952ff109282494db9ab1d58123ed038690fcf31e73212dec6c2266bfc04cc150e186105c059
+  metadata.gz: b4fe6fbb93d9127d839c7917cd44ed6cf688e676d39d98933a2793c9464fc43452785463c3ba85bbcfc53998e530feeb1d6f3bc7d9c34835caa1ef8057c7b550
+  data.tar.gz: 83bd15df6e84aff5f351f2fdfdb9b16956bfcb385eaa5982b7597f204108e4991408973d71b88aecb324414bcc38ae7bc7017efaaca687cfb1703c7c34e409b4

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.1.3](https://github.com/mrk21/firebrew/tree/v0.1.3) - 2014-08-19
+
+* Bugfix [#24](https://github.com/mrk21/firebrew/issues/24): When the `em:unpack` value of the install manifests was true, is unable to normally installing
+
 ## [0.1.2](https://github.com/mrk21/firebrew/tree/v0.1.2) - 2014-08-15
 
 * Bugfix [#23](https://github.com/mrk21/firebrew/issues/23): If the `install` element of the extension which was got by the generic AMO API was equal or greater than two, then occurs errors

data/firebrew.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activeresource", "~> 4.0"
   spec.add_dependency "activemodel", "~> 4.1"
   spec.add_dependency "inifile", "~> 2.0"
+  spec.add_dependency "rubyzip", "~> 1.1"
 end

data/lib/firebrew/firefox/extension.rb

@@ -1,6 +1,8 @@
 require 'fileutils'
 require 'open-uri'
 require 'json'
+require 'zip'
+require 'rexml/document'
 require 'firebrew/firefox/basic_extension'
 
 module Firebrew::Firefox
@@ -22,7 +24,7 @@ module Firebrew::Firefox
             name: extension['defaultLocale']['name'],
             guid: extension['id'],
             version: extension['version'],
-            uri: '%s.xpi' % File.join(self.profile.path, 'extensions', extension['id'])
+            uri: extension['descriptor'],
           }, self)
         end
       end
@@ -40,11 +42,31 @@ module Firebrew::Firefox
       def install(extension)
         dir = File.join(self.profile.path, 'extensions')
         FileUtils.mkdir_p dir
-        install_path = '%s.xpi' % File.join(dir, extension.guid)
         
-        open([extension.uri].flatten.first, 'rb') do |i|
-          open(install_path, 'wb') do |o|
-            o.write i.read
+        open([extension.uri].flatten.first, 'rb') do |r|
+          xpi = Zip::File.open(r)
+          install_manifests = xpi.find_entry('install.rdf')
+          install_manifests = install_manifests.get_input_stream.read
+          install_manifests = REXML::Document.new(install_manifests)
+          is_unpacking = REXML::XPath.match(install_manifests, '/RDF/Description/em:unpack/text()').first
+          is_unpacking = is_unpacking.nil? ? false : is_unpacking.value.strip == 'true'
+          
+          if is_unpacking then
+            extension.uri = File.join(dir, extension.guid)
+            FileUtils.mkdir_p(extension.uri)
+            xpi.each do |entry|
+              next if entry.ftype == :directory
+              content = entry.get_input_stream.read
+              Dir.chdir(extension.uri) do
+                FileUtils.mkdir_p File.dirname(entry.name)
+                File.write(entry.name, content)
+              end
+            end
+          else
+            extension.uri = '%s.xpi' % File.join(dir, extension.guid)
+            open(extension.uri, 'wb') do |w|
+              w.write r.read
+            end
           end
         end
         
@@ -53,7 +75,7 @@ module Firebrew::Firefox
       end
       
       def uninstall(extension)
-        FileUtils.rm_f extension.uri
+        FileUtils.rm_rf extension.uri
         self.remove(extension)
         self.push
       end
@@ -83,6 +105,7 @@ module Firebrew::Firefox
           'id'=> extension.guid,
           'location'=> 'app-profile',
           'version'=> extension.version,
+          'descriptor'=> extension.uri,
           'defaultLocale'=> {
             'name'=> extension.name
           }

data/lib/firebrew/version.rb

@@ -1,3 +1,3 @@
 module Firebrew
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/firebrew/firefox/extension_spec.rb

@@ -1,12 +1,13 @@
 require 'spec_helper'
 require 'fileutils'
+require 'digest/md5'
 
 module Firebrew::Firefox
   describe Firebrew::Firefox::Extension do
     let(:manager) do
       Extension::Manager.new(
         profile: Profile.new(
-          path: './tmp'
+          path: File.join(Dir.pwd, 'tmp')
         )
       )
     end
@@ -16,18 +17,19 @@ module Firebrew::Firefox
         name: 'Japanese Language Pack',
         guid: 'langpack-ja@firefox.mozilla.org',
         version: '30.0',
-        uri: './tmp/extensions/langpack-ja@firefox.mozilla.org.xpi'
+        uri: File.join(Dir.pwd, 'tmp/extensions/langpack-ja@firefox.mozilla.org.xpi')
       }, self.manager),
       Extension.new({
         name: 'Vimperator',
         guid: 'vimperator@mozdev.org',
         version: '3.8.2',
-        uri: './tmp/extensions/vimperator@mozdev.org.xpi'
+        uri: File.join(Dir.pwd, 'tmp/extensions/vimperator@mozdev.org.xpi')
       }, self.manager)
     ]}
     
     before do
-      FileUtils.cp('./spec/fixtures/firefox/extension/extensions.v16.json', './tmp/extensions.json')
+      json = File.read('./spec/fixtures/firefox/extension/extensions.v16.json')
+      File.write('./tmp/extensions.json', json % {profile_path: self.manager.profile.path})
     end
     
     describe :Manager do
@@ -92,21 +94,24 @@ module Firebrew::Firefox
         let(:extension) do
           Extension.new({
             guid: 'hoge@example.org',
-            uri: './spec/fixtures/amo_api/search/base.xml'
+            uri: File.join(Dir.pwd, 'spec/fixtures/firefox/extension/unpack_false.xpi')
           }, self.manager)
         end
         
-        it 'should copy the `path/to/profile/extensions/guid.xpi`' do
+        let(:expected_path) do
+          File.join(self.instance.profile.path, 'extensions/%s.xpi' % self.extension.guid)
+        end
+        
+        it 'should copy the `path/to/profile/extensions/<GUID>.xpi`' do
           subject
-          path = File.join(self.instance.profile.path, 'extensions/%s.xpi' % self.extension.guid)
-          expect(File.exists? path).to be_truthy
+          expect(File.exists? self.expected_path).to be_truthy
         end
         
         it 'should add the `extension` extension' do
           subject
           all = self.instance.all
           extension = self.extension
-          extension.uri = './tmp/extensions/hoge@example.org.xpi'
+          extension.uri = File.join(Dir.pwd, 'tmp/extensions/hoge@example.org.xpi')
           expect(all.size).to eq(3)
           expect(all[0]).to eq(self.extensions[0])
           expect(all[1]).to eq(self.extensions[1])
@@ -118,8 +123,8 @@ module Firebrew::Firefox
             Extension.new({
               guid: 'hoge@example.org',
               uri: [
-                './spec/fixtures/amo_api/search/base.xml',
-                './spec/fixtures/amo_api/search/not_exists.xml'
+                File.join(Dir.pwd, 'spec/fixtures/firefox/extension/unpack_false.xpi'),
+                File.join(Dir.pwd, 'spec/fixtures/firefox/extension/not_exists.xpi'),
               ]
             }, self.manager)
           end
@@ -128,19 +133,89 @@ module Firebrew::Firefox
             expect{subject}.to_not raise_error
           end
         end
+        
+        context 'when an `em:unpack` value of the `install.rdf` in the XPI package not exsisted' do
+          let(:extension) do
+            Extension.new({
+              guid: 'hoge@example.org',
+              uri: File.join(Dir.pwd, 'spec/fixtures/firefox/extension/unpack_null.xpi')
+            }, self.manager)
+          end
+          
+          it 'should copy the `path/to/profile/extensions/<GUID>.xpi`' do
+            subject
+            expect(File.exists? self.expected_path).to be_truthy
+          end
+          
+          it 'should add the `extension` extension' do
+            subject
+            all = self.instance.all
+            extension = self.extension
+            extension.uri = File.join(Dir.pwd, 'tmp/extensions/hoge@example.org.xpi')
+            expect(all.size).to eq(3)
+            expect(all[0]).to eq(self.extensions[0])
+            expect(all[1]).to eq(self.extensions[1])
+            expect(all[2]).to eq(self.extension)
+          end
+        end
+        
+        context 'when an `em:unpack` value of the `install.rdf` in the XPI package was true' do
+          let(:extension) do
+            Extension.new({
+              guid: 'hoge@example.org',
+              uri: './spec/fixtures/firefox/extension/unpack_true.xpi'
+            }, self.manager)
+          end
+          
+          let(:expected_path) do
+            File.join(self.instance.profile.path, 'extensions/%s' % self.extension.guid)
+          end
+          
+          it 'should copy the `path/to/profile/extensions/<GUID>`' do
+            subject
+            expect(File.exists? self.expected_path).to be_truthy
+          end
+          
+          it 'should unzip all files in the XPI package' do
+            subject
+            md5list = File.read('./spec/fixtures/firefox/extension/unpack_true.md5')
+            Dir.chdir(self.expected_path) do
+              md5list.each_line do |item|
+                md5, path = item.split(/\s+/)
+                expect(Digest::MD5.hexdigest(File.read path)).to eq(md5)
+              end
+            end
+          end
+          
+          it 'should add the `extension` extension' do
+            subject
+            all = self.instance.all
+            extension = self.extension
+            extension.uri = File.join(Dir.pwd, 'tmp/extensions/hoge@example.org')
+            expect(all.size).to eq(3)
+            expect(all[0]).to eq(self.extensions[0])
+            expect(all[1]).to eq(self.extensions[1])
+            expect(all[2]).to eq(self.extension)
+          end
+        end
       end
       
       describe '#uninstall(extension)' do
         let(:extension) do
           Extension.new({
             guid: 'hoge@example.org',
-            uri: './tmp/extensions/hoge@example.org.xpi'
+            uri: File.join(Dir.pwd, 'tmp/extensions/hoge@example.org.xpi')
           }, self.manager)
         end
         
-        before do
-          FileUtils.cp('./spec/fixtures/firefox/extension/extensions_added_hoge.v16.json', './tmp/extensions.json')
+        let(:create_xpi_block){->{
           File.write self.extension.uri, ''
+        }}
+        
+        before do
+          json = File.read('./spec/fixtures/firefox/extension/extensions_added_hoge.v16.json')
+          File.write('./tmp/extensions.json', json % {profile_path: self.manager.profile.path})
+          self.create_xpi_block[]
           self.manager.uninstall(self.extension)
         end
         
@@ -154,6 +229,30 @@ module Firebrew::Firefox
           expect(all[0]).to eq(self.extensions[0])
           expect(all[1]).to eq(self.extensions[1])
         end
+        
+        context 'when `em:unpack` value of the `install.rdf` in the `extension` was true' do
+          let(:extension) do
+            Extension.new({
+              guid: 'hoge@example.org',
+              uri: File.join(Dir.pwd, 'tmp/extensions/hoge@example.org')
+            }, self.manager)
+          end
+          
+          let(:create_xpi_block){->{
+            FileUtils.mkdir_p self.extension.uri
+          }}
+          
+          it 'should remove the `extension` file' do
+            expect(File.exists? self.extension.uri).to be_falsey
+          end
+          
+          it 'should remove the `extension` extension' do
+            all = self.instance.all
+            expect(all.size).to eq(2)
+            expect(all[0]).to eq(self.extensions[0])
+            expect(all[1]).to eq(self.extensions[1])
+          end
+        end
       end
     end
     

data/spec/fixtures/firefox/extension/extensions.v16.json

@@ -147,7 +147,7 @@
       "active": true,
       "userDisabled": false,
       "appDisabled": false,
-      "descriptor": "/Users/yuichi/Library/Application Support/Firefox/Profiles/k9l2swsk.default/extensions/langpack-ja@firefox.mozilla.org.xpi",
+      "descriptor": "%{profile_path}/extensions/langpack-ja@firefox.mozilla.org.xpi",
       "installDate": 1404466078000,
       "updateDate": 1404626257000,
       "applyBackgroundUpdates": 1,
@@ -197,7 +197,7 @@
       "active": true,
       "userDisabled": false,
       "appDisabled": false,
-      "descriptor": "/Users/yuichi/Library/Application Support/Firefox/Profiles/k9l2swsk.default/extensions/vimperator@mozdev.org.xpi",
+      "descriptor": "%{profile_path}/extensions/vimperator@mozdev.org.xpi",
       "installDate": 1404474084000,
       "updateDate": 1404617815000,
       "applyBackgroundUpdates": 1,

data/spec/fixtures/firefox/extension/extensions_added_hoge.v16.json

@@ -147,7 +147,7 @@
       "active": true,
       "userDisabled": false,
       "appDisabled": false,
-      "descriptor": "/Users/yuichi/Library/Application Support/Firefox/Profiles/k9l2swsk.default/extensions/langpack-ja@firefox.mozilla.org.xpi",
+      "descriptor": "%{profile_path}/extensions/langpack-ja@firefox.mozilla.org.xpi",
       "installDate": 1404466078000,
       "updateDate": 1404626257000,
       "applyBackgroundUpdates": 1,
@@ -197,7 +197,7 @@
       "active": true,
       "userDisabled": false,
       "appDisabled": false,
-      "descriptor": "/Users/yuichi/Library/Application Support/Firefox/Profiles/k9l2swsk.default/extensions/vimperator@mozdev.org.xpi",
+      "descriptor": "%{profile_path}/extensions/vimperator@mozdev.org.xpi",
       "installDate": 1404474084000,
       "updateDate": 1404617815000,
       "applyBackgroundUpdates": 1,
@@ -226,6 +226,7 @@
     {
       "id": "hoge@example.org",
       "location": "app-profile",
+      "descriptor": "%{profile_path}/extensions/hoge@example.org.xpi",
       "version": null,
       "defaultLocale": {
         "name": null

data/spec/fixtures/firefox/extension/unpack_true.md5

@@ -0,0 +1,3 @@
+412a970e86db9c913b721a7a3c025d7f  ./dir1/file2.txt
+984cd269de9bc8c6de7deb3c8fc7c393  ./file1.txt
+f2354fba2476948c88385a564086b350  ./install.rdf

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firebrew
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Yuichi Murata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: Firefox add-ons manager for CUI.
 email:
 - mrk21info+rubygems@gmail.com
@@ -151,6 +165,10 @@ files:
 - spec/fixtures/amo_api/search/single.xml
 - spec/fixtures/firefox/extension/extensions.v16.json
 - spec/fixtures/firefox/extension/extensions_added_hoge.v16.json
+- spec/fixtures/firefox/extension/unpack_false.xpi
+- spec/fixtures/firefox/extension/unpack_null.xpi
+- spec/fixtures/firefox/extension/unpack_true.md5
+- spec/fixtures/firefox/extension/unpack_true.xpi
 - spec/fixtures/firefox/profile/base.ini
 - spec/fixtures/firefox/profile/empty.ini
 - spec/spec_helper.rb
@@ -194,6 +212,10 @@ test_files:
 - spec/fixtures/amo_api/search/single.xml
 - spec/fixtures/firefox/extension/extensions.v16.json
 - spec/fixtures/firefox/extension/extensions_added_hoge.v16.json
+- spec/fixtures/firefox/extension/unpack_false.xpi
+- spec/fixtures/firefox/extension/unpack_null.xpi
+- spec/fixtures/firefox/extension/unpack_true.md5
+- spec/fixtures/firefox/extension/unpack_true.xpi
 - spec/fixtures/firefox/profile/base.ini
 - spec/fixtures/firefox/profile/empty.ini
 - spec/spec_helper.rb