Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'rails' of github.com:winton/gem_template

Conflicts:
	Rakefile
	gem_template.gemspec
  • Loading branch information...
commit 035df5338f13a7bdfac635a5240127948427d450 2 parents 5729233 + d48370b
@winton winton authored
Showing with 13 additions and 10 deletions.
  1. +4 −2 Rakefile
  2. +6 −5 acts_as_archive.gemspec
  3. +3 −3 config/gemsets.yml
View
6 Rakefile
@@ -26,11 +26,13 @@ end
desc "Build gem(s)"
task :gem do
old_gemset = ENV['GEMSET']
- pkg = "#{File.dirname(__FILE__)}/pkg"
+ root = File.expand_path('../', __FILE__)
+ pkg = "#{root}/pkg"
system "rm -Rf #{pkg}"
ActsAsArchive::Gems.gemset_names.each do |gemset|
ENV['GEMSET'] = gemset.to_s
- system "mkdir -p #{pkg} && cd #{pkg} && gem build ../acts_as_archive.gemspec"
+ system "cd #{root} && gem build acts_as_archive.gemspec"
+ system "mkdir -p #{pkg} && mv *.gem pkg"
end
ENV['GEMSET'] = old_gemset
end
View
11 acts_as_archive.gemspec
@@ -1,7 +1,8 @@
# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib/', __FILE__)
+root = File.expand_path('../', __FILE__)
+lib = "#{root}/lib"
$:.unshift lib unless $:.include?(lib)
-
+
require 'acts_as_archive/gems'
ActsAsArchive::Gems.gemset ||= ENV['GEMSET'] || :default
@@ -24,8 +25,8 @@ Gem::Specification.new do |s|
s.add_development_dependency g.to_s, ActsAsArchive::Gems.versions[g]
end
- s.executables = `git ls-files -- {bin}/*`.split("\n").collect { |f| File.basename(f) }
- s.files = `git ls-files`.split("\n")
+ s.executables = `cd #{root} && git ls-files -- {bin}/*`.split("\n").collect { |f| File.basename(f) }
+ s.files = `cd #{root} && git ls-files`.split("\n")
s.require_paths = %w(lib)
- s.test_files = `git ls-files -- {features,test,spec}/*`.split("\n")
+ s.test_files = `cd #{root} && git ls-files -- {features,test,spec}/*`.split("\n")
end
View
6 config/gemsets.yml
@@ -2,9 +2,9 @@ acts_as_archive:
rake: >=0.8.7
rspec: ~>1.0
default:
- active_wrapper-solo: =0.4.1
- also_migrate: =0.2.3
+ active_wrapper-solo: =0.4.4
+ also_migrate: =0.3.2
externals: =1.0.2
framework_fixture: =0.1.3
- mover: =0.3.5
+ mover: =0.3.6
rack-test: =0.5.6
Please sign in to comment.
Something went wrong with that request. Please try again.