jeweler 1.3.0 → 1.4.0

data/test/jeweler/commands/test_install_gem.rb

@@ -6,55 +6,16 @@ class Jeweler
       rubyforge_command_context "running" do
         setup do
           stub(@gemspec_helper).gem_path { 'pkg/zomg-1.1.1.gem' } 
-          stub(@command).sudo_wrapper { 'sudo gem install --local pkg/zomg-1.1.1.gem' }
+          stub(@command).gem_command { 'gem' }
           stub(@command).sh
 
           @command.run
         end
 
-        should "call sudo wrapper with gem install --local" do
-          assert_received(@command) {|command| command.sudo_wrapper('gem install --local pkg/zomg-1.1.1.gem') }
-        end
-
-        should "call sh with output of sudo wrapper" do
-          assert_received(@command) {|command| command.sh 'sudo gem install --local pkg/zomg-1.1.1.gem' }
-        end
-      end
-
-      rubyforge_command_context "use_sudo?" do
-        should "be false on mswin" do
-          stub(@command).host_os { "i386-mswin32" }
-          assert ! @command.use_sudo?
-        end
-
-        should "be false on windows" do
-          stub(@command).host_os { "windows" }
-          assert ! @command.use_sudo?
-        end
-
-        should "be false on cygwin" do
-          stub(@command).host_os { "cygwin" }
-          assert ! @command.use_sudo?
-        end
-
-        should "be true on basically anything else" do
-          stub(@command).host_os { "darwin9" }
-          assert @command.use_sudo?
-        end
-      end
-
-      rubyforge_command_context "sudo_wrapper" do
-        should "prefix sudo if needed" do
-          stub(@command).use_sudo? { true }
-          assert_equal "sudo blarg", @command.sudo_wrapper("blarg")
-        end
-
-        should "not prefix with sudo if unneeded" do
-          stub(@command).use_sudo? { false }
-          assert_equal "blarg", @command.sudo_wrapper("blarg")
+        should "call sh with gem install" do
+          assert_received(@command) {|command| command.sh 'gem install pkg/zomg-1.1.1.gem' }
         end
       end
-      
 
       build_command_context "build for jeweler" do
         setup do

data/test/jeweler/generator/test_options.rb

@@ -34,9 +34,15 @@ class TestOptions < Test::Unit::TestCase
     setup { setup_options }
     should_have_testing_framework :shoulda
     should_have_docmentation_framework :rdoc
+
     should 'not create repository' do
       assert ! @options[:create_repo]
     end
+
+    should 'use gemcutter' do
+      assert @options[:gemcutter]
+    end
+
     should "have project name" do
       assert_equal "project_name", @options[:project_name]
     end
@@ -116,6 +122,18 @@ class TestOptions < Test::Unit::TestCase
     end
   end
 
+  for_options '--no-gemcutter' do
+    should 'enable rubyforge' do
+      assert ! @options[:gemcutter]
+    end
+  end
+
+  for_options '--gemcutter' do
+    should 'enable rubyforge' do
+      assert @options[:gemcutter]
+    end
+  end
+
   for_options '--rdoc' do
     should_have_docmentation_framework :rdoc
   end

data/test/jeweler/test_specification.rb

@@ -2,60 +2,230 @@ require 'test_helper'
 
 class TestSpecification < Test::Unit::TestCase
   def setup
-    remove_tmpdir!
-    path = File.join(FIXTURE_DIR, "existing-project-with-version-yaml")
-    Git.init(path)
-    FileUtils.cp_r path, tmp_dir
-    #breakpoint
+    @project = create_construct
+  end
 
+  def teardown
+    @project.destroy!
+  end
 
-    @spec = Gem::Specification.new
-    @spec.extend(Jeweler::Specification)
-    @spec.set_jeweler_defaults(tmp_dir)
+  def build_jeweler_gemspec(&block)
+    gemspec = if block
+                Gem::Specification.new(&block)
+              else
+                Gem::Specification.new()
+              end
+    gemspec.extend(Jeweler::Specification)
+    gemspec
   end
 
-  def teardown
-    remove_tmpdir!
+  context "basic defaults" do
+    setup do
+      @gemspec = build_jeweler_gemspec
+    end
+
+    should "make files a FileList" do
+      assert_equal FileList, @gemspec.files.class
+    end
+
+    should "make test_files a FileList" do
+      assert_equal FileList, @gemspec.test_files.class
+    end
+
+    should "make extra_rdoc_files a FileList" do
+      assert_equal FileList, @gemspec.extra_rdoc_files.class
+    end
+
+    should "enable rdoc" do
+      assert @gemspec.has_rdoc
+    end
   end
+ 
+  context "there aren't any executables in the project directory" do
+    setup do
+      @project.directory 'bin' 
+    end
 
-  context "Gem::Specification with Jeweler monkey-patches" do
-    context "when setting defaults" do
-      should_eventually "should populate `files'" do
-        # this implementation changed to use ruby-git
-        assert_equal %w{Rakefile VERSION.yml bin/foo_the_ultimate_bin lib/foo_the_ultimate_lib.rb }, @spec.files.sort
+    context "and there hasn't been any set on the gemspec" do
+      setup do
+        @gemspec = build_jeweler_gemspec
+        @gemspec.set_jeweler_defaults(@project)
       end
 
-      should "should populate `executables'" do
-        assert_equal %w{ foo_the_ultimate_bin }, @spec.executables
+
+      should "have empty gemspec executables" do
+        assert_equal [], @gemspec.executables
       end
+    end
 
-      context "with values already set" do
-        setup do
-          @spec.files = %w{ hey_include_me_in_gemspec }
-          @spec.set_jeweler_defaults(fixture_dir)
+    context "and has been previously set executables" do
+      setup do
+        @gemspec  = build_jeweler_gemspec do |gemspec|
+          gemspec.executables = %w(non-existant)
         end
+        @gemspec.set_jeweler_defaults(@project)
+      end
+
+      should "have only the original executables in the gemspec" do
+        assert_equal %w(non-existant), @gemspec.executables
+      end
+    end
+  end
+
+  context "there are multiple executables in the project directory" do
+    setup do
+      @project.directory('bin') do |bin|
+        bin.file 'burnination'
+        bin.file 'trogdor'
+      end
+    end
 
-        should "not re-populate `files'" do
-          assert_equal %w{ hey_include_me_in_gemspec }, @spec.files
+    context "and there hasn't been any set on the gemspec" do
+      setup do
+        @gemspec  = build_jeweler_gemspec
+        @gemspec.set_jeweler_defaults(@project)
+      end
+
+      should "have the executables in the gemspec" do
+        assert_equal %w(burnination trogdor), @gemspec.executables
+      end
+    end
+    context "and has been previously set executables" do
+      setup do
+        @gemspec  = build_jeweler_gemspec do |gemspec|
+          gemspec.executables = %w(burnination)
         end
+        @gemspec.set_jeweler_defaults(@project)
+      end
+      should "have only the original executables in the gemspec" do
+        assert_equal %w(burnination), @gemspec.executables
       end
+    end
+  end
 
-      context "for rdoc" do
-        should "be enabled" do
-          assert @spec.has_rdoc
+  context "there are mutiple extconf.rb in the project directory" do
+    setup do
+      @project.directory('ext') do |ext|
+        ext.file 'extconf.rb'
+        ext.directory('trogdor_native') do |trogdor_native|
+          trogdor_native.file 'extconf.rb'
         end
+      end
+    end
 
-        should "be utf-8" do
-          assert @spec.rdoc_options.include?('--charset=UTF-8')
+    context "and there hasn't been any extensions set on the gemspec" do
+      setup do
+        @gemspec  = build_jeweler_gemspec
+        @gemspec.set_jeweler_defaults(@project)
+      end
+
+      should "have all the extconf.rb files in extensions" do
+        assert_equal %w(ext/extconf.rb ext/trogdor_native/extconf.rb), @gemspec.extensions
+      end
+
+    end
+
+  end
+
+  context "there are some files and is setup for git" do
+    setup do
+      @project.file 'Rakefile'
+      @project.directory('lib') do |lib|
+        lib.file 'example.rb'
+      end
+
+      repo = Git.init(@project)
+      repo.add('.')
+      repo.commit('Initial commit')
+    end
+
+    context "and the files defaults are used" do
+      setup do
+        @gemspec  = build_jeweler_gemspec
+        @gemspec.set_jeweler_defaults(@project, @project)
+      end
+
+      should "populate files from git" do
+        assert_equal %w(Rakefile lib/example.rb), @gemspec.files
+      end
+    end
+
+    context "and the files specified manually" do
+      setup do
+        @gemspec  = build_jeweler_gemspec do |gemspec|
+          gemspec.files = %w(Rakefile)
         end
+        @gemspec.set_jeweler_defaults(@project, @project)
+      end
+
+      should "not be overridden by files from git" do
+        assert_equal %w(Rakefile), @gemspec.files
       end
     end
 
-    should "allow the user to concat files to the existing `files' array" do
-      before = @spec.files.dup
-      @spec.files << 'extra'
+  end
+
+  context "there are some files and is setup for git with ignored files" do
+    setup do
+      @project.file '.gitignore', 'ignored'
+      @project.file 'ignored'
+      @project.file 'Rakefile'
+      @project.directory('lib') do |lib|
+        lib.file 'example.rb'
+      end
+
+      repo = Git.init(@project)
+      repo.add('.')
+      repo.commit('Initial commit')
+
+
+      @gemspec  = build_jeweler_gemspec
+      @gemspec.set_jeweler_defaults(@project, @project)
+    end
+
+    should "populate files from git excluding ignored" do
+      assert_equal %w(.gitignore Rakefile lib/example.rb), @gemspec.files
+    end
+  end
+
+  context "there are some files and is setup for git and working in a sub directory" do
+    setup do
+      @subproject = File.join(@project, 'subproject')
+      @project.file 'Rakefile'
+      @project.file 'README'
+      @project.directory 'subproject' do |subproject|
+        subproject.file 'README'
+        subproject.directory('lib') do |lib|
+          lib.file 'subproject_example.rb'
+        end
+      end
+
+      repo = Git.init(@project)
+      repo.add('.')
+      repo.commit('Initial commit')
+
+      @gemspec  = build_jeweler_gemspec
+      @gemspec.set_jeweler_defaults(@subproject, @project)
+    end
+
+    should "populate files from git relative to sub directory" do
+      assert_equal %w(lib/subproject_example.rb README).sort, @gemspec.files.sort
+    end
+  end
+
+  context "there are some files and is not setup for git" do
+    setup do
+      @project.file 'Rakefile'
+      @project.directory('lib') do |lib|
+        lib.file 'example.rb'
+      end
+
+      @gemspec  = build_jeweler_gemspec
+      @gemspec.set_jeweler_defaults(@project, @project)
+    end
 
-      assert_equal before + %w{ extra }, @spec.files
+    should "not populate files" do
+      assert_equal [], @gemspec.files.sort
     end
   end
 end

data/test/test_helper.rb

@@ -12,6 +12,8 @@ begin
   require 'shoulda'
   require 'rr'
   require 'redgreen'
+  require 'construct'
+  require 'git'
 rescue LoadError => e
   puts "*" * 80
   puts "Some dependencies needed to run tests were missing. Run the following command to find them:"
@@ -42,6 +44,7 @@ end
 
 class Test::Unit::TestCase
   include RR::Adapters::TestUnit unless include?(RR::Adapters::TestUnit)
+  include Construct::Helpers
 
   def tmp_dir
     TMP_DIR

data/test/test_jeweler.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class TestJeweler < Test::Unit::TestCase
 
   def build_jeweler(base_dir = nil)
-    base_dir ||= non_git_dir_path
+    base_dir ||= git_dir_path
     FileUtils.mkdir_p base_dir
 
     Jeweler.new(build_spec, base_dir)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jeweler
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Josh Nichols
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-18 00:00:00 -04:00
+date: 2009-11-19 00:00:00 -08:00
 default_executable: jeweler
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,6 +92,36 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: devver-construct
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: yard
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Simple and opinionated helper for creating Rubygem projects on GitHub
 email: josh@technicalpickles.com
 executables: 
@@ -176,10 +206,12 @@ files:
 - lib/jeweler/templates/bacon/helper.rb
 - lib/jeweler/templates/features/default.feature
 - lib/jeweler/templates/features/support/env.rb
+- lib/jeweler/templates/jeweler_tasks.erb
 - lib/jeweler/templates/micronaut/flunking.rb
 - lib/jeweler/templates/micronaut/helper.rb
 - lib/jeweler/templates/minitest/flunking.rb
 - lib/jeweler/templates/minitest/helper.rb
+- lib/jeweler/templates/other_tasks.erb
 - lib/jeweler/templates/riot/flunking.rb
 - lib/jeweler/templates/riot/helper.rb
 - lib/jeweler/templates/rspec/flunking.rb