tara 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8bd43a87f95c54251fd0a27ad9fb00ae8a6f2c0
-  data.tar.gz: 37127da9f2b062b6594529db98094110e76ff7cd
+  metadata.gz: 8becc22fc23dec6323164fa640d18e062cd7b7f3
+  data.tar.gz: ddd7ae48b1cfab03a864384e8e617889cba48671
 SHA512:
-  metadata.gz: b7d7ca8dbe189bf6f19b8b0a09d83912bc72ef33512c8b3f679942f16b53b4d17bcc8e1c1ea1b14b877d8b47e1cfb3fd4d277ff7b394a0b160896f97cf6dff57
-  data.tar.gz: 5c74f6978741b779b43586a0bddd8208a5560c4d82d66c4ac2ed4893bb85cd3befb5bc4ee33b634d93a7756ed2f5ad4f8f5aad0d75faa18aba84657a9e2805bb
+  metadata.gz: 5e86a0fddd03a6afa670d3eddeebcffcda3f52149020c81890f641c14261e7bc0371c94b5a290d5691801ab41df7335f98d93f3d1c126948a679a219173744b4
+  data.tar.gz: 6492aa2bf1fe0bbb33fb14566db8c7d0bf1aff66aa943acfcd6a3c48f7b2664849fa09d4fba77b60a0e14120df54081703c428260b84de845144ee7ad55f9bbb

data/lib/tara.rb

@@ -16,7 +16,7 @@ end
 require 'tara/archive'
 require 'tara/archiver'
 require 'tara/cli'
-require 'tara/executable'
 require 'tara/fetcher'
 require 'tara/installer'
 require 'tara/shell'
+require 'tara/shim'

data/lib/tara/archive.rb

@@ -112,7 +112,7 @@ module Tara
             copy_file(project_dir, package_dir, executable)
             FileUtils.chmod(0755, package_dir.join(executable))
             relative_executable = executable.relative_path_from(project_dir)
-            create_exec_wrapper(package_dir, relative_executable)
+            create_shim(package_dir, relative_executable)
           end
         end
       end
@@ -144,11 +144,11 @@ module Tara
       end
     end
 
-    def create_exec_wrapper(package_dir, executable)
-      wrapper_path = package_dir.join(executable.basename)
-      ex = Executable.new(*executable.split)
-      File.open(wrapper_path, 'w') { |f| ex.write(f) }
-      FileUtils.chmod(0755, wrapper_path)
+    def create_shim(package_dir, executable)
+      shim_path = package_dir.join(executable.basename)
+      shim = Shim.new(*executable.split)
+      File.open(shim_path, 'w') { |f| shim.write(f) }
+      FileUtils.chmod(0755, shim_path)
     end
   end
 end

data/lib/tara/installer.rb

@@ -47,9 +47,9 @@ module Tara
           Dir['vendor/ruby/*/extensions/*'].each do |ext_file|
             FileUtils.rm_rf(ext_file)
           end
-          @shell.exec('find vendor/ruby/*/gems -name "*.o" -exec rm {} \; 2> /dev/null || true')
-          @shell.exec('find vendor/ruby/*/gems -name "*.so" -exec rm {} \; 2> /dev/null || true')
-          @shell.exec('find vendor/ruby/*/gems -name "*.bundle" -exec rm {} \; 2> /dev/null || true')
+          %w[o so bundle].each do |ext|
+            find_and_remove_files('vendor/ruby/*/gems', %(*.#{ext}))
+          end
           FileUtils.cp_r('vendor', lib_path, preserve: true)
         end
       end
@@ -107,20 +107,20 @@ module Tara
 
     def strip_leftovers
       %w[c cpp h rl].each do |ext|
-        @shell.exec(%(find #{ruby_vendor_path} -name "*.#{ext}" -exec rm {} \\; 2> /dev/null))
+        find_and_remove_files(ruby_vendor_path, %(*.#{ext}))
       end
-      @shell.exec(%(find #{ruby_vendor_path} -name "extconf.rb" -exec rm {} \\; 2> /dev/null))
-      @shell.exec(%(find #{vendor_gems_glob.join('*', 'ext')} -name "Makefile" -exec rm {} \\; 2> /dev/null))
-      @shell.exec(%(find #{vendor_gems_glob.join('*', 'ext')} -name "tmp" -type d 2> /dev/null | xargs rm -rf))
+      find_and_remove_files(ruby_vendor_path, 'extconf.rb')
+      find_and_remove_files(vendor_gems_glob.join('*', 'ext'), 'Makefile')
+      find_and_remove_directories(vendor_gems_glob.join('*', 'ext'), 'tmp')
     end
 
     def strip_java_files
-      @shell.exec(%(find #{vendor_gems_glob} -name "*.java" -exec rm {} \\; 2> /dev/null))
+      find_and_remove_files(vendor_gems_glob, '*.java')
     end
 
     def strip_git_files
-      @shell.exec(%(find #{vendor_gems_glob} -name ".git" -type d 2> /dev/null | xargs rm -rf))
-      @shell.exec(%(find #{bundler_gems_glob} -name ".git" -type d 2> /dev/null | xargs rm -rf))
+      find_and_remove_directories(vendor_gems_glob, '.git')
+      find_and_remove_directories(bundler_gems_glob, '.git')
     end
 
     def strip_from_gems(things)
@@ -130,6 +130,14 @@ module Tara
       end
     end
 
+    def find_and_remove_files(dir, glob)
+      @shell.exec(%(find #{dir} -name "#{glob}" -type f -exec rm -f "{}" \\; 2> /dev/null || true))
+    end
+
+    def find_and_remove_directories(dir, glob)
+      @shell.exec(%(find #{dir} -name "#{glob}" -type d -exec rm -rf "{}" \\; 2> /dev/null || true))
+    end
+
     def lib_path
       @lib_path ||= Pathname.new(@package_dir).join('lib')
     end

data/lib/tara/{executable.rb → shim.rb}

@@ -2,7 +2,7 @@
 
 module Tara
   # @private
-  class Executable
+  class Shim
     def initialize(dirpath, name)
       @dirpath = dirpath
       @name = name

data/lib/tara/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Tara
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tara
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Mathias Söderberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2015-07-25 00:00:00.000000000 Z
 dependencies: []
 description: Tara packs your Ruby app into a standalone archive with gems and a Ruby
   runtime
@@ -24,10 +24,10 @@ files:
 - lib/tara/archive.rb
 - lib/tara/archiver.rb
 - lib/tara/cli.rb
-- lib/tara/executable.rb
 - lib/tara/fetcher.rb
 - lib/tara/installer.rb
 - lib/tara/shell.rb
+- lib/tara/shim.rb
 - lib/tara/version.rb
 homepage: http://github.com/mthssdrbrg/tara
 licenses: