haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pushes/harmony: expand dir relative to Vagrantfile root path

This commit is contained in:
Mitchell Hashimoto 2014-10-29 09:48:18 -07:00 committed by Seth Vargo
parent f3f4f4aeb6
commit 1705460880
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/pushes/harmony/push.rb
View File

@ -27,7 +27,7 @@ module VagrantPlugins
cmd += @config.include.map { |v| ["-include", v] } if !@config.include.empty? cmd += @config.include.map { |v| ["-include", v] } if !@config.include.empty?
cmd += @config.exclude.map { |v| ["-exclude", v] } if !@config.exclude.empty? cmd += @config.exclude.map { |v| ["-exclude", v] } if !@config.exclude.empty?
cmd << @config.app cmd << @config.app
cmd << @config.dir cmd << File.expand_path(@config.dir, @environment.root_path)
Vagrant::Util::SafeExec.exec(uploader, *cmd.flatten) Vagrant::Util::SafeExec.exec(uploader, *cmd.flatten)
end end

17
test/unit/plugins/pushes/harmony/push_test.rb
View File

@ -12,13 +12,16 @@ describe VagrantPlugins::HarmonyPush::Push do
end end
end end
let(:machine) { double("machine") } let(:environment) { double("environment") }
subject { described_class.new(machine, config) } subject { described_class.new(environment, config) }
before do before do
# Stub this right away to avoid real execs # Stub this right away to avoid real execs
allow(Vagrant::Util::SafeExec).to receive(:exec) allow(Vagrant::Util::SafeExec).to receive(:exec)
allow(environment).to receive(:root_path).and_return(
File.expand_path("../", __FILE__))
end end
describe "#push" do describe "#push" do
@ -47,14 +50,14 @@ describe VagrantPlugins::HarmonyPush::Push do
it "sends the basic flags" do it "sends the basic flags" do
expect(Vagrant::Util::SafeExec).to receive(:exec). expect(Vagrant::Util::SafeExec).to receive(:exec).
with("foo", "-vcs", app, ".") with("foo", "-vcs", app, environment.root_path.to_s)
subject.execute("foo") subject.execute("foo")
end end
it "doesn't send VCS if disabled" do it "doesn't send VCS if disabled" do
expect(Vagrant::Util::SafeExec).to receive(:exec). expect(Vagrant::Util::SafeExec).to receive(:exec).
with("foo", app, ".") with("foo", app, environment.root_path.to_s)
config.vcs = false config.vcs = false
subject.execute("foo") subject.execute("foo")
@ -62,7 +65,8 @@ describe VagrantPlugins::HarmonyPush::Push do
it "sends includes" do it "sends includes" do
expect(Vagrant::Util::SafeExec).to receive(:exec). expect(Vagrant::Util::SafeExec).to receive(:exec).
with("foo", "-vcs", "-include", "foo", "-include", "bar", app, ".") with("foo", "-vcs", "-include", "foo", "-include",
"bar", app, environment.root_path.to_s)
config.include = ["foo", "bar"] config.include = ["foo", "bar"]
subject.execute("foo") subject.execute("foo")
@ -70,7 +74,8 @@ describe VagrantPlugins::HarmonyPush::Push do
it "sends excludes" do it "sends excludes" do
expect(Vagrant::Util::SafeExec).to receive(:exec). expect(Vagrant::Util::SafeExec).to receive(:exec).
with("foo", "-vcs", "-exclude", "foo", "-exclude", "bar", app, ".") with("foo", "-vcs", "-exclude", "foo", "-exclude",
"bar", app, environment.root_path.to_s)
config.exclude = ["foo", "bar"] config.exclude = ["foo", "bar"]
subject.execute("foo") subject.execute("foo")