furoshiki 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c6df7eae5f4b6178c062b65d94f982f9aa5424741b33199bcd31be3be2e2f77
-  data.tar.gz: c7f26f4ce029aaf87a3cb43a9477df216bcec4feee432bd4da0362e9ede296e7
+  metadata.gz: e63382b21f1841d960724ff462e12b8df250fc7094e47e6603de086999ebe5f9
+  data.tar.gz: ab1e14b3e6c931d660754a97010aefb74726e7f6aaf94013b4e5c02ab9c8aa41
 SHA512:
-  metadata.gz: a92923698d16efa5299953828bdb93cd8d99e951a677ff21b0a38a93877b1e8c4945a2597d557a7d7fa7cabd30c66a27454159080c6a41c8d40a1a77b128f427
-  data.tar.gz: 5089838464681db8b4e196da72c730cbea89e76058373369181bca21121b90304765f5f0d4ba859bfb97d6a34b8b6115d6c4421783e21487c288d86e7d85f6b7
+  metadata.gz: 27fbff8f947bcfa96a7a58d4b0c646ce08a33d46833ff230af0fecae5eb54b882bb6004b4886db163fb875e174afe96f8db0b2bca257031731d5a3e4f9dcb7fe
+  data.tar.gz: 01b6f85ff5e974a2bfd393fa01bc64b86b028f064e7522c1af4323dd3aea667318f4686d52b80676ef214803ace7dc569a8f15d1b2735d25dd555177b0f8c7c7

data/lib/furoshiki/base_app.rb

@@ -1,10 +1,11 @@
 require 'furoshiki/configuration'
 require 'furoshiki/exceptions'
-require 'furoshiki/zip/directory'
 require 'furoshiki/jar'
 require 'fileutils'
 require 'open-uri'
 require 'net/http'
+require 'rubygems/package'
+require 'rubygems/package/tar_writer'
 
 module Furoshiki
   class BaseApp
@@ -24,6 +25,7 @@ module Furoshiki
       @package_dir = default_package_dir
       @default_template_path = cache_dir.join(template_filename)
       @template_path = default_template_path
+      @archive_path = @package_dir.join(archive_name)
       @tmp = @package_dir.join('tmp')
     end
 
@@ -38,8 +40,7 @@ module Furoshiki
       inject_jar
       after_built
 
-      move_to_package_dir tmp_app_path
-      after_moved
+      create_archive tmp_app_path
     ensure
       remove_tmp
     end
@@ -53,6 +54,9 @@ module Furoshiki
     # @return [Pathname] default path to app template
     attr_reader :default_template_path
 
+    # @return [Pathname] path to resulting archive file
+    attr_accessor :archive_path
+
     # @return [Pathname] path to app template
     attr_accessor :template_path
 
@@ -72,6 +76,10 @@ module Furoshiki
       raise NotImplementedError
     end
 
+    def archive_name
+      raise NotImplementedError
+    end
+
     def template_basename
       raise NotImplementedError
     end
@@ -96,6 +104,10 @@ module Furoshiki
       tmp.join app_name
     end
 
+    def tmp_files
+      Dir[tmp_app_path.join("**/*")]
+    end
+
     def app_path
       package_dir.join app_name
     end
@@ -104,6 +116,11 @@ module Furoshiki
       config.working_dir
     end
 
+    def executable_path
+      # Expected to be overridden on *nix systems
+      ""
+    end
+
     # Temp helpers
     def create_tmp
       tmp.mkpath
@@ -182,13 +199,14 @@ module Furoshiki
     def after_built
     end
 
-    def after_moved
-    end
-
-    def move_to_package_dir(path)
-      dest = package_dir.join(app_name)
-      dest.rmtree if dest.exist?
-      mv path.to_s, dest
+    def create_archive(source_path)
+      destination = package_dir.join(archive_name)
+      open_archive(destination) do |tar|
+        tmp_files.each do |source_item|
+          destination_item = source_item.sub(source_path.to_s, app_name)
+          write_item_to_archive(source_item, destination_item, tar)
+        end
+      end
     end
 
     def ensure_jar_exists
@@ -197,5 +215,35 @@ module Furoshiki
       jar.package(tmp) unless File.exist?(path)
       path
     end
+
+    def destination_mode(destination)
+      if executable_path.to_s.end_with?(destination)
+        0755
+      else
+        0644
+      end
+    end
+
+    def open_archive(destination)
+      File.open(destination, "wb") do |file|
+        Zlib::GzipWriter.wrap(file) do |gz|
+          Gem::Package::TarWriter.new(gz) do |tar|
+            yield tar
+          end
+        end
+      end
+    end
+
+    def write_item_to_archive(source_item, destination_item, tar)
+      if File.directory?(source_item)
+        tar.mkdir(destination_item, 0755)
+      else
+        contents = File.binread(source_item)
+        mode = destination_mode(destination_item)
+        tar.add_file_simple(destination_item, mode, contents.length) do |destination|
+          destination.write(contents)
+        end
+      end
+    end
   end
 end

data/lib/furoshiki/linux_app.rb

@@ -1,5 +1,4 @@
 require 'furoshiki/base_app'
-require 'plist'
 
 module Furoshiki
   class LinuxApp < BaseApp
@@ -9,6 +8,10 @@ module Furoshiki
       "#{config.name}-linux"
     end
 
+    def archive_name
+      "#{app_name}.tar.gz"
+    end
+
     def template_basename
       'linux-app-template'
     end
@@ -30,10 +33,6 @@ module Furoshiki
       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

data/lib/furoshiki/mac_app.rb

@@ -9,6 +9,10 @@ module Furoshiki
       "#{config.name}.app"
     end
 
+    def archive_name
+      "#{config.name}-mac.tar.gz"
+    end
+
     def template_basename
       'mac-app-template'
     end
@@ -51,10 +55,6 @@ module Furoshiki
       end
     end
 
-    def after_moved
-      executable_path.chmod 0755
-    end
-
     def executable_path
       app_path.join('Contents/MacOS/app')
     end

data/lib/furoshiki/version.rb

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

data/lib/furoshiki/windows_app.rb

@@ -1,4 +1,5 @@
 require 'furoshiki/base_app'
+require 'zip'
 
 module Furoshiki
   class WindowsApp < BaseApp
@@ -8,6 +9,10 @@ module Furoshiki
       "#{config.name}-windows"
     end
 
+    def archive_name
+      "#{app_name}.zip"
+    end
+
     def template_basename
       'windows-app-template'
     end
@@ -32,5 +37,16 @@ module Furoshiki
     def tmp_app_path
       tmp.join "#{template_basename}"
     end
+
+    def create_archive(source_path)
+      dest = package_dir.join(archive_name)
+      rm_f dest
+      ::Zip::File.open(dest, ::Zip::File::CREATE) do |zipfile|
+        tmp_files.each do |source_item|
+          dest_item = source_item.sub(source_path.to_s, app_name)
+          zipfile.add(dest_item, source_item)
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: furoshiki
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Team Shoes
@@ -9,7 +9,7 @@ authors:
 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
@@ -129,10 +129,6 @@ files:
 - 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
-- lib/furoshiki/zip/recursive.rb
 - lib/warbler/traits/furoshiki.rb
 - vendor/appbundler-1.0.jar
 homepage: http://github.com/shoes/furoshiki

data/lib/furoshiki/zip.rb

@@ -1,2 +0,0 @@
-require 'furoshiki/zip/directory'
-require 'furoshiki/zip/directory_contents'

data/lib/furoshiki/zip/directory.rb

@@ -1,19 +0,0 @@
-require 'furoshiki/zip/recursive'
-
-module Furoshiki
-  module Zip
-    class Directory
-      # @param [#to_s] input_dir the directory to zip
-      # @param [#to_s] output_file the location of the output archive
-      def initialize(input_dir, output_file)
-        @input_dir = Pathname.new(input_dir)
-        @zip = Recursive.new(output_file)
-      end
-
-      # Zip the whole input directory, including the root
-      def write
-        @zip.write [@input_dir.basename], @input_dir.parent, ''
-      end
-    end
-  end
-end

data/lib/furoshiki/zip/directory_contents.rb

@@ -1,20 +0,0 @@
-require 'furoshiki/zip/recursive'
-
-module Furoshiki
-  module Zip
-    class DirectoryContents
-      # @param [#to_s] input_dir the directory to zip
-      # @param [#to_s] output_file the location of the output archive
-      def initialize(input_dir, output_file)
-        @input_dir = Pathname.new(input_dir)
-        @zip = Recursive.new(output_file)
-      end
-
-      # Zip the contents of the input directory, without the root.
-      def write
-        entries = @input_dir.children(false)
-        @zip.write entries, @input_dir, ''
-      end
-    end
-  end
-end

data/lib/furoshiki/zip/recursive.rb

@@ -1,58 +0,0 @@
-require 'pathname'
-require 'zip'
-
-module Furoshiki
-  module Zip
-    # Adapted from rubyzip's sample, ZipFileGenerator
-    #
-    # This is a utility class that uses rubyzip to recursively
-    # generate a zip file containing the given entries and all of
-    # their children.
-    #
-    # Best used through frontend classes Furoshiki::Zip::Directory or
-    # Furoshiki::Zip::DirectoryContents
-    #
-    # @example
-    # To zip the directory "/tmp/input" so that unarchiving
-    # gives you a single directory "input":
-    #
-    #   output_file = '/tmp/out.zip'
-    #
-    #   zip = Furoshiki::Zip::Recursive(output_file)
-    #   entries = Pathname.new("/tmp/input").entries
-    #   zip_prefix = ''
-    #   disk_prefix = '/tmp'
-    #   zf.write(entries, disk_prefix, zip_prefix, output_file)
-    class Recursive
-      def initialize(output_file)
-        @output_file = output_file.to_s
-      end
-
-      # @param [Array<Pathname>] entries the initial set of files to include
-      # @param [Pathname] disk_prefix a path prefix for existing entries
-      # @param [Pathname] zip_prefix a path prefix to add within archive
-      def write(entries, disk_prefix, zip_prefix)
-        io = ::Zip::File.open(@output_file, ::Zip::File::CREATE);
-        write_entries(entries, disk_prefix, zip_prefix, io)
-        io.close();
-      end
-
-      # A helper method to make the recursion work.
-      private
-      def write_entries(entries, disk_prefix, path, io)
-        entries.each do |e|
-          zip_path = path.to_s == "" ? e.basename : path.join(e.basename)
-          disk_path = disk_prefix.join(zip_path)
-          puts "Deflating #{disk_path}"
-          if disk_path.directory?
-            io.mkdir(zip_path)
-            subdir = disk_path.children(false)
-            write_entries(subdir, disk_prefix, zip_path, io)
-          else
-            io.get_output_stream(zip_path) { |f| f.puts(File.open(disk_path, "rb").read())}
-          end
-        end
-      end
-    end
-  end
-end