Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ERB support for config file #153

Merged
merged 14 commits into from Sep 8, 2013

Conversation

Projects
None yet
6 participants

Soliah and others added some commits Aug 12, 2013

Fix an issue where the wrong project file path was being returned.
Match the whole project name in the project regex.
Tim Pote
Fix bash completion with single arg.
Previously the script was assuming that a single arg meant that a mux
command must be next.  However, mux now supports calling just
'mux projet-name', meaning the bash completion script should do the
same.
Merge pull request #148 from potetm/bash-completion-fix
Fix bash completion with single arg.
Merge branch 'master' into erb-support
Conflicts:
	bin/tmuxinator
@coveralls

This comment has been minimized.

Copy link

coveralls commented Sep 8, 2013

Coverage Status

Coverage increased (+0.21%) when pulling 64afeb6 on danielbayerlein:erb-support into e45e259 on aziz:0.7.0-wip.

yaml = begin
YAML.load(File.read(config_path))
config_path = per_project ? name : Tmuxinator::Config.project(name)
YAML.load(ERB.new(File.read(config_path)).result)

This comment has been minimized.

This comment has been minimized.

@danielbayerlein

danielbayerlein Sep 8, 2013

Author

@Soliah: Sure. Sorry for the mistake. danielbayerlein@4bcdfb9


factory :project_with_erb, :class => Tmuxinator::Project do
ignore do
file { YAML.load(ERB.new(File.read("#{File.expand_path("spec/fixtures/sample.erb.yml")}")).result) }

This comment has been minimized.

@Soliah

Soliah Sep 8, 2013

Member

As before, please use Erubis.

This comment has been minimized.

@coveralls

This comment has been minimized.

Copy link

coveralls commented Sep 8, 2013

Coverage Status

Coverage remained the same when pulling 4bcdfb9 on danielbayerlein:erb-support into e45e259 on aziz:0.7.0-wip.

@Soliah

This comment has been minimized.

Copy link
Member

Soliah commented Sep 8, 2013

Thanks for the PR ❤️

Soliah added a commit that referenced this pull request Sep 8, 2013

Merge pull request #153 from danielbayerlein/erb-support
ERB support for project file.

@Soliah Soliah merged commit b291bfc into tmuxinator:0.7.0-wip Sep 8, 2013

1 check passed

default The Travis CI build passed
Details

@danielbayerlein danielbayerlein deleted the danielbayerlein:erb-support branch Sep 8, 2013

@amiel

This comment has been minimized.

Copy link

amiel commented Sep 9, 2013

erubis++

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.