shoes-package 4.0.0.pre8 → 4.0.0.pre9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b5bb9d7084b21501f365f96292ee3849ac0c120
-  data.tar.gz: a469da43c74cdd6c99401bf9ad7afe65c11ed479
+  metadata.gz: 905de2fecc90976b6949e60f976a575c010c9008
+  data.tar.gz: 5da98924922544603b1c736413b2696dd924f5cd
 SHA512:
-  metadata.gz: af95d9171a37c398c5476e1111574ac90ce5987a25fe7b8e642bc1605ff9f0ca445d0813b003455d2d067634d958844cc5e01adc3875c96e966b6ac319f6f1e2
-  data.tar.gz: c0fba6e9818d936531ce915a485f2a1296ff5f46c08aa6b121978dc8be8b43deed56b29c8ba91b4b7cf9a4f9d3065862db2b79b525ba7fe0f06433ba3e5d9900
+  metadata.gz: c9659f7fe6a19cde5a1ae14e2bf9881dfb68458ace0b2bf4e67c3bc53cc2ddae93e3209daa47395d1cf6a994283f76939885566659c9d61c89fd4902a9c54895
+  data.tar.gz: 999aaa14cfbbf3624c2f82c4f059a23f38a3fff5c2a582ee791a3df82554114272a41bc538bf71dbcab651285ee52f8425ebe00764faea899251a9f6fc6c14e9

data/lib/shoes/package.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+class Shoes
+  module Package
+    def self.create_packager(config, wrapper)
+      require 'furoshiki/jar'
+      require 'furoshiki/jar_app'
+
+      case wrapper
+      when 'jar'
+        ::Furoshiki::Jar.new(config)
+      when 'app'
+        ::Furoshiki::JarApp.new(config)
+      else
+        abort "shoes: Don't know how to make #{config.backend}:#{wrapper} packages"
+      end
+    end
+  end
+end

data/lib/shoes/package/configuration.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'bundler'
 require 'pathname'
 require 'yaml'
@@ -17,7 +18,11 @@ class Shoes
     module Configuration
       extend ::Furoshiki::Util
 
-      JAR_APP_TEMPLATE_URL = 'https://s3.amazonaws.com/net.wasnotrice.shoes/wrappers/shoes-app-template-0.0.2.zip'.freeze
+      def backend
+        "swt"
+      end
+
+      JAR_APP_TEMPLATE_URL = 'https://s3.amazonaws.com/net.wasnotrice.shoes/wrappers/shoes-app-template-0.0.2.zip'
 
       # Convenience method for loading config from a file. Note that you
       # can pass four kinds of paths to the loader. Given the following
@@ -74,6 +79,7 @@ class Shoes
         config = YAML.safe_load(file.read, [Symbol])
         config[:working_dir] = dir
         config[:gems] = merge_gems(base_config, config)
+        config[:gems] << "shoes-swt"
         create(config)
       end
 

data/lib/shoes/package/version.rb

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

data/lib/warbler/traits/shoes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'warbler'
 require 'warbler/traits'
 require 'warbler/traits/furoshiki'
@@ -28,8 +29,15 @@ module Warbler
         [Traits::Jar, Traits::NoGemspec].include? trait
       end
 
+      INIT_CONTENTS = <<~EOS
+        require 'shoes'
+        require 'shoes/swt'
+
+        Shoes::Swt.initialize_backend
+      EOS
+
       def after_configure
-        config.init_contents << StringIO.new("require 'shoes'\nrequire 'shoes/swt'\nShoes::Swt.initialize_backend\n")
+        config.init_contents << StringIO.new(INIT_CONTENTS)
       end
 
       def update_archive(jar)
@@ -37,6 +45,21 @@ module Warbler
         add_main_rb(jar, apply_pathmaps(config, default_executable, :application))
       end
 
+      def add_main_rb(jar, bin_path, _params = nil)
+        main = <<~EOS
+          begin
+            load '#{bin_path}'
+          rescue Java::OrgEclipseSwt::SWTException => e
+            if e.message == "Invalid thread access"
+              puts ""
+              puts "Ooops, you'll need to pass -XstartOnFirstThread when you start your jar!"
+            end
+          end
+        EOS
+
+        jar.files['META-INF/main.rb'] = StringIO.new(main)
+      end
+
       # Uses the `@config.run` if it exists. Otherwise, looks in the
       # application's `bin` directory for an executable with the same name as
       # the jar. If this also fails, defaults to the first executable (alphabetically) in the

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: shoes-package
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre8
+  version: 4.0.0.pre9
 platform: ruby
 authors:
 - Team Shoes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-28 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre8
+        version: 4.0.0.pre9
   name: shoes-core
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre8
+        version: 4.0.0.pre9
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -59,9 +59,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/shoes/package.rb
 - lib/shoes/package/configuration.rb
-- lib/shoes/package/jar.rb
-- lib/shoes/package/jar_app.rb
 - lib/shoes/package/version.rb
 - lib/warbler/traits/shoes.rb
 homepage: https://github.com/shoes/shoes4

data/lib/shoes/package/jar.rb

@@ -1,17 +0,0 @@
-require 'forwardable'
-require 'furoshiki/jar'
-
-class Shoes
-  module Package
-    class Jar
-      extend Forwardable
-
-      def_delegators :@packager, :package, :default_dir, :filename
-
-      def initialize(config)
-        config.gems << 'shoes-swt'
-        @packager = Furoshiki::Jar.new(config)
-      end
-    end
-  end
-end

data/lib/shoes/package/jar_app.rb

@@ -1,18 +0,0 @@
-require 'forwardable'
-require 'furoshiki/jar_app'
-
-class Shoes
-  module Package
-    class JarApp
-      extend Forwardable
-
-      def_delegators :@packager, :package, :default_package_dir, :cache_dir,
-                     :remote_template_url, :template_path
-
-      def initialize(config)
-        config.gems << 'shoes-swt'
-        @packager = Furoshiki::JarApp.new(config)
-      end
-    end
-  end
-end