shoes-swt 4.0.0.pre9 → 4.0.0.pre10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fa7f22da50579179f09bcba6ec3b1f589fef9d8b
-  data.tar.gz: 363298706bad5dcf25350458fe15e12e57888258
+SHA256:
+  metadata.gz: 5568168dba00b066067857b6851707061f81ce275c5433c703bf6f063cf676b6
+  data.tar.gz: '08a5ab31927b65327622b913cd240b1cc7065bf672b638ce11dfd2ffa11a60bc'
 SHA512:
-  metadata.gz: 026df8ba229e2903b7f21c9a417e9d2834bcfa3671a045fff862c0ae51999c1cc025da331d723379aca6c49acaf705d7e11bed81a5c162f0efb601271de59aae
-  data.tar.gz: 6a1712511969ca616ec9077b4f3ae8af4ce780cb72688bb64e98624b86d69a82d32a89b8876eae71bfdbe46b83e6c937438e6ebfed7906c2a094303622c4ab83
+  metadata.gz: 165e28c2286c5983066af12851ac288da3fb4800e1112bf2177876873ffc3467fe2b6d3a196a91b0b8902f900602ea208642cbb51b66ace23e2b2c62ae0a51db
+  data.tar.gz: afbf71d8d6436e73bd5a34ea2366e2027e983aa215e00b32d7c006905a8a961714abd5bb4c51ef03880626a10ec4206ddf99ff8b2c755962f9fb4e8b82092cc0

data/bin/shoes-swt

@@ -9,4 +9,4 @@ if File.exist?("Gemfile")
 end
 
 require 'shoes/ui/cli'
-Shoes::CLI.new("swt").run ARGV
+Shoes::UI::CLI.new("swt").run ARGV

data/lib/shoes/swt.rb

@@ -59,6 +59,7 @@ class Shoes
       require 'shoes/swt/common/clickable'
       require 'shoes/swt/common/container'
       require 'shoes/swt/common/fill'
+      require 'shoes/swt/common/image_handling'
       require 'shoes/swt/common/resource'
       require 'shoes/swt/common/painter'
       require 'shoes/swt/common/painter_updates_position'

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+class Shoes
+  module Swt
+    module Common
+      module ImageHandling
+        # Why copy the file to a temporary location just to pass a different name
+        # to load? Because SWT doesn't like us when we're packaged!
+        #
+        # Apparently the warbler-style path names we end up with for relative
+        # image paths don't cross nicely to SWT, so we need to resolve the paths
+        # in Ruby-land before handing it over.
+        def load_file_image_data(name)
+          tmpname = File.join(Dir.tmpdir, "__shoes4_#{Time.now.to_i}_#{File.basename(name)}")
+          FileUtils.cp(name, tmpname)
+
+          @cleanup_files ||= []
+          @cleanup_files << tmpname
+          tmpname
+        end
+
+        def cleanup_temporary_files
+          return unless @cleanup_files
+
+          @cleanup_files.each do |file|
+            begin
+              FileUtils.rm(file)
+            rescue => e
+              Shoes.logger.debug("Error during image temp file cleanup.\n#{e.class}: #{e.message}")
+            end
+          end
+          @cleanup_files.clear
+        end
+      end
+    end
+  end
+end

data/lib/shoes/swt/image.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+require 'fileutils'
+
 class Shoes
   module Swt
     class Image
@@ -9,6 +11,7 @@ class Shoes
       include Common::PainterUpdatesPosition
       include Common::Visibility
       include Common::Remove
+      include Common::ImageHandling
       include ::Shoes::BackendDimensionsDelegations
 
       attr_reader :app, :real, :dsl, :painter
@@ -47,7 +50,7 @@ class Shoes
 
       def display_temporary_download_image
         temporary_download_image = File.join(DIR, 'static/downloading.png')
-        create_image(temporary_download_image)
+        create_image(load_file_image_data(temporary_download_image))
       end
 
       def create_image(data)
@@ -56,6 +59,8 @@ class Shoes
         @full_height       = @real.getImageData.height
         dsl.element_width  ||= default_width
         dsl.element_height ||= default_height
+
+        cleanup_temporary_files
       end
 
       def default_width
@@ -93,7 +98,7 @@ class Shoes
         data = if raw_image_data?(name_or_data)
                  load_raw_image_data(name_or_data)
                else
-                 name_or_data
+                 load_file_image_data(name_or_data)
                end
         create_image(data)
       end

data/lib/shoes/swt/image_pattern.rb

@@ -3,6 +3,7 @@ class Shoes
   module Swt
     class ImagePattern
       include Common::Remove
+      include Common::ImageHandling
 
       def initialize(dsl)
         @dsl = dsl
@@ -16,8 +17,11 @@ class Shoes
       # Since colors are bound up (at least in specs) with image patterns,
       # we can't safely touch images during initialize, so lazily load them.
       def pattern
-        @image   ||= ::Swt::Image.new(Shoes.display, @dsl.path)
+        @image   ||= ::Swt::Image.new(Shoes.display, load_file_image_data(@dsl.path))
         @pattern ||= ::Swt::Pattern.new(Shoes.display, @image)
+        cleanup_temporary_files
+
+        @pattern
       end
 
       def apply_as_fill(gc, _dsl)

data/lib/shoes/swt/packager.rb

@@ -7,13 +7,27 @@ class Shoes
       def initialize(dsl)
         @dsl  = dsl
         @gems = []
+        @packages = []
       end
 
-      def create_package(program_name, package)
-        unless package =~ /^(swt):(app|jar)$/
-          abort("#{program_name}: Can't package as '#{package}'. See '#{program_name} --help'")
+      def options
+        OptionParser.new do |opts|
+          opts.on('--jar', 'Package as executable JAR file') do
+            @packages << :jar
+          end
+
+          opts.on('--mac', 'Package as OS X application') do
+            @packages << :mac
+          end
+
+          opts.on('--windows', 'Package as Windows application') do
+            @packages << :windows
+          end
+
+          opts.on('--linux', 'Package as Linux application') do
+            @packages << :linux
+          end
         end
-        package.split(':')
       end
 
       def run(path)
@@ -26,40 +40,12 @@ class Shoes
           abort "shoes: #{e.message}"
         end
 
-        @dsl.packages.each do |backend, wrapper|
-          puts "Packaging #{backend}:#{wrapper}..."
-          packager = ::Shoes::Package.create_packager(config, wrapper)
+        @packages.each do |package_type|
+          puts "Packaging #{package_type}..."
+          packager = ::Shoes::Package.create_packager(config, package_type)
           packager.package
         end
       end
-
-      def help(program_name)
-        <<-EOS
-
-    Package types:
-#{package_types}
-    Examples:
-#{examples(program_name)}
-        EOS
-      end
-
-      def package_types
-        <<-EOS
-    swt:app     A standalone OS X executable with the Swt backend
-    swt:jar     An executable JAR with the Swt backend
-        EOS
-      end
-
-      def examples(program_name)
-        <<-EOS
-    To run a Shoes app:
-      #{program_name} path/to/shoes-app.rb
-
-    Two ways to package a Shoes app as an APP and a JAR, using the Swt backend:
-      #{program_name} -p swt:app -p swt:jar path/to/app.yaml
-      #{program_name} -p swt:app -p swt:jar path/to/shoes-app.rb
-          EOS
-      end
     end
   end
 end

data/lib/shoes/swt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoes-swt
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre9
+  version: 4.0.0.pre10
 platform: ruby
 authors:
 - Team Shoes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2017-06-17 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.pre9
+        version: 4.0.0.pre10
   name: shoes-core
   prerelease: false
   type: :runtime
@@ -51,13 +51,13 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre9
+        version: 4.0.0.pre10
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre9
+        version: 4.0.0.pre10
   name: shoes-package
   prerelease: false
   type: :runtime
@@ -65,8 +65,9 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre9
-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.
+        version: 4.0.0.pre10
+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:
 - shoes@lists.mvmanila.com
 executables:
@@ -95,6 +96,7 @@ files:
 - lib/shoes/swt/common/clickable.rb
 - lib/shoes/swt/common/container.rb
 - lib/shoes/swt/common/fill.rb
+- lib/shoes/swt/common/image_handling.rb
 - lib/shoes/swt/common/painter.rb
 - lib/shoes/swt/common/painter_updates_position.rb
 - lib/shoes/swt/common/remove.rb
@@ -176,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key:
 specification_version: 4
 summary: A JRuby and Swt backend for Shoes, the best little GUI toolkit for Ruby.