gemsmith 1.3.0 → 1.4.0

data/CHANGELOG.rdoc

@@ -1,3 +1,11 @@
+= v1.4.0
+
+* Added Travis CI templates for Rails build matrix that can support multiple version tests.
+* Added vendor files to gemspec template so they are included when building a new gem (especially Rails related).
+* Moved library requirements within the Rails conditional check so that requirements are only loaded if Rails is detected.
+* Modified the RSpec development dependency so that if Rails is detected, the rspec-rails gem is included instead.
+* Changed the Rails default version to 3.2.0.
+
 = v1.3.0
 
 * Specified Thor+ 0.2.x version dependency.

data/README.rdoc

@@ -54,7 +54,7 @@ If no options are configured, then the defaults are as follows:
   github_user: <github user>
   year: <current year>
   ruby_version: 1.9.0
-  rails_version: 3.1.0
+  rails_version: 3.2.0
 
 = Usage
 

data/lib/gemsmith/cli.rb

@@ -70,6 +70,12 @@ module Gemsmith
         template File.join("lib", "generators", "gem", "install", "USAGE.tmp"), File.join(target_path, "lib", "generators", gem_name, "install", "USAGE"), template_options
         template File.join("lib", "generators", "gem", "upgrade", "upgrade_generator.rb.tmp"), File.join(target_path, "lib", "generators", gem_name, "upgrade", "upgrade_generator.rb"), template_options
         template File.join("lib", "generators", "gem", "upgrade", "USAGE.tmp"), File.join(target_path, "lib", "generators", gem_name, "upgrade", "USAGE"), template_options
+        # Travis CI (optional).
+        if template_options[:travis]
+          template File.join("gemfiles", "rails-3.0.x.gemfile.tmp"), File.join(target_path, "gemfiles", "rails-3.0.x.gemfile"), template_options
+          template File.join("gemfiles", "rails-3.1.x.gemfile.tmp"), File.join(target_path, "gemfiles", "rails-3.1.x.gemfile"), template_options
+          template File.join("gemfiles", "rails-3.2.x.gemfile.tmp"), File.join(target_path, "gemfiles", "rails-3.2.x.gemfile"), template_options
+        end
       end
 
       # RSpec (optional).
@@ -165,7 +171,7 @@ module Gemsmith
         github_user: (settings[:github_user] || Gemsmith::Kit.git_config_value("github.user") || "unknown"),
         year: (settings[:year] || Time.now.year),
         ruby_version: (settings[:ruby_version] || "1.9.0"),
-        rails_version: (settings[:rails_version] || "3.1.0"),
+        rails_version: (settings[:rails_version] || "3.2.0"),
         post_install_message: settings[:post_install_message],
         bin: (options[:bin] || false),
         rails: (options[:rails] || false),

data/lib/gemsmith/templates/gem.gemspec.tmp

@@ -25,16 +25,17 @@ Gem::Specification.new do |s|
 	s.add_dependency "rails", "~> <%= config[:rails_version] %>"
 	<%- end -%>
   <%- if config[:travis] -%>
-	s.add_development_dependency "rake"
+  s.add_development_dependency "rake"
 	<%- end -%>
   <%- if config[:rspec] -%>
-	s.add_development_dependency "rspec"
+  <%- rspec_gem = config[:rails] ? "rspec-rails" : "rspec" -%>
+  s.add_development_dependency "<%= rspec_gem %>"
 	<%- end -%>
   <%- if config[:bin] -%>
 	s.add_development_dependency "aruba"
 	<%- end -%>
-
-  s.files            = Dir["lib/**/*"]
+	
+  s.files            = Dir["lib/**/*", "vendor/**/*"]
   s.extra_rdoc_files = Dir["README*", "CHANGELOG*", "LICENSE*"]
   <%- if config[:bin] -%>
 	s.executables      << "<%= config[:gem_name] %>"

data/lib/gemsmith/templates/gemfiles/rails-3.0.x.gemfile.tmp

@@ -0,0 +1,5 @@
+source :rubygems
+
+gem "rails", "~> 3.0.0"
+
+gemspec path: "../"

data/lib/gemsmith/templates/gemfiles/rails-3.1.x.gemfile.tmp

@@ -0,0 +1,5 @@
+source :rubygems
+
+gem "rails", "~> 3.1.0"
+
+gemspec path: "../"

data/lib/gemsmith/templates/gemfiles/rails-3.2.x.gemfile.tmp

@@ -0,0 +1,5 @@
+source :rubygems
+
+gem "rails", "~> 3.2.0"
+
+gemspec path: "../"

data/lib/gemsmith/templates/lib/gem.rb.tmp

@@ -1,16 +1,15 @@
-# Dependencies
 require File.join File.dirname(__FILE__), "<%= config[:gem_name] %>", "version.rb"
-<%- if config[:rails] -%>
-require File.join File.dirname(__FILE__), "<%= config[:gem_name] %>", "active_record", "class_methods.rb"
-require File.join File.dirname(__FILE__), "<%= config[:gem_name] %>", "active_record", "instance_methods.rb"
-require File.join File.dirname(__FILE__), "<%= config[:gem_name] %>", "action_view", "instance_methods.rb"
-require File.join File.dirname(__FILE__), "<%= config[:gem_name] %>", "action_controller", "class_methods.rb"
-require File.join File.dirname(__FILE__), "<%= config[:gem_name] %>", "action_controller", "instance_methods.rb"
-<%- end -%>
 
 <%- if config[:rails] -%>
 # Rails Enhancements
 if defined? Rails
+  # Dependencies
+  require File.join File.dirname(__FILE__), "<%= config[:gem_name] %>", "active_record", "class_methods.rb"
+  require File.join File.dirname(__FILE__), "<%= config[:gem_name] %>", "active_record", "instance_methods.rb"
+  require File.join File.dirname(__FILE__), "<%= config[:gem_name] %>", "action_view", "instance_methods.rb"
+  require File.join File.dirname(__FILE__), "<%= config[:gem_name] %>", "action_controller", "class_methods.rb"
+  require File.join File.dirname(__FILE__), "<%= config[:gem_name] %>", "action_controller", "instance_methods.rb"
+
   # Model
   if defined? ActiveRecord
     ActiveRecord::Base.send :include, <%= config[:gem_class] %>::ActiveRecord

data/lib/gemsmith/templates/travis.yml.tmp

@@ -2,4 +2,10 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
+<%- if config[:rails] -%>
+gemfile:
+  - gemfiles/rails-3.0.x.gemfile
+  - gemfiles/rails-3.1.x.gemfile
+  - gemfiles/rails-3.2.x.gemfile
+<%- end -%>
 script: bundle exec rspec spec

data/lib/gemsmith/version.rb

@@ -1,3 +1,3 @@
 module Gemsmith
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemsmith
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-14 00:00:00.000000000Z
+date: 2012-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70314477299460 !ruby/object:Gem::Requirement
+  requirement: &70142827478420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: 0.14.0
   type: :runtime
   prerelease: false
-  version_requirements: *70314477299460
+  version_requirements: *70142827478420
 - !ruby/object:Gem::Dependency
   name: thor_plus
-  requirement: &70314477299000 !ruby/object:Gem::Requirement
+  requirement: &70142827477960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70314477299000
+  version_requirements: *70142827477960
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70314477298620 !ruby/object:Gem::Requirement
+  requirement: &70142827477580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70314477298620
+  version_requirements: *70142827477580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70314477298160 !ruby/object:Gem::Requirement
+  requirement: &70142827477120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70314477298160
+  version_requirements: *70142827477120
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70314477297740 !ruby/object:Gem::Requirement
+  requirement: &70142827476700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70314477297740
+  version_requirements: *70142827476700
 description: ! 'Ruby gem skeleton generation for the professional gemsmith. Includes
   custom settings, binary, Ruby on Rails, and RSpec support. '
 email: brooke@redalchemist.com
@@ -86,6 +86,9 @@ files:
 - lib/gemsmith/templates/Rakefile.tmp
 - lib/gemsmith/templates/bin/gem.tmp
 - lib/gemsmith/templates/gem.gemspec.tmp
+- lib/gemsmith/templates/gemfiles/rails-3.0.x.gemfile.tmp
+- lib/gemsmith/templates/gemfiles/rails-3.1.x.gemfile.tmp
+- lib/gemsmith/templates/gemfiles/rails-3.2.x.gemfile.tmp
 - lib/gemsmith/templates/gitignore.tmp
 - lib/gemsmith/templates/lib/gem/action_controller/class_methods.rb.tmp
 - lib/gemsmith/templates/lib/gem/action_controller/instance_methods.rb.tmp
@@ -130,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.13
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Ruby gem skeleton generation for the professional gemsmith.