jrubyfx 0.9.1-java → 0.9.2-java

data/README.md

@@ -39,6 +39,22 @@ This jar can then run anywhere there is a JVM with JavaFX. Note than the main fi
 renamed to jar-bootstrap.rb inside the jar. If you need to detect if you are in a jar,
 use the JRubyFX::Application.in_jar? method.
 
+You can create native application packages and installers. For now, this requires that you have [JDK8 installed](http://jdk8.java.net/download.html), although this may change in the near future. Just pass the `--native` option. The packaging toolkit can only create packages for the OS it is being used on, so for Windows installers you will need to run it on a Windows machine, for OSX installers you will need to run it on a Mac, etc.
+
+In order for the installer to be created, you will need some additional tools installed on your system. For Windows you need either Inno Setup 5 or later for an EXE or [Windows Installer XML (WiX) toolset](http://wix.sourceforge.net/) to generate an MSI. Make sure the WiX toolset's `bin` folder is on the `PATH`.  No special tools are need to generate a DMG, just a recent version of OSX. For linux, the packager uses dpkg-deb to create DEB installers and rpmbuild for RPM.
+
+If you don't want your application to be called "JarBootstrapMain", I highly suggest passing the `--name` option with an appropriate string.
+
+To customize the package, for example to change the icons or license pass the `-v` or `--verbose` option. This will cause the JavaFX packaging tools to enter verbose mode, and provide more details about the process, including (the important part for customization) the location of a temporary folder where the config resources for the build are held and a list of the resources and the role of each. Copy the contents of this tmp folder into a folder in your project directory (the dir you run jrubyfx-jarify from) where the packaging tools will know to look for them. For example, on linux this would be `main_project_dir/package/linux`. On OSX, it is `main_project_dir/package/macosx`. So, if I wanted to use a custom icon, I'd replace the default icon with my own, ensuring it has the same name, and place it inside that linux or macosx folder.  Then run the build again. You can find more information on customizing at the [official Oracle documentation](http://docs.oracle.com/javafx/2/deployment/self-contained-packaging.htm#BCGICFDB).  [This blog post](http://ed4becky.net/homepage/javafx-from-the-trenches-part-1-native-packaging/4/) may also be helpful, as he goes through the process of customizing an app for both Windows and OSX.
+
+The JavaFX tools provide far more options than are available from this tool. You can create your own rake tasks and access them directly, however. See [this article](https://github.com/jruby/jruby/wiki/Packaging-Native-Installers-with-the-JavaFX-Ant-Tasks) in the JRuby wiki.
+
+Example: If my project directory is `Hello`, all my files are in `src`, I have a `dist` folder created for my jar file, my main file is called `HelloWorldApp.rb`, my app's name is "Hello World App", and I want the customization info, the command line would look like this:
+
+```
+jrubyfx-jarify src --main src/HelloWorldApp.rb dist/HelloWorldApp.jar --native --name "Hello World App" -v
+```
+
 Sample
 -------
 
@@ -65,8 +81,8 @@ Creating Application and Controller
 
 Require the 'jrubyfx' file/gem, and subclass JRubyFX::Application (and JRubyFX::Controller if you are using FXML).
 At the bottom of the file, call _yourFXApplicationClass_.launch().
-Override start(stage) in the application. See samples/fxml/Demo.rb for commented FXML example, 
-or the fils in samples/javafx for non-FXML (programatic JavaFX, but you should really 
+Override start(stage) in the application. See samples/fxml/Demo.rb for commented FXML example,
+or the fils in samples/javafx for non-FXML (programatic JavaFX, but you should really
 look into FXML, its better) or see the Getting Started Guide and the Notes.
 
 If you want rdoc, run `rake rdoc`.

data/bin/{rubyfx-generator → jrubyfx-generator}

@@ -31,12 +31,12 @@ rb = ARGV[1] if ARGV.length > 1
 name_guess = "My" + File.basename(fxml).gsub(/\.fxml$/i, "").gsub(/[^a-zA-Z0-9_]/i, "") # better guess would be better
 name_guess = ARGV[2] if ARGV.length > 2
 
-print "Generating RubyFX template for #{fxml} into #{rb}... "
+print "Generating JRubyFX template for #{fxml} into #{rb}... "
 
 File.open(rb, "w") do |output|
   
   output << <<END
-# This file was auto-generated by rubyfx-generator at #{DateTime.now.to_s}
+# This file was auto-generated by jrubyfx-generator at #{DateTime.now.to_s}
 
 require 'jrubyfx'
 
@@ -76,6 +76,6 @@ END
 end
 
 puts "Done!"
-puts "Launching 'ruby #{rb}' ..."
+puts "Launching 'jruby #{rb}' ..."
 
 require rb

data/bin/jrubyfx-jarify

@@ -21,11 +21,16 @@ require 'jrubyfx_tasks'
 def usage
   puts "#{$0} {options} project-folder [output.jar]"
   puts <<THEOPTIONS
-  project-folder should contain rb files and supporting files  
+  project-folder should contain rb files and supporting files
 
-  -m|--main FILE     ruby script to launch when the jar is executed. 
+  -m|--main FILE     ruby script to launch when the jar is executed.
                      Defaults to jar-bootstrap.rb or main.rb
-  -j|--include-jars  Include jars in the jar
+  -j|--include-jars  Include jars in the jar. (off by default to prevent including
+                     the jar you are building)
+  --native           Create native application packages and installers. (Requires JDK8)
+  -v|--verbose       Turns on the native packagers verbose mode. Useful for
+                     customizing icons, licenses, etc.
+  --name STRING      Name for your native package.
 THEOPTIONS
   exit -1
 end
@@ -36,6 +41,9 @@ end
 
 main = ["jar-bootstrap.rb", "main.rb"]
 include_jars = false
+native_bundle = false
+app_name = ""
+verbose = false
 nargs = []
 default_on_next = on_next = ->(arg){true}
 
@@ -54,8 +62,21 @@ ARGV.each do |arg|
   when "-j", "--include-jars"
     include_jars = true
     next
+  when "--native"
+    native_bundle = true
+    next
+  when "--name"
+    on_next = ->(arg){
+      app_name = [arg]
+      on_next = default_on_next
+      false
+    }
+    next
+  when "-v", "--verbose"
+    verbose = true
   when "-h", "--help"
     usage
+    exit 0
   when /^-/
     puts "ERROR! Unrecognized option '#{arg}'!"
     exit -2
@@ -73,7 +94,7 @@ project_folder, output_jar = nargs
 # Download the current running JRuby version
 JRubyFX::Tasks::download_jruby(JRUBY_VERSION)
 
-# set the main script to the first (must be passed in), or tries to find 
+# set the main script to the first (must be passed in), or tries to find
 # a file that does exists. Silently fails if it fails.
 main_script = main[0]
 if main.length > 1
@@ -88,3 +109,7 @@ end
 
 # Jarify!
 JRubyFX::Tasks::jarify_jrubyfx(project_folder + "/**/*", main_script, nil, output_jar, :file_filter => ->(filename){!filename.end_with?(".jar") or include_jars})
+
+if native_bundle
+  JRubyFX::Tasks::native_bundles(Dir.pwd, output_jar, verbose, app_name[0])
+end

data/lib/jrubyfx/core_ext/border_pane.rb

@@ -14,6 +14,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 =end
+require 'jrubyfx/dsl'
+
 # JRubyFX DSL extensions for BorderPanes
 class Java::javafx::scene::layout::BorderPane
   include JRubyFX::DSL

data/lib/jrubyfx/core_ext/column_constraints.rb

@@ -14,6 +14,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 =end
+require 'jrubyfx/dsl'
+
 # JRubyFX DSL extensions for JavaFX Column Constraints
 class Java::javafx::scene::layout::ColumnConstraints
   extend JRubyFX::Utils::CommonConverters

data/lib/jrubyfx/core_ext/drag_event.rb

@@ -0,0 +1,32 @@
+=begin
+JRubyFX - Write JavaFX and FXML in Ruby
+Copyright (C) 2013 The JRubyFX Team
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=end
+require 'jrubyfx/utils/common_converters'
+
+# JRubyFX DSL extensions for JavaFX drag events
+class Java::javafx::scene::input::DragEvent
+  extend JRubyFX::Utils::CommonConverters
+  include JRubyFX::Utils::CommonUtils
+
+  tmc = enum_converter(Java::javafx::scene::input::TransferMode)
+  converter_for :accept_transfer_modes, &tmc
+
+  # FIXME: For non-dsl calls like this we want converter logic
+  alias :accept_transfer_modes_orig :accept_transfer_modes
+  def accept_transfer_modes(*values)
+    accept_transfer_modes_orig *attempt_conversion(self, "accept_transfer_modes", *values)
+  end
+end

data/lib/jrubyfx/core_ext/drag_event.rb~

@@ -0,0 +1,32 @@
+=begin
+JRubyFX - Write JavaFX and FXML in Ruby
+Copyright (C) 2013 The JRubyFX Team
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=end
+require 'jrubyfx/dsl'
+
+# JRubyFX DSL extensions for JavaFX drop shadows
+class Java::javafx::scene::input::DragEvent
+  extend JRubyFX::Utils::CommonConverters
+
+  converter_for :acceptTransferModes, [enum_converter(Java::javafx::scene::input::TransferMode)]
+
+  class << self
+    extend JRubyFX::Utils::CommonConverters
+
+    converter_for :new, [], [:none, :color], [:none, :none, :none, :color],
+      [enum_converter(Java::javafx::scene::effect::BlurType), :color, :none, :none, :none, :none]
+  end
+
+end

data/lib/jrubyfx/core_ext/duration.rb

@@ -14,6 +14,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 =end
+require 'jrubyfx/dsl'
+
 # JRubyFX DSL extensions for JavaFX Duration
 class Fixnum
   # defines #ms, #sec, etc to create a JavaFX duration object of respective type

data/lib/jrubyfx/core_ext/effects.rb

@@ -14,6 +14,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 =end
+require 'jrubyfx/dsl'
+
 # JRubyFX DSL extensions for JavaFX drop shadows
 class Java::javafx::scene::effect::DropShadow
   extend JRubyFX::Utils::CommonConverters

data/lib/jrubyfx/core_ext/file_chooser.rb

@@ -14,8 +14,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 =end
+require 'jrubyfx/dsl'
+
 # JRubyFX DSL extensions for JavaFX FileChooser
 class Java::javafx::stage::FileChooser
+  include JRubyFX::DSL
 
   # call-seq:
   #   add_extension_filter(description)

data/lib/jrubyfx/core_ext/image_view.rb

@@ -0,0 +1,24 @@
+=begin
+JRubyFX - Write JavaFX and FXML in Ruby
+Copyright (C) 2013 The JRubyFX Team
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=end
+require 'jrubyfx/dsl'
+
+# JRubyFX DSL extensions for JavaFX Image Views
+class Java::javafx::scene::image::ImageView
+  extend JRubyFX::Utils::CommonConverters
+
+  converter_for :viewport, [:rectangle2d]
+end

data/lib/jrubyfx/core_ext/image_view.rb~

@@ -0,0 +1,24 @@
+=begin
+JRubyFX - Write JavaFX and FXML in Ruby
+Copyright (C) 2013 The JRubyFX Team
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=end
+require 'jrubyfx/dsl'
+
+# JRubyFX DSL extensions for JavaFX color stops
+class Java::javafx::scene::media::MediaPlayer
+  extend JRubyFX::Utils::CommonConverters
+
+  converter_for :viewport, [:geometry]
+end

data/lib/jrubyfx/core_ext/media_player.rb

@@ -14,6 +14,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 =end
+require 'jrubyfx/dsl'
+
 # JRubyFX DSL extensions for JavaFX color stops
 class Java::javafx::scene::media::MediaPlayer
   extend JRubyFX::Utils::CommonConverters

data/lib/jrubyfx/core_ext/menu.rb

@@ -0,0 +1,25 @@
+=begin
+JRubyFX - Write JavaFX and FXML in Ruby
+Copyright (C) 2013 The JRubyFX Team
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=end
+require 'jrubyfx/dsl'
+
+# JRubyFX DSL extensions for JavaFX Menus
+class Java::javafx::scene::control::Menu
+  include JRubyFX::DSL
+
+  include_method_missing MenuItem
+  include_add :getItems
+end

data/lib/jrubyfx/core_ext/menu.rb~

@@ -0,0 +1,26 @@
+=begin
+JRubyFX - Write JavaFX and FXML in Ruby
+Copyright (C) 2013 The JRubyFX Team
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=end
+require 'jrubyfx/dsl'
+
+# JRubyFX DSL extensions for JavaFX color stops
+class Java::javafx::scene::control::MenuBar
+  java_import 'javafx.scene.control.MenuItem'
+  include JRubyFX::DSL
+
+  include_method_missing MenuItem
+  include_add :getItems
+end

data/lib/jrubyfx/core_ext/menu_bar.rb

@@ -0,0 +1,25 @@
+=begin
+JRubyFX - Write JavaFX and FXML in Ruby
+Copyright (C) 2013 The JRubyFX Team
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=end
+require 'jrubyfx/dsl'
+
+# JRubyFX DSL extensions for JavaFX Menu Bars
+class Java::javafx::scene::control::MenuBar
+  include JRubyFX::DSL
+
+  include_method_missing Menu
+  include_add :getMenus
+end

data/lib/jrubyfx/core_ext/menu_bar.rb~

@@ -0,0 +1,24 @@
+=begin
+JRubyFX - Write JavaFX and FXML in Ruby
+Copyright (C) 2013 The JRubyFX Team
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=end
+require 'jrubyfx/dsl'
+
+# JRubyFX DSL extensions for JavaFX color stops
+class Java::javafx::scene::control::MenuBar
+  extend JRubyFX::Utils::CommonConverters
+
+  include_add :get_menus
+end

data/lib/jrubyfx/core_ext/menu_item.rb

@@ -0,0 +1,22 @@
+=begin
+JRubyFX - Write JavaFX and FXML in Ruby
+Copyright (C) 2013 The JRubyFX Team
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+=end
+require 'jrubyfx/dsl'
+
+# JRubyFX DSL extensions for JavaFX Menu Items
+class Java::javafx::scene::control::MenuItem
+  include JRubyFX::DSL
+end

data/lib/jrubyfx/core_ext/node.rb

@@ -21,4 +21,6 @@ class Java::javafx::scene::Node
   include JRubyFX::DSL
 
   include_rotate
+
+  getter_setter :effect
 end

data/lib/jrubyfx/core_ext/pagination.rb

@@ -14,10 +14,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 =end
-# JRubyFX DSL extensions for JavaFX Progress *
+require 'jrubyfx/dsl'
+
+# JRubyFX DSL extensions for JavaFX Pagination
 class Java::javafx::scene::control::Pagination
   extend JRubyFX::Utils::CommonConverters
-  
+
   indeterm_map = map_converter(indeterminate: INDETERMINATE)
 
   converter_for :page_count, [indeterm_map]