jeweler 1.8.1 → 1.8.2

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+notifications:
+  irc: "irc.freenode.org#jeweler"

data/ChangeLog.markdown

@@ -1,3 +1,9 @@
+# jeweler 1.8.2, 2012-01-24
+
+ * Standardize on invoking jeweler in development: bundle exec jeweler #220
+ * Add travis-ci configuration and build status to README #222
+ * Updated version of rspec used by generator to 2.8.0 #223
+
 # jeweler 1.8.1, 2012-01-24
 
  * Generated projects using yard now use ~> 0.7.4 #219

data/Gemfile

@@ -1,24 +1,35 @@
 source "http://rubygems.org"
 source "http://gems.github.com"
 
+# steal a page from bundler's gemspec:
+# add this directory as jeweler, in order to bundle exec jeweler and use the current working directory
+gem 'jeweler', :path => '.'
+
 gem "rake"
 gem "git", ">= 1.2.5"
 gem "bundler", "~> 1.0"
 gem "rdoc"
 
 group :development do
-  gem "shoulda"
-  gem "mhennemeyer-output_catcher"
-  gem "rr"
-  gem "mocha"
-  gem "redgreen"
-  gem "test-construct"
   gem "yard", "~> 0.7.4"
   gem "rdoc"
   gem "bluecloth"
   gem "cucumber", "~> 1.1.4"
   gem "rcov"
+end
+
+group :test do
   gem "timecop"
   gem "activesupport", "~> 2.3.5"
+  gem "shoulda"
+  gem "mhennemeyer-output_catcher"
+  gem "rr", "~> 1.0.4"
+  gem "mocha"
+  gem "redgreen"
+  gem "test-construct"
+  gem "rake"
+end
+
+group :debug do
   gem (RUBY_VERSION =~ /^1\.9/ ? "ruby-debug19" : "ruby-debug")
 end

data/Gemfile.lock

@@ -1,3 +1,12 @@
+PATH
+  remote: .
+  specs:
+    jeweler (1.8.1)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+
 GEM
   remote: http://rubygems.org/
   remote: http://gems.github.com/
@@ -5,7 +14,7 @@ GEM
     activesupport (2.3.8)
     bluecloth (2.0.7)
     builder (3.0.0)
-    columnize (0.3.1)
+    columnize (0.3.6)
     cucumber (1.1.4)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -17,20 +26,22 @@ GEM
       json (>= 1.4.6)
     git (1.2.5)
     json (1.6.3)
-    linecache (0.43)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
     mhennemeyer-output_catcher (1.0.1)
     mocha (0.9.8)
       rake
     rake (0.9.2.2)
+    rbx-require-relative (0.0.5)
     rcov (0.9.8)
     rdoc (3.12)
       json (~> 1.4)
     redgreen (1.2.2)
-    rr (0.10.11)
-    ruby-debug (0.10.3)
+    rr (1.0.4)
+    ruby-debug (0.10.4)
       columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.3.0)
-    ruby-debug-base (0.10.3)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
       linecache (>= 0.3)
     shoulda (2.11.3)
     term-ansicolor (1.0.7)
@@ -47,13 +58,14 @@ DEPENDENCIES
   bundler (~> 1.0)
   cucumber (~> 1.1.4)
   git (>= 1.2.5)
+  jeweler!
   mhennemeyer-output_catcher
   mocha
   rake
   rcov
   rdoc
   redgreen
-  rr
+  rr (~> 1.0.4)
   ruby-debug
   shoulda
   test-construct

data/README.markdown

@@ -5,6 +5,8 @@ Jeweler provides the noble ruby developer with two primary features:
  * a library for managing and releasing RubyGem projects
  * a scaffold generator for starting new RubyGem projects
 
+[![Build Status](https://secure.travis-ci.org/technicalpickles/jeweler.png)](http://travis-ci.org/technicalpickles/jeweler])
+
 ## Hello, world
 
 Use RubyGems to install the heck out of jeweler to get started: 

data/bin/jeweler

@@ -1,5 +1,8 @@
-#!/usr/bin/env ruby
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+# Don't try to run this binary directory. Instead:
+# * `bundle exec jeweler` if doing jeweler development
+# * `bundle exec jeweler` if part of a bundle
+# * `jeweler` if installed through rubygems, relying on the rubygem wrapper
+
 require 'jeweler/generator'
 
 exit Jeweler::Generator::Application.run!(*ARGV)

data/features/support/env.rb

@@ -1,6 +1,6 @@
 require 'bundler'
 begin
-  Bundler.setup(:default, :development)
+  Bundler.setup(:default, :test)
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
   $stderr.puts "Run `bundle install` to install missing gems"

data/jeweler.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "jeweler"
-  s.version = "1.8.1"
+  s.version = "1.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Nichols"]
-  s.date = "2012-01-24"
+  s.date = "2012-01-25"
   s.description = "Simple and opinionated helper for creating Rubygem projects on GitHub"
   s.email = "josh@technicalpickles.com"
   s.executables = ["jeweler"]
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".travis.yml",
     ".yardopts",
     "ChangeLog.markdown",
     "Gemfile",
@@ -189,63 +190,39 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<rake>, [">= 0"])
       s.add_runtime_dependency(%q<git>, [">= 1.2.5"])
       s.add_runtime_dependency(%q<bundler>, ["~> 1.0"])
       s.add_runtime_dependency(%q<rdoc>, [">= 0"])
-      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<test-construct>, [">= 0"])
       s.add_development_dependency(%q<yard>, ["~> 0.7.4"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<bluecloth>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, ["~> 1.1.4"])
       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<jeweler>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<git>, [">= 1.2.5"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
-      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<test-construct>, [">= 0"])
       s.add_dependency(%q<yard>, ["~> 0.7.4"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<bluecloth>, [">= 0"])
       s.add_dependency(%q<cucumber>, ["~> 1.1.4"])
       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<jeweler>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<git>, [">= 1.2.5"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
-    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<test-construct>, [">= 0"])
     s.add_dependency(%q<yard>, ["~> 0.7.4"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<bluecloth>, [">= 0"])
     s.add_dependency(%q<cucumber>, ["~> 1.1.4"])
     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
 

data/lib/jeweler/generator/options.rb

@@ -11,11 +11,6 @@ class Jeweler
         self[:documentation_framework] = :rdoc
         self[:use_bundler]             = true
 
-        git_config =  if Pathname.new("~/.gitconfig").expand_path.exist?
-                        Git.global_config
-                      else
-                        {}
-                      end
         self[:user_name]       = ENV['GIT_AUTHOR_NAME']  || ENV['GIT_COMMITTER_NAME']  || git_config['user.name']
         self[:user_email]      = ENV['GIT_AUTHOR_EMAIL'] || ENV['GIT_COMMITTER_EMAIL'] || git_config['user.email']
         self[:github_username] = git_config['github.user']
@@ -162,6 +157,21 @@ class Jeweler
         self.class.new(@orig_args + other.orig_args)
       end
 
+
+      # Expose git config here, so we can stub it out for test environments
+      def self.git_config
+        @git_config  ||=  if Pathname.new("~/.gitconfig").expand_path.exist?
+                           Git.global_config
+                         else
+                           {}
+                         end
+
+      end
+
+      def git_config
+        self.class.git_config
+      end
+
     end
   end
 end

data/lib/jeweler/generator/rspec_mixin.rb

@@ -2,7 +2,7 @@ class Jeweler
   class Generator
     module RspecMixin
       def self.extended(generator)
-        generator.development_dependencies << ["rspec", "~> 2.3.0"]
+        generator.development_dependencies << ["rspec", "~> 2.8.0"]
       end
 
       def default_task

data/lib/jeweler/version.rb

@@ -2,7 +2,7 @@ class Jeweler
   module Version
     MAJOR = 1
     MINOR = 8
-    PATCH = 1
+    PATCH = 2
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/test/jeweler/commands/test_write_gemspec.rb

@@ -25,7 +25,8 @@ class Jeweler
           @command.output = @output
           @command.gemspec_helper = @gemspec_helper
 
-          @now = Time.now
+          # FIXME apparently rubygems doesn't use Time.now under the hood when generating a date
+          @now = Time.local(2008, 9, 1, 12, 0, 0)
           stub(Time.now).now { @now }
         end
 
@@ -45,9 +46,10 @@ class Jeweler
           assert_equal '2.3.4', @gemspec.version.to_s
         end
 
-        should "update gemspec date to the beginning of today" do
+        should_eventually "update gemspec date to the beginning of today" do
           @command.run
-          assert_equal Time.mktime(@now.year, @now.month, @now.day, 0, 0), @gemspec.date
+          # FIXME apparently rubygems doesn't use Time.now under the hood when generating a date
+          assert_equal Time.local(@now.year, @now.month, @now.day, 0, 0), @gemspec.date
         end
 
         should "write gemspec" do

data/test/jeweler/generator/test_options.rb

@@ -20,6 +20,7 @@ class TestOptions < Test::Unit::TestCase
   end
 
   def setup_options(*arguments)
+    stub(Jeweler::Generator::Options).git_config { valid_git_config }
     @options = Jeweler::Generator::Options.new(["project_name"] + arguments)
   end
 

data/test/test_helper.rb

@@ -8,7 +8,7 @@ end
 
 require 'bundler'
 begin
-  Bundler.setup(:default, :development)
+  Bundler.setup(:default, :test)
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
   $stderr.puts "Run `bundle install` to install missing gems"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jeweler
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 1
   - 8
-  - 1
-  version: 1.8.1
+  - 2
+  version: 1.8.2
 platform: ruby
 authors: 
 - Josh Nichols
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-24 00:00:00 Z
+date: 2012-01-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -29,7 +29,7 @@ dependencies:
         version: "0"
   requirement: *id001
   prerelease: false
-  name: rake
+  name: jeweler
   type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
@@ -37,44 +37,44 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 3
         segments: 
-        - 1
-        - 2
-        - 5
-        version: 1.2.5
+        - 0
+        version: "0"
   requirement: *id002
   prerelease: false
-  name: git
+  name: rake
   type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 21
         segments: 
         - 1
-        - 0
-        version: "1.0"
+        - 2
+        - 5
+        version: 1.2.5
   requirement: *id003
   prerelease: false
-  name: bundler
+  name: git
   type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 1
         - 0
-        version: "0"
+        version: "1.0"
   requirement: *id004
   prerelease: false
-  name: rdoc
+  name: bundler
   type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
@@ -88,80 +88,10 @@ dependencies:
         version: "0"
   requirement: *id005
   prerelease: false
-  name: shoulda
-  type: :development
+  name: rdoc
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
-  prerelease: false
-  name: mhennemeyer-output_catcher
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id007
-  prerelease: false
-  name: rr
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id008
-  prerelease: false
-  name: mocha
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id009
-  prerelease: false
-  name: redgreen
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id010
-  prerelease: false
-  name: test-construct
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -172,12 +102,12 @@ dependencies:
         - 7
         - 4
         version: 0.7.4
-  requirement: *id011
+  requirement: *id006
   prerelease: false
   name: yard
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -186,12 +116,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id012
+  requirement: *id007
   prerelease: false
   name: rdoc
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -200,12 +130,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id013
+  requirement: *id008
   prerelease: false
   name: bluecloth
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -216,12 +146,12 @@ dependencies:
         - 1
         - 4
         version: 1.1.4
-  requirement: *id014
+  requirement: *id009
   prerelease: false
   name: cucumber
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -230,54 +160,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id015
+  requirement: *id010
   prerelease: false
   name: rcov
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id016 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id016
-  prerelease: false
-  name: timecop
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id017 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 3
-        - 5
-        version: 2.3.5
-  requirement: *id017
-  prerelease: false
-  name: activesupport
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id018 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id018
-  prerelease: false
-  name: ruby-debug
-  type: :development
 description: Simple and opinionated helper for creating Rubygem projects on GitHub
 email: josh@technicalpickles.com
 executables: 
@@ -290,6 +176,7 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - .document
+- .travis.yml
 - .yardopts
 - ChangeLog.markdown
 - Gemfile