namelessjon-jeweler 0.6.2 → 0.6.5

data/lib/jeweler/gemspec.rb

@@ -1,53 +1,41 @@
 class Jeweler
-  module Gemspec
-    # Writes out the gemspec
-    def write_gemspec
-      self.refresh_version
-      @gemspec.version = self.version
-      @gemspec.date = Time.now
-      File.open(gemspec_path, 'w') do |f|
-        f.write @gemspec.to_ruby
-      end
-      puts "Generated: #{gemspec_path}"
-    end
 
-    # Validates the gemspec in an environment similar to how GitHub would build
-    # it. See http://gist.github.com/16215
-    def validate_gemspec
-      begin
-        parse_gemspec
-        puts "#{gemspec_path} is valid."
-      rescue Exception => e
-        puts "#{gemspec_path} is invalid. See the backtrace for more details."
-        raise
-      end
-    end
+  class GemSpecHelper
+
+    attr_accessor :spec, :base_dir
 
+    def initialize(spec, base_dir = nil)
+      self.spec = spec
+      self.base_dir = base_dir || ''
 
-    def valid_gemspec?
+      yield spec if block_given?
+    end
+
+    def valid?
       begin
-        parse_gemspec
+        parse
         true
-      rescue Exception => e
+      rescue
         false
       end
     end
-
-    def parse_gemspec(data = nil)
-      data ||= File.read(gemspec_path)
-      Thread.new { eval("$SAFE = 3\n#{data}", binding, gemspec_path) }.join
+    
+    def write
+      File.open(path, 'w') do |f|
+        f.write @spec.to_ruby
+      end 
     end
 
-    def unsafe_parse_gemspec(data = nil)
-      data ||= File.read(gemspec_path)
-      eval(data, binding, gemspec_path)
+    def path
+      denormalized_path = File.join(@base_dir, "#{@spec.name}.gemspec")
+      absolute_path = File.expand_path(denormalized_path)
+      absolute_path.gsub(Dir.getwd + File::SEPARATOR, '') 
     end
 
-  protected
-    def gemspec_path
-      denormalized_path = File.join(@base_dir, "#{@gemspec.name}.gemspec")
-      absolute_path = File.expand_path(denormalized_path)
-      absolute_path.gsub(Dir.getwd + File::SEPARATOR, '')
+    def parse
+      data = File.read(path)
+      Thread.new { eval("$SAFE = 3\n#{data}", binding, path) }.join 
     end
+
   end
 end

data/lib/jeweler/generator.rb

@@ -52,6 +52,8 @@ class Jeweler
       if should_create_repo
         create_and_push_repo
         puts "Jeweler has pushed your repo to #{github_url}"
+        enable_gem_for_repo
+        puts "Jeweler has enabled gem building for your repo"
       end
     end
 
@@ -164,6 +166,17 @@ class Jeweler
       @repo.push('origin')
     end
 
+    def enable_gem_for_repo
+      url = "https://github.com/#{github_username}/#{github_repo_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),
+                                #'login' => github_username,
+                                #'token' => github_token,
+                                #'field' => 'repository_rubygem',
+                                #'value' => '1'
+    end
+
     def read_git_config
       # we could just use Git::Base's .config, but that relies on a repo being around already
       # ... which we don't have yet, since this is part of a sanity check

data/lib/jeweler/tasks.rb

@@ -1,6 +1,5 @@
 require 'rake'
 require 'rake/tasklib'
-require 'rubygems/builder'
 
 class Jeweler
   class Tasks < ::Rake::TaskLib
@@ -16,18 +15,32 @@ class Jeweler
     end
 
   private
-    def ensure_version_yml(&block)
-      unless File.exists? 'VERSION.yml'
-        @jeweler.write_version(ENV['MAJOR'], ENV['MINOR'], ENV['PATCH'])
+    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"
       end
-      block.call if block
-    end
 
-    def define
-      desc "Generate a gem"
-      task :gem => :'gemspec:validate' do
-        gemspec = @jeweler.unsafe_parse_gemspec
-        Gem::Builder.new(gemspec).build
+      desc "Build gem"
+      task :build => :'gem:build'
+
+      desc "Build gem"
+      task :gem => :'gem:build'
+
+      desc "Install gem using sudo"
+      task :install => :'gem:install'
+
+      namespace :gem do
+        desc "Install gem using sudo"
+        task :install => :build do
+          @jeweler.install_gem
+        end
+
+        desc "Build gem"
+        task :build => :'gemspec:validate' do
+          @jeweler.build_gem
+        end
       end
 
       desc "Generate and validates gemspec"
@@ -35,15 +48,13 @@ class Jeweler
 
       namespace :gemspec do
         desc "Validates the gemspec"
-        task :validate do
+        task :validate => 'VERSION.yml' do
           @jeweler.validate_gemspec
         end
 
-        desc "Generates the gemspec"
-        task :generate do
-          ensure_version_yml do
-            @jeweler.write_gemspec
-          end
+        desc "Generates the gemspec, using version from VERSION.yml"
+        task :generate => 'VERSION.yml' do
+          @jeweler.write_gemspec
         end
       end
 
@@ -51,38 +62,38 @@ class Jeweler
       task :version => 'version:display'
 
       namespace :version do
-        desc "Creates an initial version file. Respects the following environment variables, or defaults to 0: MAJOR, MINOR, PATCH"
+        desc "Setup initial version of 0.0.0"
+        task :setup => "VERSION.yml"
+
+        desc "Writes out an explicit version. Respects the following environment variables, or defaults to 0: MAJOR, MINOR, PATCH"
         task :write do
-          @jeweler.write_version(ENV['MAJOR'], ENV['MINOR'], ENV['PATCH'])
+          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}"
         end
 
         desc "Displays the current version"
-        task :display do
-          ensure_version_yml do
-            puts "Current version: #{@jeweler.version}"
-          end
+        task :display => :setup do
+          $stdout.puts "Current version: #{@jeweler.version}"
         end
 
         namespace :bump do
           desc "Bump the gemspec by a major version."
-          task :major => 'version:display' do
-            ensure_version_yml do
-              @jeweler.bump_major_version
-            end
+          task :major => ['VERSION.yml', :display] do
+            @jeweler.bump_major_version
+            $stdout.puts "Updated version: #{@jeweler.version}"
           end
 
           desc "Bump the gemspec by a minor version."
-          task :minor => 'version:display' do
-            ensure_version_yml do
-              @jeweler.bump_minor_version
-            end
+          task :minor => ['VERSION.yml', 'version:display'] do
+            @jeweler.bump_minor_version
+            $stdout.puts "Updated version: #{@jeweler.version}"
           end
 
           desc "Bump the gemspec by a patch version."
-          task :patch => 'version:display' do
-            ensure_version_yml do
-              @jeweler.bump_patch_version
-            end
+          task :patch => ['VERSION.yml', 'version:display'] do
+            @jeweler.bump_patch_version
+            $stdout.puts "Updated version: #{@jeweler.version}"
           end
         end
       end

data/lib/jeweler/version.rb

@@ -0,0 +1,81 @@
+class Jeweler
+  class Version
+    attr_accessor :base_dir
+    attr_reader :major, :minor, :patch
+
+    def initialize(base_dir)
+      self.base_dir = base_dir
+
+      if File.exists?(yaml_path)
+        parse_yaml
+      end
+    end
+
+    def bump_major
+      @major += 1
+      @minor = 0
+      @patch = 0
+    end
+
+    def bump_minor
+      @minor += 1
+      @patch = 0
+    end
+
+    def bump_patch
+      @patch += 1
+    end
+
+    def update_to(major, minor, patch)
+      @major = major
+      @minor = minor
+      @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
+    end
+
+  end
+end

data/test/gemspec_test.rb

@@ -0,0 +1,32 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class GemspecTest < Test::Unit::TestCase
+  context "A Jeweler::GemSpec, given a gemspec" do
+    setup do
+      @spec = build_spec
+      @helper = Jeweler::GemSpecHelper.new(@spec, File.dirname(__FILE__))
+    end
+
+    should 'have sane gemspec path' do
+      assert_equal "test/#{@spec.name}.gemspec", @helper.path
+    end
+  end
+
+  context "Jeweler::GemSpec#write" do
+    setup do
+      @spec = build_spec
+      @helper = Jeweler::GemSpecHelper.new(@spec)
+      FileUtils.rm_f(@helper.path)
+
+      @helper.write
+    end
+
+    should "create gemspec file" do
+      assert File.exists?(@helper.path)
+    end
+
+    should "make valid spec" do
+      assert @helper.valid?
+    end
+  end
+end

data/test/generators/initialization_test.rb

@@ -68,7 +68,7 @@ class JewelerGeneratorInitializerTest < Test::Unit::TestCase
     end
   end
   
-  context "without github username set" do
+  context "without github token set" do
     setup do
       Jeweler::Generator.any_instance.stubs(:read_git_config).
         returns({'user.email' => 'bar@example.com', 'user.name' => 'foo', 'github.user' => 'technicalpickles'})
@@ -143,4 +143,4 @@ class JewelerGeneratorInitializerTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/jeweler_test.rb

@@ -12,18 +12,6 @@ class JewelerTest < Test::Unit::TestCase
     FileUtils.rm_rf("#{File.dirname(__FILE__)}/tmp")
   end
 
-  def build_spec
-    Gem::Specification.new do |s|
-      s.name = "bar"
-      s.summary = "Simple and opinionated helper for creating Rubygem projects on GitHub"
-      s.email = "josh@technicalpickles.com"
-      s.homepage = "http://github.com/technicalpickles/jeweler"
-      s.description = "Simple and opinionated helper for creating Rubygem projects on GitHub"
-      s.authors = ["Josh Nichols", "Dan Croak"]
-      s.files =  FileList["[A-Z]*", "{generators,lib,test}/**/*"]
-    end
-  end
-
   context "A jeweler without a VERSION.yml" do
     setup do
       FileUtils.mkdir_p(tmp_dir)
@@ -31,7 +19,7 @@ class JewelerTest < Test::Unit::TestCase
     end
 
     should "not have VERSION.yml" do
-      assert ! File.exists?(File.join(tmp_dir, 'bar.gemspec'))
+      assert ! File.exists?(File.join(tmp_dir, 'VERSION.yml'))
     end
   end
 
@@ -39,7 +27,7 @@ class JewelerTest < Test::Unit::TestCase
   context "A Jeweler with a VERSION.yml" do
     setup do
       FileUtils.cp_r(fixture_dir, tmp_dir)
-
+      
       @jeweler = Jeweler.new(build_spec, tmp_dir)
     end
 
@@ -71,6 +59,35 @@ class JewelerTest < Test::Unit::TestCase
       should_bump_version 2, 0, 0
     end
 
+    should "should find files" do
+      assert ! @jeweler.gemspec.files.empty?
+    end
+
+    context "with standard 'files' specified" do
+      setup do
+        @alt_jeweler = Jeweler.new(build_spec("[A-Z]*.*", "{bin,generators,lib,test,spec}/**/*"), tmp_dir)
+      end
+      
+      should "have the same files as when no 'files' are specified" do
+        assert_equal @jeweler.gemspec.files, @alt_jeweler.gemspec.files
+      end
+    end
+
+    context "gemsepc's rdoc" do
+      should 'have be enabled' do
+        assert @jeweler.gemspec.has_rdoc
+      end
+
+      should 'do inline source' do
+        assert @jeweler.gemspec.rdoc_options.include?('--inline-source')
+      end
+
+      should 'be utf-8' do
+        assert @jeweler.gemspec.rdoc_options.include?('--charset=UTF-8')
+      end
+
+    end
+
     context "writing the gemspec" do
       setup do
         @output = catch_out { @jeweler.write_gemspec }

data/test/shoulda_macros/jeweler_macros.rb

@@ -30,9 +30,6 @@ class Test::Unit::TestCase
       should_have_minor_version minor
       should_have_patch_version patch
       should_be_version version
-      should "output the new version, #{version}" do
-        assert_match version, @output
-      end
     end
   end
 end

data/test/tasks_test.rb

@@ -22,6 +22,8 @@ class TasksTest < Test::Unit::TestCase
     end
 
     should 'define tasks' do
+      assert Task.task_defined?(:build)
+      assert Task.task_defined?(:install)
       assert Task.task_defined?(:gemspec)
       assert Task.task_defined?(:'gemspec:validate')
       assert Task.task_defined?(:'gemspec:generate')