tara 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1784fce5a6faf5e5507684228b65c90d5f2339bb
-  data.tar.gz: e0c5d1d73c8057cd1bc9de4c22bd365da606356b
+  metadata.gz: cf67fd26a216bf00d73d635b4611334cb822d819
+  data.tar.gz: 5f17c1b3f28685d7d1e148a641dc8af995b671d4
 SHA512:
-  metadata.gz: e3504bc7febfbe67dfefd611ade399514de470b152fae96d675033d537a2b141353635d4e8f96aa1ee470a34a99a12b1d102d5d067b1174cfad66e5cb1363159
-  data.tar.gz: c78a5c896ab9bb2468d86c2487688938250c71125c07f992d3ca281f42c9f32f4ab4d3c8c9243781ecabb3e76d149b50b87b14f620818f49f4f7313116e8d7eb
+  metadata.gz: d366f9c00a4abfad35c071514bb19a43a929712de193e0f90f5ef3837560cd5587543d479e9db67728f6adf226475164898609d7447a1fdc8019a60e7c3682bb
+  data.tar.gz: bbbd4a77e5dd631eb11cb07f424737a51f98ca8a8cbb886638f965c598afcdcae9c1f059ee1ddcbc4c758cdcff09dd8cc94df8c57537ef730b06eea7ca8c768a

data/lib/ext/bundler.rb

@@ -0,0 +1,12 @@
+require 'bundler'
+module Bundler
+  class Definition
+    def add_optional_group(group)
+      @optional_groups ||= []
+      @optional_groups << group.to_sym
+    end
+    def has_optional_groups?
+      @optional_groups && @optional_groups.is_a?(Array)
+    end
+  end
+end

data/lib/tara.rb

@@ -3,7 +3,7 @@
 require 'bundler'
 require 'pathname'
 require 'tmpdir'
-
+require 'ext/bundler'
 
 module Tara
   TaraError = Class.new(StandardError)

data/lib/tara/installer.rb

@@ -35,7 +35,7 @@ module Tara
 
     def bundler_command
       @bundler_command ||= begin
-        command = 'bundle install --jobs 4 --path . --gemfile lib/vendor/Gemfile'
+        command = 'bundle install --jobs 4 --frozen --path . --gemfile lib/vendor/Gemfile'
         command << %( --without #{@without_groups.join(' ')}) if @without_groups.any?
         command
       end
@@ -46,6 +46,7 @@ module Tara
       copy_gem_files(vendor_path)
       Dir.chdir(@package_dir) do
         Bundler.with_clean_env do
+          copy_local_gems
           @shell.exec_with_env(bundler_command, @bundle_env)
           if @build_command
             @shell.exec_with_env(@build_command, @bundle_env)
@@ -63,6 +64,41 @@ module Tara
       end
     end
 
+    def find_installed_gems
+      definition = Bundler::Definition.build('lib/vendor/Gemfile', 'lib/vendor/Gemfile.lock', false)
+      return [] unless definition.has_optional_groups?
+      @without_groups.each do |group|
+        definition.add_optional_group(group)
+      end
+      definition.specs.each_with_object([]) do |gem_spec, specs|
+        if gem_spec.full_gem_path.start_with?(Bundler.bundle_path.to_s) # Local gem
+          specs << {
+            :full_gem_path => gem_spec.full_gem_path,
+            :spec_file => gem_spec.spec_file,
+            :relative_path => Pathname.new(gem_spec.full_gem_path).relative_path_from(Bundler.bundle_path).to_s,
+          }
+        end
+      end
+    rescue Bundler::GemNotFound => e
+      []
+    end
+
+    def copy_local_gems
+      local_gems = find_installed_gems
+      target_directory = File.join(@package_dir, 'lib/vendor', Bundler.ruby_scope)
+
+      spec_dir = File.join(target_directory, 'specifications')
+      FileUtils.mkdir_p(spec_dir)
+      FileUtils.mkdir_p(File.join(target_directory, 'bin'))
+      FileUtils.mkdir_p(File.join(target_directory, 'gems'))
+      FileUtils.mkdir_p(File.join(target_directory, 'bundler', 'gems'))
+
+      local_gems.each do |gemspec|
+        FileUtils.cp_r(gemspec[:full_gem_path], File.join(target_directory, gemspec[:relative_path]))
+        FileUtils.cp(gemspec[:spec_file], spec_dir) if File.exists?(gemspec[:spec_file])
+      end
+    end
+
     def extract_ruby
       FileUtils.mkdir_p(ruby_path)
       FileUtils.mkdir_p(ruby_vendor_path)

data/lib/tara/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tara
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Mathias Söderberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies: []
 description: Tara packs your Ruby app into a standalone archive with gems and a Ruby
   runtime
@@ -20,6 +20,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/tara
+- lib/ext/bundler.rb
 - lib/tara.rb
 - lib/tara/archive.rb
 - lib/tara/archiver.rb
@@ -49,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Packs your Ruby app as a standalone archive