vagrant-ruby 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c32b7bf20347664e5133c3d1144e2e72ce284026
-  data.tar.gz: 61312965535dd1ed61db74839cb6ad0628107852
+  metadata.gz: 8bf8ed159bb358a5d35db45d371cc69334757dea
+  data.tar.gz: 4759fabdbdc6f1152b7f1d3d861193b055319c4e
 SHA512:
-  metadata.gz: 6650a2ed95a8bfd9f39d8ad4d24d8d1c62ba74784e2a28b6315e8e0a52999d177d0efeae6f6eead14e84154e02ac18707a3d3591e80ddb0474ee14dfa6d42875
-  data.tar.gz: f669b4efb39591a7992fd3dcac8930c882a8bc30a6e081293c03e7cc4ab9d9aef4031ea2cb294910ca99025f1af281599a2d334b04f1d1be8e826d429a32e687
+  metadata.gz: 9c4943f1034084ed9ea3d1253debed0120cddd8f57def5dd7d685947381f3f19420e61af91f4f6190174f8562e2f2d54ab168879cf8ce9b9811e4c8eda1bcdf6
+  data.tar.gz: 51d0ffae863d09e1a9671c6748d8c967ec39c4f927f324682866c0ae4b792466894d570055ca66caf2371e79c78149b0290c0dc8e07eca997e2a2c9aa632ca48

data/lib/{vagrant/ruby.rb → vagrant-ruby.rb}

@@ -18,20 +18,21 @@
 #
 
 require 'rubygems'
-require 'vagrant/ruby/version'
 
 module Vagrant
   module Ruby
-    COMMANDS = %w{gem irb rake rdoc ruby}
+    COMMANDS = %w{gem irb rake rdoc}
 
     class Command < Vagrant.plugin('2', :command)
       attr_reader :name
+      attr_reader :flags
 
       def initialize(name)
         @name = name
       end
 
-      def new(*_) # Oy vey.
+      def new(flags, *_)
+        @flags = flags
         self
       end
 
@@ -39,16 +40,49 @@ module Vagrant
         "execute Vagrant's embedded #{name}"
       end
 
+      def with_clean_env
+        if not defined? ::Bundler
+          yield
+        else
+          ::Bundler.with_clean_env do
+            yield
+          end
+        end
+      end
+
       def execute
-        command = File.join(Gem.default_bindir, name)
-        Process.exec([command, name], *ARGV[1..-1])
+        with_clean_env do
+          command = File.join(Gem.default_bindir, name)
+          Process.exec([command, name], *flags)
+        end
+      end
+    end
+
+    class Ruby < Command
+      def execute
+        preflags, subcommand, subflags = split_main_and_subcommand(flags)
+        case subcommand
+        when 'exec'
+          Command.new(subflags.first).new(subflags.slice(1..-1)).execute
+        when 'ruby'
+          Command.new('ruby').new(preflags + subflags).execute
+        else
+          Command.new('ruby').new(flags).execute
+        end
       end
     end
 
     class Plugin < Vagrant.plugin('2')
       name 'ruby'
+
+      command('ruby') do
+        Ruby.new('ruby')
+      end
+
       COMMANDS.each do |name|
-        command(name) { Command.new(name) }
+        command(name) do
+          Command.new(name)
+        end
       end
     end
   end

data/lib/{vagrant/ruby → vagrant-ruby}/version.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016 Catalyst.net Ltd
+# Copyright (c) 2016-2017 Catalyst.net Ltd
 #
 # This file is part of vagrant-ruby.
 #
@@ -20,6 +20,6 @@
 module Vagrant
   module Ruby
     NAME = 'vagrant-ruby'
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Evan Hanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies: []
 description: Adds subcommands for Vagrant's embedded Ruby and associated programs
 email: evanh@catalyst.net.nz
@@ -16,8 +16,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/vagrant/ruby.rb
-- lib/vagrant/ruby/version.rb
+- lib/vagrant-ruby.rb
+- lib/vagrant-ruby/version.rb
 homepage: https://gitlab.com/catalyst-it/vagrant-ruby
 licenses:
 - GPL-3.0
@@ -38,7 +38,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Use Vagrant's embedded Ruby commands