grill 0.3.0 → 0.4.0

data/lib/grill.rb

@@ -4,6 +4,7 @@ require "grill/version"
 
 module Grill
   class << self
+
     def home
       home = "#{ENV["GRILL_HOME"] || ENV["HOME"] || "."}/.grill"
       unless File.directory?(home)
@@ -12,6 +13,15 @@ module Grill
       home
     end
 
+    def gemfile_path(gems)
+      fullpath = File.expand_path($0)
+      filename = "#{Digest::MD5.hexdigest(fullpath)}-#{Digest::MD5.hexdigest(gems)}"
+      path = File.join(home, ruby, filename)
+      dir = File.dirname(path)
+      FileUtils.mkdir_p(dir) unless File.directory?(dir)
+      path
+    end
+
     def implant(*args)
       gems = ""
       args.each do |arg|
@@ -23,21 +33,44 @@ module Grill
         gems << "\n"
       end
 
-      fullpath = File.expand_path($0)
-      gemfile = "#{home}/#{Digest::MD5.hexdigest(fullpath)}-#{Digest::MD5.hexdigest(gems)}"
+      gemfile = gemfile_path(gems)
       tmp = File.open(gemfile, "w")
       tmp.puts gems
       tmp.close
       ENV["BUNDLE_GEMFILE"] = tmp.path
 
-      unless system(%Q!bundle check --gemfile "#{gemfile}" --path #{home}/gems > #{File::NULL}!)
+      gemdir = File.join(home, ruby)
+      unless system(%Q!bundle check --gemfile "#{gemfile}" --path "#{gemdir}" > #{devnull}!)
         puts "missing gems found. will install them"
-        system(%Q!bundle install --gemfile "#{gemfile}" --path "#{home}/gems"!)
+        system(%Q!bundle install --gemfile "#{gemfile}" --path "#{gemdir}"!)
         puts "gems are installed."
       end
 
       require "bundler/setup"
       Bundler.require
     end
+
+    private
+    def ruby
+      "#{defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby18"}-#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
+    end
+
+    def devnull
+      # from https://github.com/marcandre/backports/blob/v2.6.5/lib/backports/1.9.3/file.rb
+      return File::NULL if File.const_defined?(:NULL)
+
+      platform = RUBY_PLATFORM
+      platform = RbConfig::CONFIG['host_os'] if platform == 'java'
+      case platform
+      when /mswin|mingw/i
+        'NUL'
+      when /amiga/i
+        'NIL:'
+      when /openvms/i
+        'NL:'
+      else
+        '/dev/null'
+      end
+    end
   end
 end

data/lib/grill/version.rb

@@ -1,3 +1,3 @@
 module Grill
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/grill_spec.rb

@@ -12,7 +12,7 @@ describe Grill do
   end
 
   it "#home" do
-    Grill.home.should == "#{ENV["GRILL_HOME"]}/.grill"
+    Grill.home.should match %r!^#{ENV["GRILL_HOME"]}/.grill!
   end
 
   # cannot use `context` because test will be broken
@@ -69,14 +69,14 @@ describe Grill do
   end
 
   it "separete Gemfile different contants" do
-    Grill.implant(<<-GEM)
-      gem "bundler"
-    GEM
-    Dir.glob("#{Grill.home}/*-*").length.should == 2 # Gemfile and Gemfile.lock
+    gemfile1 = 'gem "bundler"'
+    file1 = Grill.gemfile_path(gemfile1)
 
-    Grill.implant(<<-GEM)
+    gemfile2 = <<-GEM
       gem "dummy", :path => "#{File.expand_path(".././support", __FILE__)}"
     GEM
-    Dir.glob("#{Grill.home}/*-*").length.should == 4
+    file2 = Grill.gemfile_path(gemfile2)
+
+    file1.should_not == file2
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grill
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler