rubinjam 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 352528474106c74c5ec74fd6b7fc8785d4ea73d1
-  data.tar.gz: 32437116794027bd101b3039949f25e28bef582d
+  metadata.gz: 16e1a95902b0ae96f7958bcc3bcae3ece2e8e0d5
+  data.tar.gz: cb9a318a818923447b55eba4818937da5bbe379a
 SHA512:
-  metadata.gz: 3adaf88e521ce70e5b169abbba87f351a845c378691c0129248865e70a2f85616543a5e66dd314999b896f1d4b99848473c3face09cd7cd937bcb3e914a9c88d
-  data.tar.gz: 7eda2b3a6765e7314d2f5a0b958f1f7f59e0e1e3efc2f2f5bfc7729b39f732ea8f3759d10de11660a827fd76b67bf68822e4cbdbdcae601df0d9656780e8d846
+  metadata.gz: 2bbf2dae2a452d2fa1d086a041748b19cda0c015d8114f1576cc806b2c5c77cd396d1191ace604d05166428baeeb00614980cbe2186cb9f5e6dbaa9398630426
+  data.tar.gz: 0de50fa021af6a5dd339c8d3c496974c4727870e321b70eab66f420380a7e07faba7de840a0f351a72b5ce92a920763fdb2b1de9eb90c12ffe2e247817f995ae

data/lib/rubinjam/version.rb

@@ -1,3 +1,3 @@
 module Rubinjam
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/lib/rubinjam.rb

@@ -6,6 +6,7 @@ module Rubinjam
   HEADER = '#!/usr/bin/env ruby'.freeze
 
   class << self
+    # pack a directory
     def pack(dir)
       Dir.chdir(dir) do
         binaries = Dir["bin/*"]
@@ -16,6 +17,7 @@ module Rubinjam
       end
     end
 
+    # pack a gem
     def pack_gem(gem, version=nil)
       require "shellwords"
       require "rubygems/package"
@@ -24,13 +26,13 @@ module Rubinjam
         Dir.chdir(dir) do
           # fetch
           command = "gem fetch #{Shellwords.escape(gem)}"
-          command << " -v" << version if version
+          command << " -v" << Shellwords.escape(version) if version
           sh(command)
 
           # load spec
           gem_ball = Dir["*.gem"].first
           spec = Gem::Package.new(gem_ball).spec.to_ruby
-          sh("gem unpack #{gem_ball}")
+          sh("gem unpack #{Shellwords.escape(gem_ball)}")
 
           # bundle
           Dir.chdir(gem_ball.sub(".gem", "")) do
@@ -44,7 +46,9 @@ module Rubinjam
     private
 
     def libraries
-      libs_from_paths(["lib"]).merge!(gem_libraries).merge!("rubinjam/internal" => internal_code)
+      libs_from_paths(["lib"]).
+        merge!(gem_libraries).
+        merge!("rubinjam/internal" => internal_code)
     end
 
     def internal_code
@@ -55,14 +59,21 @@ module Rubinjam
       end
     end
 
+    # unpack dependent gems with bundler so we can pack them
+    # this takes a while so we try to avoid if possible
     def gem_libraries
       return {} unless gemspec = Dir["*.gemspec"].first
-      return {} unless File.read(gemspec) =~ /add_(runtime_)?dependency/
+
+      dependency = "add_(runtime_)?dependency"
+      content = File.read(gemspec)
+      content.gsub!(/.*#{dependency}.*['"\{\<]json['">\}].*/, '')
+      content.gsub!(/.*add_development_dependency.*/, "")
+      return {} unless content =~ /#{dependency}/
 
       Dir.mktmpdir do |dir|
         sh "cp -R . #{dir}/"
         Dir.chdir(dir) do
-          write gemspec, File.read(gemspec).gsub(/.*add_development_dependency.*/, "")
+          write gemspec, content
           write "Gemfile", <<-RUBY.gsub(/^            /, "")
             source "https://rubygems.org"
             gemspec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubinjam
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Jam a gem into a universal binary that works with any ruby