Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert back to the old way of doing bundler support.

  • Loading branch information...
commit bbd5d4dbc643965bc34371460005b5f5e819865f 1 parent d70cd51
@technicalpickles technicalpickles authored
View
10 Gemfile
@@ -1,11 +1,9 @@
source 'http://gemcutter.org'
source 'http://gems.github.com'
-group :runtime do
- gem "rake"
- gem "git", ">= 1.2.5"
- gem "bundler", ">= 1.0.0.rc.5"
-end
+gem "rake"
+gem "git", ">= 1.2.5"
+gem "bundler", ">= 1.0.0.rc.5"
group :development do
gem "shoulda"
@@ -19,5 +17,5 @@ group :development do
gem "rcov"
gem "timecop"
gem "activesupport", "~> 2.3.5"
- gem "ruby-debug"
+ #gem "ruby-debug"
end
View
2  Rakefile
@@ -1,7 +1,7 @@
require 'rake'
require 'bundler'
begin
- Bundler.setup(:runtime, :development)
+ Bundler.setup(:default, :development)
rescue Bundler::BundlerError => e
$stderr.puts e.message
$stderr.puts "Run `bundle install` to install missing gems"
View
1  VERSION
@@ -0,0 +1 @@
+1.5.0.pre
View
5 VERSION.yml
@@ -1,5 +0,0 @@
----
-:minor: 4
-:patch: 0
-:major: 1
-:build:
View
37 jeweler.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Josh Nichols"]
- s.date = %q{2010-02-15}
+ s.date = %q{2010-08-18}
s.default_executable = %q{jeweler}
s.description = %q{Simple and opinionated helper for creating Rubygem projects on GitHub}
s.email = %q{josh@technicalpickles.com}
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
"TODO"
]
s.files = [
+ ".document",
".gitignore",
"ChangeLog.markdown",
"Gemfile",
@@ -104,9 +105,9 @@ Gem::Specification.new do |s|
"lib/jeweler/templates/other_tasks.erb",
"lib/jeweler/templates/riot/flunking.rb",
"lib/jeweler/templates/riot/helper.rb",
+ "lib/jeweler/templates/rspec/.rspec",
"lib/jeweler/templates/rspec/flunking.rb",
"lib/jeweler/templates/rspec/helper.rb",
- "lib/jeweler/templates/rspec/spec.opts",
"lib/jeweler/templates/shindo/flunking.rb",
"lib/jeweler/templates/shindo/helper.rb",
"lib/jeweler/templates/shoulda/flunking.rb",
@@ -174,14 +175,12 @@ Gem::Specification.new do |s|
"test/jeweler/test_version_helper.rb",
"test/shoulda_macros/jeweler_macros.rb",
"test/test_helper.rb",
- "test/test_jeweler.rb",
- "tmp/existing-project-with-version-plaintext/VERSION"
+ "test/test_jeweler.rb"
]
s.homepage = %q{http://github.com/technicalpickles/jeweler}
- s.rdoc_options = ["--charset=UTF-8"]
s.require_paths = ["lib"]
- s.rubygems_version = %q{1.3.5}
- s.summary = %q{Simple and opinionated helper for creating Rubygem projects on GitHub}
+ s.rubygems_version = %q{1.3.6}
+ s.summary = %q{Opinionated tool for creating and managing RubyGem projects}
s.test_files = [
"test/fixtures/bar/lib/foo_the_ultimate_lib.rb",
"test/fixtures/existing-project-with-version-constant/lib/existing_project_with_version.rb",
@@ -226,46 +225,52 @@ Gem::Specification.new do |s|
if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<rake>, [">= 0"])
s.add_runtime_dependency(%q<git>, [">= 1.2.5"])
- s.add_runtime_dependency(%q<gemcutter>, [">= 0.1.0"])
- s.add_runtime_dependency(%q<bundler>, [">= 0.9.5"])
+ s.add_runtime_dependency(%q<bundler>, [">= 1.0.0.rc.5"])
s.add_development_dependency(%q<shoulda>, [">= 0"])
s.add_development_dependency(%q<mhennemeyer-output_catcher>, [">= 0"])
s.add_development_dependency(%q<rr>, [">= 0"])
s.add_development_dependency(%q<mocha>, [">= 0"])
s.add_development_dependency(%q<redgreen>, [">= 0"])
- s.add_development_dependency(%q<devver-construct>, [">= 0"])
+ s.add_development_dependency(%q<test-construct>, [">= 0"])
s.add_development_dependency(%q<yard>, [">= 0"])
s.add_development_dependency(%q<cucumber>, [">= 0"])
s.add_development_dependency(%q<rcov>, [">= 0"])
+ s.add_development_dependency(%q<timecop>, [">= 0"])
+ s.add_development_dependency(%q<activesupport>, ["~> 2.3.5"])
+ s.add_development_dependency(%q<ruby-debug>, [">= 0"])
else
s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<git>, [">= 1.2.5"])
- s.add_dependency(%q<gemcutter>, [">= 0.1.0"])
- s.add_dependency(%q<bundler>, [">= 0.9.5"])
+ s.add_dependency(%q<bundler>, [">= 1.0.0.rc.5"])
s.add_dependency(%q<shoulda>, [">= 0"])
s.add_dependency(%q<mhennemeyer-output_catcher>, [">= 0"])
s.add_dependency(%q<rr>, [">= 0"])
s.add_dependency(%q<mocha>, [">= 0"])
s.add_dependency(%q<redgreen>, [">= 0"])
- s.add_dependency(%q<devver-construct>, [">= 0"])
+ s.add_dependency(%q<test-construct>, [">= 0"])
s.add_dependency(%q<yard>, [">= 0"])
s.add_dependency(%q<cucumber>, [">= 0"])
s.add_dependency(%q<rcov>, [">= 0"])
+ s.add_dependency(%q<timecop>, [">= 0"])
+ s.add_dependency(%q<activesupport>, ["~> 2.3.5"])
+ s.add_dependency(%q<ruby-debug>, [">= 0"])
end
else
s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<git>, [">= 1.2.5"])
- s.add_dependency(%q<gemcutter>, [">= 0.1.0"])
- s.add_dependency(%q<bundler>, [">= 0.9.5"])
+ s.add_dependency(%q<bundler>, [">= 1.0.0.rc.5"])
s.add_dependency(%q<shoulda>, [">= 0"])
s.add_dependency(%q<mhennemeyer-output_catcher>, [">= 0"])
s.add_dependency(%q<rr>, [">= 0"])
s.add_dependency(%q<mocha>, [">= 0"])
s.add_dependency(%q<redgreen>, [">= 0"])
- s.add_dependency(%q<devver-construct>, [">= 0"])
+ s.add_dependency(%q<test-construct>, [">= 0"])
s.add_dependency(%q<yard>, [">= 0"])
s.add_dependency(%q<cucumber>, [">= 0"])
s.add_dependency(%q<rcov>, [">= 0"])
+ s.add_dependency(%q<timecop>, [">= 0"])
+ s.add_dependency(%q<activesupport>, ["~> 2.3.5"])
+ s.add_dependency(%q<ruby-debug>, [">= 0"])
end
end
View
12 lib/jeweler/specification.rb
@@ -71,6 +71,18 @@ def set_jeweler_defaults(base_dir, git_base_dir = nil)
if blank?(extra_rdoc_files)
self.extra_rdoc_files = FileList['README*', 'ChangeLog*', 'LICENSE*', 'TODO']
end
+
+ if File.exist?('Gemfile')
+ require 'bundler'
+ bundler = Bundler.load
+ bundler.dependencies_for(:default).each do |dependency|
+ self.add_dependency dependency.name, dependency.requirement.to_s
+ end
+ bundler.dependencies_for(:development).each do |dependency|
+ self.add_development_dependency dependency.name, dependency.requirement.to_s
+ end
+ end
+
end
end
View
5 lib/jeweler/templates/Gemfile
@@ -1,7 +1,6 @@
# Add dependencies required to use your gem here.
-group :runtime do
- #gem 'bundler', '>= 0.9.5'
-end
+# Example:
+# gem "activesupport", ">= 2.3.5"
# Add dependencies to develop your gem here.
# Include everything needed to run rake, tests, features, etc.
View
11 lib/jeweler/templates/jeweler_tasks.erb
@@ -1,5 +1,6 @@
require 'jeweler'
Jeweler::Tasks.new do |gem|
+ # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
gem.name = "<%= project_name %>"
gem.summary = %Q{<%= summary %>}
gem.description = %Q{<%= description %>}
@@ -9,9 +10,13 @@ Jeweler::Tasks.new do |gem|
<% if should_setup_rubyforge %>
gem.rubyforge_project = "<%= project_name %>"
<% end %>
- # Have dependencies? Add them to Gemfile
-
- # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20
+ # Include your dependencies below. Runtime dependencies are required when using your gem,
+ # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
+ # spec.add_runtime_dependency 'jabber4r', '> 0.1'
+ # spec.add_runtime_dependency 'rspec', '> 1.2.3'
+<% development_dependencies.each do |name, version| %>
+ gem.add_development_dependency "<%= name %>", "<%= version %>"
+<% end %>
end
Jeweler::GemcutterTasks.new
<% if should_setup_rubyforge %>
View
4 test/test_helper.rb
@@ -8,7 +8,7 @@
require 'bundler'
begin
- Bundler.setup(:runtime, :development)
+ Bundler.setup(:default, :development)
rescue Bundler::BundlerError => e
$stderr.puts e.message
$stderr.puts "Run `bundle install` to install missing gems"
@@ -18,7 +18,7 @@
require 'rake'
require 'shoulda'
require 'rr'
-require 'redgreen'
+#require 'redgreen'
require 'construct'
require 'git'
require 'time'
Please sign in to comment.
Something went wrong with that request. Please try again.