namelessjon-jeweler 0.6.5 → 0.7.2

data/ChangeLog.markdown

@@ -1,3 +1,19 @@
+# jeweler 0.7.2
+
+ * Added rake task 'version:bump' which is shorthand for 'version:bump:patch'
+ * Generated projects no longer assume RCov is installed.
+
+# jeweler 0.7.1
+
+ * Fixed yaml not being required
+
+# jeweler 0.7.0
+
+ * Added support to generator for specifying a description
+ * Condensed README.markdown to be less novel-like
+ * RDoc is now included in your gemspec
+ * Rescue errors that raise in the generator, and display better error message, and exit with a non-zero exit status
+
 # jeweler 0.6.5
 
  * `jeweler --create-repo foo` now enables gem creation in addition to creating the repository

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2008 Josh Nichols
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.markdown

@@ -28,7 +28,7 @@ In this example, `s` is a Gem::Specification object. See the documentation for w
 
 ## Kicking off a new project
 
-Jeweler provides a generator:
+Jeweler provides a generator. It requires you to [setup your name and email for git](http://github.com/guides/tell-git-your-user-name-and-email-address) and [your username and token for GitHub](http://github.com/guides/local-github-config).
 
     jeweler the-perfect-gem
 
@@ -77,6 +77,13 @@ It does the following for you:
  * Push to GitHub (which results in a gem being build)
  * Tag the version and push to GitHub
 
+## Workflow
+
+ * Hack, commit, hack, commit, etc, etc
+ * `rake version:bump:patch release` to do the actual version bump and release
+ * Have a delicious scotch
+ * Go to [Has My Gem Built Yet](http://hasmygembuiltyet.org) and wait for your gem to be built
+
 ## Links
 
  * [Bugs](http://technicalpickles.lighthouseapp.com/projects/23560-jeweler/overview)

data/Rakefile

@@ -14,7 +14,6 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "jeweler"
-    s.executables = "jeweler"
     s.summary = "Simple and opinionated helper for creating Rubygem projects on GitHub"
     s.email = "josh@technicalpickles.com"
     s.homepage = "http://github.com/technicalpickles/jeweler"
@@ -28,11 +27,7 @@ rescue LoadError
 end
 
 
-Rake::TestTask.new do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/*_test.rb'
-  t.verbose = false
-end
+Rake::TestTask.new 
 
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -42,10 +37,6 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-Rcov::RcovTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/**/*_test.rb']
-  t.verbose = true
-end
+Rcov::RcovTask.new 
 
 task :default => :rcov

data/TODO

@@ -8,11 +8,6 @@
    * Support rspec?
    * Support test/unit
    * Change generated test filename (test_foo not foo_test)
- * better error handling during generation
-   * directory existing
-   * no github.token configured
-   * no github.username configured
  * Releasing
   * Open hasmygembuiltyet.org
  * enable runcoderun by default
- * Add --summary option to generator

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 5
+:patch: 2
 :major: 0
-:minor: 6
+:minor: 7

data/bin/jeweler

@@ -27,6 +27,10 @@ class JewelerOpts < Hash
       o.on('--create-repo', 'create the repository on GitHub') do
         self[:create_repo] = true
       end
+
+      o.on('--summary [SUMMARY]', 'specify the summary of the project') do |summary|
+        self[:summary] = summary
+      end
       
       o.on_tail('-h', '--help', 'display this help and exit') do
         puts o
@@ -46,5 +50,23 @@ unless ARGV.size == 1
 end
 
 github_repo_name = ARGV.first
-generator = Jeweler::Generator.new github_repo_name, options
-generator.run
+
+begin
+  generator = Jeweler::Generator.new github_repo_name, options
+  generator.run
+rescue Jeweler::NoGitUserName
+  $stderr.puts %Q{No user.name found in ~/.gitconfig. Please tell git about yourself (see http://github.com/guides/tell-git-your-user-name-and-email-address for details). For example: git config --global user.name "mad voo"}
+  exit 1
+rescue Jeweler::NoGitUserEmail
+  $stderr.puts %Q{No user.email found in ~/.gitconfig. Please tell git about yourself (see http://github.com/guides/tell-git-your-user-name-and-email-address for details). For example: git config --global user.email mad.vooo@gmail.com}
+  exit 1
+rescue Jeweler::NoGitHubUser
+  $stderr.puts %Q{No github.user found in ~/.gitconfig. Please tell git about your GitHub account (see http://github.com/blog/180-local-github-config for details). For example: git config --global github.user defunkt}
+  exit 1
+rescue Jeweler::NoGitHubToken
+  $stderr.puts %Q{No github.token found in ~/.gitconfig. Please tell git about your GitHub account (see http://github.com/blog/180-local-github-config for details). For example: git config --global github.token 6ef8395fecf207165f1a82178ae1b984}
+  exit 1
+rescue Jeweler::FileInTheWay
+  $stderr.puts "The directory #{github_repo_name} already exists. Maybe move it out of the way before continuing?"
+  exit 1
+end

data/lib/jeweler.rb

@@ -23,6 +23,12 @@ class Jeweler
       @gemspec.files = FileList["[A-Z]*.*", "{bin,generators,lib,test,spec}/**/*"]
     end
 
+    if @gemspec.executables.nil? || @gemspec.executables.empty?
+      @gemspec.executables = Dir["#{@base_dir}/bin/*"].map do |f|
+        File.basename(f)
+      end
+    end
+
     @gemspec.has_rdoc = true
     @gemspec.rdoc_options << '--inline-source' << '--charset=UTF-8'
     @gemspec.extra_rdoc_files ||=  FileList["[A-Z]*.*"]

data/lib/jeweler/generator.rb

@@ -21,8 +21,9 @@ class Jeweler
   end    
 
   class Generator    
-    attr_accessor :target_dir, :user_name, :user_email,
-                  :github_repo_name, :github_remote, :github_url, :github_username, :github_token,
+    attr_accessor :target_dir, :user_name, :user_email, :summary,
+                  :github_repo_name, :github_remote, :github_url, 
+                  :github_username, :github_token,
                   :lib_dir, :constant_name, :file_name_prefix, :config, :test_style,
                   :repo, :should_create_repo
 
@@ -43,6 +44,7 @@ class Jeweler
       self.constant_name = self.github_repo_name.split(/[-_]/).collect{|each| each.capitalize }.join
       self.file_name_prefix = self.github_repo_name.gsub('-', '_')
       self.should_create_repo = options[:create_repo]
+      self.summary = options[:summary] || 'TODO'
     end
 
     def run
@@ -96,19 +98,19 @@ class Jeweler
       self.config = read_git_config
       
       unless config.has_key? 'user.name'
-        raise NoGitUserName, %Q{No user.name set in ~/.gitconfig. Set it with: git config --global user.name 'Your Name Here'}
+        raise NoGitUserName
       end
       
       unless config.has_key? 'user.email'
-        raise NoGitUserEmail, %Q{No user.name set in ~/.gitconfig. Set it with: git config --global user.name 'Your Name Here'}
+        raise NoGitUserEmail
       end
       
       unless config.has_key? 'github.user'
-        raise NoGitHubUser, %Q{No github.user set in ~/.gitconfig. Set it with: git config --global github.user 'Your username here'}
+        raise NoGitHubUser
       end
       
       unless config.has_key? 'github.token'
-        raise NoGitHubToken, %Q{No github.token set in ~/.gitconfig. Set it with: git config --global github.token 'Your token here'}
+        raise NoGitHubToken
       end
 
       self.user_name = config['user.name']
@@ -161,6 +163,7 @@ class Jeweler
       Net::HTTP.post_form URI.parse('http://github.com/repositories'),
                                 'login' => github_username,
                                 'token' => github_token,
+                                'repository[description]' => summary,
                                 'repository[name]' => github_repo_name
       sleep 2
       @repo.push('origin')

data/lib/jeweler/tasks.rb

@@ -62,6 +62,9 @@ class Jeweler
       task :version => 'version:display'
 
       namespace :version do
+        desc "Bump the gemspec by a patch version."
+        task :bump => "bump:patch"
+
         desc "Setup initial version of 0.0.0"
         task :setup => "VERSION.yml"
 

data/lib/jeweler/templates/Rakefile

@@ -1,13 +1,12 @@
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
-require 'rcov/rcovtask'
 
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "<%= github_repo_name %>"
-    s.summary = "TODO"
+    s.summary = %Q{<%= summary %>}
     s.email = "<%= user_email %>"
     s.homepage = "<%= github_url %>"
     s.description = "TODO"
@@ -31,10 +30,14 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-Rcov::RcovTask.new do |t|
-  t.libs << '<%= testspec %>'
-  t.test_files = FileList['<%= testspec %>/**/*_<%= testspec %>.rb']
-  t.verbose = true
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |t|
+    t.libs << '<%= testspec %>'
+    t.test_files = FileList['<%= testspec %>/**/*_<%= testspec %>.rb']
+    t.verbose = true
+  end
+rescue LoadError
 end
 
-task :default => :rcov
+task :default => :test

data/lib/jeweler/templates/bacon/spec_helper.rb

@@ -1,5 +1,8 @@
 require 'rubygems'
 require 'bacon'
 
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require '<%= file_name_prefix %>'
+
 # get a summary of errors raised and such
 Bacon.summary_on_exit

data/lib/jeweler/templates/shoulda/test_helper.rb

@@ -3,5 +3,8 @@ require 'test/unit'
 require 'shoulda'
 require 'mocha'
 
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require '<%= file_name_prefix %>'
+
 class Test::Unit::TestCase
-end
+end

data/lib/jeweler/version.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 class Jeweler
   class Version
     attr_accessor :base_dir

data/test/{gemspec_test.rb → test_gemspec.rb}

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-class GemspecTest < Test::Unit::TestCase
+class TestGemspec < Test::Unit::TestCase
   context "A Jeweler::GemSpec, given a gemspec" do
     setup do
       @spec = build_spec

data/test/{jeweler_generator_test.rb → test_generator.rb}

@@ -1,7 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-class JewelerTest < Test::Unit::TestCase
-
+class TestGenerator < Test::Unit::TestCase
   def self.should_create_directory(directory)
     should "create #{directory} directory" do
       assert File.exists?(File.join(@tmp_dir, directory))
@@ -75,6 +74,10 @@ class JewelerTest < Test::Unit::TestCase
         assert_match 's.email = "bar@example.com"', @content
       end
 
+      should "include the summary in the gem" do
+        assert_match %Q{s.summary = %Q{zomg, so good}}, @content
+      end
+
       should "include the github repo's url as the gem's url" do
         assert_match 's.homepage = "http://github.com/technicalpickles/the-perfect-gem"', @content
       end
@@ -122,7 +125,7 @@ class JewelerTest < Test::Unit::TestCase
 
       context "for generating technicalpickles's the-perfect-gem repo in 'tmp'" do
         setup do
-          @generator = Jeweler::Generator.new('the-perfect-gem', :directory => @tmp_dir)
+          @generator = Jeweler::Generator.new('the-perfect-gem', :directory => @tmp_dir, :summary => 'zomg, so good')
         end
 
         should "use tmp for target directory" do

data/test/{jeweler_test.rb → test_jeweler.rb}

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-class JewelerTest < Test::Unit::TestCase
+class TestJeweler < Test::Unit::TestCase
 
   def setup
     @now = Time.now

data/test/{tasks_test.rb → test_tasks.rb}

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/test_helper'
 
 require 'rake'
-class TasksTest < Test::Unit::TestCase
+class TestTasks < Test::Unit::TestCase
   include Rake
 
   context 'instantiating Jeweler::Tasks' do
@@ -30,6 +30,7 @@ class TasksTest < Test::Unit::TestCase
       assert Task.task_defined?(:version)
       assert Task.task_defined?(:'version:write')
       assert Task.task_defined?(:'version:display')
+      assert Task.task_defined?(:'version:bump')
       assert Task.task_defined?(:'version:bump:major')
       assert Task.task_defined?(:'version:bump:minor')
       assert Task.task_defined?(:'version:bump:patch')

data/test/{version_test.rb → test_version.rb}

@@ -1,10 +1,9 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-class VersionTest < Test::Unit::TestCase
+class TestVersion < Test::Unit::TestCase
 
   VERSION_TMP_DIR = File.dirname(__FILE__) + '/version_tmp'
 
-
   def self.should_have_version(major, minor, patch)
     should "have major version #{major}" do
       assert_equal major, @version.major

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: namelessjon-jeweler
 version: !ruby/object:Gem::Version 
-  version: 0.6.5
+  version: 0.7.2
 platform: ruby
 authors: 
 - Josh Nichols
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-14 00:00:00 -08:00
+date: 2009-01-29 00:00:00 -08:00
 default_executable: jeweler
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,6 +31,7 @@ extra_rdoc_files: []
 
 files: 
 - ChangeLog.markdown
+- LICENSE
 - Rakefile
 - README.markdown
 - TODO
@@ -56,16 +57,17 @@ files:
 - test/fixtures
 - test/fixtures/bar
 - test/fixtures/bar/VERSION.yml
-- test/gemspec_test.rb
 - test/generators
 - test/generators/initialization_test.rb
-- test/jeweler_generator_test.rb
-- test/jeweler_test.rb
+- test/jeweler
 - test/shoulda_macros
 - test/shoulda_macros/jeweler_macros.rb
-- test/tasks_test.rb
+- test/test_gemspec.rb
+- test/test_generator.rb
 - test/test_helper.rb
-- test/version_test.rb
+- test/test_jeweler.rb
+- test/test_tasks.rb
+- test/test_version.rb
 - test/version_tmp
 - test/version_tmp/VERSION.yml
 - lib/jeweler/templates/.gitignore