brew-gem 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de74e23c2529c9b89da46be8a61c359b95084faa
-  data.tar.gz: 3b4f5f5db5896e391ad7e5a67955f69155e0f60f
+  metadata.gz: d6ba857abec83ca711b1adcb6709e0bb14b08d86
+  data.tar.gz: 0168eda064815ed9c5ac071f331d56c19223a7e9
 SHA512:
-  metadata.gz: 2d1ca48b2b6e13740538aaad8d8d432ddc817c11b8c3e743fa61900869fa196ba6fd52b526666aff6a92f7fc1581dc4dd5e3bfb4d9fc7e8ebab9b2d03f7969fb
-  data.tar.gz: ffec21a1943b8cde6af60a79b471575eb04a51a018da5953939214bec75eaa6015964fb698b6a884799a60049c56156c69224eec222d35b1e73e4f89960db4eb
+  metadata.gz: 89f82b8fe2b0c28454e3e2b1f202d8efe6869421fd6624fd73e8f5d9d428c6480d3b283535ccd7ece12cf1f5c7ef5486e73033567950c74c1e91df0b45d3b49c
+  data.tar.gz: 27402b1e5fdcc14a345fb551e698fddd14c47c9d99baf568b6fd0e5615185010474a8ab895ef2414e9bbbbf325a3bfca1248bd06a5576f0841046b32e4da81e6

data/CHANGELOG.markdown

@@ -1,3 +1,13 @@
+#### 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

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,36 @@ 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 to_args
+      @args.reject {|a| a == gem || a == supplied_version }
+    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,21 +62,26 @@ 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)
     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)
@@ -63,24 +99,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)) do |filename|
+      case arguments.command
       when "formula"
         $stdout.puts File.read(filename)
       else
-        system "brew #{command} #{filename}"
+        system "brew #{arguments.to_args.shelljoin} #{filename}"
         exit $?.exitstatus unless $?.success?
       end
     end

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

@@ -3,12 +3,16 @@
 require 'formula'
 require 'fileutils'
 
+BREWGEM_RUBYBINDIR = '<%= use_homebrew_ruby ? "#{homebrew_prefix}/bin" : "/usr/bin" %>'
+BREWGEM_GEM_PATH = "#{BREWGEM_RUBYBINDIR}/gem"
+BREWGEM_RUBY_PATH = "#{BREWGEM_RUBYBINDIR}/ruby"
+
 class RubyGemsDownloadStrategy < AbstractDownloadStrategy
   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
+      system BREWGEM_GEM_PATH, "fetch", "<%= name %>", "--version", resource.version
     end
   end
 
@@ -38,10 +42,13 @@ 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,
+    # 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 BREWGEM_GEM_PATH, "install", cached_download,
              "--no-ri",
              "--no-rdoc",
              "--no-wrapper",
@@ -74,7 +81,7 @@ class <%= klass %> < Formula
       file = Pathname.new("#{brew_gem_prefix}/#{gemspec.bindir}/#{exe}")
       (bin+file.basename).open('w') do |f|
         f << <<-RUBY
-#!#{ruby_path} --disable-gems
+#!#{BREWGEM_RUBY_PATH} --disable-gems
 ENV['GEM_HOME']="#{prefix}"
 ENV['GEM_PATH']="#{prefix}"
 require 'rubygems'

data/lib/brew/gem/version.rb

@@ -1,5 +1,5 @@
 module Brew
   module Gem
-    VERSION = "0.8.3"
+    VERSION = "0.8.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brew-gem
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Nick Sieger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler