Make changes and patch patch for xdg update.

3 files changed, 104 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fbd8bc769255..660b14be676d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,21 @@
 pkgbase = tmuxinator
 	pkgdesc = Manage complex tmux sessions easily
 	pkgver = 2.0.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/aziz/tmuxinator
 	arch = any
 	license = MIT
-	makedepends = rubygems
+	makedepends = ruby-bundler
 	depends = ruby
 	depends = ruby-erubis
 	depends = ruby-thor
-	depends = ruby-xdg>=2.2.5
+	depends = ruby-xdg>=4.3.0
 	depends = ruby-rdoc
-	noextract = tmuxinator-2.0.2.gem
-	source = http://rubygems.org/downloads/tmuxinator-2.0.2.gem
-	md5sums = 298a13a2798aa7941bfe6e40579a9479
+	options = !emptydirs
+	source = tmuxinator-2.0.2.tar.gz::https://github.com/aziz/tmuxinator/archive/v2.0.2.tar.gz
+	source = xdg.patch
+	sha256sums = 2e473fc56f9491f682ec115b62c07b29bbfb79b2e5bb0cc33ea3c5e008e6f852
+	sha256sums = 565f40e0e314a82d5ce547333d6d912efa7c3e0bd6330892eea28319eef49316
 
 pkgname = tmuxinator
 
diff --git a/PKGBUILD b/PKGBUILD
index 60b84b2d7990..519be16da7c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,59 @@
 # Contributor: Luca Cesari < luca AT cesari DOT me>
-_gemname=tmuxinator
 pkgname=tmuxinator
 pkgver=2.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Manage complex tmux sessions easily"
 arch=(any)
 url="https://github.com/aziz/tmuxinator"
 license=(MIT)
-depends=(ruby ruby-erubis ruby-thor 'ruby-xdg>=2.2.5' ruby-rdoc)
-makedepends=(rubygems)
-source=(http://rubygems.org/downloads/tmuxinator-$pkgver.gem)
-noextract=(tmuxinator-$pkgver.gem)
-md5sums=('298a13a2798aa7941bfe6e40579a9479')
+depends=(
+  'ruby'
+  'ruby-erubis'
+  'ruby-thor'
+  'ruby-xdg>=4.3.0'
+  'ruby-rdoc'
+)
+makedepends=('ruby-bundler')
+options=('!emptydirs')
+source=(
+  "${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz"
+  "xdg.patch"
+)
+sha256sums=('2e473fc56f9491f682ec115b62c07b29bbfb79b2e5bb0cc33ea3c5e008e6f852'
+            '565f40e0e314a82d5ce547333d6d912efa7c3e0bd6330892eea28319eef49316')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 < ../xdg.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  mkdir -p pkg
+  gem build -o "pkg/${pkgname}-${pkgver}.gem"
+}
 
 package() {
-    cd $srcdir
-    export HOME='/tmp'
-    local _gemdir="$(ruby -rrubygems -e'puts Gem.default_dir')"
-    install -d -m 755 ${pkgdir}/usr/bin
-    gem install --no-user-install --ignore-dependencies -i "${pkgdir}${_gemdir}" -n ${pkgdir}/usr/bin ${_gemname}-${pkgver}.gem
+  cd ${pkgname}-${pkgver}
+  local _gemdir
+  _gemdir="$(gem env gemdir)"
+
+  gem install \
+    --verbose \
+    --ignore-dependencies \
+    --no-user-install \
+    --install-dir "${pkgdir}/${_gemdir}" \
+    --bindir "${pkgdir}/usr/bin" \
+    "pkg/${pkgname}-${pkgver}.gem"
+
+  mkdir -p "${pkgdir}/usr/share/tmuxinator"
+  install -D -m 644 "${pkgdir}/${_gemdir}/gems/tmuxinator-${pkgver}/completion/tmuxinator.bash" "${pkgdir}/usr/share/tmuxinator/completion.bash"
+  install -D -m 644 "${pkgdir}/${_gemdir}/gems/tmuxinator-${pkgver}/completion/tmuxinator.fish" "${pkgdir}/usr/share/tmuxinator/completion.fish"
+  install -D -m 644 "${pkgdir}/${_gemdir}/gems/tmuxinator-${pkgver}/completion/tmuxinator.zsh" "${pkgdir}/usr/share/tmuxinator/completion.zsh"
+  install -D -m 644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
-    rm "${pkgdir}/${_gemdir}/cache/${_gemname}-${pkgver}.gem"
-    mkdir -p "${pkgdir}/usr/share/tmuxinator"
-    install -D -m 644 "${pkgdir}/${_gemdir}/gems/tmuxinator-${pkgver}/completion/tmuxinator.bash" "${pkgdir}/usr/share/tmuxinator/completion.bash"
-    install -D -m 644 "${pkgdir}/${_gemdir}/gems/tmuxinator-${pkgver}/completion/tmuxinator.fish" "${pkgdir}/usr/share/tmuxinator/completion.fish"
-    install -D -m 644 "${pkgdir}/${_gemdir}/gems/tmuxinator-${pkgver}/completion/tmuxinator.zsh" "${pkgdir}/usr/share/tmuxinator/completion.zsh"
-    install -D -m 644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  rm -rf "${pkgdir}/${_gemdir}/cache"
+  install -D -m 644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 # vim:set ts=2 sw=2 :
diff --git a/xdg.patch b/xdg.patch
new file mode 100644
index 000000000000..34f669fb1681
--- /dev/null
+++ b/xdg.patch
@@ -0,0 +1,50 @@
+diff --git a/lib/tmuxinator/config.rb b/lib/tmuxinator/config.rb
+index 25620bf..fcc61a3 100644
+--- a/lib/tmuxinator/config.rb
++++ b/lib/tmuxinator/config.rb
+@@ -29,7 +29,7 @@ module Tmuxinator
+       # 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?
+diff --git a/spec/lib/tmuxinator/config_spec.rb b/spec/lib/tmuxinator/config_spec.rb
+index 71b8da2..d28a60a 100644
+--- a/spec/lib/tmuxinator/config_spec.rb
++++ b/spec/lib/tmuxinator/config_spec.rb
+@@ -53,7 +53,8 @@ describe Tmuxinator::Config do
+
+         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
+@@ -134,7 +135,8 @@ describe Tmuxinator::Config do
+
+   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
+
+diff --git a/tmuxinator.gemspec b/tmuxinator.gemspec
+index 1b02053..3f4c8f8 100644
+--- a/tmuxinator.gemspec
++++ b/tmuxinator.gemspec
+@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
+
+   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", ">= 4.3.0"
+
+   s.add_development_dependency "activesupport", "< 5.0.0" # Please see issue #432
+   s.add_development_dependency "awesome_print", "~> 1.2"