shoes-swt 4.0.0.pre2 → 4.0.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc2fdddb4dde0f1851a14ad6d80eba05bbfbcbf8
-  data.tar.gz: 46f67fe6b3e5862691160e72ffe11fdeb2c16fb2
+  metadata.gz: 6157cdc9610526ffb063c6c08ee1a78d77d26e86
+  data.tar.gz: 29e9d0f9376d61eabcdafe9429e9c914bcd3aa99
 SHA512:
-  metadata.gz: efd9df04dd3ff0ab42b48199549fdd8e106bc1800253596b8c08faf38ff31f685f9fbabbe1b79a467a7121f2fb4fba65861f00182f92ebe8a342d8c839d97b7b
-  data.tar.gz: 0f90a7302a227e3781dc04438b0a238a786d2f9fbfade0ae3627225fd22de5350704243c5d19d25dfd501820ff300f65a2f59740ab6382e31eca7a07020f03b4
+  metadata.gz: d357ec7854ea59d2746ad44a482e13be4d3f4f0a06bfb7fbf01e3d31da2046c3df97babfad75d4faa4bf0925dcf6716420c3c8d5c5e7bb7ecdce1d036fac278d
+  data.tar.gz: 517a9db8cd6880ffeeea32425604800879c1a9c02670e0d11e0a762643e193b49edd0f5542edcad802dd8e40c199aa562c4dcc952f4058067e2f71bc8a7289b9

data/README.md

@@ -1,201 +1,6 @@
-# shoes4 [![Build Status](https://secure.travis-ci.org/shoes/shoes4.svg?branch=master)](http://travis-ci.org/shoes/shoes4)[![Code Climate](https://img.shields.io/codeclimate/github/shoes/shoes4.svg)](https://codeclimate.com/github/shoes/shoes4)[![Coverage Status](https://img.shields.io/coveralls/shoes/shoes4.svg)](https://coveralls.io/r/shoes/shoes4?branch=master)[![Dependency Status](https://img.shields.io/gemnasium/shoes/shoes4.svg)](https://gemnasium.com/shoes/shoes4)
+# shoes-swt
 
-Shoes 4 : the next version of Shoes
-
-## Pre-alpha
-
-Hi there, thanks for checking by! Shoes 4 is still pre-alpha software. It currently supports almost all of the shoes DSL, but there are still some spots where you might get surprising results. If you're not too adventurous just yet you can still use the [old shoes](https://github.com/shoes/shoes)!
-
-There is a first [preview release](https://rubygems.org/gems/shoes/versions/4.0.0.pre1) now :)
-
-## Installing Shoes4
-
-There are two ways to get your hands on shoes 4 - the preview gem release and installing it straight from github. For both you need a current [JRuby](http://www.jruby.org/) installation.
-
-
-### Get a JDK and JRuby
-
-So your first step is to install a [JDK](http://www.oracle.com/technetwork/java/javase/downloads/) (shoes also works with [OpenJDK](http://openjdk.java.net/)) and [JRuby](http://jruby.org). Make sure to grab the appropriate JRuby version for your operating system. On Linux/Mac you can also use ruby installation tools to install JRuby. For instance [rvm](http://rvm.io/):
-
-    $ rvm install jruby
-    
-**Important JRuby version note:** JRuby 1.7.14 and 1.7.15 have a bug where `bundle install` won't work with shoes4. Make sure to use JRuby 1.7.16 or JRuby-1.7.13 with shoes4.
-    
-**JDK version note:** While shoes4 should generally work with JDK version 6 and up we recommend to use newer version. Also within the JDK major version make sure to have the latest updates installed, we had cases where newer versions resolved bugs.
-
-### Installing Shoes4 as a gem
-
-#### *nix (Mac OSX/Linux)
-
-    $ gem install shoes --pre
-
-#### Windows
-
-    C:\tmp> jruby -S gem install shoes --pre
-
-### Installing Shoes4 from github
-
-If you want to be on the bleeding edge or want to contribute code you need to install it straight from the github repository.
-
-#### *nix (Mac OSX/Linux)
-
-1. Fork the repository and clone your fork, or
-
-        $ git clone git://github.com/shoes/shoes4.git
-
-2. Set up your local environment
-
-        $ cd shoes4
-        $ gem install bundler && bundle install
-
-Note: If you got rvm, rbenv or something like that installed it might complain that you should use jruby version xx. That's because we keep our .ruby-version files up to date. You should be able to run it with a JRuby version >= 1.7.0. We recommend up to date versions though.
-
-3. You're ready to go!
-
-#### Windows
-
-1. Fork the repository and clone your fork, or
-
-        C:\tmp> git clone git://github.com/shoes/shoes4.git
-
-2. Set up your local environment
-
-        C:\tmp>cd shoes4
-        C:\tmp\shoes4>jruby -S gem install bundler
-        C:\tmp\shoes4>jruby -S bundle install
-
-3. You're ready to go!
-
-## Running a Shoes App
-
-Shoes 4 comes with a command-line app runner. Just pass it the filename of your Shoes app.
-
-    $ bin/shoes samples/simple-sound.rb
-
-**Note:** For Windows, `C:\tmp\shoes4>bin\shoes samples\simple-sound.rb` If you installed Shoes4 as a gem, just do `C:\tmp> shoes path\to\file.rb`
-
-There is also a simple ruby starter script which you may use as follows:
-
-    $ bin/ruby-shoes samples/simple-sound.rb
-
-This does not work yet on Mac as JRuby (the JVM) needs some additional parameters. Here you can just do the following (which basically is what bin/shoes does):
-
-    $ jruby -J-XstartOnFirstThread bin/ruby-shoes samples/simple-sound.rb
-
-Another alternative yet is to put `require 'shoes'` at the top of your applications, then you can simply do
-
-    $ jruby path/to/file.rb
-
-On OS X you still need to supply the additional parameters to JRuby
-
-    $ jruby -J-XstartOnFirstThread path/to/file.rb
-
-## Want to see what shoes can do?
-
-You can run `rake samples` and random samples we believe are working will be run until you quit with Ctr + C. Some of them are really simple, while others are more complex or even games!
-If you notice any issue with those samples please [let us know](https://github.com/shoes/shoes4/issues/new)!
-
-## Packaging a Shoes App
-
-Packaging is just a baby, so be gentle.
-
-In order to package an app, you need to have the Shoes gem installed in your environment. If you didn't do the gem installation you can always generate a gem and install it from the current source:
-
-    $ rake install:all
-
-Now, you can package an app. But first, look here:
-
-- The packager will include ***everything*** in the directory of your shoes script and below, unless you tell it not to.
-- The packager will probably not work properly if it detects a `.gemspec` or a `Gemfile`. It uses Warbler, which always looks for those files. If you run the specs, you may notice some warnings like this:
-
-> warning: Bundler \`path' components are not currently supported.
-> The \`shoes-4.0.0.pre1' component was not bundled.
-> Your application may fail to boot!
-
-That's Warbler talking. Actually, we sneak the Shoes gem in anyway, but don't tell.
-
-Okay, now for real. The simplest thing is to put your script in a directory by itself and then:
-
-    $ bin/shoes -p swt:app path/to/directory-of/your-shoes-app.rb
-
-This will produce a Mac app, which you can then find at `path/to/directory-of/pkg/Shoes App.app`.
-
-You can also package a shoes app up as a jar through:
-
-    $ bin/shoes -p swt:jar path/to/directory-of/your-shoes-app.rb
-
-You can find the jar in the same directory as above, i.e. path/to/directory-of/pkg/your-shoes-app.jar
-
-If you want more control (like you want to name your app something besides "Shoes App", or you don't want to include all of those files we talked about before), make an `app.yaml` file. See [the example](https://github.com/shoes/shoes4/blob/master/app.yaml) for more details.
-
-***Note:*** *If you use an `app.yaml`, you will have to customize or comment out each option. The example is just an example ;)*
-
-When you have an `app.yaml` file right next to your script, you have three options:
-
-    $ bin/shoes -p swt:app path/to/directory-of/your-shoes-app.rb
-    $ bin/shoes -p swt:app path/to/directory-of/app.yaml
-    $ bin/shoes -p swt:app path/to/directory-of
-
-The packager will find your instructions using any of those commands. Again, you'll find your app in the `pkg` directory inside your project's directory. Find out more at `bin/shoes --help`.
-
-Oh, and you can also just run your Shoes apps with `bin/shoes`.
-
-## Want to contribute?
-
-That's awesome, thank you!
-
-You can go ahead an try to fix one of our [issues](https://github.com/shoes/shoes4/issues).
-We have introduced a new tag 'Newcomer Friendly' for issues we believe are suitable to get started with shoes contributing. These issues either are relatively easy to accomplish or don't depend on a lot of other shoes code (e.g. completely new features) so that it's easier to get started.
-Please feel free to tackle any issue - we will help you if needed. The tag is just a suggestion! =)
-
-Also there is a list of samples that already work at samples/README, along with all the other samples. You can try to get a new sample to run. In order to do so you can run `rake non_samples` to run a random sample we think does not work. If you just want to list the non working samples you can also run `rake list_non_samples`.
-
-With all you do, please make sure to write specs as Shoes 4 is developed TDD-style (see the [Running Specs](https://github.com/shoes/shoes4#running-specs) section below). So make sure that you don't break any tests :-)
-
-If you feel unsure about testing or your implementation just open an issue or a pull request. Pull requests don't need to be done - they are great discussion starters! We're happy to help you get your contribution ready to be merged in order to help build Shoes 4!
-
-In fact we greatly appreciate early pull requests to review code and help you find your way around Shoes4! =)
-
-If you have questions, also feel free to drop by on the #shoes channel on FreeNode irc. People might not respond instantly, but after some time someone will respond :-)
-
-It sometimes is also a good way to refactor some code or write some specs in order to get familiar with a project. If you want to try this approach you can have a look at our [Code Climate](https://codeclimate.com/github/shoes/shoes4) to find candidates for refactoring or after running the specs locally take a peak into the coverage directory and open index.html - it shows you our current coverage data. See something that isn't covered and maybe you can write a spec for it?
-
-Refer to the following section for information on how to run the specs, that were mentioned before :-)
-
-## Running Specs
-
-Shoes 4 is developed in a TDD style. You should be writing and running the specs :)
-
-There are two kinds of Shoes 4 specs:
-
-1. **Integration specs:** These specify the functionality of the Shoes
-   DSL. They can be run with any compatible Shoes backend. Shoes 4 comes
-   with a mock backend and an Swt backend that can run the integration
-   specs.
-
-2. **Isolation specs:** These specify the internal behavior of a Shoes
-   backend, in isolation from the DSL. Shoes 4 comes with an isolation spec
-   suite for the Swt backend.
-
-There are rake tasks for running specs. Some examples:
-
-    $ rake spec                      # Run the whole spec suite
-    $ rake spec:shoes                # Run integration specs using the mock backend
-    $ rake spec:swt                  # Run integration specs using the Swt backend, plus isolation specs for the Swt backend
-    $ rake spec:swt:isolation        # Run isolation specs for the Swt backend
-    $ rake spec:swt:integration      # Run integration specs using the Swt backend
-    $ rake spec[Shape]               # Run the whole spec suite, but only for Shape
-    $ rake spec:shoes[Shape]         # Run integration specs for Shape using the mock backend
-    $ rake spec:swt[Shape]           # Run integration and isolation specs for Shape, using the Swt backend
-    $ rake spec:swt:isolation[Shape] # Run isolation specs for Shape using the Swt backend
-
-**Note:** For Windows, `C:\tmp\shoes4>jruby -S rake spec`
-
-## Contact
-
-Want to get in touch with the shoes community? That's great! You can get in touch here:
-
-* You can join the mailing list, simply send an email to shoes@librelist.com - you can also check out [the archives](http://librelist.com/browser/shoes/)
-* We also have an irc channel #shoes on freenode - a lot of people are idling there so it might take some time to react
-
-However we try to keep most discussions about the development in this repository/its issues so everyone can see them and look them up.
+This is the default shoes backend, implemented for JRuby using the SWT library.
+In addition to implementing the full backend interface it also installs the
+`shoes-swt` executable which can be targeted by the main `shoes-picker`
+executable.

data/Rakefile

@@ -0,0 +1 @@
+require 'bundler/gem_tasks'

data/bin/shoes-swt

@@ -0,0 +1,11 @@
+#!/usr/bin/env jruby
+lib_directory = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH << lib_directory
+
+if File.exists?("Gemfile")
+  require "bundler/setup"
+  Bundler.require
+end
+
+require 'shoes/ui/cli'
+Shoes::CLI.new.run ARGV

data/lib/shoes/swt.rb

@@ -29,7 +29,7 @@ class Shoes
     extend ::Shoes::Common::Registration
 
     module Shoes
-      def self.app(opts={}, &blk)
+      def self.app(opts = {}, &blk)
         Shoes::App.new(opts, &blk)
         Shoes.logger.debug "Exiting Shoes.app"
       end
@@ -42,7 +42,7 @@ class Shoes
         ::Swt::Widgets::Display.getCurrent
       end
 
-      ::Swt::Widgets::Display.new.getFontList(nil, true).each{|f| ::Shoes::FONTS << f.getName}
+      ::Swt::Widgets::Display.new.getFontList(nil, true).each { |f| ::Shoes::FONTS << f.getName }
       ::Shoes::FONTS.uniq!
     end
   end
@@ -51,6 +51,7 @@ end
 Shoes.configuration.backend = :swt
 
 require 'shoes/swt/disposed_protection'
+require 'shoes/swt/click_listener'
 require 'shoes/swt/color'
 require 'shoes/swt/color_factory'
 require 'shoes/swt/common/child'
@@ -112,6 +113,8 @@ require 'shoes/swt/text_block/fitter'
 require 'shoes/swt/text_block/text_font_factory'
 require 'shoes/swt/text_block/text_style_factory'
 
+require 'shoes/swt/packager'
+
 require 'shoes/swt/tooling/leak_hunter' if ENV["LEAK_HUNTER"]
 
 # redrawing aspect needs to know all the classes

data/lib/shoes/swt/animation.rb

@@ -1,7 +1,6 @@
 class Shoes
   module Swt
     class Animation
-
       attr_reader :task
 
       # An Swt animation implementation
@@ -15,7 +14,7 @@ class Shoes
 
         # Wrap the animation block so we can count frames.
         # Note that the task re-calls itself on each run.
-        @task = Proc.new do
+        @task = proc do
           unless animation_removed?
             run_animation unless @dsl.stopped?
             schedule_next_animation
@@ -29,6 +28,7 @@ class Shoes
       end
 
       private
+
       def animation_removed?
         @app.real.disposed? || @dsl.removed?
       end

data/lib/shoes/swt/app.rb

@@ -19,10 +19,9 @@ class Shoes
       include Common::Container
       include Common::Clickable
 
-      attr_reader :dsl, :real, :shell, :clickable_elements
+      attr_reader :dsl, :real, :shell, :click_listener
 
-      def initialize dsl
-        @clickable_elements = []
+      def initialize(dsl)
         @dsl = dsl
         ::Swt::Widgets::Display.app_name = @dsl.app_title
         @background = Color.new(@dsl.opts[:background])
@@ -58,24 +57,20 @@ class Shoes
       end
 
       def width
-        if overlay_scrollbars?
-          @shell.client_area.width
-        else
-          width_adjusted_for_scrollbars
-        end
+        shell.client_area.width
       end
 
       def height
-        @shell.client_area.height
+        shell.client_area.height
       end
 
       def disposed?
         @shell.disposed? || @real.disposed?
       end
 
-      def redraw(left=nil, top=nil, width=nil, height=nil, all=true)
+      def redraw(left = nil, top = nil, width = nil, height = nil, all = true)
         unless @real.disposed?
-          if (left == nil or top == nil or width == nil or height == nil)
+          if left.nil? || top.nil? || width.nil? || height.nil?
             @real.redraw
           else
             @real.redraw(left, top, width, height, all)
@@ -94,14 +89,15 @@ class Shoes
       end
 
       def scroll_top
-        @real.getLocation.y
+        @real.location.y
       end
 
       def scroll_top=(n)
         @real.setLocation 0, -n
-        @shell.getVerticalBar.setSelection n
+        @shell.vertical_bar.selection = n
       end
 
+      # Java doesn't like ruby-style accessors here for some reason
       def clipboard
         ::Swt::Clipboard.new(Shoes.display).getContents ::Swt::TextTransfer.getInstance
       end
@@ -121,8 +117,8 @@ class Shoes
         @shell.full_screen
       end
 
-      def add_clickable_element(element)
-        @clickable_elements << element
+      def clickable_elements
+        @click_listener.clickable_elements
       end
 
       def started?
@@ -134,7 +130,7 @@ class Shoes
       # method is called, we don't rely on its reported value.
       def gutter
         # 16
-        @shell.getVerticalBar.getSize.x
+        @shell.vertical_bar.size.x
       end
 
       def add_key_listener(listener)
@@ -145,12 +141,21 @@ class Shoes
         @key_listeners[listener.class].delete(listener)
       end
 
+      # For use from modal Shoes windows, keeps pumping UI messages but hangs
+      # on from executing other Shoes code until we're done.
+      def wait_until_closed
+        until @shell.isDisposed
+          ::Swt.display.sleep unless ::Swt.display.readAndDispatch
+        end
+      end
+
       private
+
       def initialize_scroll_bar
-        scroll_bar = @shell.getVerticalBar
-        scroll_bar.setIncrement 10
+        scroll_bar = @shell.vertical_bar
+        scroll_bar.increment = 10
         selection_listener = SelectionListener.new(scroll_bar) do |vertical_bar, event|
-          if self.shell.getVerticalBar.getVisible and event.detail != ::Swt::SWT::DRAG
+          if shell.vertical_bar.visible && event.detail != ::Swt::SWT::DRAG
             vertically_scroll_window(vertical_bar)
           end
         end
@@ -158,9 +163,9 @@ class Shoes
       end
 
       def vertically_scroll_window(vertical_bar)
-        location = self.real.getLocation
-        location.y = -vertical_bar.getSelection
-        self.real.setLocation location
+        location = real.location
+        location.y = -vertical_bar.selection
+        real.location = location
       end
 
       def force_shell_size
@@ -172,15 +177,16 @@ class Shoes
       end
 
       def main_window_on_close
-        lambda { |event|
+        lambda do |_event|
           ::Swt.display.dispose
-          Dir[File.join(Dir.tmpdir, "__shoes4_*.png")].each{|f| File.delete f}
-        }
+          Dir[File.join(Dir.tmpdir, "__shoes4_*.png")].each { |f| File.delete f }
+        end
       end
 
       def main_window_style
         style  = ::Swt::SWT::CLOSE | ::Swt::SWT::MIN | ::Swt::SWT::V_SCROLL
         style |= ::Swt::SWT::RESIZE | ::Swt::SWT::MAX if @dsl.opts[:resizable]
+        style |= ::Swt::SWT::APPLICATION_MODAL        if @dsl.opts[:modal]
         style
       end
 
@@ -196,9 +202,9 @@ class Shoes
 
       def initialize_real
         @real = ::Swt::Widgets::Composite.new(@shell,
-          ::Swt::SWT::TRANSPARENT | ::Swt::SWT::NO_RADIO_GROUP)
-        @real.setSize(@dsl.width - @shell.getVerticalBar.getSize.x, @dsl.height)
-        @real.setLayout init_shoes_layout
+                                              ::Swt::SWT::TRANSPARENT | ::Swt::SWT::NO_RADIO_GROUP)
+        @real.setSize(@dsl.width - @shell.vertical_bar.size.x, @dsl.height)
+        @real.layout = init_shoes_layout
       end
 
       # it seems like the class can not not have a constructor with an argument
@@ -213,6 +219,7 @@ class Shoes
         attach_shell_event_listeners
         attach_real_event_listeners
         attach_key_event_listeners
+        attach_click_listener
       end
 
       def attach_shell_event_listeners
@@ -222,7 +229,7 @@ class Shoes
       end
 
       def unregister_app
-        proc do |event|
+        proc do |_event|
           ::Shoes::Swt.unregister(self)
         end
       end
@@ -252,22 +259,13 @@ class Shoes
         end
       end
 
-      def for_this_shell?(evt)
-        evt.widget.shell == @shell unless evt.widget.disposed?
+      def attach_click_listener
+        @click_listener = ClickListener.new(self)
       end
 
-      def overlay_scrollbars?
-        @shell.scrollbars_mode == ::Swt::SWT::SCROLLBAR_OVERLAY
-      end
-
-      def width_adjusted_for_scrollbars
-        if @shell.getVerticalBar.getVisible
-          @shell.client_area.width + @shell.getVerticalBar.getSize.x
-        else
-          @shell.client_area.width
-        end
+      def for_this_shell?(evt)
+        evt.widget.shell == @shell unless evt.widget.disposed?
       end
-
     end
 
     class ShellControlListener
@@ -277,21 +275,19 @@ class Shoes
 
       def controlResized(event)
         shell = event.widget
-        width = shell.client_area.width
+        width  = shell.client_area.width
         height = shell.client_area.height
-        @app.dsl.top_slot.width   = width
-        @app.dsl.top_slot.height  = height
         @app.real.setSize width, height
         @app.real.layout
-        @app.dsl.resize_callbacks.each{|blk| blk.call}
+        @app.dsl.resize_callbacks.each(&:call)
       end
 
-      def controlMoved(e)
+      def controlMoved(_e)
       end
     end
 
     class MouseListener
-      def initialize app
+      def initialize(app)
         @app = app
       end
 
@@ -305,10 +301,9 @@ class Shoes
         @app.dsl.mouse_pos = [e.x, e.y]
       end
 
-      def mouseDoubleClick(e)
+      def mouseDoubleClick(_e)
         # do nothing
       end
     end
-
   end
 end