technicalpickles-jeweler 0.11.0 → 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/application.rb

@@ -9,6 +9,11 @@ class Jeweler
           options = Jeweler::Generator::Options.new(arguments)
           options = options.merge(env_opts) if env_opts
 
+          if options[:invalid_argument]
+            $stderr.puts options[:invalid_argument]
+            options[:show_help] = true
+          end
+
           if options[:show_help]
             $stderr.puts options.opts
             return 1
@@ -19,10 +24,10 @@ class Jeweler
             return 1
           end
 
-          github_repo_name = arguments.first
+          project_name = arguments.first
 
           begin
-            generator = Jeweler::Generator.new(github_repo_name, options)
+            generator = Jeweler::Generator.new(project_name, options)
             generator.run
             return 0
           rescue Jeweler::NoGitUserName
@@ -38,7 +43,7 @@ class Jeweler
             $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}
             return 1
           rescue Jeweler::FileInTheWay
-            $stderr.puts "The directory #{github_repo_name} already exists. Maybe move it out of the way before continuing?"
+            $stderr.puts "The directory #{project_name} already exists. Maybe move it out of the way before continuing?"
             return 1
           end
         end

data/lib/jeweler/generator/bacon_mixin.rb

@@ -0,0 +1,39 @@
+class Jeweler
+  class Generator
+    module BaconMixin
+
+      def default_task
+        'spec'
+      end
+
+      def feature_support_require
+        'test/unit/assertions'
+      end
+
+      def feature_support_extend
+        'Test::Unit::Assertions' # NOTE can't use bacon inside of cucumber actually
+      end
+
+      def test_dir
+        'spec'
+      end
+
+      def test_task
+        'spec'
+      end
+
+      def test_pattern
+        'spec/**/*_spec.rb'
+      end
+
+      def test_filename
+        "#{require_name}_spec.rb"
+      end
+
+      def test_helper_filename
+        "spec_helper.rb"
+      end
+
+    end
+  end
+end

data/lib/jeweler/generator/micronaut_mixin.rb

@@ -0,0 +1,38 @@
+class Jeweler
+  class Generator
+    module MicronautMixin
+      
+      def default_task
+        'examples'
+      end
+
+      def feature_support_require
+        'micronaut/expectations'
+      end
+
+      def feature_support_extend
+        'Micronaut::Matchers'
+      end
+
+      def test_dir
+        'examples'
+      end
+
+      def test_task
+        'examples'
+      end
+
+      def test_pattern
+        'examples/**/*_example.rb'
+      end
+
+      def test_filename
+        "#{require_name}_example.rb"
+      end
+
+      def test_helper_filename
+        "example_helper.rb"
+      end
+    end
+  end
+end

data/lib/jeweler/generator/minitest_mixin.rb

@@ -0,0 +1,39 @@
+class Jeweler
+  class Generator
+    module MinitestMixin
+
+      def default_task
+        'test'
+      end
+
+      def feature_support_require
+        'mini/test'
+      end
+
+      def feature_support_extend
+        'Mini::Test::Assertions'
+      end
+
+      def test_dir
+        'test'
+      end
+
+      def test_task
+        'test'
+      end
+
+      def test_pattern
+        'test/**/*_test.rb'
+      end
+
+      def test_filename
+        "#{require_name}_test.rb"
+      end
+
+      def test_helper_filename
+        "test_helper.rb"
+      end
+
+    end
+  end
+end

data/lib/jeweler/generator/options.rb

@@ -61,7 +61,11 @@ class Jeweler
           end
         end
 
-        @opts.parse!(args)
+        begin
+          @opts.parse!(args)
+        rescue OptionParser::InvalidOption => e
+          self[:invalid_argument] = e.message
+        end
       end
 
       def merge(other)

data/lib/jeweler/generator/rspec_mixin.rb

@@ -0,0 +1,39 @@
+class Jeweler
+  class Generator
+    module RspecMixin
+
+      def default_task
+        'spec'
+      end
+
+      def feature_support_require
+        'spec/expectations'
+      end
+
+      def feature_support_extend
+        nil # Cucumber is smart enough extend Spec::Expectations on its own
+      end
+
+      def test_dir
+        'spec'
+      end
+
+      def test_task
+        'spec'
+      end
+
+      def test_pattern
+        'spec/**/*_spec.rb'
+      end
+
+      def test_filename
+        "#{require_name}_spec.rb"
+      end
+
+      def test_helper_filename
+        "spec_helper.rb"
+      end
+
+    end
+  end
+end

data/lib/jeweler/generator/shoulda_mixin.rb

@@ -0,0 +1,39 @@
+class Jeweler
+  class Generator
+    module ShouldaMixin
+
+      def default_task
+        'test'
+      end
+
+      def feature_support_require
+        'test/unit/assertions'
+      end
+
+      def feature_support_extend
+        'Test::Unit::Assertions'
+      end
+
+      def test_dir
+        'test'
+      end
+
+      def test_task
+        'test'
+      end
+
+      def test_pattern
+        'test/**/*_test.rb'
+      end
+
+      def test_filename
+        "#{require_name}_test.rb"
+      end
+
+      def test_helper_filename
+        "test_helper.rb"
+      end
+
+    end
+  end
+end

data/lib/jeweler/generator/testunit_mixin.rb

@@ -0,0 +1,39 @@
+class Jeweler
+  class Generator
+    module TestunitMixin
+
+      def default_task
+        'test'
+      end
+
+      def feature_support_require
+        'test/unit/assertions'
+      end
+
+      def feature_support_extend
+        'Test::Unit::Assertions'
+      end
+
+      def test_dir
+        'test'
+      end
+
+      def test_task
+        'test'
+      end
+
+      def test_pattern
+        'test/**/*_test.rb'
+      end
+
+      def test_filename
+        "#{require_name}_test.rb"
+      end
+
+      def test_helper_filename
+        "test_helper.rb"
+      end
+
+    end
+  end
+end

data/lib/jeweler/generator.rb

@@ -4,6 +4,13 @@ require 'erb'
 require 'net/http'
 require 'uri'
 
+require 'jeweler/generator/bacon_mixin'
+require 'jeweler/generator/micronaut_mixin'
+require 'jeweler/generator/minitest_mixin'
+require 'jeweler/generator/rspec_mixin'
+require 'jeweler/generator/shoulda_mixin'
+require 'jeweler/generator/testunit_mixin'
+
 class Jeweler
   class NoGitUserName < StandardError
   end
@@ -22,28 +29,33 @@ class Jeweler
 
   class Generator    
     attr_accessor :target_dir, :user_name, :user_email, :summary, :testing_framework,
-                  :github_repo_name, :github_username, :github_token,
+                  :project_name, :github_username, :github_token,
                   :repo, :should_create_repo, :should_use_cucumber, :should_setup_rubyforge
 
-    SUPPORTED_TESTING_FRAMEWORKS = [:shoulda, :testunit, :bacon, :rspec, :micronaut, :minitest]
+    DEFAULT_TESTING_FRAMEWORK = :shoulda
 
-    def initialize(github_repo_name, options = {})
-      if github_repo_name.nil? || github_repo_name.squeeze.strip == ""
+    def initialize(project_name, options = {})
+      if project_name.nil? || project_name.squeeze.strip == ""
         raise NoGitHubRepoNameGiven
       end
 
-      self.github_repo_name   = github_repo_name
+      self.project_name   = project_name
 
-      self.testing_framework  = (options[:testing_framework] || :shoulda).to_sym
-      unless SUPPORTED_TESTING_FRAMEWORKS.include? self.testing_framework
+      self.testing_framework  = (options[:testing_framework] || DEFAULT_TESTING_FRAMEWORK).to_sym
+      begin
+        generator_mixin_name = "#{self.testing_framework.to_s.capitalize}Mixin"
+        generator_mixin = self.class.const_get(generator_mixin_name)
+        extend generator_mixin
+      rescue NameError => e
         raise ArgumentError, "Unsupported testing framework (#{testing_framework})"
       end
 
-      self.target_dir         = options[:directory] || self.github_repo_name
 
-      self.should_create_repo = options[:create_repo]
-      self.summary            = options[:summary] || 'TODO'
-      self.should_use_cucumber= options[:use_cucumber]
+      self.target_dir             = options[:directory] || self.project_name
+
+      self.should_create_repo     = options[:create_repo]
+      self.summary                = options[:summary] || 'TODO'
+      self.should_use_cucumber    = options[:use_cucumber]
       self.should_setup_rubyforge = options[:rubyforge]
 
       use_user_git_config
@@ -53,112 +65,49 @@ class Jeweler
     def run
       create_files
       gitify
-      $stdout.puts "Jeweler has prepared your gem in #{github_repo_name}"
+      $stdout.puts "Jeweler has prepared your gem in #{target_dir}"
       if should_create_repo
         create_and_push_repo
-        $stdout.puts "Jeweler has pushed your repo to #{github_url}"
+        $stdout.puts "Jeweler has pushed your repo to #{project_homepage}"
         enable_gem_for_repo
         $stdout.puts "Jeweler has enabled gem building for your repo"
       end
     end
 
-    # Directory where 'tests' live
-    def test_dir
-      test_or_spec
+    def git_remote
+      "git@github.com:#{github_username}/#{project_name}.git"
     end
 
-    # Default rake task to use
-    def default_task
-      case testing_framework.to_sym
-      when :shoulda, :testunit, :minitest
-        'test'
-      when :bacon, :rspec
-        'spec'
-      when :micronaut
-        'examples'
-      else
-        raise ArgumentError, "Don't know default task for #{testing_framework}"
-      end
-    end
-
-    def feature_support_require
-      case testing_framework.to_sym
-      when :testunit, :shoulda, :bacon # NOTE bacon doesn't really work inside of cucumber
-        'test/unit/assertions'
-      when :minitest
-        'mini/test'
-      when :rspec
-        'spec/expectations'
-      when :micronaut
-        'micronaut/expectations'
-      else
-        raise "Don't know what to require for #{testing_framework}"
-      end
+    def project_homepage
+      "http://github.com/#{github_username}/#{project_name}"
     end
-
-    def feature_support_extend
-      case testing_framework.to_sym
-      when :testunit, :shoulda, :bacon # NOTE bacon doesn't really work inside of cucumber
-        'Test::Unit::Assertions'
-      when :minitest
-        'Mini::Test::Assertions'
-      when :rspec
-        nil
-      when :micronaut
-        'Micronaut::Matchers'
-      else
-        raise "Don't know what to extend for #{testing_framework}"
-      end
+    
+    def constant_name
+      self.project_name.split(/[-_]/).collect{|each| each.capitalize }.join
     end
 
-    def github_remote
-      "git@github.com:#{github_username}/#{github_repo_name}.git"
+    def lib_filename
+      "#{project_name}.rb"
     end
 
-    def github_url
-      "http://github.com/#{github_username}/#{github_repo_name}"
-    end
-
-    
-    def constant_name
-      self.github_repo_name.split(/[-_]/).collect{|each| each.capitalize }.join
+    def require_name
+      self.project_name
     end
 
     def file_name_prefix
-      self.github_repo_name.gsub('-', '_')
+      self.project_name.gsub('-', '_')
     end
 
     def lib_dir
       'lib'
     end
 
-    def test_dir
-      case testing_framework.to_sym
-      when :shoulda, :testunit, :minitest
-        'test'
-      when :bacon, :rspec
-        'spec'
-      when :micronaut
-        'examples'
-      else
-        raise ArgumentError, "Don't know test dir for #{testing_framework.inspect}"
-      end
-    end
-
-    def test_filename
-      "#{file_name_prefix}_#{test_or_spec}.rb"
-    end
-
-    def test_helper_filename
-      "#{test_or_spec}_helper.rb"
-    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
@@ -173,20 +122,6 @@ class Jeweler
       File.join(features_dir, 'step_definitions')
     end
 
-    def test_or_spec
-      case testing_framework.to_sym
-      when :shoulda, :testunit, :minitest
-        'test'
-      when :bacon, :rspec
-        'spec'
-      when :micronaut
-        'example'
-      else
-        raise ArgumentError, "Unknown test style: #{testing_framework}"
-      end
-    end
-
-
   protected
 
     # This is in a separate method so we can stub it out during testing
@@ -213,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)
@@ -247,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']
@@ -306,13 +243,13 @@ class Jeweler
         end
 
         begin
-          @repo.commit "Initial commit to #{github_repo_name}."
+          @repo.commit "Initial commit to #{project_name}."
         rescue Git::GitExecuteError => e
           raise
         end
 
         begin
-          @repo.add_remote('origin', github_remote)
+          @repo.add_remote('origin', git_remote)
         rescue Git::GitExecuteError => e
           puts "Encountered an error while adding origin remote. Maybe you have some weird settings in ~/.gitconfig?"
           raise
@@ -327,13 +264,13 @@ class Jeweler
                                 'login' => github_username,
                                 'token' => github_token,
                                 'repository[description]' => summary,
-                                'repository[name]' => github_repo_name
+                                'repository[name]' => project_name
       # TODO do a HEAD request to see when it's ready
       @repo.push('origin')
     end
 
     def enable_gem_for_repo
-      url = "https://github.com/#{github_username}/#{github_repo_name}/update"
+      url = "https://github.com/#{github_username}/#{project_name}/update"
       `curl -F 'login=#{github_username}' -F 'token=#{github_token}' -F 'field=repository_rubygem' -F 'value=1' #{url} 2>/dev/null`
       # FIXME use NET::HTTP instead of curl
       #Net::HTTP.post_form URI.parse(url),