bueller 0.0.1 → 0.0.2

data/lib/bueller/commands/git_tag_release.rb

@@ -24,17 +24,26 @@ class Bueller
       def repo; bueller.repo; end
 
       def run
-        raise "Hey buddy, try committing them files first" unless clean_staging_area?
+        run = true
+        unless clean_staging_area?
+          output.puts "There are some modified files that haven't been committed. Proceed anyway?"
+          run = $stdin.gets =~ /(y|yes)/i ? true : false
+        end
 
-        repo.checkout('master')
-        repo.push
-        
-        unless release_tagged?
-          output.puts "Tagging #{release_tag}"
-          repo.add_tag(release_tag)
+        if run
+          repo.checkout('master')
+          
+          if release_tagged?
+            repo.push
+          else
+            output.puts "Tagging #{release_tag}"
+            repo.add_tag release_tag
 
-          output.puts "Pushing #{release_tag} to origin"
-          repo.push('origin', release_tag)
+            output.puts "Pushing #{release_tag} to origin"
+            repo.push 'origin', release_tag
+          end
+        else
+          raise "Release cancelled"
         end
       end 
 

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

@@ -19,17 +19,29 @@ class Bueller
 
         def version_helper; bueller.version_helper; end
         def gemspec_helper; bueller.gemspec_helper; end
+        def repo; bueller.repo; end
+        def commit; bueller.commit; end
 
         def run
           update_version
 
           gemspec_helper.update_version version_helper.to_s
+          gemspec_helper.set_date
           gemspec_helper.write
+
+          commit_version
         end
 
         def update_version
           raise "Subclasses should implement this"
         end
+
+        def commit_version
+          if repo and commit
+            repo.add gemspec_helper.path
+            repo.commit "Version bump to #{version_helper.to_s}"
+          end
+        end
       end
     end
   end

data/lib/bueller/gemspec_helper.rb

@@ -39,10 +39,11 @@ class Bueller
     end
 
     def path
+      return @path unless @path.nil?
       denormalized_path = Dir.glob(File.join(base_dir, '*.gemspec')).first
       raise NoGemspecFound, "No gemspec found in #{base_dir}" if denormalized_path.nil?
       absolute_path = File.expand_path(denormalized_path)
-      absolute_path.gsub(Dir.getwd + File::SEPARATOR, '') 
+      @path = absolute_path.gsub(Dir.getwd + File::SEPARATOR, '') 
     end
 
     def spec_source

data/lib/bueller/tasks.rb

@@ -78,21 +78,18 @@ class Bueller
           desc "Bump the gemspec by a major version."
           task :major => :version do
             bueller.bump_major_version
-            bueller.write_gemspec
             $stdout.puts "Updated version: #{bueller.version}"
           end
 
           desc "Bump the gemspec by a minor version."
           task :minor => :version do
             bueller.bump_minor_version
-            bueller.write_gemspec
             $stdout.puts "Updated version: #{bueller.version}"
           end
 
           desc "Bump the gemspec by a patch version."
           task :patch => :version do
             bueller.bump_patch_version
-            bueller.write_gemspec
             $stdout.puts "Updated version: #{bueller.version}"
           end
         end
@@ -102,19 +99,10 @@ class Bueller
       task :release do
       end
 
-      namespace :github do
-        desc "Release Gem to GitHub"
-        task :release do
-          bueller.release_gem_to_github
-        end
-      end
-
-      task :release => 'github:release'
-
       namespace :git do
-        desc "Tag a release in Git"
+        desc "Tag a release and push to origin"
         task :release do
-          bueller.release_to_git
+          bueller.git_tag_release
         end
       end
 
@@ -122,7 +110,7 @@ class Bueller
 
       namespace :rubygems do
         desc "Release gem to Rubygems"
-        task :release => [:gemspec, :build] do
+        task :release => :build do
           bueller.release_gem_to_rubygems
         end
       end

data/lib/bueller/templates/other_tasks.erb

@@ -73,6 +73,7 @@ require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
+  rdoc.main = 'README.rdoc'
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "<%= project_name %> #{version}"
   rdoc.rdoc_files.include('README*')

data/lib/bueller.rb

@@ -1,4 +1,5 @@
 require 'date'
+require 'git'
 
 # Bueller helps you craft the perfect Rubygem. Give him a gemspec, and he takes care of the rest.
 #
@@ -110,10 +111,6 @@ class Bueller
     Bueller::Commands::Version::Write.run_for self, major, minor, patch, build
   end
 
-  def release_gem_to_github
-    Bueller::Commands::ReleaseToGithub.run_for self
-  end
-
   def git_tag_release
     Bueller::Commands::GitTagRelease.run_for self
   end

data/spec/bueller/commands/git_tag_release_spec.rb

@@ -17,12 +17,21 @@ describe Bueller::Commands::GitTagRelease do
     before :each do
       command.repo.stub! :checkout
       command.repo.stub! :push
+      command.repo.stub! :add_tag
+      command.stub!(:clean_staging_area?).and_return true
       command.stub!(:release_tagged?).and_return true
     end
 
-    it 'should raise an error if the staging area is unclean' do
+    it 'should not run if the staging area is unclean and user does not confirm' do
       command.stub!(:clean_staging_area?).and_return false
-      expect { command.run }.should raise_error(RuntimeError, /try committing/i)
+      $stdin.stub!(:gets).and_return 'no'
+      expect { command.run }.should raise_error
+    end
+    it 'should run if the staging area is unclean and user confirms' do
+      command.stub!(:clean_staging_area?).and_return false
+      $stdin.stub!(:gets).and_return 'yes'
+      command.repo.should_receive :checkout
+      command.run
     end
     it 'should check out master' do
       command.repo.should_receive(:checkout).with 'master'
@@ -32,17 +41,16 @@ describe Bueller::Commands::GitTagRelease do
       command.repo.should_receive :push
       command.run
     end
-
     it 'should not push tags if the release is already tagged' do
       command.repo.should_not_receive :add_tag
-      command.repo.should_receive(:push).once
+      command.repo.should_receive :push
 
       command.run
     end
     it 'should push tags if the release is not tagged' do
       command.stub!(:release_tagged?).and_return false
       command.repo.should_receive :add_tag
-      command.repo.should_receive(:push).twice
+      command.repo.should_receive :push
 
       command.run
     end

data/spec/bueller_spec.rb

@@ -76,15 +76,7 @@ describe Bueller do
     end
   end
 
-  describe '#bump_major_version' do
-    it 'should build and run release to github command when running release_gem_to_github' do
-      Bueller::Commands::ReleaseToGithub.should_receive(:run_for).with(bueller)
-
-      bueller.release_gem_to_github
-    end
-  end
-
-  describe '#bump_major_version' do
+  describe '#git_tag_release' do
     it 'should build and tag the release' do
       Bueller::Commands::GitTagRelease.should_receive(:run_for).with(bueller)
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Derek Kastner
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 -05:00
+date: 2011-01-19 00:00:00 -05:00
 default_executable: bueller
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -198,7 +198,6 @@ files:
 - lib/bueller/tasks.rb
 - lib/bueller/rubyforge_tasks.rb
 - lib/bueller/generator.rb
-- lib/bueller/commands/release_to_github.rb
 - lib/bueller/commands/build_gem.rb
 - lib/bueller/commands/release_to_rubygems.rb
 - lib/bueller/commands/install_gem.rb
@@ -287,7 +286,6 @@ files:
 - spec/fixtures/bar/bar.gemspec
 - spec/bueller/gemspec_helper_spec.rb
 - spec/bueller/commands/git_tag_release_spec.rb
-- spec/bueller/commands/release_to_github_spec.rb
 - spec/bueller/commands/release_to_rubygems_spec.rb
 - spec/bueller/commands/build_gem_spec.rb
 - spec/bueller/commands/write_gemspec_spec.rb
@@ -316,7 +314,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -77423727
+      hash: -330140273
       segments: 
       - 0
       version: "0"
@@ -364,7 +362,6 @@ test_files:
 - spec/fixtures/bar/bar.gemspec
 - spec/bueller/gemspec_helper_spec.rb
 - spec/bueller/commands/git_tag_release_spec.rb
-- spec/bueller/commands/release_to_github_spec.rb
 - spec/bueller/commands/release_to_rubygems_spec.rb
 - spec/bueller/commands/build_gem_spec.rb
 - spec/bueller/commands/write_gemspec_spec.rb

data/lib/bueller/commands/release_to_github.rb

@@ -1,41 +0,0 @@
-class Bueller
-  module Commands
-    class ReleaseToGithub
-      def self.run_for(bueller, attributes = {})
-        command = new bueller, attributes
-        command.run
-        command
-      end
-
-      attr_accessor :output
-      attr_reader :bueller
-
-      def initialize(bueller, attributes = {})
-        self.output = $stdout
-        @bueller = bueller
-
-        attributes.each_pair do |key, value|
-          send("#{key}=", value)
-        end
-      end
-
-      def base_dir; bueller.base_dir; end
-      def version; bueller.version; end
-      def repo; bueller.repo; end
-
-      def run
-        raise "Hey buddy, try committing them files first" unless clean_staging_area?
-
-        repo.checkout('master')
-
-        output.puts "Pushing master to origin"
-        repo.push
-      end
-
-      def clean_staging_area?
-        status = repo.status
-        status.added.empty? && status.deleted.empty? && status.changed.empty?
-      end
-    end
-  end
-end

data/spec/bueller/commands/release_to_github_spec.rb

@@ -1,54 +0,0 @@
-require 'spec_helper'
-
-describe Bueller::Commands::ReleaseToGithub do
-  let(:bueller) { Bueller.new }
-  let(:command) { Bueller::Commands::ReleaseToGithub.new bueller, :output => StringIO.new }
-
-  before :each do
-    status = mock(Object)
-    bueller.repo = mock(Git, :status => status)
-
-    command.repo.status.stub!(:added).and_return []
-    command.repo.status.stub!(:changed).and_return []
-    command.repo.status.stub!(:deleted).and_return []
-  end
-
-  describe '#run' do
-    before :each do
-      command.repo.stub! :checkout
-      command.repo.stub! :push
-      command.stub!(:release_tagged?).and_return true
-    end
-
-    it 'should raise an error if the staging area is unclean' do
-      command.stub!(:clean_staging_area?).and_return false
-      expect { command.run }.should raise_error(RuntimeError, /try committing/i)
-    end
-    it 'should check out master' do
-      command.repo.should_receive(:checkout).with 'master'
-      command.run
-    end
-    it 'should push' do
-      command.repo.should_receive :push
-      command.run
-    end
-  end
-
-  describe '#clean_staging_area?' do
-    it 'should return true if there are no added, changed, or deleted files' do
-      command.should be_clean_staging_area
-    end
-    it 'should return false if there are added files' do
-      command.repo.status.stub!(:added).and_return ['Gemfile.lock']
-      command.should_not be_clean_staging_area
-    end
-    it 'should return false if there are changed files' do
-      command.repo.status.stub!(:changed).and_return ['Gemfile.lock']
-      command.should_not be_clean_staging_area
-    end
-    it 'should return false if there are deleted files' do
-      command.repo.status.stub!(:deleted).and_return ['Gemfile.lock']
-      command.should_not be_clean_staging_area
-    end
-  end
-end