shoes-swt 4.0.0.pre10 → 4.0.0.pre11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5568168dba00b066067857b6851707061f81ce275c5433c703bf6f063cf676b6
-  data.tar.gz: '08a5ab31927b65327622b913cd240b1cc7065bf672b638ce11dfd2ffa11a60bc'
+  metadata.gz: c09977e2aa7d8d84bfc7a5c71fc8aaa3ec8c31f88616266febf0e0d9684139f1
+  data.tar.gz: 816a6a60e7d9a29314c2dcc532cfba105d674ff2d0c282defd2c8ef32123f527
 SHA512:
-  metadata.gz: 165e28c2286c5983066af12851ac288da3fb4800e1112bf2177876873ffc3467fe2b6d3a196a91b0b8902f900602ea208642cbb51b66ace23e2b2c62ae0a51db
-  data.tar.gz: afbf71d8d6436e73bd5a34ea2366e2027e983aa215e00b32d7c006905a8a961714abd5bb4c51ef03880626a10ec4206ddf99ff8b2c755962f9fb4e8b82092cc0
+  metadata.gz: da4721c20e3aaadf9a866435e8230ea1a57eb2849d8990975c3be081c251164a5e4772cd091bc1dba2e50982603a9dd0114dd4edffca112c1c35b3fa74dde0f9
+  data.tar.gz: a686968991a518351c2ef7b51a8e87ddf3c703e98db5f6df553fb9da451ede1b9541eb04582f43195bfde6d96bd60f290f81eb8a2fa376a455c5acfd7938140c

data/bin/shoes-swt

@@ -3,7 +3,31 @@
 lib_directory = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH << lib_directory
 
-if File.exist?("Gemfile")
+# We want the Gemfile alongside the Shoes code that we're executing, not
+# necessarily the Gemfile in our current directory. This helps in both running
+# and packaging apps that have their own Gemfiles, even if we run `shoes` from
+# another location.
+candidates = (ARGV + ["."]).map do |candidate|
+  File.expand_path(File.join(File.dirname(candidate), "Gemfile"))
+end
+
+gemfile = candidates.uniq.find do |candidate|
+  File.exist?(candidate)
+end
+
+if gemfile
+  if defined?(Bundler) && gemfile != Bundler.default_gemfile.to_s
+    puts <<~EOS
+      Shoes wants to load the Gemfile from '#{gemfile}'
+      But you've already loaded Gemfile at '#{Bundler.default_gemfile}'
+
+      Instead of `bundle exec shoes`, try just `shoes` instead. We'll load Bundler for you.
+
+    EOS
+  end
+
+  # Thanks Bundler for the ENV vars! <3
+  ENV["BUNDLE_GEMFILE"] = gemfile
   require "bundler/setup"
   Bundler.require
 end

data/lib/shoes/swt/arrow_painter.rb

@@ -52,7 +52,12 @@ class Shoes
         end
       end
 
+      def dispose
+        clear_path
+      end
+
       def clear_path
+        @path.dispose unless @path.nil? || @path.disposed?
         @path = nil
       end
     end

data/lib/shoes/swt/click_listener.rb

@@ -45,7 +45,7 @@ class Shoes
         return if handlers.nil? || handlers.empty?
 
         handlers = handlers.to_a
-                           .select { |dsl, _| !dsl.hidden? }
+                           .reject { |dsl, _| dsl.hidden? }
                            .select { |dsl, _| dsl.in_bounds?(event.x, event.y) }
 
         # Take the last handler as an approximation of the "top-most" element

data/lib/shoes/swt/common/remove.rb

@@ -12,7 +12,7 @@ class Shoes
         end
 
         def dispose_held_resources
-          @color_factory.dispose unless @color_factory.nil?
+          @color_factory&.dispose
         end
 
         # Classes should override to dispose of any Swt resources they create

data/lib/shoes/swt/common/resource.rb

@@ -13,7 +13,7 @@ class Shoes
 
         def dispose_previous_contexts
           @graphic_contexts ||= []
-          @graphic_contexts.each { |g| g.dispose if g }
+          @graphic_contexts.each { |g| g&.dispose }
           @graphic_contexts.clear
         end
 

data/lib/shoes/swt/common/stroke.rb

@@ -20,7 +20,7 @@ class Shoes
         #
         # @return [Integer] The alpha value of this object's stroke color (0-255)
         def stroke_alpha
-          dsl.stroke.alpha if dsl.stroke
+          dsl&.stroke&.alpha
         end
 
         # This object's strokewidth

data/lib/shoes/swt/gradient.rb

@@ -10,8 +10,8 @@ class Shoes
       end
 
       def dispose
-        @color1.dispose if @color1
-        @color2.dispose if @color2
+        @color1&.dispose
+        @color2&.dispose
 
         @patterns.each do |pattern|
           pattern.dispose unless pattern.disposed?
@@ -62,7 +62,7 @@ class Shoes
 
       def determine_args_based_on_angle(angle, left, top, width, height)
         x, y = calculate_x_and_y(angle, height, width)
-        if 0 <= angle && angle < Math::PI * 0.5
+        if angle >= 0 && angle < Math::PI * 0.5
           args = [left + width + x, top + height - y, left + width - x, top + height + y]
         elsif Math::PI * 0.5 <= angle && angle < Math::PI
           args = [left + width + y, top + height + x, left + width - y, top + height - x]

data/lib/shoes/swt/image_pattern.rb

@@ -10,8 +10,8 @@ class Shoes
       end
 
       def dispose
-        @image.dispose if @image
-        @pattern.dispose if @pattern
+        @image&.dispose
+        @pattern&.dispose
       end
 
       # Since colors are bound up (at least in specs) with image patterns,

data/lib/shoes/swt/key_listener.rb

@@ -88,23 +88,23 @@ class Shoes
       end
 
       def alt?(event)
-        is_this_modifier_key?(event, ::Swt::SWT::ALT)
+        this_modifier_key?(event, ::Swt::SWT::ALT)
       end
 
       def control?(event)
-        is_this_modifier_key?(event, ::Swt::SWT::CTRL)
+        this_modifier_key?(event, ::Swt::SWT::CTRL)
       end
 
       def shift?(event)
-        is_this_modifier_key?(event, ::Swt::SWT::SHIFT)
+        this_modifier_key?(event, ::Swt::SWT::SHIFT)
       end
 
       def super?(event)
-        is_this_modifier_key?(event, ::Swt::SWT::COMMAND)
+        this_modifier_key?(event, ::Swt::SWT::COMMAND)
       end
 
       # NOTE: state_mask and key_code error for me so the java version is used
-      def is_this_modifier_key?(event, key)
+      def this_modifier_key?(event, key)
         (event.stateMask & key) == key
       end
 

data/lib/shoes/swt/link_segment.rb

@@ -8,7 +8,7 @@ class Shoes
         @text_segment = text_segment
 
         # Don't create regions for empty links!
-        return unless @range.count > 0
+        return unless @range.count.positive?
 
         add_regions_for_lines(lines_for_link)
         offset_regions(text_segment.element_left, text_segment.element_top)

data/lib/shoes/swt/packager.rb

@@ -31,6 +31,11 @@ class Shoes
       end
 
       def run(path)
+        if @packages.empty?
+          puts "You must select at least one packaging format.\n\n#{::Shoes::UI::CLI::PackageCommand.help}"
+          return
+        end
+
         begin
           require 'shoes/package'
           require 'shoes/package/configuration'

data/lib/shoes/swt/rect_painter.rb

@@ -31,11 +31,11 @@ class Shoes
       end
 
       def rounded?
-        (@obj.corners || 0) > 0
+        (@obj.corners || 0).positive?
       end
 
       def strokewidth?
-        (@obj.dsl.style[:strokewidth] || 0) > 0
+        (@obj.dsl.style[:strokewidth] || 0).positive?
       end
     end
   end

data/lib/shoes/swt/text_block/fitter.rb

@@ -151,7 +151,7 @@ class Shoes
             # Try to find a parent container we fit in.
             # If that doesn't work, just bail with [0,0] so we don't crash.
             width = width_from_ancestor if width <= 0
-            return [0, 0] if width < 0
+            return [0, 0] if width.negative?
           end
 
           [width, height]
@@ -162,7 +162,7 @@ class Shoes
         def width_from_ancestor
           width = -1
           current_ancestor = @dsl.parent
-          until width > 0 || current_ancestor.nil?
+          until width.positive? || current_ancestor.nil?
             width = @dsl.desired_width(current_ancestor.width)
 
             break unless current_ancestor.respond_to?(:parent)

data/lib/shoes/swt/text_block/text_segment.rb

@@ -68,7 +68,7 @@ class Shoes
 
         def set_style(styles, range = (0...text.length))
           # If we've been given an empty/nonsense range, just ignore it
-          return unless range.count > 0
+          return unless range.count.positive?
 
           font = @font_factory.create_font(styles[:font_detail])
           style = @style_factory.create_style(font, styles[:fg], styles[:bg], styles)

data/lib/shoes/swt/text_block/text_segment_collection.rb

@@ -88,7 +88,7 @@ class Shoes
         end
 
         def segment_at_text_position(index)
-          return @segments.last if index < 0
+          return @segments.last if index.negative?
           segment_ranges(index..index).first.first
         end
 
@@ -149,7 +149,7 @@ class Shoes
         end
 
         def at_end?(index)
-          index < 0 || index > @dsl.text.length
+          index.negative? || index > @dsl.text.length
         end
 
         def relative_end_position

data/lib/shoes/swt/text_block/text_style_factory.rb

@@ -87,7 +87,7 @@ class Shoes
       end
 
       def style_present?(style)
-        !style.nil? && !(style == 'none')
+        !style.nil? && (style != 'none')
       end
     end
   end

data/lib/shoes/swt/version.rb

@@ -2,6 +2,6 @@
 
 class Shoes
   module Swt
-    VERSION = "4.0.0.pre10"
+    VERSION = "4.0.0.pre11"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoes-swt
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre10
+  version: 4.0.0.pre11
 platform: ruby
 authors:
 - Team Shoes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-17 00:00:00.000000000 Z
+date: 2017-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre10
+        version: 4.0.0.pre11
   name: shoes-core
   prerelease: false
   type: :runtime
@@ -51,13 +51,13 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre10
+        version: 4.0.0.pre11
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre10
+        version: 4.0.0.pre11
   name: shoes-package
   prerelease: false
   type: :runtime
@@ -65,7 +65,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre10
+        version: 4.0.0.pre11
 description: A JRuby and Swt backend for Shoes, the best little GUI toolkit for Ruby.
   Shoes makes building for Mac, Windows, and Linux super simple.
 email: