brew-gem 0.8.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3b51e0ed7462440fcd09a45ae0120112e88082ee
-  data.tar.gz: d4554cffc8bbe17b4089da5aaf802ea3124b5463
+SHA256:
+  metadata.gz: df6562ae148c6903c357d09a1c8a1f6c97f0e1fa8d769c0a31af29310c171652
+  data.tar.gz: f5cea024787571e2d1d80796df0d29343e902b1b2fc656a0a5bfceacfd7c2fea
 SHA512:
-  metadata.gz: 7f87ccaf6353b0f84f8c43ef867b1505c8afe65e329f943cdc886dc8c052fca93cc26d25418c630c4b13e28a4207f461d0a4a1d8a4dda2304b0838e1c521cf90
-  data.tar.gz: 918856f384cba1e280ce4b5b0c66dc8cadb5b7be3b776b436cfe15554584fa1e931c4723b4775c3f6064d823169088fa61509f0c2b82f50499a9157c2e29a2cb
+  metadata.gz: 7f96bd1a41356ee2ce572c1206a5f490c003ea9ecfd10eea82ac8e041297b5784d479b384ce073169f6d2f344e792a26240cfa9f0250980ba1a0d9f59471ff5f
+  data.tar.gz: a38fef07e4db35059c41363f20061a4fe28843f513e508752d148b2f1f1dc157e85087c67fe3468c45c64a1f03a7866c0b380bf33f50c0e1723bc006ec6e92bb

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.3.6

data/CHANGELOG.markdown

@@ -1,3 +1,41 @@
+#### v1.1.0
+
+* Allow arguments after `--` to be passed to `gem install`
+
+  > https://github.com/sportngin/brew-gem/pull/67
+
+#### v1.0.0
+
+* Fix homebrew ruby path (thanks Kaleb Lape)
+
+  > https://github.com/sportngin/brew-gem/pull/59  
+
+* Fix old ruby gem flags (thanks JuPlutonic)
+
+  > https://github.com/sportngin/brew-gem/pull/57/
+
+#### v0.9.0
+
+* Fix compatibility with latest homebrew
+
+  > Nick Sieger: https://github.com/sportngin/brew-gem/pull/54
+
+#### v0.8.4
+
+* Install with homebrew ruby by default, if present
+
+  > Nick Sieger: Emma Sax, Andy Fleener, Unknown User: https://github.com/sportngin/brew-gem/pull/53
+
+* Fix gem exe used by RubyGemsDownloadStrategy
+
+  > Nick Sieger: Andy Fleener, Unknown User: https://github.com/sportngin/brew-gem/pull/51
+
+#### v0.8.3
+
+* Add --disable-gems to generated binstubs
+
+  > Nick Sieger: https://github.com/sportngin/brew-gem/pull/49
+
 #### v0.8.2
 
 * Fix sandbox permissions with gem spec cache

data/lib/brew/gem/cli.rb

@@ -1,5 +1,6 @@
 require 'erb'
 require 'tempfile'
+require 'shellwords'
 
 module Brew::Gem::CLI
   module_function
@@ -14,6 +15,49 @@ module Brew::Gem::CLI
     "help"      => "This message"
   }
 
+  HOMEBREW_RUBY_FLAG = "--homebrew-ruby"
+  SYSTEM_RUBY_FLAG   = "--system-ruby"
+  RUBY_FLAGS = [HOMEBREW_RUBY_FLAG, SYSTEM_RUBY_FLAG]
+
+  class Arguments
+    attr_reader :ruby_flag
+
+    def initialize(args)
+      @ruby_flag          = args.select {|a| RUBY_FLAGS.include?(a) }.last
+      @args               = args.reject {|a| RUBY_FLAGS.include?(a) }
+      @args_without_flags = @args.reject {|a| a.start_with?('-') }
+    end
+
+    def command
+      @args_without_flags[0]
+    end
+
+    def gem
+      @args_without_flags[1]
+    end
+
+    def supplied_version
+      @args_without_flags[2]
+    end
+
+    def flags
+      @flags ||= @args.reject {|a| a == gem || a == supplied_version }
+    end
+
+    def to_gem_args
+      if start = flags.index('--')
+        flags[start..-1]
+      else
+        []
+      end
+    end
+
+    def to_brew_args
+      stop_index = (flags.index('--') || 0) - 1
+      flags[0..stop_index]
+    end
+  end
+
   def help_msg
     (["Please specify a gem name (e.g. brew gem command <name>)"] +
       COMMANDS.map {|name, desc| "  #{name} - #{desc}"}).join("\n")
@@ -31,31 +75,36 @@ module Brew::Gem::CLI
   end
 
   def process_args(args)
-    abort help_msg unless args[0]
-    abort "unknown command: #{args[0]}\n#{help_msg}" unless COMMANDS.keys.include?(args[0])
+    arguments = Arguments.new(args)
+    command   = arguments.command
+    abort help_msg unless command
+    abort "unknown command: #{command}\n#{help_msg}" unless COMMANDS.keys.include?(command)
 
-    if args[0] == 'help'
+    if command == 'help'
       STDERR.puts help_msg
       exit 0
     end
 
-    args[0..3]
+    arguments
+  end
+
+  def homebrew_prefix
+    ENV['HOMEBREW_PREFIX'] || `brew --prefix`.chomp
   end
 
-  def expand_formula(name, version, use_homebrew_ruby=false)
+  def expand_formula(name, version, use_homebrew_ruby = false, gem_arguments = [])
     klass           = 'Gem' + name.capitalize.gsub(/[-_.\s]([a-zA-Z0-9])/) { $1.upcase }.gsub('+', 'x')
     user_gemrc      = "#{ENV['HOME']}/.gemrc"
-    homebrew_prefix = ENV['HOMEBREW_PREFIX'] || `brew --prefix`.chomp
     template_file   = File.expand_path('../formula.rb.erb', __FILE__)
     template        = ERB.new(File.read(template_file))
     template.result(binding)
   end
 
-  def with_temp_formula(name, version, use_homebrew_ruby)
+  def with_temp_formula(name, version, use_homebrew_ruby, gem_arguments)
     filename = File.join Dir.tmpdir, "gem-#{name}.rb"
 
     open(filename, 'w') do |f|
-      f.puts expand_formula(name, version, use_homebrew_ruby)
+      f.puts expand_formula(name, version, use_homebrew_ruby, gem_arguments)
     end
 
     yield filename
@@ -63,24 +112,21 @@ module Brew::Gem::CLI
     File.unlink filename
   end
 
-  def run(args = ARGV)
-    command, name, supplied_version, homebrew_ruby = process_args(args)
-    homebrew_ruby_flag = "--homebrew-ruby"
-    if supplied_version == homebrew_ruby_flag
-      supplied_version = nil
-      homebrew_ruby = homebrew_ruby_flag
-    end
-
-    use_homebrew_ruby = homebrew_ruby == homebrew_ruby_flag
-
-    version = fetch_version(name, supplied_version)
+  def homebrew_ruby?(ruby_flag)
+    File.exist?("#{homebrew_prefix}/opt/ruby") &&
+      ruby_flag.nil? || ruby_flag == HOMEBREW_RUBY_FLAG
+  end
 
-    with_temp_formula(name, version, use_homebrew_ruby) do |filename|
-      case command
+  def run(args = ARGV)
+    arguments = process_args(args)
+    name      = arguments.gem
+    version   = fetch_version(name, arguments.supplied_version)
+    with_temp_formula(name, version, homebrew_ruby?(arguments.ruby_flag), arguments.to_gem_args) do |filename|
+      case arguments.command
       when "formula"
         $stdout.puts File.read(filename)
       else
-        system "brew #{command} #{filename}"
+        system "brew #{arguments.to_brew_args.shelljoin} --formula #{filename}"
         exit $?.exitstatus unless $?.success?
       end
     end

data/lib/brew/gem/formula.rb.erb

@@ -3,17 +3,39 @@
 require 'formula'
 require 'fileutils'
 
+USE_HOMEBREW_RUBY = <%= use_homebrew_ruby ? "true" : "false" %>
+GEM_ARGUMENTS = <%= gem_arguments.inspect %>
+
+module RubyBin
+  def ruby_bin
+    USE_HOMEBREW_RUBY ? Formula["ruby"].opt_bin: "/usr/bin"
+  end
+end
+
 class RubyGemsDownloadStrategy < AbstractDownloadStrategy
+  include RubyBin
+
   def fetch
     ohai "Fetching <%= name %> from gem source"
-    HOMEBREW_CACHE.cd do
-      ENV['GEM_SPEC_CACHE'] = "#{HOMEBREW_CACHE}/gem_spec_cache"
-      system "gem", "fetch", "<%= name %>", "--version", resource.version
+    cache.cd do
+      ENV['GEM_SPEC_CACHE'] = "#{cache}/gem_spec_cache"
+      system "#{ruby_bin}/gem", "fetch", "<%= name %>", "--version", gem_version
     end
   end
 
   def cached_location
-    Pathname.new("#{HOMEBREW_CACHE}/<%= name %>-#{resource.version}.gem")
+    Pathname.new("#{cache}/<%= name %>-#{gem_version}.gem")
+  end
+
+  def cache
+    @cache ||= HOMEBREW_CACHE
+  end
+
+  def gem_version
+    return @version if defined?(@version) && @version
+    @version = @resource.version if defined?(@resource)
+    raise "Unable to determine version; did Homebrew change?" unless @version
+    @version
   end
 
   def clear_cache
@@ -22,8 +44,11 @@ class RubyGemsDownloadStrategy < AbstractDownloadStrategy
 end
 
 class <%= klass %> < Formula
+  include RubyBin
+
   url "<%= name %>", :using => RubyGemsDownloadStrategy
   version "<%= version %>"
+  depends_on "ruby"
 
   def install
     # Copy user's RubyGems config to temporary build home.
@@ -38,16 +63,18 @@ class <%= klass %> < Formula
     ENV['GEM_HOME']="#{prefix}"
     ENV['GEM_PATH']="#{prefix}"
 
-    rubybindir = '<%= use_homebrew_ruby ? "#{homebrew_prefix}/bin" : "/usr/bin" %>'
-    gem_path = "#{rubybindir}/gem"
-    ruby_path = "#{rubybindir}/ruby"
-    system gem_path, "install", cached_download,
-             "--no-ri",
-             "--no-rdoc",
+    # Use /usr/local/bin at the front of the path instead of Homebrew shims,
+    # which mess with Ruby's own compiler config when building native extensions
+    if defined?(HOMEBREW_SHIMS_PATH)
+      ENV['PATH'] = ENV['PATH'].sub(HOMEBREW_SHIMS_PATH.to_s, '/usr/local/bin')
+    end
+
+    system "#{ruby_bin}/gem", "install", cached_download,
+             "--no-document",
              "--no-wrapper",
              "--no-user-install",
              "--install-dir", prefix,
-             "--bindir", bin
+             "--bindir", bin, *GEM_ARGUMENTS
 
     raise "gem install '<%= name %>' failed with status #{$?.exitstatus}" unless $?.success?
 
@@ -74,9 +101,10 @@ class <%= klass %> < Formula
       file = Pathname.new("#{brew_gem_prefix}/#{gemspec.bindir}/#{exe}")
       (bin+file.basename).open('w') do |f|
         f << <<-RUBY
-#!#{ruby_path}
+#!#{ruby_bin}/ruby --disable-gems
 ENV['GEM_HOME']="#{prefix}"
 ENV['GEM_PATH']="#{prefix}"
+require 'rubygems'
 $:.unshift(#{ruby_libs.map(&:inspect).join(",")})
 load "#{file}"
         RUBY

data/lib/brew/gem/version.rb

@@ -1,5 +1,5 @@
 module Brew
   module Gem
-    VERSION = "0.8.2"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brew-gem
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Nick Sieger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,7 +97,7 @@ homepage: https://github.com/sportngin/brew-gem
 licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -112,9 +112,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Generate Homebrew formulas to install standalone ruby gems.
 test_files: []