brew-gem 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b98d4bf81184caf4b20bbd22da2e1330ab15af4
-  data.tar.gz: 1b71b15e529c93502d8c15b536748bd0137a54bc
+  metadata.gz: ff47bde472a2c913a8fd3db706664b2175077952
+  data.tar.gz: 85fb227c6650b78ff73c3652b9ddd58c5f91b73d
 SHA512:
-  metadata.gz: 3514488a6d2300184867f2a5a71f0fc4e915149fccef20733ffb60b87f14b79eae2746d5486b43eb7e3adfe2b0a0e82d226642bb13e33f4a4b63701547f26d60
-  data.tar.gz: 02e8d8d7c198fbfb06bd83a435a19d49936be6716792d660c4882313aedeec85af511f4625b9fd50a7babeef717098064f18f2b3ff6be57921b46a88dc2a0a14
+  metadata.gz: 6c010deb7ea8d23ccad502bbd57da4894e06bef318e3bb070033cb50d98986bcd634c2d11dbfc7c9629b33d9ed425df819c131f86ef0b0e3d3772c70ba0facf1
+  data.tar.gz: 4c6aa78d44f6af619e6d1598ee9f111c4eca4e62a9008e49de90ce3d32272a2bb8ebcac1ed8cd7e517a6abc0a9d7f7ffb82ae4eb7f667e1a2a7d5158a851df93

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/.ruby-gemset

@@ -0,0 +1 @@
+brew-gem

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in brew-gem.gemspec
+gem 'rake', '~>11.0'
 gemspec

data/README.md

@@ -59,11 +59,19 @@ Usage
 To install a specific version:
 
     brew gem install heroku 3.8.3
-    
+
+To install using a brew installed ruby(/usr/local/bin/ruby):
+
+    brew gem install heroku --homebrew-ruby
+
+And with a specific version:
+
+    brew gem install heroku 3.8.3 --homebrew-ruby
+
 To upgrade:
 
     brew gem upgrade heroku
-    
+
 To uninstall:
 
     brew gem uninstall heroku

data/brew-gem.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "https://rubygems.org/"
+    spec.metadata['allowed_push_host'] = "https://rubygems.org"
   else
     raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
   end

data/lib/brew/gem/cli.rb

@@ -38,10 +38,10 @@ module Brew::Gem::CLI
       exit 0
     end
 
-    args[0..2]
+    args[0..3]
   end
 
-  def expand_formula(name, version)
+  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"
     template_file = File.expand_path('../formula.rb.erb', __FILE__)
@@ -49,11 +49,11 @@ module Brew::Gem::CLI
     template.result(binding)
   end
 
-  def with_temp_formula(name, version)
+  def with_temp_formula(name, version, use_homebrew_ruby)
     filename = File.join Dir.tmpdir, "gem-#{name}.rb"
 
     open(filename, 'w') do |f|
-      f.puts expand_formula(name, version)
+      f.puts expand_formula(name, version, use_homebrew_ruby)
     end
 
     yield filename
@@ -62,11 +62,18 @@ module Brew::Gem::CLI
   end
 
   def run(args = ARGV)
-    command, name, supplied_version = process_args(args)
+    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)
 
-    with_temp_formula(name, version) do |filename|
+    with_temp_formula(name, version, use_homebrew_ruby) do |filename|
       system "brew #{command} #{filename}"
     end
   end

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

@@ -36,7 +36,11 @@ class <%= klass %> < Formula
     # they might not be there if, say, we change to a different rvm gemset
     ENV['GEM_HOME']="#{prefix}"
     ENV['GEM_PATH']="#{prefix}"
-    system "gem", "install", cached_download,
+
+    rubybindir = '<%= use_homebrew_ruby ? "/usr/local/bin" : "/usr/bin" %>'
+    gem_path = "#{rubybindir}/gem"
+    ruby_path = "#{rubybindir}/ruby"
+    system gem_path, "install", cached_download,
              "--no-ri",
              "--no-rdoc",
              "--no-wrapper",
@@ -67,7 +71,7 @@ class <%= klass %> < Formula
       file = Pathname.new("#{brew_gem_prefix}/#{gemspec.bindir}/#{exe}")
       (bin+file.basename).open('w') do |f|
         f << <<-RUBY
-#!/usr/bin/ruby
+#!#{ruby_path}
 ENV['GEM_HOME']="#{prefix}"
 ENV['GEM_PATH']="#{prefix}"
 $:.unshift(#{ruby_libs.map(&:inspect).join(",")})

data/lib/brew/gem/version.rb

@@ -1,5 +1,5 @@
 module Brew
   module Gem
-    VERSION = "0.7.3"
+    VERSION = "0.8.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brew-gem
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Nick Sieger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,6 +78,7 @@ files:
 - ".gitignore"
 - ".octopolo.yml"
 - ".rspec"
+- ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
@@ -93,7 +94,7 @@ files:
 homepage: https://github.com/sportngin/brew-gem
 licenses: []
 metadata:
-  allowed_push_host: https://rubygems.org/
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths: