gem-dependencies 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaba358cbe264b03da89c480fe1af1770d22e0c1
-  data.tar.gz: 939670d117b0fe8d56254af9cb3b586e4ef71cae
+  metadata.gz: 82454adc88a4b3b11ab715a20615a44c4e4e581b
+  data.tar.gz: b99d0dcc685fe2c51b123da8ec2a223f6e2f4a20
 SHA512:
-  metadata.gz: 03ed104d610a1e95cd4c3badc49f45ab13f874cf9847ff6d655fa5c9b98e615efdc9d8be6a3c56c920aa6b76d5ac83446187b8e16213af841e2f7fef71ee2a54
-  data.tar.gz: 08aeb1d16a5948db7405df0e0f01d281e5923471a53a5db401c05272f912122927a2e25b7aab633394db587a8b2019473121745dc0e14b408b2933d10bfc8003
+  metadata.gz: ddb9b340194a31bf3efc8ab19839970e7b2faf569b83887b156aa91f0a32e54ba07d233a1ce02cfc487cfd90ab7bc31077f9e314c2d9c64741eaeb93a6fe5bcc
+  data.tar.gz: ef5c81bb07d0433acb9152816ce34de3a3d5089f639ac82df797f8b8a8638384b8716e9c3742259b2ec61eaf1a185b482c704457c86beb65f08a4a309c78da3b

data/README.md

@@ -25,17 +25,12 @@ gems:
   "*":
     command: sudo apk --update add ${packages}
   bcrypt:
-    "~> 2.0, <= 3.1":
+    "~> 2.0, <= 3.3":
       - bcrypt-2.1
-      - libxml2-3.4
-      - libyagni-1.0c
-    "~> 3.1.5": "bcrypt-3.1.10.tar.gz tree"
+      - "*"
   nokogiri:
-    "~> 2.0, <= 3.1":
-      - bcrypt-2.1
-      - libxml2-3.4
-      - libyagni-1.0c
-    "~> 3.1.5": "s3://one:two@s3.amazon.com/three/bcrypt-3.1.10.tar.gz tree"
+    "~> 1.6.2, < 1.8": "* libxml2-dev libxslt-dev"
+    "1.2.8": "s3://one:two@s3.amazon.com/three/* tree"
 ```
 
 After determining the runtime dependencies and creating a compiled extensions tarball, edit the dependency index to add a key with the name of the new gem and sub-keys to indicate the version requirements. The values of these sub-key are either an array of package dependencies and extension tarballs or a space-delimited string of the same. All items ending in ```.tar.gz``` are considered to be extension tarballs and everything else is considered to be a package dependency. Extension tarballs can also be given as a file system path or an http, https, git, or s3 url.
@@ -59,7 +54,7 @@ The dependency index will be downloaded and searched for the requested gem and v
 Note that a version requirement can also be specified in the ```gem install``` command. For example, the following are all valid:
 
 ```shell
-bcrypt, bcrypt:3.1.4, "bcrypt:~>3.1.8", "bcrypt > 3.1.4, ~3.2, < 3.8"
+bcrypt, bcrypt:3.1.4, "bcrypt:~>3.1.8", "bcrypt > 3.1.4, ~> 3.2, < 3.8"
 ```
 
 Using this approach, a runtime system can quickly and efficiently install dependencies and extensions without the need to compile them locally.

data/gem-dependencies.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "gem-dependencies"
-  s.version     = "0.1.9"
+  s.version     = "0.2.0"
   s.summary     = "RubyGems plugin to simplify installing binary gems on runtime systems."
   s.description = "This gem makes it easy to install binary gems on machines without a compiler."
   s.homepage    = "https://github.com/shreeve/gem-dependencies"

data/lib/rubygems/gem_dependencies.rb

@@ -2,7 +2,7 @@
 # gem_dependencies.rb: Simplifies installing binary gems on runtime systems
 #
 # Author: Steve Shreeve <steve.shreeve@gmail.com>
-#   Date: June 11, 2015
+#   Date: June 12, 2015
 #  Legal: MIT License
 # =============================================================================
 
@@ -37,26 +37,45 @@ module Gem
         true
       end
 
-      # locate a match and return [pkgs, exts]
+      # return a gem's packages and extensions
       def find_dependencies(env)
         require 'rubygems/remote_fetcher'
         @@deps = YAML.load(fetch(env))['gems'] unless defined?(@@deps)
+        @@deps.key?[spec.name] or return
 
+        # find dependencies
         case deps = @@deps[spec.name]
-        when nil # no deps provided, assume one extension file relative to the index
-          path = File.join(File.dirname(env.split(/[?;#]/,2).first), "#{spec.full_name}.tar.gz")
-          path << "?raw=true" if path.start_with?("https://github.com/")
-          deps = [path]
+        when nil, "*" # for nil or '*', use the default extension name
+          deps = ["*"]
         when String # string of space-delimited dependencies and extensions
         when Array # array of dependencies and extensions
         when Hash # hash of dependencies and extensions, indexed by version requirements
-          reqs, deps = deps.find do |reqs, info|
+          reqs, deps = deps.find do |reqs, info| # deps is an array or space-delimited string
             Gem::Requirement.new(reqs.split(',')).satisfied_by?(spec.version)
           end
+          deps or return #!# what about nil here? should it be the same as non-hash version?
         end
-        deps or return
         deps = deps.strip.split(/\s+/) if deps.is_a?(String)
-        deps.compact.uniq.partition {|item| item =~ REGEXP_SCHEMA || item.end_with?(".tar.gz")}.reverse
+        deps = deps.compact.uniq
+
+        # helpful variables
+        bcwd = Dir.pwd
+        benv = File.dirname(env.split(/[?;#]/,2).first)
+        name = "#{spec.full_name}.tar.gz"
+
+        # return packages and extensions
+        exts, pkgs = deps.partition {|item| item.include?("*") || item =~ REGEXP_SCHEMA || item.include?(".tar.gz")}
+        exts.map! do |item|
+          case item
+            when "*"       then item = File.join(benv, name) # use complete default tarball name
+            when /\A\*/    then item[0,1] = benv             # path relative to env variable
+            when /\A[^\/]/ then item[0,0] = bcwd + "/"       # path relative to current directory
+          end
+          item.gsub!("*", name) # swap inline wildcards with default tarball name
+          item << "?raw=true" if item.start_with?("https://github.com/")
+          item
+        end
+        [pkgs, exts]
       end
 
       def install_os_packages(*args)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem-dependencies
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Steve Shreeve
@@ -30,7 +30,7 @@ cert_chain:
   4PkbTeqnzZJmSZjUBwvnQFNhXY08hPUs7aASHu9deACBbOBY+Hg6tiSOdfw50uYS
   ksjokeQosImFuxgjMrlyoRcpbZmyfQ33yImqtLH6FMWF3hpoxJq9wPk=
   -----END CERTIFICATE-----
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-06-13 00:00:00.000000000 Z
 dependencies: []
 description: This gem makes it easy to install binary gems on machines without a compiler.
 email: steve.shreeve@gmail.com

metadata.gz.sig

@@ -1 +1,2 @@
-7_؃�`2{u�П-5�Λf�~b^.Ph�?�����n��V淳߳ܧC/֛�w{#΅�t1�Z[\ۤ�`����	Uy��q>��2;�S�+,�,Ñ�,f��i���y�%-���a�F�V���0�q��h���?L�n˂���0�[��2����o�]>�z�P�9�Uy��C�6r�h����7�=��	�X��Z������
�=�n,�f�8�r���^K!v1�f��D����L^���Ηߠ���
+$�#��BT3������T�*�
���2�7�����v'z��}�L�?�ޥm����񊲿�H�=N��uk`�o���~8���}z�u��"
+��6�2u�A
Bv�^#[X�N�Z8	#���8�