furoshiki 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e1d32dc5465e95025e50c5d21471f5d52384b56c
-  data.tar.gz: f6c54405cff72df1aa6f96b2040d2b077c56928c
+SHA256:
+  metadata.gz: 9c6df7eae5f4b6178c062b65d94f982f9aa5424741b33199bcd31be3be2e2f77
+  data.tar.gz: c7f26f4ce029aaf87a3cb43a9477df216bcec4feee432bd4da0362e9ede296e7
 SHA512:
-  metadata.gz: bcf40eafe968ba9a044b7389c465c64726099d4fabeb0d32d662ae9c932f5c6ba0cc2b550636c090a26ba4732c719c74c4117b17a5ba20a02ce577ca7236c183
-  data.tar.gz: bf16aaa636595a789937c474beb31265cfb0503b4fe0225b11feee3ed7d664f40acaeb42f809dc3e346ab44c998e2cec7ca74ae1e1683065cb470681215f561d
+  metadata.gz: a92923698d16efa5299953828bdb93cd8d99e951a677ff21b0a38a93877b1e8c4945a2597d557a7d7fa7cabd30c66a27454159080c6a41c8d40a1a77b128f427
+  data.tar.gz: 5089838464681db8b4e196da72c730cbea89e76058373369181bca21121b90304765f5f0d4ba859bfb97d6a34b8b6115d6c4421783e21487c288d86e7d85f6b7

data/lib/furoshiki/{jar_app.rb → base_app.rb}

@@ -1,13 +1,13 @@
+require 'furoshiki/configuration'
 require 'furoshiki/exceptions'
 require 'furoshiki/zip/directory'
 require 'furoshiki/jar'
 require 'fileutils'
-require 'plist'
 require 'open-uri'
 require 'net/http'
 
 module Furoshiki
-  class JarApp
+  class BaseApp
     include FileUtils
 
     # @param [Furoshiki::Shoes::Configuration] config user configuration
@@ -27,58 +27,61 @@ module Furoshiki
       @tmp = @package_dir.join('tmp')
     end
 
+    def package
+      remove_tmp
+      create_tmp
+
+      cache_template
+      extract_template
+
+      inject_files
+      inject_jar
+      after_built
+
+      move_to_package_dir tmp_app_path
+      after_moved
+    ensure
+      remove_tmp
+    end
+
     # @return [Pathname] default package directory: ./pkg
     attr_reader :default_package_dir
 
     # @return [Pathname] package directory
     attr_accessor :package_dir
 
-    # @return [Pathname] default path to .app template
+    # @return [Pathname] default path to app template
     attr_reader :default_template_path
 
-    # @return [Pathname] path to .app template
+    # @return [Pathname] path to app template
     attr_accessor :template_path
 
     # @return [Pathname] cache directory
     attr_reader :cache_dir
 
+    # @param [Furoshiki::Shoes::Configuration] config user configuration
     attr_reader :config
 
+    # @return [Pathname] app building temp directory
     attr_reader :tmp
 
-    def package
-      remove_tmp
-      create_tmp
-      cache_template
-      extract_template
-      inject_icon
-      inject_config
-      jar_path = ensure_jar_exists
-      inject_jar jar_path
-      move_to_package_dir tmp_app_path
-      tweak_permissions
-    rescue => e
-      raise e
-    ensure
-      remove_tmp
-    end
-
     private
-    def create_tmp
-      tmp.mkpath
+
+    # Locations and names
+    def app_name
+      raise NotImplementedError
     end
 
-    def remove_tmp
-      tmp.rmtree if tmp.exist?
+    def template_basename
+      raise NotImplementedError
     end
 
-    def cache_template
-      cache_dir.mkpath unless cache_dir.exist?
-      download_template unless template_path.size?
+    def latest_template_version
+      raise NotImplementedError
     end
 
-    def template_basename
-      'shoes-app-template'
+    def remote_template_url
+      raise NotImplementedError
     end
 
     def template_extension
@@ -89,10 +92,28 @@ module Furoshiki
       "#{template_basename}-#{latest_template_version}#{template_extension}"
     end
 
-    def latest_template_version
-      '0.0.2'
+    def tmp_app_path
+      tmp.join app_name
+    end
+
+    def app_path
+      package_dir.join app_name
+    end
+
+    def working_dir
+      config.working_dir
+    end
+
+    # Temp helpers
+    def create_tmp
+      tmp.mkpath
     end
 
+    def remove_tmp
+      tmp.rmtree if tmp.exist?
+    end
+
+    # Downloading
     def download_template
       download remote_template_url, template_path
     end
@@ -130,37 +151,10 @@ module Furoshiki
       end
     end
 
-    def downloads_url
-      "http://shoesrb.com/downloads"
-    end
-
-    def remote_template_url
-      config.template_urls.fetch(:jar_app)
-    end
-
-    def move_to_package_dir(path)
-      dest = package_dir.join(path.basename)
-      dest.rmtree if dest.exist?
-      mv path.to_s, dest
-    end
-
-    def ensure_jar_exists
-      jar = Jar.new(@config)
-      path = tmp.join(jar.filename)
-      jar.package(tmp) unless File.exist?(path)
-      path
-    end
-
-    # Injects JAR into APP. The JAR should be the only item in the
-    # Contents/Java directory. If this directory contains more than one
-    # JAR, the "first" one gets run, which may not be what we want.
-    #
-    # @param [Pathname, String] jar_path the location of the JAR to inject
-    def inject_jar(jar_path)
-      jar_dir = tmp_app_path.join('Contents/Java')
-      jar_dir.rmtree if File.exist?(jar_dir)
-      jar_dir.mkdir
-      cp Pathname.new(jar_path), jar_dir
+    # Template helpers
+    def cache_template
+      cache_dir.mkpath unless cache_dir.exist?
+      download_template unless template_path.size?
     end
 
     def extract_template
@@ -169,57 +163,39 @@ module Furoshiki
 
       ::Zip::File.open(template_path) do |zip_file|
         zip_file.each do |entry|
-          extracted_app = template_path.join(entry.name) if Pathname.new(entry.name).extname == '.app'
           p = tmp.join(entry.name)
           p.dirname.mkpath
           entry.extract(p)
         end
       end
-      mv tmp.join(extracted_app.basename.to_s), tmp_app_path
-    end
-
-    def inject_config
-      plist = tmp_app_path.join 'Contents/Info.plist'
-      template = Plist.parse_xml(plist)
-      template['CFBundleIdentifier'] = "com.hackety.shoes.#{config.shortname}"
-      template['CFBundleDisplayName'] = config.name
-      template['CFBundleName'] = config.name
-      template['CFBundleVersion'] = config.version
-      template['CFBundleIconFile'] = Pathname.new(config.icons[:osx]).basename.to_s if config.icons[:osx]
-      File.open(plist, 'w') { |f| f.write template.to_plist }
-    end
-
-    def inject_icon
-      if config.icons[:osx]
-        icon_path = working_dir.join(config.icons[:osx])
-        raise IOError, "Couldn't find app icon at #{icon_path}" unless icon_path.exist?
-        resources_dir = tmp_app_path.join('Contents/Resources')
-        cp icon_path, resources_dir.join(icon_path.basename)
-      end
     end
 
-    def tweak_permissions
-      executable_path.chmod 0755
+    # Packaging helpers
+    def inject_files
+      # Hook for allowing different app types to put there files in
     end
 
-    def app_name
-      "#{config.name}.app"
+    def inject_jar
+      raise NotImplementedError("Tell us where the jar is")
     end
 
-    def tmp_app_path
-      tmp.join app_name
+    def after_built
     end
 
-    def app_path
-      package_dir.join app_name
+    def after_moved
     end
 
-    def executable_path
-      app_path.join('Contents/MacOS/JavaAppLauncher')
+    def move_to_package_dir(path)
+      dest = package_dir.join(app_name)
+      dest.rmtree if dest.exist?
+      mv path.to_s, dest
     end
 
-    def working_dir
-      config.working_dir
+    def ensure_jar_exists
+      jar = Jar.new(@config)
+      path = tmp.join(jar.filename)
+      jar.package(tmp) unless File.exist?(path)
+      path
     end
   end
 end

data/lib/furoshiki/linux_app.rb

@@ -0,0 +1,45 @@
+require 'furoshiki/base_app'
+require 'plist'
+
+module Furoshiki
+  class LinuxApp < BaseApp
+    private
+
+    def app_name
+      "#{config.name}-linux"
+    end
+
+    def template_basename
+      'linux-app-template'
+    end
+
+    def latest_template_version
+      '0.0.1'
+    end
+
+    def remote_template_url
+      "https://github.com/shoes/linux-app-templates/releases/download/v#{latest_template_version}/linux-app-template-#{latest_template_version}.zip"
+    end
+
+    def inject_jar
+      jar_path = ensure_jar_exists
+      cp Pathname.new(jar_path), File.join(tmp_app_path, "app.jar")
+    end
+
+    def after_built
+      mv File.join(tmp_app_path, "app"), File.join(tmp_app_path, config.name)
+    end
+
+    def after_moved
+      executable_path.chmod 0755
+    end
+
+    def executable_path
+      app_path.join(config.name)
+    end
+
+    def tmp_app_path
+      tmp.join "#{template_basename}"
+    end
+  end
+end

data/lib/furoshiki/mac_app.rb

@@ -0,0 +1,66 @@
+require 'furoshiki/base_app'
+require 'plist'
+
+module Furoshiki
+  class MacApp < BaseApp
+    private
+
+    def app_name
+      "#{config.name}.app"
+    end
+
+    def template_basename
+      'mac-app-template'
+    end
+
+    def latest_template_version
+      '0.0.3'
+    end
+
+    def remote_template_url
+      "https://github.com/shoes/mac-app-templates/releases/download/v#{latest_template_version}/mac-app-template-#{latest_template_version}.zip"
+    end
+
+    def inject_jar
+      jar_path = ensure_jar_exists
+      cp Pathname.new(jar_path), File.join(tmp_app_path, "Contents", "Java", "app.jar")
+    end
+
+    def inject_files
+      inject_icon
+      inject_config
+    end
+
+    def inject_config
+      plist = tmp_app_path.join 'Contents/Info.plist'
+      template = Plist.parse_xml(plist)
+      template['CFBundleIdentifier'] = "com.hackety.shoes.#{config.shortname}"
+      template['CFBundleDisplayName'] = config.name
+      template['CFBundleName'] = config.name
+      template['CFBundleVersion'] = config.version
+      template['CFBundleIconFile'] = Pathname.new(config.icons[:osx]).basename.to_s if config.icons[:osx]
+      File.open(plist, 'w') { |f| f.write template.to_plist }
+    end
+
+    def inject_icon
+      if config.icons[:osx]
+        icon_path = working_dir.join(config.icons[:osx])
+        raise IOError, "Couldn't find app icon at #{icon_path}" unless icon_path.exist?
+        resources_dir = tmp_app_path.join('Contents/Resources')
+        cp icon_path, resources_dir.join(icon_path.basename)
+      end
+    end
+
+    def after_moved
+      executable_path.chmod 0755
+    end
+
+    def executable_path
+      app_path.join('Contents/MacOS/app')
+    end
+
+    def tmp_app_path
+      tmp.join "#{template_basename}"
+    end
+  end
+end

data/lib/furoshiki/version.rb

@@ -1,4 +1,4 @@
 module Furoshiki
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end
 

data/lib/furoshiki/windows_app.rb

@@ -0,0 +1,36 @@
+require 'furoshiki/base_app'
+
+module Furoshiki
+  class WindowsApp < BaseApp
+    private
+
+    def app_name
+      "#{config.name}-windows"
+    end
+
+    def template_basename
+      'windows-app-template'
+    end
+
+    def latest_template_version
+      '0.0.1'
+    end
+
+    def remote_template_url
+      "https://github.com/shoes/windows-app-templates/releases/download/v#{latest_template_version}/windows-app-template-#{latest_template_version}.zip"
+    end
+
+    def inject_jar
+      jar_path = ensure_jar_exists
+      cp Pathname.new(jar_path), File.join(tmp_app_path, "app.jar")
+    end
+
+    def after_built
+      mv File.join(tmp_app_path, "app.bat"), File.join(tmp_app_path, "#{config.name}.bat")
+    end
+
+    def tmp_app_path
+      tmp.join "#{template_basename}"
+    end
+  end
+end

data/lib/furoshiki.rb

@@ -1,4 +1,6 @@
 require 'furoshiki/configuration'
 require 'furoshiki/exceptions'
 require 'furoshiki/jar'
-require 'furoshiki/jar_app'
+require 'furoshiki/mac_app'
+require 'furoshiki/windows_app'
+require 'furoshiki/linux_app'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: furoshiki
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Team Shoes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Create .app, .exe, and $LINUX_PACKAGE versions of your application, with its own embedded Ruby.
+description: Create .app, .exe, and $LINUX_PACKAGE versions of your application, with
+  its own embedded Ruby.
 email: shoes@lists.mvmanila.com
 executables: []
 extensions: []
@@ -117,14 +118,17 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - lib/furoshiki.rb
+- lib/furoshiki/base_app.rb
 - lib/furoshiki/configuration.rb
 - lib/furoshiki/exceptions.rb
 - lib/furoshiki/jar.rb
-- lib/furoshiki/jar_app.rb
+- lib/furoshiki/linux_app.rb
+- lib/furoshiki/mac_app.rb
 - lib/furoshiki/util.rb
 - lib/furoshiki/validator.rb
 - lib/furoshiki/version.rb
 - lib/furoshiki/warbler_extensions.rb
+- lib/furoshiki/windows_app.rb
 - lib/furoshiki/zip.rb
 - lib/furoshiki/zip/directory.rb
 - lib/furoshiki/zip/directory_contents.rb
@@ -150,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key:
 specification_version: 4
 summary: Package and distribute applications with Ruby.