redcar-dev 0.12.14dev-java → 0.12.15dev-java

data/lib/redcar.rb

@@ -57,7 +57,7 @@ end
 #
 # and so on.
 module Redcar
-  VERSION         = '0.12.14dev' # also change in the gemspec!
+  VERSION         = '0.12.15dev' # also change in the gemspec!
   VERSION_MAJOR   = 0
   VERSION_MINOR   = 12
   VERSION_RELEASE = 0

data/plugins/application_swt/lib/application_swt/html_tab.rb

@@ -2,6 +2,7 @@
 module Redcar
   class ApplicationSWT
     class HtmlTab < Tab
+      
       attr_reader :browser
       
       def initialize(model, notebook)
@@ -13,7 +14,7 @@ module Redcar
         Swt::Graphics::Device.DEBUG = true
         if Redcar.platform == :windows
           java.lang.System.setProperty('org.eclipse.swt.browser.XULRunnerPath',
-                                      (Redcar.asset_dir + "/xulrunner").gsub("/", "\\"))
+                                      HtmlTab.windows_xulrunner_path.gsub("/", "\\"))
           @browser = Swt::Browser.new(notebook.tab_folder, Swt::SWT::MOZILLA)
         else
           @browser = Swt::Browser.new(notebook.tab_folder, Swt::SWT::NONE)
@@ -63,6 +64,16 @@ module Redcar
         @location_listener = LocationListener.new(@model)
         @browser.add_location_listener(@location_listener)
       end
+      
+      def self.windows_xulrunner_path
+        begin
+          require 'redcar-xulrunner-win'
+        rescue LoadError => e
+          raise "Missing xulrunner browser widget, install gem redcar-xulrunner-win."
+        end
+        Redcar::XulrunnerWin.ensure_unpacked
+        Redcar::XulrunnerWin.path
+      end
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: redcar-dev
 version: !ruby/object:Gem::Version 
   prerelease: 7
-  version: 0.12.14dev
+  version: 0.12.15dev
 platform: java
 authors: 
   - Daniel Lucraft
@@ -80,7 +80,7 @@ dependencies:
     type: :runtime
     version_requirements: *id006
   - !ruby/object:Gem::Dependency 
-    name: rubyzip
+    name: net-sftp
     prerelease: false
     requirement: &id007 !ruby/object:Gem::Requirement 
       none: false
@@ -91,7 +91,7 @@ dependencies:
     type: :runtime
     version_requirements: *id007
   - !ruby/object:Gem::Dependency 
-    name: net-sftp
+    name: net-ftp-list
     prerelease: false
     requirement: &id008 !ruby/object:Gem::Requirement 
       none: false
@@ -102,7 +102,7 @@ dependencies:
     type: :runtime
     version_requirements: *id008
   - !ruby/object:Gem::Dependency 
-    name: net-ftp-list
+    name: jruby-openssl
     prerelease: false
     requirement: &id009 !ruby/object:Gem::Requirement 
       none: false
@@ -113,7 +113,7 @@ dependencies:
     type: :runtime
     version_requirements: *id009
   - !ruby/object:Gem::Dependency 
-    name: jruby-openssl
+    name: ruby-blockcache
     prerelease: false
     requirement: &id010 !ruby/object:Gem::Requirement 
       none: false
@@ -124,7 +124,7 @@ dependencies:
     type: :runtime
     version_requirements: *id010
   - !ruby/object:Gem::Dependency 
-    name: ruby-blockcache
+    name: bouncy-castle-java
     prerelease: false
     requirement: &id011 !ruby/object:Gem::Requirement 
       none: false
@@ -135,7 +135,7 @@ dependencies:
     type: :runtime
     version_requirements: *id011
   - !ruby/object:Gem::Dependency 
-    name: bouncy-castle-java
+    name: swt
     prerelease: false
     requirement: &id012 !ruby/object:Gem::Requirement 
       none: false
@@ -146,7 +146,7 @@ dependencies:
     type: :runtime
     version_requirements: *id012
   - !ruby/object:Gem::Dependency 
-    name: swt
+    name: plugin_manager
     prerelease: false
     requirement: &id013 !ruby/object:Gem::Requirement 
       none: false
@@ -157,7 +157,7 @@ dependencies:
     type: :runtime
     version_requirements: *id013
   - !ruby/object:Gem::Dependency 
-    name: plugin_manager
+    name: redcar-icons
     prerelease: false
     requirement: &id014 !ruby/object:Gem::Requirement 
       none: false
@@ -168,7 +168,7 @@ dependencies:
     type: :runtime
     version_requirements: *id014
   - !ruby/object:Gem::Dependency 
-    name: redcar-icons
+    name: redcar-svnkit
     prerelease: false
     requirement: &id015 !ruby/object:Gem::Requirement 
       none: false
@@ -179,7 +179,7 @@ dependencies:
     type: :runtime
     version_requirements: *id015
   - !ruby/object:Gem::Dependency 
-    name: redcar-svnkit
+    name: redcar-bundles
     prerelease: false
     requirement: &id016 !ruby/object:Gem::Requirement 
       none: false
@@ -190,7 +190,7 @@ dependencies:
     type: :runtime
     version_requirements: *id016
   - !ruby/object:Gem::Dependency 
-    name: redcar-bundles
+    name: redcar-javamateview
     prerelease: false
     requirement: &id017 !ruby/object:Gem::Requirement 
       none: false
@@ -201,7 +201,7 @@ dependencies:
     type: :runtime
     version_requirements: *id017
   - !ruby/object:Gem::Dependency 
-    name: redcar-javamateview
+    name: cucumber
     prerelease: false
     requirement: &id018 !ruby/object:Gem::Requirement 
       none: false
@@ -209,10 +209,10 @@ dependencies:
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
-    type: :runtime
+    type: :development
     version_requirements: *id018
   - !ruby/object:Gem::Dependency 
-    name: cucumber
+    name: rspec
     prerelease: false
     requirement: &id019 !ruby/object:Gem::Requirement 
       none: false
@@ -223,7 +223,7 @@ dependencies:
     type: :development
     version_requirements: *id019
   - !ruby/object:Gem::Dependency 
-    name: rspec
+    name: watchr
     prerelease: false
     requirement: &id020 !ruby/object:Gem::Requirement 
       none: false
@@ -233,17 +233,6 @@ dependencies:
             version: "0"
     type: :development
     version_requirements: *id020
-  - !ruby/object:Gem::Dependency 
-    name: watchr
-    prerelease: false
-    requirement: &id021 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    type: :development
-    version_requirements: *id021
 description: ""
 email: 
   - dan@fluentradical.com