rubygems-precompiled 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0e5cac9e19549ede238139f4fda54ccc3fd8d1c
-  data.tar.gz: 0fc7264556763bd4bc0499324356b26e116abb24
+  metadata.gz: 718a7b49fe7f73247987a88ae55bbfddf0efee7e
+  data.tar.gz: 7b0c230d2c75810b6c936b2d83a5fb46641f3bac
 SHA512:
-  metadata.gz: a38e2d35832ad3bcbf2a8a09985aa2f26b137b4ec7e83c902c8c2cbe1740623455e317b9ed43a5a21e83f5587b5710c0683ffa6d69b902fc065f6983cf35de7b
-  data.tar.gz: a67172765f91f0cc7f2a93603e62e1130cb36b2847254e8a33b95bdd64e2680b6f9b090d6b3b1c6fe0ef30365ea27b4a06ed2cb304bd0b8d7d22cf5ff8c06609
+  metadata.gz: b9f67856cba175412a497ce3a67b17ac26cf3fd56062cfb6b55614ca297b2f31bfd1bca00af96231274886e708fe231901c9a93d8216c30027bb7892531a3a11
+  data.tar.gz: e5c35c515a6cfc1598e30a15aaf37b94c70cb073c22080e3b0763cdb58d2305e36592f1ec61dc05bb192ce16f09011dc1ce761e94d841c27a3b51a6c958e9ea9

data/features/installing_with_cache.feature

@@ -3,8 +3,6 @@ Feature: Installing using a compiled-cache
   Background:
     Given I have wiped the folder "/tmp/precompiled-workroot"
 
-#  Scenario: Installing a compiled gem without the cache
-
   Scenario: Installing a compiled gem with a cache miss
     Given I use the gem configuration option
       """
@@ -16,14 +14,14 @@ Feature: Installing using a compiled-cache
     Then I should see "Building native extensions"
     Then I should not see "Loading native extension from cache"
 
-    When I execute
+    When I run ruby
       """
-      echo "puts CompiledClass.new.test_method" | ruby -I/tmp/precompiled-workroot/installroot/gems/compiled-gem-0.0.1/lib -rtest_ext/test_ext
+      require "test_ext/test_ext"
+      puts CompiledClass.new.test_method
       """
 
     Then I should see "Hello, world!"
 
-  # this works in reality but the test is dodgy on ruby 2. Needs investment in time to fix
   Scenario: Installing a compiled gem with a cache hit
     Given I use the gem configuration option
       """
@@ -38,9 +36,10 @@ Feature: Installing using a compiled-cache
     Then I should not see "Building native extensions"
     Then I should see "Loading native extension from cache"
 
-    When I execute
+    When I run ruby
       """
-      echo "puts CompiledClass.new.test_method" | ruby -I/tmp/precompiled-workroot/installroot/gems/compiled-gem-0.0.1/lib -rtest_ext/test_ext
+      require "test_ext/test_ext"
+      puts CompiledClass.new.test_method
       """
 
     Then I should see "Hello, world!"

data/features/precompiling_gems.feature

@@ -28,6 +28,7 @@ Feature: Pre-compiling gems
     And the command should return a success status code
 
   Scenario: Pre-compiling a single compiled gem with --build-config
+    Given this version of rubygems supports build options
     When I run the command "gem precompile --verbose --build-config='--foo --bar' compiled-gem.gem"
 
     Then I should see "build-args --foo --bar"

data/features/steps/command_steps.rb

@@ -35,14 +35,29 @@ def execute(command)
   puts @last_stderr
 end
 
-When /^I (?:run the command|execute) "(.*?)"( ignoring the exit code)?$/ do |command,ignore_exit_code|
+When /^I (?:run ruby)$/ do |command|
+  installroot = "/tmp/precompiled-workroot/installroot"
+  extension_path = if Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.0.0")
+    "#{installroot}/gems/compiled-gem-0.0.1/lib"
+  else
+    "#{installroot}/extensions/#{Gem::Platform.local}/#{RbConfig::CONFIG["ruby_version"]}-static/compiled-gem-0.0.1"
+  end
+
+  cmd = %{cat <<RUBY | ruby -I "#{extension_path}"
+#{command}
+RUBY}
+  execute(cmd)
+  raise RuntimeError, "Command '#{command}' exited with non-zero exit status" unless @last_status == 0
+end
+
+When /^I (?:run the command|execute) "(.*?)"( ignoring the exit code)?$/ do |command, ignore_exit_code|
   execute(command)
   raise RuntimeError, "Command '#{command}' exited with non-zero exit status" unless ignore_exit_code or @last_status == 0
-
 end
+
 When /^I (?:run the command|execute)$/ do |command|
-    execute(command)
-    raise RuntimeError, "Command '#{command}' exited with non-zero exit status" unless @last_status == 0
+  execute(command)
+  raise RuntimeError, "Command '#{command}' exited with non-zero exit status" unless @last_status == 0
 end
 
 Then /^I should( not)? see "(.*?)"( on (stdout|stderr))?$/ do |invert, expect, any, channel|
@@ -65,7 +80,7 @@ Then /^the command should leave behind temporary directories/ do
   data = @last_stdout + @last_stderr
   data.each_line do |l|
     if m = l.match(/Leaving (.*) in place/)
-      expect(Dir.exists?(m[1])).to be_true
+      expect(Dir.exists?(m[1])).to be true
     end
   end
 end

data/features/steps/file_steps.rb

@@ -21,11 +21,12 @@ Given /^I have changed to a temporary directory(?: containing "(.*?)")?$/ do |gl
   FileUtils.chdir(directory)
 end
 After do
+  FileUtils.chdir(OriginalWorkingDirectory)
   cleanup.each { |dir| FileUtils.rm_rf(dir) }
 end
 
 Then /^the folder "(.*?)" should exist$/ do |folder|
-  File.directory?(folder).should be_true
+  expect(File.directory?(folder)).to be true
 end
 
 Then /^the file "(.*?)" should (not )?exist$/ do |file, invert|

data/features/steps/rubygem_steps.rb

@@ -0,0 +1,6 @@
+Given /this version of rubygems supports build options/ do
+  require "rubygems/installer"
+  unless Gem::Installer.method_defined?(:write_build_info_file)
+    pending "This test will not pass on this version of rubygems."
+  end
+end

data/lib/rubygems/precompiled.rb

@@ -1,4 +1,7 @@
 require 'rubygems/precompiled/version'
+require "rubygems/precompiled/file_cache"
+require "rubygems/precompiled/http_cache"
+
 require 'rubygems/installer'
 require 'rubygems/ext/builder'
 require 'rubygems/package/tar_reader'
@@ -9,66 +12,6 @@ require 'uri'
 require 'tempfile'
 
 module Precompiled
-
-  def self.included(base)
-    base.send(:alias_method, :build_extensions_without_cache, :build_extensions)
-    base.send(:alias_method, :build_extensions, :build_extensions_with_cache)
-  end
-
-  class BaseCache
-    def initialize(root_uri)
-      @root_uri = root_uri
-    end
-
-    def retrieve(spec)
-      raise "Must be overriden!"
-    end
-    def contains?(spec)
-      false
-    end
-    def cache_key(spec)
-      "/ruby-#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}/#{Gem::Platform.local.to_s}/#{spec.name}-#{spec.version}.tar.gz"
-    end
-  end
-
-  class FileCache < BaseCache
-    def path_for(spec)
-      File.join(@root_uri.path, cache_key(spec))
-    end
-    def contains?(spec)
-      File.exists?(path_for(spec))
-    end
-
-    def retrieve(spec)
-      yield path_for(spec)
-    end
-  end
-
-  class HttpCache < BaseCache
-    def uri_to_spec(spec)
-      URI.join(@root_uri, File.join(@root_uri.path, cache_key(spec)))
-    end
-    def contains?(spec)
-      uri = uri_to_spec(spec)
-      http = Net::HTTP.start(uri.host, uri.port)
-      http.head(uri.path).code == "200"
-    end
-    def retrieve(spec)
-      tempfile = Tempfile.new('cache-hit')
-      uri = uri_to_spec(spec)
-      http = Net::HTTP.start(uri.host, uri.port)
-      http.request_get(uri.path) do |resp|
-        resp.read_body do |segment|
-          tempfile.write(segment)
-        end
-        tempfile.close
-      end
-
-      yield tempfile
-      tempfile.delete
-    end
-  end
-
   GemCache = {
     'file' => FileCache,
     'http' => HttpCache
@@ -84,43 +27,50 @@ module Precompiled
     end
   end
 
-  def build_extensions_with_cache
-    cache = Precompiled.precompiled_caches.find { |cache| cache.contains?(@spec) }
+  module InstallerExtension
+    def self.included(base)
+      base.send(:alias_method, :build_extensions_without_cache, :build_extensions)
+      base.send(:alias_method, :build_extensions, :build_extensions_with_cache)
+    end
+
 
-    if cache
-      $stderr.puts "Loading native extension from cache"
-      cache.retrieve(@spec) do |path|
-        if @spec.respond_to?(:extension_dir)
-          overlay_tarball(path, @spec.extension_dir)
-        else
-          overlay_tarball(path, @gem_dir)
+    def build_extensions_with_cache
+      cache = Precompiled.precompiled_caches.find { |cache| cache.contains?(spec) }
+
+      if cache
+        $stderr.puts "Loading native extension from cache"
+        cache.retrieve(spec) do |path|
+          if spec.respond_to?(:extension_dir)
+            precompile_overlay_tarball(path, spec.extension_dir)
+          else
+            precompile_overlay_tarball(path, @gem_dir)
+          end
         end
+      else
+        build_extensions_without_cache
       end
-    else
-      build_extensions_without_cache
     end
-  end
 
-  # Private: Extracts a .tar.gz file on-top of the gem's installation directory
-  def overlay_tarball(tarball, target_root)
-    Zlib::GzipReader.open(tarball) do |gzip_io|
-      Gem::Package::TarReader.new(gzip_io) do |tar|
-        tar.each do |entry|
-          target_path = File.join(target_root, entry.full_name)
-          if entry.directory?
-            FileUtils.mkdir_p(target_path)
-          elsif entry.file?
-            FileUtils.mkdir_p(File.dirname(target_path))
-            File.open(target_path, "w") do |f|
-              f.write entry.read(1024*1024) until entry.eof?
+    # Private: Extracts a .tar.gz file on-top of the gem's installation directory
+    def precompile_overlay_tarball(tarball, target_root)
+      Zlib::GzipReader.open(tarball) do |gzip_io|
+        Gem::Package::TarReader.new(gzip_io) do |tar|
+          tar.each do |entry|
+            target_path = File.join(target_root, entry.full_name)
+            if entry.directory?
+              FileUtils.mkdir_p(target_path)
+            elsif entry.file?
+              FileUtils.mkdir_p(File.dirname(target_path))
+              File.open(target_path, "w") do |f|
+                f.write entry.read(1024*1024) until entry.eof?
+              end
             end
+            entry.close
           end
-          entry.close
-        end
-       end
+         end
+      end
     end
   end
-
 end
 
-Gem::Installer.send(:include, Precompiled)
+Gem::Installer.send(:include, Precompiled::InstallerExtension)

data/lib/rubygems/precompiled/base_cache.rb

@@ -0,0 +1,19 @@
+module Precompiled
+  class BaseCache
+    def initialize(root_uri)
+      @root_uri = root_uri
+    end
+
+    def retrieve(spec)
+      raise "Must be overriden!"
+    end
+
+    def contains?(spec)
+      false
+    end
+
+    def cache_key(spec)
+      "/ruby-#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}/#{Gem::Platform.local.to_s}/#{spec.name}-#{spec.version}.tar.gz"
+    end
+  end
+end

data/lib/rubygems/precompiled/file_cache.rb

@@ -0,0 +1,17 @@
+require "rubygems/precompiled/base_cache"
+
+module Precompiled
+  class FileCache < BaseCache
+    def path_for(spec)
+      File.join(@root_uri.path, cache_key(spec))
+    end
+
+    def contains?(spec)
+      File.exists?(path_for(spec))
+    end
+
+    def retrieve(spec)
+      yield path_for(spec)
+    end
+  end
+end

data/lib/rubygems/precompiled/http_cache.rb

@@ -0,0 +1,30 @@
+require "rubygems/precompiled/base_cache"
+
+module Precompiled
+  class HttpCache < BaseCache
+    def uri_to_spec(spec)
+      URI.join(@root_uri, File.join(@root_uri.path, cache_key(spec)))
+    end
+
+    def contains?(spec)
+      uri = uri_to_spec(spec)
+      http = Net::HTTP.start(uri.host, uri.port)
+      http.head(uri.path).code == "200"
+    end
+
+    def retrieve(spec)
+      tempfile = Tempfile.new('cache-hit')
+      uri = uri_to_spec(spec)
+      http = Net::HTTP.start(uri.host, uri.port)
+      http.request_get(uri.path) do |resp|
+        resp.read_body do |segment|
+          tempfile.write(segment)
+        end
+        tempfile.close
+      end
+
+      yield tempfile
+      tempfile.delete
+    end
+  end
+end

data/lib/rubygems/precompiled/version.rb

@@ -1,5 +1,5 @@
 module Rubygems
   module Precompiled
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/lib/rubygems/precompiler.rb

@@ -34,34 +34,34 @@ class Gem::Precompiler
     end
   end
 
-  # Private: Extracts the gem files into the specified path
+  # Private: Extracts the gem files into the specified path
   #
   def extract_files_into(dir)
     @installer.unpack(dir)
   end
 
-  # Public: Returns the name of the gem
+  # Public: Returns the name of the gem
   #
   # Returns a string
   def gem_name
     @spec.name
   end
 
-  # Public: Returns the version string of the gem
+  # Public: Returns the version string of the gem
   #
-  # Returns a Gem::Version
+  # Returns a Gem::Version
   def gem_version
     @spec.version
   end
 
-  # Public: Returns the relative require-paths specified by the gem
+  # Public: Returns the relative require-paths specified by the gem
   #
   # Returns an array of strings
   def gem_require_paths
     @spec.require_paths
   end
 
-  # Public: Does the gem actually have any compiled extensions?
+  # Public: Does the gem actually have any compiled extensions?
   #
   # Returns boolean - true if the gem has a c-extension that needs building
   def has_extension?
@@ -96,7 +96,7 @@ class Gem::Precompiler
     File.join(*[@target_dir, "#{gem_name}-#{gem_version.to_s}.tar.gz"].compact)
   end
 
-  # Private: Calls the code necessary to build all the extensions
+  # Private: Calls the code necessary to build all the extensions
   # into a specified install root
   #
   # Returns a list of files beneath that root making up the build
@@ -171,7 +171,7 @@ class Gem::Precompiler
     FileUtils.mv(temp_output.path, output_path)
   end
 
-  # Private: Yield a reference to a TarWriter that writes to
+  # Private: Yield a reference to a TarWriter that writes to
   # the specified .tar.gz file
   #
   def targz_file(path, &block)

data/rubygems-precompiled.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "~> 3.4"
   spec.add_development_dependency "cucumber"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-precompiled
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Thomas Haggett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +87,9 @@ files:
 - features/steps/rubygem_steps.rb
 - lib/rubygems/commands/precompile_command.rb
 - lib/rubygems/precompiled.rb
+- lib/rubygems/precompiled/base_cache.rb
+- lib/rubygems/precompiled/file_cache.rb
+- lib/rubygems/precompiled/http_cache.rb
 - lib/rubygems/precompiled/version.rb
 - lib/rubygems/precompiler.rb
 - lib/rubygems_plugin.rb