jrubyfx 0.9.1-java → 0.9.2-java

data/lib/jrubyfx/jfx_imports.rb

@@ -31,8 +31,10 @@ begin
       jfx_path.gsub(/[\/\\][amdix345678_]+$/, "") # strip i386 or amd64 (including variants). TODO: ARM
     end
   end
-  require 'jfxrt.jar'
-rescue  LoadError
+	# Java 8 and above has JavaFX as part of the normal distib, only require it if we are 7 or below
+  require 'jfxrt.jar' if ENV['JFX_DIR'] or ENV_JAVA["java.runtime.version"].match(/^1\.[0-7]{1}\..*/)
+  testit = Java.javafx.application.Application
+rescue  LoadError, NameError
   puts "JavaFX runtime not found.  Please install Java 7u6 or newer or set environment variable JFX_DIR to the folder that contains jfxrt.jar "
   puts "If you have Java 7u6 or later, this is a bug. Please report to the issue tracker on github. Include your OS version, 32/64bit, and architecture (x86, ARM, PPC, etc)"
   exit -1
@@ -42,50 +44,50 @@ module JRubyFX
   # If you need JavaFX, just include this module. Its sole purpose in life is to
   # import all JavaFX stuff, plus a few useful Java classes (like Void)
   module FXImports
-  
+
     # If something is missing, just java_import it in your code.
     # And then ask us to put it in this list
-  
-    ## 
+
+    ##
     # This is the list of all classes in JavaFX that most apps should care about.
-    # It is a hashmaps with the leafs as arrays. Where a leaf also contains more 
+    # It is a hashmaps with the leafs as arrays. Where a leaf also contains more
     # packages, the hashmap key is "" (empty string). You can utilize this constant
     # to save yourself some typing when adding code for most/all of the JavaFX
     # classes by using either `Hash.flat_tree_inject` from jrubyfx/utils.rb or
     # writing your own traversal function
     #
     JFX_CLASS_HIERARCHY = { :javafx => {
-        :animation => %w[Animation AnimationTimer FadeTransition FillTransition Interpolator KeyFrame KeyValue ParallelTransition PathTransition 
+        :animation => %w[Animation AnimationTimer FadeTransition FillTransition Interpolator KeyFrame KeyValue ParallelTransition PathTransition
         PauseTransition RotateTransition ScaleTransition SequentialTransition StrokeTransition Timeline Transition TranslateTransition],
         :application => ['Platform'],
         :beans => {
           :property => ['SimpleDoubleProperty'],
           #TODO: import more
-          :value => ['ChangeListener']  
+          :value => ['ChangeListener']
         },
         :collections => ['FXCollections'],
         :event => %w[Event ActionEvent EventHandler],
         :fxml => ['Initializable', 'LoadException'],
-        :geometry => %w[HorizontalDirection HPos Insets Orientation Pos Side VerticalDirection VPos], 
+        :geometry => %w[HorizontalDirection HPos Insets Orientation Pos Rectangle2D Side VerticalDirection VPos],
         :scene => {
           '' => %w[Group Node Parent Scene],
           :canvas => ['Canvas'],
-          :chart => %w[Axis CategoryAxis Chart LineChart NumberAxis XYChart],
-          # TODO: import more of these
-          :control => %w[Accordion Button Cell CheckBox CheckBoxTreeItem CheckMenuItem ChoiceBox ColorPicker ComboBox ContextMenu Hyperlink 
-          Label ListCell ListView Menu MenuBar MenuButton MenuItem Pagination PasswordField PopupControl ProgressBar ProgressIndicator RadioButton 
-          RadioMenuItem ScrollBar ScrollPane Separator SeparatorMenuItem Slider SplitMenuButton SplitPane Tab TableView TableColumn TabPane TextArea 
-          TextField TitledPane ToggleButton ToggleGroup ToolBar Tooltip TreeItem TreeView ContentDisplay OverrunStyle SelectionMode],
-          :effect => %w[Blend BlendMode Bloom BlurType BoxBlur ColorAdjust ColorInput DisplacementMap DropShadow GaussianBlur Glow ImageInput 
+          :chart => %w[AreaChart Axis BarChart BubbleChart CategoryAxis Chart LineChart NumberAxis
+          PieChart ScatterChart StackedAreaChart StackedBarChart ValueAxis XYChart],
+          :control => %w[Accordion Button Cell CheckBox CheckBoxTreeItem CheckMenuItem ChoiceBox ColorPicker ComboBox ContextMenu Hyperlink
+          Label ListCell ListView Menu MenuBar MenuButton MenuItem Pagination PasswordField PopupControl ProgressBar ProgressIndicator RadioButton
+          RadioMenuItem ScrollBar ScrollPane Separator SeparatorMenuItem Slider SplitMenuButton SplitPane Tab TableView TableColumn TabPane TextArea
+          TextField TitledPane ToggleButton ToggleGroup ToolBar Tooltip TreeCell TreeItem TreeView ContentDisplay OverrunStyle SelectionMode],
+          :effect => %w[Blend BlendMode Bloom BlurType BoxBlur ColorAdjust ColorInput DisplacementMap DropShadow GaussianBlur Glow ImageInput
           InnerShadow Lighting MotionBlur PerspectiveTransform Reflection SepiaTone Shadow],
           :image => %w[Image ImageView PixelReader PixelWriter],
-          :input => %w[Clipboard ContextMenuEvent DragEvent GestureEvent InputEvent InputMethodEvent KeyEvent 
-          Mnemonic MouseDragEvent MouseEvent RotateEvent ScrollEvent SwipeEvent TouchEvent ZoomEvent],
+          :input => %w[Clipboard ClipboardContent ContextMenuEvent DragEvent GestureEvent InputEvent InputMethodEvent KeyCode KeyEvent
+          Mnemonic MouseDragEvent MouseEvent RotateEvent ScrollEvent SwipeEvent TouchEvent TransferMode ZoomEvent],
           :layout => %w[AnchorPane BorderPane ColumnConstraints FlowPane GridPane HBox Pane Priority RowConstraints StackPane TilePane VBox],
-          :media => %w[Media MediaPlayer MediaView],
-          # TODO: fill this out
+          :media => %w[AudioClip AudioEqualizer AudioTrack EqualizerBand Media MediaException
+          MediaErrorEvent MediaMarkerEvent MediaPlayer MediaView VideoTrack],
           :paint => %w[Color CycleMethod ImagePattern LinearGradient Paint RadialGradient Stop],
-          :shape => %w[Arc ArcTo ArcType Circle ClosePath CubicCurve CubicCurveTo Ellipse FillRule HLineTo Line LineTo MoveTo Path PathElement 
+          :shape => %w[Arc ArcTo ArcType Circle ClosePath CubicCurve CubicCurveTo Ellipse FillRule HLineTo Line LineTo MoveTo Path PathElement
           Polygon Polyline QuadCurve QuadCurveTo Rectangle Shape StrokeLineCap StrokeLineJoin StrokeType SVGPath VLineTo],
           :text => %w[Font FontPosture FontSmoothingType FontWeight Text TextAlignment TextBoundsType],
           :transform => %w[Affine Rotate Scale Shear Translate],
@@ -95,7 +97,7 @@ module JRubyFX
         :util => ['Duration']
       }
     }
-  
+
     # Imports all the listed JavaFX classes
     java_import *(JFX_CLASS_HIERARCHY.flat_tree_inject do |res, name, values|
         name = "#{name.to_s}."
@@ -104,4 +106,4 @@ module JRubyFX
       end)
     java_import 'java.lang.Void'
   end
-end
+end

data/lib/jrubyfx/utils/__ignore_java_stupid_rdoc.rb

@@ -11,12 +11,18 @@ module Java #:nodoc: all
       end
       module control
       end
+      module effect
+      end
       module layout
       end
+      module media
+      end
       module paint
       end
       module shape
       end
+      module transform
+      end
     end
     module stage
     end

data/lib/jrubyfx/utils/common_converters.rb

@@ -14,11 +14,15 @@ 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
+false # Do NOT delete this or it will make RDOC associate the copyright header with JRubyFX module
+
 module JRubyFX
   module Utils
     # Contains conversion utilities to ease Ruby => JavaFX coding
     module CommonConverters
       java_import 'javafx.scene.paint.Color'
+      java_import 'javafx.geometry.Insets'
+      java_import 'javafx.geometry.Rectangle2D'
 
       # argument converter method name suffix
       ARG_CONVERTER_SUFFIX = '_arg_converter'
@@ -48,7 +52,20 @@ module JRubyFX
           (JRubyFX::Utils::CommonConverters.map_enums(enum_class)[value.to_s] || value)
         end
       end
-      
+
+      ##
+      # call-seq:
+      #   animation_converter_for :property_name, ...
+      #   
+      # Generates an animation adapter for the given properties so you can specify
+      # transformations, etc with a hashmap of from, to values
+      # === Examples
+      #   animation_converter_for :value
+      #   
+      #   ...
+      #   
+      #   _my_type_(value: {0 => 360})
+      #
       def animation_converter_for(*prop_names)
         prop_names.each do |prop_name|
           self.__send__(:define_method, prop_name.to_s + "=") do |hash|
@@ -72,9 +89,18 @@ module JRubyFX
       # *new_arg_converter* which will perform no argument coercion on
       # the first argument and a color coercion on the second argument.
       #
-      def converter_for(method_name, *converters)
+      #    e = enum_converter(Java::javafx::scene::input::TransferMode)
+      #    converter_for :accept_transfer_modes &e
+      #
+      # This method will allow a catch-all converter to be used for all
+      # arities not specified.  In this case since no arities are given
+      # all arities will pass through this enum_converter.  This form
+      # is useful for single var_args signatures.
+      #
+      def converter_for(method_name, *converters, &default)
         sheep = lambda do |direct, this, *values|
           converter = converters.find { |e| e.length == values.length }
+          converter = Array.new(values.length, default) unless converter
 
           # FIXME: Better error reporting on many things which can fail
           i = 0
@@ -115,6 +141,28 @@ module JRubyFX
           new_value = NAME_TO_COLORS[value.to_s.gsub(/_/, "")]
           new_value ? new_value : value
         },
+        :rectangle2d => lambda { |value|
+          if value == :empty
+            Rectangle2D::EMPTY
+          elsif value.is_a? Array
+            Rectangle2D.new(*value)
+          else
+            value
+          end
+        },
+        :insets => lambda { |value|
+          if value == :empty
+            Insets::EMPTY
+          elsif value.is_a? Numeric
+            Insets.new(value)
+          elsif value.is_a? Array
+            # top/bottom, left/right
+            value = [value[0], value[1], value[0], value[1]] if value.size == 2 
+            Insets.new(*value)
+          else
+            value
+          end
+        },
       }
       
       # Store enum mapping overrides

data/lib/jrubyfx/version.rb

@@ -1,4 +1,4 @@
 module JRubyFX
   # Current gem version. Used in rake task.
-  VERSION='0.9.1'
+  VERSION='0.9.2'
 end

data/lib/jrubyfx_tasks.rb

@@ -19,6 +19,8 @@ limitations under the License.
 require 'open-uri'
 require 'rake'
 require 'tmpdir'
+require "ant"
+require "pathname"
 
 module JRubyFX
   # This module contains utilities to jarify an app, and can be used in a rakefile or a running app.
@@ -28,8 +30,8 @@ module JRubyFX
     BASE_URL='http://repository.codehaus.org/org/jruby/jruby-complete'
 
     ##
-    # Downloads the jruby-complete jar file for `jruby_version` and save in 
-    # ~/.jruby-jar/jruby-complete.jar unless it already exits. If the jar is 
+    # Downloads the jruby-complete jar file for `jruby_version` and save in
+    # ~/.jruby-jar/jruby-complete.jar unless it already exits. If the jar is
     # corrupt or an older version, set force to true to delete and re-download
     def download_jruby(jruby_version, force=false)
       dist = "#{ENV['HOME']}/.jruby-jar"
@@ -37,19 +39,19 @@ module JRubyFX
         mkdir_p dist
         base_dir = Dir.pwd
         cd dist
-        puts "JRuby complete jar not found. Downloading... (May take awhile)"
+        $stderr.puts "JRuby complete jar not found. Downloading... (May take awhile)"
         download(jruby_version)
         cd base_dir
       end
     end
 
-    ## 
+    ##
     # Creates a full jar from the given source pattern (must be a pattern to match
     # files), with the given main script as the script to launch when the jarfile
     # is run. The output jar is saved in the `target` dir, which also doubles as a
     # temporary work dir. `jar` is the executable that makes jars. If `target` is
     # nill then a random temporary directory is created, and output_jar is the
-    # full path to the jar file to save 
+    # full path to the jar file to save
     def jarify_jrubyfx(src="src/*" ,main_script=nil, target="target", output_jar="jrubyfx-app.jar", opts = {})
       if target_was_nil = target == nil
         target = Dir.mktmpdir("jrubyfx")
@@ -71,11 +73,11 @@ module JRubyFX
       cp main_script, "#{target}/jar-bootstrap.rb" unless main_script == nil
 
       unless File.exists? "#{target}/jar-bootstrap.rb"
-        puts "@"*79
-        puts "@#{"!!!WARNING!!!".center(79-2)}@"
-        puts "@#{"jar-bootstrap.rb NOT FOUND!".center(79-2)}@"
-        puts "@#{"Did you set main_src= or have jar-bootstrap in src= ?".center(79-2)}@"
-        puts "@"*79
+        $stderr.puts "@"*79
+        $stderr.puts "@#{"!!!WARNING!!!".center(79-2)}@"
+        $stderr.puts "@#{"jar-bootstrap.rb NOT FOUND!".center(79-2)}@"
+        $stderr.puts "@#{"Did you set main_src= or have jar-bootstrap in src= ?".center(79-2)}@"
+        $stderr.puts "@"*79
       end
 
       #copy our libs in
@@ -96,6 +98,47 @@ module JRubyFX
       end
     end
 
+    # Uses Java 8 Ant task to create a native bundle (exe, deb, rpm, etc) of the
+    # specified jar-ified ruby script
+    def native_bundles(base_dir=Dir.pwd, output_jar, verbosity, app_name)
+      # Currently only JDK8 will package up JRuby apps. In the near
+      # future the necessary tools will be in maven central and
+      # we can download them as needed, so this can be changed then.
+      # this is in format "1.7.0_11-b21", check for all jdk's less than 8
+      if ENV_JAVA["java.runtime.version"].match(/^1\.[0-7]{1}\..*/)
+        raise "You must install JDK 8 to use the native-bundle packaging tools. You can still create an executable jar, though."
+      end
+      
+      output_jar = Pathname.new(output_jar)
+      dist_dir = output_jar.parent
+      jar_name = File.basename(output_jar)
+      out_name = File.basename(output_jar, '.*')
+
+      # Can't access the "fx" xml namespace directly, so we get it via __send__.
+      ant do
+        taskdef(resource: "com/sun/javafx/tools/ant/antlib.xml",
+          uri: "javafx:com.sun.javafx.tools.ant",
+          classpath: ".:${java.home}/../lib/ant-javafx.jar")
+        __send__("javafx:com.sun.javafx.tools.ant:deploy", nativeBundles: "all",
+          width: "100", height: "100", outdir: "#{base_dir}/build/",
+          outfile: out_name, verbose: verbosity) do
+          application(mainClass: "org.jruby.JarBootstrapMain", name: app_name)
+          resources do
+            fileset(dir: dist_dir) do
+              include name: jar_name
+            end
+          end
+        end
+      end
+
+      # These webstart files don't work, and the packager doesn't have an option to
+      # disable them, so remove them so the user isn't confused.
+      # FIXME: jnlp webstart
+      full_build_dir = "#{base_dir}/build/"
+      rm FileList["#{full_build_dir}*.html","#{full_build_dir}*.jnlp"]
+    end
+
+
     private
     def download(version_string) #:nodoc:
       File.open("jruby-complete.jar","wb") do |f|
@@ -105,6 +148,7 @@ module JRubyFX
 
     module_function :jarify_jrubyfx
     module_function :download_jruby
+    module_function :native_bundles
     module_function :download
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: jrubyfx
 version: !ruby/object:Gem::Version
+  version: 0.9.2
   prerelease:
-  version: 0.9.1
 platform: java
 authors:
 - Patrick Plenefisch
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -39,7 +39,7 @@ email:
 - nahi@ruby-lang.org
 - asari.ruby@gmail.com
 executables:
-- rubyfx-generator
+- jrubyfx-generator
 - jrubyfx-jarify
 extensions: []
 extra_rdoc_files: []
@@ -57,11 +57,20 @@ files:
 - lib/jrubyfx/core_ext/border_pane.rb
 - lib/jrubyfx/core_ext/circle.rb
 - lib/jrubyfx/core_ext/column_constraints.rb
+- lib/jrubyfx/core_ext/drag_event.rb
+- lib/jrubyfx/core_ext/drag_event.rb~
 - lib/jrubyfx/core_ext/duration.rb
 - lib/jrubyfx/core_ext/effects.rb
 - lib/jrubyfx/core_ext/file_chooser.rb
+- lib/jrubyfx/core_ext/image_view.rb
+- lib/jrubyfx/core_ext/image_view.rb~
 - lib/jrubyfx/core_ext/labeled.rb
 - lib/jrubyfx/core_ext/media_player.rb
+- lib/jrubyfx/core_ext/menu.rb
+- lib/jrubyfx/core_ext/menu.rb~
+- lib/jrubyfx/core_ext/menu_bar.rb
+- lib/jrubyfx/core_ext/menu_bar.rb~
+- lib/jrubyfx/core_ext/menu_item.rb
 - lib/jrubyfx/core_ext/node.rb
 - lib/jrubyfx/core_ext/observable_value.rb
 - lib/jrubyfx/core_ext/pagination.rb
@@ -79,15 +88,19 @@ files:
 - lib/jrubyfx/core_ext/table_view.rb
 - lib/jrubyfx/core_ext/timeline.rb
 - lib/jrubyfx/core_ext/transition.rb
+- lib/jrubyfx/core_ext/tree_item.rb
+- lib/jrubyfx/core_ext/tree_item.rb~
+- lib/jrubyfx/core_ext/tree_view.rb
+- lib/jrubyfx/core_ext/tree_view.rb~
 - lib/jrubyfx/core_ext/xy_chart.rb
 - lib/jrubyfx/utils/__ignore_java_stupid_rdoc.rb
 - lib/jrubyfx/utils/common_converters.rb
 - lib/jrubyfx/utils/common_utils.rb
 - LICENSE
 - README.md
-- bin/rubyfx-generator
+- bin/jrubyfx-generator
 - bin/jrubyfx-jarify
-homepage: https://github.com/byteit101/JRubyFX
+homepage: https://github.com/jruby/jrubyfx
 licenses: []
 post_install_message:
 rdoc_options: []