tara 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6e420d1eb102159255e920d2b4945a2b4e87541
-  data.tar.gz: dcbf5d159a857c56dbed52b53f10a17873b46ff8
+  metadata.gz: 2617054a9d3083e73b54e1e80c40d8a657fcdfa9
+  data.tar.gz: 8323289eb628caaf484509aab0e9b8c7fdd319a7
 SHA512:
-  metadata.gz: d78bc8b757e1b9ac52bec3d072c3e0bc50d59644fedccfe072779e79761b5c2a7b3eacb709db07927dab2fbe6dce616b2fd31f5db28adde036b21475414ab0a0
-  data.tar.gz: 058c330f69ae1dd4f3bb4bce1f354970a765d400dd8ff0fe0eef7bf2341eb1894582f421a5ae1165fc6bccd284a67853ba10866dee93919169481764350b607e
+  metadata.gz: e1b7e0c93f9052feeb74586d3b08189a13276ff4f12ac04285723885cd8945163f5256ef73b3f909c4a07b9e4f1d428546b113f32d17e9c425635f4e3f044b38
+  data.tar.gz: 8dcf6b5c2eec3707c7ab07bf9495622145b9037c2069b9d924ae8e8442da5faaa1a073d0b7cb244c9b37a25e24af07bc7788c43dc1d8e6a3ed0c63ad7b914019

data/lib/tara/archive.rb

@@ -46,6 +46,8 @@ module Tara
     #   expanded when including source files in archive. Should be relative from :app_dir.
     # @option config [Array<String>] :executables (%w[bin/*]) list of globs that will be
     #   expanded when including executables in archive. Should be relative from :app_dir.
+    # @option config [Array<String, String>] :gem_executables ([]) list of gem and exec name
+    #   pairs which will be included as executables in archive.
     # @option config [String] :target (linux-x86_64) target platform that the archive will
     #   be created for. Should be one of "linux-x86", "linux-x86_64", or "osx".
     # @option config [String] :traveling_ruby_version (20150210) release of Traveling Ruby
@@ -62,6 +64,7 @@ module Tara
       @config[:archive_name] ||= @config[:app_name] + '.tgz'
       @config[:files] ||= %w[lib/**/*.rb]
       @config[:executables] ||= %w[bin/*]
+      @config[:gem_executables] ||= []
       @config[:target] ||= 'linux-x86_64'
       @config[:traveling_ruby_version] ||= '20150210'
       @config[:without_groups] ||= %w[development test]
@@ -88,6 +91,7 @@ module Tara
         install_dependencies(package_dir, fetcher)
         copy_source(project_dir, package_dir)
         copy_executables(project_dir, package_dir)
+        create_gem_shims(package_dir)
         Dir.chdir(tmp_dir) do
           create_archive(build_dir)
         end
@@ -120,6 +124,12 @@ module Tara
       end
     end
 
+    def create_gem_shims(package_dir)
+      @config[:gem_executables].each do |gem_name, exec_name|
+        create_gem_shim(package_dir, gem_name, exec_name)
+      end
+    end
+
     def create_archive(build_dir)
       Shell.exec('tar -czf %s %s' % [@config[:archive_name], Dir['*'].join(' ')])
       FileUtils.mkdir_p(build_dir)
@@ -137,6 +147,9 @@ module Tara
     def copy_file(project_dir, package_dir, file)
       relative_file = file.relative_path_from(project_dir)
       if relative_file.directory?
+        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
@@ -148,7 +161,14 @@ module Tara
 
     def create_shim(package_dir, executable)
       shim_path = package_dir.join(executable.basename)
-      shim = Shim.new(*executable.split)
+      shim = ExecShim.new(*executable.split)
+      File.open(shim_path, 'w') { |f| shim.write(f) }
+      FileUtils.chmod(0755, shim_path)
+    end
+
+    def create_gem_shim(package_dir, gem_name, exec_name)
+      shim_path = package_dir.join(exec_name)
+      shim = GemShim.new(gem_name, exec_name)
       File.open(shim_path, 'w') { |f| shim.write(f) }
       FileUtils.chmod(0755, shim_path)
     end

data/lib/tara/archiver.rb

@@ -31,6 +31,8 @@ module Tara
     #   expanded when including source files in archive. Should be relative from `:app_dir`.
     # @option config [Array<String>] :executables (%w[bin/*]) list of globs that will be
     #   expanded when including executables in archive. Should be relative from `:app_dir`.
+    # @option config [Array<String, String>] :gem_executables ([]) list of gem and exec name
+    #   pairs which will be included as executables in archive.
     # @option config [String] :target (linux-x86_64) target platform that the archive will
     #   be created for. Should be one of "linux-x86", "linux-x86_64", or "osx".
     # @option config [String] :traveling_ruby_version (20150210) release of Traveling Ruby

data/lib/tara/fetcher.rb

@@ -11,7 +11,7 @@ module Tara
       @target = target
       @tr_version = tr_version
       @ruby_version = options[:ruby_version] || RUBY_VERSION
-      @release_url = options[:tr_release_url] || 'http://d6r77u77i8pq3.cloudfront.net/releases'
+      @release_url = options[:tr_release_url] || 'https://d6r77u77i8pq3.cloudfront.net/releases'
       @shell = options[:shell] || Shell
     end
 
@@ -44,11 +44,11 @@ module Tara
     def fetch(remote_uri, local_uri, limit=10)
       unless File.exist?(local_uri)
         uri = URI(remote_uri)
-        Net::HTTP.start(uri.host, uri.port) do |http|
+        Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
           http.request(Net::HTTP::Get.new(uri)) do |response|
             case response
             when Net::HTTPSuccess
-              File.open(local_uri, 'w') do |f|
+              File.open(local_uri, 'wb') do |f|
                 response.read_body do |chunk|
                   f.write(chunk)
                 end

data/lib/tara/shim.rb

@@ -3,9 +3,8 @@
 module Tara
   # @private
   class Shim
-    def initialize(dirpath, name)
-      @dirpath = dirpath
-      @name = name
+    def initialize(command)
+      @command = command
     end
 
     def write(io)
@@ -21,8 +20,22 @@ module Tara
         SELF_DIR=$(dirname "$0")
         export BUNDLE_GEMFILE="$SELF_DIR/lib/vendor/Gemfile"
         unset BUNDLE_IGNORE_CONFIG
-        exec "$SELF_DIR/lib/ruby/bin/ruby" -rbundler/setup "$SELF_DIR/#{@dirpath}/#{@name}" "$@"
+        exec "$SELF_DIR/lib/ruby/bin/ruby" -rbundler/setup #{@command}
       EOH
     end
   end
+
+  # @private
+  class ExecShim < Shim
+    def initialize(dirpath, name)
+      super(%("$SELF_DIR/#{dirpath}/#{name}" "$@"))
+    end
+  end
+
+  # @private
+  class GemShim < Shim
+    def initialize(gem_name, exec_name)
+     super(%(-e "load Gem.bin_path('#{gem_name}', '#{exec_name}')" -- "$@"))
+    end
+  end
 end

data/lib/tara/version.rb

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

metadata

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