Skip to content

Commit

Permalink
Merge e3ff161 into d675b36
Browse files Browse the repository at this point in the history
  • Loading branch information
ethagnawl committed Apr 25, 2020
2 parents d675b36 + e3ff161 commit 61325be
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## Unreleased
### Misc
- bump XDG dependency to 3.0.1, which is the most up-to-date version aligned
with tmuxinator's list of currently supported Rubies (#753)
- add support for tmux 3.1 (#754)
- bump copyright year in README

Expand Down
2 changes: 1 addition & 1 deletion lib/tmuxinator/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def home?
# a custom value. (e.g. if $XDG_CONFIG_HOME is set to ~/my-config, the
# return value will be ~/my-config/tmuxinator)
def xdg
XDG["CONFIG"].to_s + "/tmuxinator"
XDG::Config.new.home.to_s + "/tmuxinator"
end

def xdg?
Expand Down
6 changes: 4 additions & 2 deletions spec/lib/tmuxinator/config_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@

Dir.mktmpdir do |dir|
config_parent = "#{dir}/non_existant_parent/s"
allow(XDG).to receive(:[]).with("CONFIG").and_return config_parent
allow(XDG::Config).to receive_message_chain(:new, :home, :to_s).
and_return config_parent
expect(described_class.directory).
to eq "#{config_parent}/tmuxinator"
expect(File.directory?("#{config_parent}/tmuxinator")).to be true
Expand Down Expand Up @@ -134,7 +135,8 @@

describe "#xdg" do
it "is $XDG_CONFIG_HOME/tmuxinator" do
expect(described_class.xdg).to eq "#{XDG['CONFIG_HOME']}/tmuxinator"
config_home = XDG::Config.new.home.to_s
expect(described_class.xdg).to eq "#{config_home}/tmuxinator"
end
end

Expand Down
4 changes: 2 additions & 2 deletions tmuxinator.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ Gem::Specification.new do |s|
}

s.required_rubygems_version = ">= 1.8.23"
s.required_ruby_version = ">= 2.4.6"
s.required_ruby_version = ">= 2.5.8"

s.add_dependency "erubis", "~> 2.6"
s.add_dependency "thor", "~> 1.0"
s.add_dependency "xdg", "~> 2.2", ">= 2.2.5"
s.add_dependency "xdg", "~> 3.0.1"

s.add_development_dependency "activesupport", "< 5.0.0" # Please see issue #432
s.add_development_dependency "awesome_print", "~> 1.2"
Expand Down

0 comments on commit 61325be

Please sign in to comment.