tara 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2617054a9d3083e73b54e1e80c40d8a657fcdfa9
-  data.tar.gz: 8323289eb628caaf484509aab0e9b8c7fdd319a7
+  metadata.gz: 1784fce5a6faf5e5507684228b65c90d5f2339bb
+  data.tar.gz: e0c5d1d73c8057cd1bc9de4c22bd365da606356b
 SHA512:
-  metadata.gz: e1b7e0c93f9052feeb74586d3b08189a13276ff4f12ac04285723885cd8945163f5256ef73b3f909c4a07b9e4f1d428546b113f32d17e9c425635f4e3f044b38
-  data.tar.gz: 8dcf6b5c2eec3707c7ab07bf9495622145b9037c2069b9d924ae8e8442da5faaa1a073d0b7cb244c9b37a25e24af07bc7788c43dc1d8e6a3ed0c63ad7b914019
+  metadata.gz: e3504bc7febfbe67dfefd611ade399514de470b152fae96d675033d537a2b141353635d4e8f96aa1ee470a34a99a12b1d102d5d067b1174cfad66e5cb1363159
+  data.tar.gz: c78a5c896ab9bb2468d86c2487688938250c71125c07f992d3ca281f42c9f32f4ab4d3c8c9243781ecabb3e76d149b50b87b14f620818f49f4f7313116e8d7eb

data/lib/tara/archive.rb

@@ -88,10 +88,10 @@ module Tara
         project_dir = Pathname.new(@config[:app_dir])
         package_dir = Pathname.new(tmp_dir)
         build_dir = Pathname.new(@config[:build_dir])
-        install_dependencies(package_dir, fetcher)
         copy_source(project_dir, package_dir)
         copy_executables(project_dir, package_dir)
         create_gem_shims(package_dir)
+        install_dependencies(package_dir, fetcher)
         Dir.chdir(tmp_dir) do
           create_archive(build_dir)
         end
@@ -150,7 +150,6 @@ module Tara
         unless (dirname = relative_file.dirname) == DOT_PATH
           FileUtils.mkdir_p(package_dir.join(dirname))
         end
-        FileUtils.cp_r(file, package_dir.join(relative_file))
       else
         unless (dirname = relative_file.dirname) == DOT_PATH
           FileUtils.mkdir_p(package_dir.join(dirname))

data/lib/tara/installer.rb

@@ -8,8 +8,9 @@ module Tara
       @fetcher = fetcher
       @without_groups = options[:without_groups]
       @app_dir = Pathname.new(options[:app_dir])
-      @bundle_env = 'BUNDLE_IGNORE_CONFIG=1' if options[:bundle_ignore_config]
+      @bundle_env = bundle_env(options[:bundle_ignore_config])
       @shell = options[:shell] || Shell
+      @build_command = options[:build_command]
     end
 
     def execute
@@ -21,37 +22,43 @@ module Tara
       strip_leftovers
       strip_java_files
       strip_git_files
-      create_bundler_config
+      strip_empty_directories
     end
 
     private
 
+    def bundle_env(ignore_config)
+      env = {'BUNDLE_GEMFILE' => 'lib/vendor/Gemfile'}
+      env['BUNDLE_IGNORE_CONFIG'] = '1' if ignore_config
+      env
+    end
+
     def bundler_command
       @bundler_command ||= begin
-        command = "#{@bundle_env} bundle install --jobs 4 --path vendor"
+        command = 'bundle install --jobs 4 --path . --gemfile lib/vendor/Gemfile'
         command << %( --without #{@without_groups.join(' ')}) if @without_groups.any?
         command
       end
     end
 
     def bundle_gems
-      FileUtils.mkdir_p(lib_path)
-      Dir.mktmpdir do |tmpdir|
-        copy_gem_files(Pathname.new(tmpdir))
-        Dir.chdir(tmpdir) do
-          Bundler.with_clean_env do
-            @shell.exec(bundler_command)
-          end
-          Dir['vendor/*/*/cache/*'].each do |cached_file|
-            FileUtils.rm_rf(cached_file)
-          end
-          Dir['vendor/ruby/*/extensions/*'].each do |ext_file|
-            FileUtils.rm_rf(ext_file)
-          end
-          %w[o so bundle].each do |ext|
-            find_and_remove_files('vendor/ruby/*/gems', %(*.#{ext}))
+      FileUtils.mkdir_p(vendor_path)
+      copy_gem_files(vendor_path)
+      Dir.chdir(@package_dir) do
+        Bundler.with_clean_env do
+          @shell.exec_with_env(bundler_command, @bundle_env)
+          if @build_command
+            @shell.exec_with_env(@build_command, @bundle_env)
           end
-          FileUtils.cp_r('vendor', lib_path, preserve: true)
+        end
+        Dir['lib/vendor/*/*/cache/*'].each do |cache_file|
+          FileUtils.rm_rf(cache_file)
+        end
+        Dir['lib/vendor/ruby/*/extensions/*'].each do |ext_file|
+          FileUtils.rm_rf(ext_file)
+        end
+        %w[o so bundle].each do |ext|
+          find_and_remove_files('lib/vendor/ruby/*/gems', %(*.#{ext}))
         end
       end
     end
@@ -88,16 +95,6 @@ module Tara
       end
     end
 
-    def create_bundler_config
-      copy_gem_files(vendor_path)
-      FileUtils.mkdir_p(bundle_path)
-      File.open(bundle_path.join('config'), 'w+') do |f|
-        f.puts(%(BUNDLE_PATH: .))
-        f.puts(%(BUNDLE_WITHOUT: #{@without_groups.join(':')})) if @without_groups.any?
-        f.puts(%(BUNDLE_DISABLE_SHARED_GEMS: '1'))
-      end
-    end
-
     def strip_tests
       strip_from_gems(%w[tests test spec])
     end
@@ -131,6 +128,10 @@ module Tara
       end
     end
 
+    def strip_empty_directories
+      @shell.exec(%(find #{@package_dir} -type d -empty -delete 2> /dev/null || true))
+    end
+
     def find_and_remove_files(dir, glob)
       @shell.exec(%(find #{dir} -name "#{glob}" -type f -exec rm -f "{}" \\; 2> /dev/null || true))
     end
@@ -151,10 +152,6 @@ module Tara
       @ruby_vendor_path ||= vendor_path.join('ruby')
     end
 
-    def bundle_path
-      @bundle_path ||= vendor_path.join('.bundle')
-    end
-
     def ruby_path
       @ruby_path ||= lib_path.join('ruby')
     end

data/lib/tara/shell.rb

@@ -10,6 +10,12 @@ module Tara
         raise ExecError, %(Command `#{command}` failed with output: #{output})
       end
       output
+    rescue Errno::ENOENT => e
+      raise ExecError, %(Command `#{command}` failed with output: #{e.message})
+    end
+
+    def self.exec_with_env(command, env)
+      self.exec(env.map { |k, v| [k, v].join('=') }.join(' ') << ' ' << command)
     end
   end
 end

data/lib/tara/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tara
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Mathias Söderberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies: []
 description: Tara packs your Ruby app into a standalone archive with gems and a Ruby
   runtime