prebundler 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1928d857a1f4ed0596fa85e0ca8e2d38cdc3a35f1061dcf0cdc62edbe0f0f95d
-  data.tar.gz: 89b331c36e6f7d1962ce81a976e73fc557d86c73b9585ecc1f029e0d20e75c4c
+  metadata.gz: f49a9f3fcf95202953b7e9b0ff30de9fc464a773e2e7758b66405aa785fdf469
+  data.tar.gz: efc796dedb3083913832bd140cf3e7d94d7591177beb199f24f98ef0b5ea659d
 SHA512:
-  metadata.gz: 25d91cdaad84af6e2bbe70c70ed11a4e30124b75287df16ef94391d411bbc411618619271ead3507241a2a47ec204f3e4849390b475d50f1e98543de657623f5
-  data.tar.gz: 49c459e87af92719d8715c160cf82ea43cb28e4300617621717479ccc34577a1e571aeff58761ba8fa89a8dcc8027268426ca96a42553b25e5e25e8172059e60
+  metadata.gz: 53ba3344cdc671135fd4ec13bced1631ad7207c76a08086544ce3c012bf15a4af363b5d1314afb59b26f6642e107110ecd51f9d409b8b4816640e5bbaf4d61e2
+  data.tar.gz: 58575cb59c0101a01578c27e171f131b32a471af4b7f0d7161ba68a342d502578311525a1689a62c563dc17457a2b3b141a757debdab08ccf4364b3dd4b1ab95

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.9.1
+===
+- Woops, also use platform version when determining the gems that have already been built.
+- Fix the subsetter so it outputs gems inside correct source blocks.
+
 0.9.0
 ===
 - Include platform version when uploading gem tarballs to the storage backend (this will cause bundles installed by previous versions of prebundler to be rebuilt).

data/lib/prebundler.rb

@@ -1,3 +1,5 @@
+require 'ohai'
+
 module Prebundler
   autoload :Cli,                'prebundler/cli'
   autoload :Configurator,       'prebundler/configurator'
@@ -23,5 +25,15 @@ module Prebundler
     def configured?
       !!@config
     end
+
+    def platform_version
+      @platform_version ||= "#{system_info['platform']}-#{system_info['platform_version']}"
+    end
+
+    private
+
+    def system_info
+      @@system_info ||= Ohai::System.new.all_plugins(['platform'])
+    end
   end
 end

data/lib/prebundler/gem_ref.rb

@@ -1,6 +1,5 @@
 require 'fileutils'
 require 'set'
-require 'ohai'
 
 module Prebundler
   class GemRef
@@ -119,21 +118,14 @@ module Prebundler
     end
 
     def relative_gemspec_files
-      [File.join('specifications', gemspec_file)]
+      Dir.chdir(bundle_path) do
+        Dir.glob(File.join('specifications', "#{id}*.gemspec"))
+      end
     end
 
     def tar_file
-      platform_version = "#{system_info['platform']}-#{system_info['platform_version']}"
-      file = File.join(Bundler.local_platform.to_s, platform_version, Gem.extension_api_version.to_s, "#{id}.tar")
+      file = File.join(Bundler.local_platform.to_s, Prebundler.platform_version, Gem.extension_api_version.to_s, "#{id}.tar")
       prefix && !prefix.empty? ? File.join(prefix, file) : file
     end
-
-    def system_info
-      @@system_info ||= Ohai::System.new.all_plugins(['platform'])
-    end
-
-    def gemspec_file
-      "#{id}.gemspec"
-    end
   end
 end

data/lib/prebundler/gemfile_subset.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module Prebundler
   class GemfileSubset
     attr_reader :gemfile, :included_gems, :additional_gems, :raw
@@ -8,7 +10,7 @@ module Prebundler
 
     def initialize(gemfile)
       @gemfile = gemfile
-      @included_gems = []
+      @included_gems = Set.new
       @additional_gems = []
       @raw = []
     end
@@ -46,18 +48,12 @@ module Prebundler
       end
 
       ''.tap do |result|
-        (groups.keys - [nil]).each_with_index do |remote, idx|
+        groups.each_with_index do |(remote, _), idx|
           result << "\n" if idx > 0
           result << "source '#{remote}' do\n"
           result << groups[remote].map { |g| "  #{g}" }.join("\n")
           result << "\nend\n"
         end
-
-        unless groups[nil].empty?
-          result << "\n"
-          result << groups[nil].join("\n")
-          result << "\n"
-        end
       end
     end
 
@@ -67,24 +63,26 @@ module Prebundler
       Hash.new { |h, k| h[k] = [] }.tap do |ret|
         deps.each do |dep|
           if spec = gemfile.gems[dep.name]
-            ret[spec.remote] << spec.to_gem
+            ret[spec.remote || GemRef::DEFAULT_SOURCE] << spec.to_gem
           else
             req_str = dep.requirements_list.map { |r| "'#{r}'" }.join(', ')
-            ret[nil] << "gem '#{dep.name}', #{req_str}"
+            ret[GemRef::DEFAULT_SOURCE] << "gem '#{dep.name}', #{req_str}"
           end
         end
       end
     end
 
     def aggregate_deps(include_dev_deps)
-      Set.new.tap do |result|
+      dep_names = Set.new.tap do |result|
         included_gems.each do |included_gem_name|
           gemfile.gems[included_gem_name].gemspecs.each do |gemspec|
-            result.merge(gemspec.runtime_dependencies)
-            result.merge(gemspec.development_dependencies) if include_dev_deps
+            result.merge(gemspec.runtime_dependencies.map(&:name))
+            result.merge(gemspec.development_dependencies.map(&:name)) if include_dev_deps
           end
         end
       end
+
+      dep_names.map { |dep_name| gemfile.gems[dep_name] }.compact
     end
   end
 end

data/lib/prebundler/s3_backend.rb

@@ -31,7 +31,7 @@ module Prebundler
       files = []
       base_options = {
         bucket: bucket,
-        prefix: "#{Bundler.local_platform.to_s}/#{Gem.extension_api_version.to_s}"
+        prefix: "#{Bundler.local_platform.to_s}/#{Prebundler.platform_version}/#{Gem.extension_api_version.to_s}"
       }
 
       while truncated

data/lib/prebundler/version.rb

@@ -1,3 +1,3 @@
 module Prebundler
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prebundler
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-05 00:00:00.000000000 Z
+date: 2019-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler