firebrew 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee0908cafa9dc7f91a605e060ed0e023b63cb9a4
-  data.tar.gz: 88e3a156dfba8e25ed0f3dab12e6a6418a6a5f93
+  metadata.gz: 5a542b1a8f741b5c1e6def0a8086d9c79d68f67e
+  data.tar.gz: a029dfe002d81c711026d3ea9df4fbe2f2d9fe0c
 SHA512:
-  metadata.gz: 9258b7043880fe71cf3259f7b4d065694e8936d3a69f88bf63705d2d98cd77223dfdbeb3ca0de5bca35768e605c9e6d0e7562494818d06eab1247839eddb95d3
-  data.tar.gz: 5b7b4e143d90517b87eeb16938b51171356970b91d105f8be5d5f62874ae8caf118c9f7a8cf3dfccf1b841b2f5401669ae67631535617f9610858940a5661e12
+  metadata.gz: c46210782bdf747211f0f9a18c86ea35dcacd99d831ead9817dfcb8870f0598aa41894a5a4d9c5f1778cb743b484a249b019d586bd82a6ce4698bea436a2155a
+  data.tar.gz: 59ad9eef3e13be8c5f4f21926374464d2f7ad0b34c5e02e73dd42f409d0487f457fcc64c777f2560a85a42e8740b3fd76bcbb44a0ea591cf8770d22d96a7e392

data/README.md

@@ -16,6 +16,9 @@ Or install it yourself as:
 
     $ gem install firebrew
 
+
+_NOTE: This program execution requires the OpenSSL._
+
 ## Usage
 
 The structure of the command line is shown below:
@@ -80,11 +83,11 @@ The Firefox profiles.ini directory:
 
 The default value is listed below:
 
-| platform | path |
-| -------- | ---- |
-| Mac OS X | ~/Library/Application Support/Firefox | 
-| Linux    | ~/.mozilla/firefox |
-| Windows 7 x86\_64 | %UserProfile%\AppData\Roming\Mozilla\Firefox |
+| platform | value |
+| -------- | ----- |
+| Mac OS X | `~/Library/Application Support/Firefox` | 
+| Linux    | `~/.mozilla/firefox` |
+| Windows  | `%APPDATA%\Mozilla\Firefox` |
 
 It's able to overridden by the `FIREBREW_FIREFOX_PROFILE_BASE_DIR` environment variable.
 
@@ -108,11 +111,11 @@ The Firefox command path:
 
 The default value is listed below:
 
-| platform | path |
-| -------- | ---- |
-| Mac OS X | /Applications/Firefox.app/Contents/MacOS/firefox-bin |
-| Linux    | /usr/bin/firefox |
-| Windows 7 x86\_64 | C:\Program Files (x86)\Mozilla Firefox\firefox.exe |
+| platform | value |
+| -------- | ----- |
+| Mac OS X | `/Applications/Firefox.app/Contents/MacOS/firefox-bin` |
+| Linux    | `/usr/bin/firefox` |
+| Windows  | `%PROGRAMFILES%\Mozilla Firefox\firefox.exe` or `%PROGRAMFILES(X86)%\Mozilla Firefox\firefox.exe` |
 
 It's able to overridden by the `FIREBREW_FIREFOX` environment variable.
 

data/lib/firebrew.rb

@@ -4,11 +4,10 @@ module Firebrew
   class Error < StandardError; def status; 1 end end
   class ProfilesFileNotFoundError < Error; def status; 2 end end
   class ProfileNotFoundError < Error; def status; 3 end end
-  class ExtensionsFileNotFoundError < Error; def status; 4 end end
-  class ExtensionNotFoundError < Error; def status; 5 end end
-  class FirefoxCommandError < Error; def status; 6 end end
-  class CommandLineError < Error; def status; 7 end end
-  class OperationAlreadyCompletedError < Error; def status; 8 end end
+  class ExtensionNotFoundError < Error; def status; 4 end end
+  class FirefoxCommandError < Error; def status; 5 end end
+  class CommandLineError < Error; def status; 6 end end
+  class OperationAlreadyCompletedError < Error; def status; 7 end end
 end
 
 require 'firebrew/entity'

data/lib/firebrew/firefox/command.rb

@@ -10,7 +10,7 @@ module Firebrew::Firefox
       @config = config
       @executer = executer
       begin
-        result = @executer.exec('%{firefox} --version' % @config)
+        result = @executer.exec('"%{firefox}" --version' % @config)
         raise Firebrew::FirefoxCommandError unless result[0] =~ /Mozilla Firefox/
         raise Firebrew::FirefoxCommandError unless result[1] == 0
       rescue SystemCallError
@@ -20,7 +20,7 @@ module Firebrew::Firefox
     
     def version
       return @version if @version.present?
-      result = @executer.exec('%{firefox} --version' % @config)[0]
+      result = @executer.exec('"%{firefox}" --version' % @config)[0]
       @version = result.match(/[0-9.]+/)[0]
     end
   end

data/lib/firebrew/firefox/extension.rb

@@ -62,7 +62,9 @@ module Firebrew::Firefox
       
       def data_path
         path = File.join(self.profile.path, 'extensions.json')
-        raise Firebrew::ExtensionsFileNotFoundError unless File.exists? path
+        unless File.exists?(path) then
+          File.write(path, %({"schemaVersion": 16, "addons": []}))
+        end
         path
       end
       

data/lib/firebrew/runner.rb

@@ -23,8 +23,10 @@ module Firebrew
         result[:firefox] ||= '/usr/bin/firefox'
         
       when /mswin(?!ce)|mingw|cygwin|bccwin/ then
-        result[:base_dir] ||= '~/AppData/Roming/Mozilla/Firefox'
-        result[:firefox] ||= 'C:/Program Files (x86)/Mozilla Firefox/firefox.exe'
+        appdata = ENV['APPDATA'].to_s.gsub('\\','/')
+        programfiles = (ENV['PROGRAMFILES(X86)'] || ENV['PROGRAMFILES']).to_s.gsub('\\','/')
+        result[:base_dir] ||= File.join(appdata, 'Mozilla/Firefox')
+        result[:firefox] ||= File.join(programfiles, 'Mozilla Firefox/firefox.exe')
       end
       
       result

data/lib/firebrew/version.rb

@@ -1,3 +1,3 @@
 module Firebrew
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/double/firefox.bat

@@ -0,0 +1,2 @@
+@echo off
+ruby ./spec/double/firefox.rb

data/spec/firebrew/command_line_spec.rb

@@ -130,7 +130,7 @@ module Firebrew
       
       context 'when the `Firebrew::Error` was thrown' do
         let(:exeption){raise Firebrew::CommandLineError, 'CommandLineError message'}
-        it { expect(subject[0]).to eq(7) }
+        it { expect(subject[0]).to eq(6) }
         it { expect(subject[1]).to eq('CommandLineError message') }
       end
       

data/spec/firebrew/firefox/extension_spec.rb

@@ -46,8 +46,14 @@ module Firebrew::Firefox
         end
         
         context 'when not existed `extension.json`' do
-          before {FileUtils.rm_f './tmp/extensions.json'}
-          it { expect{subject}.to raise_error(Firebrew::ExtensionsFileNotFoundError) }
+          before do
+            FileUtils.rm_f './tmp/extensions.json'
+            subject
+          end
+          
+          it 'should create that' do
+            expect(File.exists? './tmp/extensions.json').to be_truthy
+          end
         end
       end
       

data/spec/firebrew/firefox/profile_spec.rb

@@ -33,7 +33,7 @@ module Firebrew::Firefox
           expect(subject[1].is_default).to be_falsey
           
           expect(subject[2].name).to eq('abs_profile')
-          expect(subject[2].path).to eq('/path/to/abs_profile')
+          expect(subject[2].path).to eq(File.expand_path('/path/to/abs_profile'))
           expect(subject[2].is_default).to be_falsey
         end
         

data/spec/firebrew/runner_spec.rb

@@ -15,6 +15,12 @@ module Firebrew
         ENV['FIREBREW_FIREFOX'] = nil
       end
       
+      after do
+        ENV['FIREBREW_FIREFOX_PROFILE_BASE_DIR'] = nil
+        ENV['FIREBREW_FIREFOX_PROFILE'] = nil
+        ENV['FIREBREW_FIREFOX'] = nil
+      end
+      
       context 'when the `platform` was "MacOS"' do
         let(:platform){'x86_64-darwin13.0'}
         it do
@@ -37,14 +43,71 @@ module Firebrew
         end
       end
       
-      context 'when the `platform` was "Windows 7 x86_64"' do
+      context 'when the `platform` was "Windows"' do
         let(:platform){'x64-mingw32'}
-        it do
-          is_expected.to eq(
-            base_dir: '~/AppData/Roming/Mozilla/Firefox',
-            firefox: 'C:/Program Files (x86)/Mozilla Firefox/firefox.exe',
-            profile: 'default'
-          )
+        
+        before do
+          ENV['APPDATA'] = nil
+          ENV['PROGRAMFILES'] = nil
+          ENV['PROGRAMFILES(X86)'] = nil
+        end
+        
+        after do
+          ENV['APPDATA'] = nil
+          ENV['PROGRAMFILES'] = nil
+          ENV['PROGRAMFILES(X86)'] = nil
+        end
+        
+        context 'when the ruby architecture was "x86"' do
+          context 'when the `platform` was "Windows 7 x86_64"' do
+            before do
+              ENV['APPDATA'] = 'C:\Users\admin\AppData\Roaming'
+              ENV['PROGRAMFILES'] = 'C:\Program Files (x86)'
+              ENV['PROGRAMFILES(X86)'] = 'C:\Program Files (x86)'
+            end
+            
+            it do
+              is_expected.to eq(
+                base_dir: 'C:/Users/admin/AppData/Roaming/Mozilla/Firefox',
+                firefox: 'C:/Program Files (x86)/Mozilla Firefox/firefox.exe',
+                profile: 'default'
+              )
+            end
+          end
+          
+          context 'when the `platform` was "Windows XP x86"' do
+            before do
+              ENV['APPDATA'] = 'C:\Documents and Settings\Administrator\Application Data'
+              ENV['PROGRAMFILES'] = 'C:\Program Files'
+              ENV['PROGRAMFILES(X86)'] = nil
+            end
+            
+            it do
+              is_expected.to eq(
+                base_dir: 'C:/Documents and Settings/Administrator/Application Data/Mozilla/Firefox',
+                firefox: 'C:/Program Files/Mozilla Firefox/firefox.exe',
+                profile: 'default'
+              )
+            end
+          end
+        end
+        
+        context 'when the ruby architecture was "X86_64"' do
+          context 'when the `platform` was "Windows 7 x86_64"' do
+            before do
+              ENV['APPDATA'] = 'C:\Users\admin\AppData\Roaming'
+              ENV['PROGRAMFILES'] = 'C:\Program Files'
+              ENV['PROGRAMFILES(X86)'] = 'C:\Program Files (x86)'
+            end
+            
+            it do
+              is_expected.to eq(
+                base_dir: 'C:/Users/admin/AppData/Roaming/Mozilla/Firefox',
+                firefox: 'C:/Program Files (x86)/Mozilla Firefox/firefox.exe',
+                profile: 'default'
+              )
+            end
+          end
         end
       end
       
@@ -55,12 +118,6 @@ module Firebrew
           ENV['FIREBREW_FIREFOX'] = 'path/to/firefox'
         end
         
-        after do
-          ENV['FIREBREW_FIREFOX_PROFILE_BASE_DIR'] = nil
-          ENV['FIREBREW_FIREFOX_PROFILE'] = nil
-          ENV['FIREBREW_FIREFOX'] = nil
-        end
-        
         it do
           is_expected.to eq(
             base_dir: 'path/to/profile_base_directory',
@@ -78,7 +135,7 @@ module Firebrew
         Runner.new(
           base_dir: './tmp',
           data_file: 'profiles.ini',
-          firefox: './spec/double/firefox.rb'
+          firefox: ENV['OS'].nil? ? './spec/double/firefox.rb' : './spec/double/firefox.bat'
         )
       end
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firebrew
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Yuichi Murata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -135,6 +135,7 @@ files:
 - lib/firebrew/firefox/profile.rb
 - lib/firebrew/runner.rb
 - lib/firebrew/version.rb
+- spec/double/firefox.bat
 - spec/double/firefox.rb
 - spec/firebrew/amo_api/search_spec.rb
 - spec/firebrew/command_line_spec.rb
@@ -177,6 +178,7 @@ signing_key:
 specification_version: 4
 summary: Firefox add-ons manager for CUI.
 test_files:
+- spec/double/firefox.bat
 - spec/double/firefox.rb
 - spec/firebrew/amo_api/search_spec.rb
 - spec/firebrew/command_line_spec.rb