jeweler 0.11.1 → 1.0.0

data/lib/jeweler/commands/release.rb

@@ -3,40 +3,64 @@ class Jeweler
     class Release
       attr_accessor :gemspec, :version, :repo, :output, :gemspec_helper, :base_dir
 
-      def initialize
+      def initialize(attributes = {})
         self.output = $stdout
+
+        attributes.each_pair do |key, value|
+          send("#{key}=", value)
+        end
       end
 
       def run
-        repo.checkout('master')
-
         raise "Hey buddy, try committing them files first" if any_pending_changes?
 
-        gemspec_helper.update_version(version)
-        gemspec_helper.write
+        repo.checkout('master')
 
-        repo.add(gemspec_helper.path)
-        output.puts "Committing #{gemspec_helper.path}"
-        repo.commit("Regenerated gemspec for version #{version}")
+        regenerate_gemspec!
+        commit_gemspec! if gemspec_changed?
 
         output.puts "Pushing master to origin"
         repo.push
 
+        tag_release! unless release_tagged?
+      end
+      
+      def any_pending_changes?
+        !(@repo.status.added.empty? && @repo.status.deleted.empty? && @repo.status.changed.empty?)
+      end
+
+      def tag_release!
         output.puts "Tagging #{release_tag}"
         repo.add_tag(release_tag)
 
         output.puts "Pushing #{release_tag} to origin"
         repo.push('origin', release_tag)
       end
-      
-      def any_pending_changes?
-        !(@repo.status.added.empty? && @repo.status.deleted.empty? && @repo.status.changed.empty?)
+
+      def commit_gemspec!
+        repo.add(gemspec_helper.path)
+        output.puts "Committing #{gemspec_helper.path}"
+        repo.commit "Regenerated gemspec for version #{version}"
+      end
+
+      def regenerate_gemspec!
+        gemspec_helper.update_version(version)
+        gemspec_helper.write
       end
 
       def release_tag
         "v#{version}"
       end
 
+      def release_tagged?
+        tag = repo.tag(release_tag) rescue nil
+        ! tag.nil?
+      end
+
+      def gemspec_changed?
+        ! any_pending_changes?
+      end
+
       def gemspec_helper
         @gemspec_helper ||= Jeweler::GemSpecHelper.new(self.gemspec, self.base_dir)
       end

data/lib/jeweler/commands/version/base.rb

@@ -20,7 +20,7 @@ class Jeweler
 
         def commit_version
           if self.repo
-            self.repo.add('VERSION.yml')
+            self.repo.add(version_helper.path)
             self.repo.commit("Version bump to #{self.version_helper.to_s}")
           end
         end

data/lib/jeweler/gemspec_helper.rb

@@ -58,12 +58,10 @@ class Jeweler
     end
 
     def prettyify_array(gemspec_ruby, array_name)
-      array = @spec.send(array_name)
-      quoted_array = array.map {|file| %Q{"#{file}"}}
-      nastily_formated_array = "s.#{array_name} = [#{quoted_array.join(", ")}]"
-      nicely_formated_array  = "s.#{array_name} = [\n    #{quoted_array.join(",\n    ")}\n  ]"
-
-      gemspec_ruby.gsub(nastily_formated_array, nicely_formated_array)
+      gemspec_ruby.gsub(/s\.#{array_name.to_s} = \[.+?\]/) do |match|
+        leadin, files = match[0..-2].split("[")
+        leadin + "[\n    #{files.split(",").join(",\n    ")}\n  ]"
+      end
     end
 
     def gem_path

data/lib/jeweler/generator.rb

@@ -86,8 +86,12 @@ class Jeweler
       self.project_name.split(/[-_]/).collect{|each| each.capitalize }.join
     end
 
+    def lib_filename
+      "#{project_name}.rb"
+    end
+
     def require_name
-      self.project_name.gsub('-', '_')
+      self.project_name
     end
 
     def file_name_prefix
@@ -99,11 +103,11 @@ class Jeweler
     end
 
     def feature_filename
-      "#{file_name_prefix}.feature"
+      "#{project_name}.feature"
     end
 
     def steps_filename
-      "#{file_name_prefix}_steps.rb"
+      "#{project_name}_steps.rb"
     end
 
     def features_dir
@@ -144,7 +148,7 @@ class Jeweler
       output_template_in_target '.document'
 
       mkdir_in_target           lib_dir
-      touch_in_target           File.join(lib_dir, "#{file_name_prefix}.rb")
+      touch_in_target           File.join(lib_dir, lib_filename)
 
       mkdir_in_target           test_dir
       output_template_in_target File.join(testing_framework.to_s, 'helper.rb'), File.join(test_dir, test_helper_filename)
@@ -178,8 +182,10 @@ class Jeweler
         raise NoGitHubUser
       end
       
-      unless git_config.has_key? 'github.token'
-        raise NoGitHubToken
+      if should_create_repo
+        unless git_config.has_key? 'github.token'
+          raise NoGitHubToken
+        end
       end
 
       self.user_name       = git_config['user.name']

data/lib/jeweler/rubyforge_tasks.rb

@@ -0,0 +1,46 @@
+require 'rake'
+require 'rake/tasklib'
+require 'rake/contrib/sshpublisher'
+
+
+class Jeweler
+  class RubyforgeTasks < ::Rake::TaskLib
+    attr_accessor :project, :remote_doc_path
+    attr_accessor :jeweler
+
+    def initialize
+      yield self if block_given?
+
+      self.jeweler = Rake.application.jeweler
+
+      self.remote_doc_path ||= jeweler.gemspec.name
+      self.project ||= jeweler.gemspec.rubyforge_project
+
+      define
+    end
+
+    def define
+      namespace :rubyforge do
+
+        desc "Release gem and RDoc documentation to RubyForge"
+        task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
+
+        namespace :release do
+          desc "Publish RDoc to RubyForge."
+          task :docs => [:rdoc] do
+            config = YAML.load(
+              File.read(File.expand_path('~/.rubyforge/user-config.yml'))
+            )
+
+            host = "#{config['username']}@rubyforge.org"
+            remote_dir = "/var/www/gforge-projects/#{project}/#{remote_doc_path}"
+            local_dir = 'rdoc'
+
+            sh %{rsync -av --delete #{local_dir}/ #{host}:#{remote_dir}}
+          end
+        end
+      end
+      
+    end
+  end
+end

data/lib/jeweler/specification.rb

@@ -26,8 +26,9 @@ class Jeweler
     # Assigns the Jeweler defaults to the Gem::Specification
     def set_jeweler_defaults(base_dir)
       Dir.chdir(base_dir) do
-        if blank?(files)
-          self.files = FileList["[A-Z]*.*", "{bin,examples,generators,lib,rails,spec,test}/**/*", 'Rakefile', 'LICENSE*']
+        if blank?(files) && File.directory?(File.join(base_dir, '.git'))
+          repo = Git.open(base_dir)
+          self.files = repo.ls_files.keys
         end
 
         if blank?(test_files)

data/lib/jeweler/tasks.rb

@@ -1,6 +1,10 @@
 require 'rake'
 require 'rake/tasklib'
 
+class Rake::Application
+  attr_accessor :jeweler
+end
+
 class Jeweler
   class Tasks < ::Rake::TaskLib
     attr_accessor :gemspec, :jeweler
@@ -10,25 +14,27 @@ class Jeweler
       @jeweler = Jeweler.new(@gemspec)
       yield @gemspec if block_given?
 
+      Rake.application.jeweler = @jeweler
       define
     end
 
   private
     def define
       desc "Setup initial version of 0.0.0"
-      file "VERSION.yml" do
-        @jeweler.write_version 0, 0, 0, :commit => false
-        $stdout.puts "Created VERSION.yml: 0.0.0"
+      task :version_required do
+        unless jeweler.version_exists?
+          abort "Expected VERSION or VERSION.yml to exist. See version:write to create an initial one."
+        end
       end
 
       desc "Build gem"
       task :build do
-        @jeweler.build_gem
+        jeweler.build_gem
       end
 
       desc "Install gem using sudo"
       task :install => :build do
-        @jeweler.install_gem
+        jeweler.install_gem
       end
 
       desc "Generate and validates gemspec"
@@ -36,53 +42,53 @@ class Jeweler
 
       namespace :gemspec do
         desc "Validates the gemspec"
-        task :validate => 'VERSION.yml' do
-          @jeweler.validate_gemspec
+        task :validate => :version_required do
+          jeweler.validate_gemspec
         end
 
-        desc "Generates the gemspec, using version from VERSION.yml"
-        task :generate => 'VERSION.yml' do
-          @jeweler.write_gemspec
+        desc "Generates the gemspec, using version from VERSION"
+        task :generate => :version_required do
+          jeweler.write_gemspec
         end
       end
 
       desc "Displays the current version"
-      task :version => 'VERSION.yml' do
-        $stdout.puts "Current version: #{@jeweler.version}"
+      task :version => :version_required do
+        $stdout.puts "Current version: #{jeweler.version}"
       end
 
       namespace :version do
         desc "Writes out an explicit version. Respects the following environment variables, or defaults to 0: MAJOR, MINOR, PATCH"
         task :write do
           major, minor, patch = ENV['MAJOR'].to_i, ENV['MINOR'].to_i, ENV['PATCH'].to_i
-          @jeweler.write_version(major, minor, patch, :announce => false, :commit => false)
-          $stdout.puts "Updated version: #{@jeweler.version}"
+          jeweler.write_version(major, minor, patch, :announce => false, :commit => false)
+          $stdout.puts "Updated version: #{jeweler.version}"
         end
 
         namespace :bump do
           desc "Bump the gemspec by a major version."
-          task :major => ['VERSION.yml', :version] do
-            @jeweler.bump_major_version
-            $stdout.puts "Updated version: #{@jeweler.version}"
+          task :major => [:version_required, :version] do
+            jeweler.bump_major_version
+            $stdout.puts "Updated version: #{jeweler.version}"
           end
 
           desc "Bump the gemspec by a minor version."
-          task :minor => ['VERSION.yml', :version] do
-            @jeweler.bump_minor_version
-            $stdout.puts "Updated version: #{@jeweler.version}"
+          task :minor => [:version_required, :version] do
+            jeweler.bump_minor_version
+            $stdout.puts "Updated version: #{jeweler.version}"
           end
 
           desc "Bump the gemspec by a patch version."
-          task :patch => ['VERSION.yml', :version] do
-            @jeweler.bump_patch_version
-            $stdout.puts "Updated version: #{@jeweler.version}"
+          task :patch => [:version_required, :version] do
+            jeweler.bump_patch_version
+            $stdout.puts "Updated version: #{jeweler.version}"
           end
         end
       end
 
       desc "Release the current version. Includes updating the gemspec, pushing, and tagging the release"
       task :release do
-        @jeweler.release
+        jeweler.release
       end
       
       namespace :rubyforge do
@@ -90,7 +96,7 @@ class Jeweler
           desc "Release the current gem version to RubyForge."
           task :gem => [:gemspec, :build] do
             begin
-              @jeweler.release_gem_to_rubyforge
+              jeweler.release_gem_to_rubyforge
             rescue NoRubyForgeProjectInGemspecError => e
               abort "Setting up RubyForge requires that you specify a 'rubyforge_project' in your Jeweler::Tasks declaration"
             rescue MissingRubyForgePackageError => e
@@ -104,7 +110,7 @@ class Jeweler
         desc "Setup a rubyforge project for this gem"
         task :setup do
           begin 
-            @jeweler.setup_rubyforge
+            jeweler.setup_rubyforge
           rescue NoRubyForgeProjectInGemspecError => e
             abort "Setting up RubyForge requires that you specify a 'rubyforge_project' in your Jeweler::Tasks declaration"
           rescue RubyForgeProjectNotConfiguredError => e

data/lib/jeweler/templates/Rakefile

@@ -14,6 +14,10 @@ begin
 <% end %>
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
+
+<% if should_setup_rubyforge %>
+  Jeweler::RubyforgeTasks.new
+<% end %>
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
@@ -96,30 +100,3 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-<% if should_setup_rubyforge %>
-begin
-  require 'rake/contrib/sshpublisher'
-  namespace :rubyforge do
-    
-    desc "Release gem and RDoc documentation to RubyForge"
-    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
-    
-    namespace :release do
-      desc "Publish RDoc to RubyForge."
-      task :docs => [:rdoc] do
-        config = YAML.load(
-            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-        )
-
-        host = "#{config['username']}@rubyforge.org"
-        remote_dir = "/var/www/gforge-projects/<%= project_name %>/"
-        local_dir = 'rdoc'
-
-        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-      end
-    end
-  end
-rescue LoadError
-  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
-end
-<% end %>

data/lib/jeweler/templates/rspec/flunking.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "<%= constant_name %>" do
   it "fails" do

data/lib/jeweler/version_helper.rb

@@ -5,11 +5,85 @@ class Jeweler
     attr_accessor :base_dir
     attr_reader :major, :minor, :patch
 
+    module YamlExtension
+      def write
+        File.open(yaml_path, 'w+') do |f|
+          YAML.dump(self.to_hash, f)
+        end
+      end
+
+      def to_hash
+        {
+          :major => major,
+          :minor => minor,
+          :patch => patch
+        }
+      end
+
+      def refresh
+        parse_yaml
+      end
+
+      def parse_yaml
+        yaml = read_yaml
+        @major = (yaml['major'] || yaml[:major]).to_i
+        @minor = (yaml['minor'] || yaml[:minor]).to_i
+        @patch = (yaml['patch'] || yaml[:patch]).to_i
+      end
+
+      def read_yaml
+        if File.exists?(yaml_path)
+          YAML.load_file(yaml_path)
+        else
+          raise VersionYmlError, "#{yaml_path} does not exist!"
+        end
+      end
+
+      def path
+        yaml_path
+      end
+    end
+
+    module PlaintextExtension
+      def write
+        File.open(plaintext_path, 'w') do |file|
+          file.puts to_s
+        end
+      end
+
+      def parse_plaintext
+        plaintext = read_plaintext.chomp
+        if plaintext =~ /^(\d+)\.(\d+)\.(\d+)$/
+          @major = $1.to_i
+          @minor = $2.to_i
+          @patch = $3.to_i
+        end
+      end
+
+      def read_plaintext
+        File.read(plaintext_path)
+      end
+
+      def refresh
+        parse_plaintext
+      end
+
+      def path
+        plaintext_path
+      end
+    end
+
     def initialize(base_dir)
       self.base_dir = base_dir
 
       if File.exists?(yaml_path)
+        extend YamlExtension
         parse_yaml
+      else
+        extend PlaintextExtension
+        if File.exists?(plaintext_path)
+          parse_plaintext
+        end
       end
     end
 
@@ -34,49 +108,20 @@ class Jeweler
       @patch = patch
     end
 
-    def write
-      File.open(yaml_path, 'w+') do |f|
-        YAML.dump(self.to_hash, f)
-      end
-    end
-
     def to_s
       "#{major}.#{minor}.#{patch}"
     end
 
-    def to_hash
-      {
-        :major => major,
-        :minor => minor,
-        :patch => patch
-      }
-    end
-
-    def refresh
-      parse_yaml
-    end
-
     def yaml_path
       denormalized_path = File.join(@base_dir, 'VERSION.yml')
       absolute_path = File.expand_path(denormalized_path)
       absolute_path.gsub(Dir.getwd + File::SEPARATOR, '')
     end
 
-    protected
-
-    def parse_yaml
-      yaml = read_yaml
-      @major = (yaml['major'] || yaml[:major]).to_i
-      @minor = (yaml['minor'] || yaml[:minor]).to_i
-      @patch = (yaml['patch'] || yaml[:patch]).to_i
-    end
-
-    def read_yaml
-      if File.exists?(yaml_path)
-        YAML.load_file(yaml_path)
-      else
-        raise VersionYmlError, "#{yaml_path} does not exist!"
-      end
+    def plaintext_path
+      denormalized_path = File.join(@base_dir, 'VERSION')
+      absolute_path = File.expand_path(denormalized_path)
+      absolute_path.gsub(Dir.getwd + File::SEPARATOR, '')
     end
 
   end

data/lib/jeweler.rb

@@ -13,6 +13,7 @@ require 'jeweler/generator/application'
 require 'jeweler/commands'
 
 require 'jeweler/tasks'
+require 'jeweler/rubyforge_tasks'
 
 require 'jeweler/specification'
 
@@ -133,5 +134,9 @@ class Jeweler
     File.exists?(File.join(self.base_dir, '.git'))
   end
 
+  def version_exists?
+    File.exists?(@version_helper.plaintext_path) || File.exists?(@version_helper.yaml_path)
+  end
+
 end
 

data/test/fixtures/existing-project-with-version-plaintext/.document

@@ -0,0 +1,5 @@
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+LICENSE

data/test/fixtures/existing-project-with-version-plaintext/.gitignore

@@ -0,0 +1,5 @@
+*.sw?
+.DS_Store
+coverage
+rdoc
+pkg

data/test/fixtures/existing-project-with-version-plaintext/VERSION

@@ -0,0 +1 @@
+1.5.3

data/test/fixtures/existing-project-with-version-yaml/.document

@@ -0,0 +1,5 @@
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+LICENSE

data/test/fixtures/existing-project-with-version-yaml/.gitignore

@@ -0,0 +1,5 @@
+*.sw?
+.DS_Store
+coverage
+rdoc
+pkg

data/test/fixtures/existing-project-with-version-yaml/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 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/test/fixtures/existing-project-with-version-yaml/README.rdoc

@@ -0,0 +1,7 @@
+= existing-project-with-version
+
+Description goes here.
+
+== Copyright
+
+Copyright (c) 2009 Josh Nichols. See LICENSE for details.