Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ depcomp
src/gitsh
lib/gitsh/version.rb
gitsh-*.tar.gz
vendor/gems

# Sub-repositories for release
gh-pages
Expand Down
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ source 'https://rubygems.org'

ruby '2.0.0'

gem 'parslet'
group :dist do
gem 'parslet'
end

group :test do
gem 'rspec'
Expand Down
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man lib/gitsh
SUBDIRS = src man lib/gitsh vendor
EXTRA_DIST = LICENSE README.md

.PHONY: release \
Expand Down
14 changes: 12 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,24 @@ AX_PROG_RUBY_VERSION(
AC_MSG_ERROR(Ruby 2.0 or later is required to install gitsh)
)

newer=$(ls -t $srcdir/Gemfile.lock $srcdir/vendor/gems/setup.rb 2>/dev/null | (read n; echo $n))
if test "$newer" == "$srcdir/Gemfile.lock"; then
rm -rf vendor/gems
$srcdir/vendor/vendorize vendor/gems || AC_MSG_ERROR([Vendorizing gems failed])
fi

rubydir=$datadir/$PACKAGE/ruby
pkgrubydir=$rubydir/$PACKAGE
libfiles="$(cd `dirname $0`/lib/gitsh; echo *.rb)"
libfiles="$(cd "$(dirname "$0")/lib/gitsh"; echo *.rb)"
vendorfiles="$(cd "$(dirname "$0")/vendor"; echo $(find gems -type f))"
gemsetuppath=$datadir/$PACKAGE/gems/setup.rb

AC_SUBST([RUBY])
AC_SUBST([rubydir])
AC_SUBST([pkgrubydir])
AC_SUBST([libfiles])
AC_SUBST([vendorfiles])
AC_SUBST([gemsetuppath])

AC_CONFIG_FILES([Makefile src/Makefile lib/gitsh/Makefile man/Makefile])
AC_CONFIG_FILES([Makefile src/Makefile lib/gitsh/Makefile man/Makefile vendor/Makefile])
AC_OUTPUT
3 changes: 2 additions & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ EXTRA_DIST = gitsh.in

edit = sed \
-e 's|@RUBY[@]|$(RUBY)|g' \
-e 's|@rubydir[@]|$(rubydir)|g'
-e 's|@rubydir[@]|$(rubydir)|g' \
-e 's|@gemsetuppath[@]|$(gemsetuppath)|g'

gitsh: Makefile gitsh.in
$(edit) $(srcdir)/$@.in > $@
Expand Down
1 change: 1 addition & 0 deletions src/gitsh.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

$LOAD_PATH.unshift('@rubydir@')

require '@gemsetuppath@'
require 'gitsh/cli'

begin
Expand Down
5 changes: 5 additions & 0 deletions vendor/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
nobase_dist_pkgdata_DATA = $(vendorfiles)
EXTRA_DIST = vendorize

distclean-local:
-rm -rf gems
30 changes: 30 additions & 0 deletions vendor/vendorize
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/usr/bin/env ruby

require 'bundler'

unless ARGV.length == 1
$stderr.puts "usage: vendorize path-to-gems"
exit 64
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want to start a campaign to get your nickname internationally recognized as Sysexits.

George "Sysexits" Brocklehurst.

end

TARGET_PATH = ARGV.first
SETUP_PATH = File.join(TARGET_PATH, 'setup.rb')

FileUtils.mkdir_p(TARGET_PATH)

File.open(SETUP_PATH, 'w') do |setup_file|
Bundler.definition.specs_for([:dist]).each do |gem|
if gem.name != 'bundler'
system(
'/usr/bin/env', 'gem', 'unpack',
'--target', TARGET_PATH,
'--version', gem.version.to_s,
gem.name
)

setup_file << "$LOAD_PATH.unshift(File.expand_path(%s, __FILE__))\n" % [
"../#{gem.name}-#{gem.version}/lib".inspect
]
end
end
end