bueller 0.0.3 → 0.0.4

data/README.markdown

@@ -1,12 +1,13 @@
-# Bueller: Craft the absolute perfect RubyGem
+# Bueller: A Tool for Crafting Gems Along With Bundler
 
 Bueller provides two things:
 
- * Rake tasks for managing gems and versioning of a <a href="http://github.com">GitHub</a> project
  * A generator for creating/kickstarting a new project
+ * Rake tasks for managing gems and versioning of a <a href="http://github.com">GitHub</a> project
 
 ## Quick Links
 
+ * [Web](http://dkastner.github.com/bueller)
  * [Wiki](http://wiki.github.com/dkastner/bueller)
  * [Bugs](http://github.com/dkastner/bueller/issues)
 
@@ -37,10 +38,10 @@ This will prepare a project in the 'the-perfect-gem' directory, setup to use Bue
 It supports a number of options. Here's a taste, but `bueller --help` will give you the most up-to-date listing:
 
  * --create-repo: in addition to preparing a project, it create an repo up on GitHub and enable RubyGem generation
+ * --rspec: generate spec_helper.rb and spec ready for rspec (this is the default TDD framework)
  * --testunit: generate test_helper.rb and test ready for test/unit
  * --minitest: generate test_helper.rb and test ready for minitest
  * --shoulda: generate test_helper.rb and test ready for shoulda
- * --rspec: generate spec_helper.rb and spec ready for rspec (this is the default)
  * --bacon: generate spec_helper.rb and spec ready for bacon
  * --gemcutter: setup releasing to gemcutter
  * --rubyforge: setup releasing to rubyforge
@@ -87,13 +88,6 @@ Initially, your project starts out at 0.0.0. Bueller provides Rake tasks for bum
     rake version:bump:minor
     rake version:bump:patch
 
-You can also programmatically set the version if you wish. Typically, you use this to have a module with the version info so clients can access it. The only downside here is you no longer can use the version:bump tasks.
-
-    Gem::Specification.new do |s|
-       s.version = MyProject::VERSION
-       # more stuff
-    end
-
 ### Prerelease versioning
 
 Major, minor, and patch versions have a distant cousin: build. You can use this to add an arbitrary (or you know, regular type) version. This is particularly useful for prereleases.
@@ -117,63 +111,15 @@ It does the following for you:
 
 As is though, it doesn't actually get your gem anywhere. To do that, you'll need to use rubyforge or gemcutter.
 
-### Releasing to Gemcutter
-
-Bueller can also handle releasing to [Gemcutter](http://gemcutter.org). There are a few steps you need to do before doing any Gemcutter releases with Bueller:
-
- * [Create an account on Gemcutter](http://gemcutter.org/sign_up)
- * Install the Gemcutter gem: gem install gemcutter
- * Run 'gem tumble' to set up RubyGems to use gemcutter as the default source if you haven't already
- * Update your Rakefile to make an instance of `Bueller::GemcutterTasks`
-
-
-A Rakefile setup for gemcutter would include something like this:
-
-    begin
-      require 'bueller'
-      Bueller::Tasks.new
-      Bueller::GemcutterTasks.new
-    rescue LoadError
-      puts "Bueller (or a dependency) not available. Install it with: gem install bueller"
-    end
+### Releasing to Rubygems
 
+Bueller can also handle releasing to [Rubygems](http://rubygems.org). You must [create an account](http://rubygems.org/sign_up) on Rubygems before doing any Rubygems releases with Bueller.
 
 After you have configured this, `rake release` will now also release to Gemcutter.
 
 If you need to release it without the rest of the release task, you can run:
 
-    $ rake gemcutter:release
-
-### Releasing to RubyForge
-
-Bueller can also handle releasing to [RubyForge](http://rubyforge.org). There are a few steps you need to do before doing any RubyForge releases with Bueller:
-
- * [Create an account on RubyForge](http://rubyforge.org/account/register.php)
- * Request a project on RubyForge.
- * Install the RubyForge gem: gem install rubyforge
- * Run 'rubyforge setup' and fill in your username and password for RubyForge
- * Run 'rubyforge config' to pull down information about your projects
- * Run 'rubyforge login' to make sure you are able to login
- * In Bueller::Tasks, you must set `rubyforge_project` to the project you just created
- * Add Bueller::RubyforgeTasks to bring in the appropriate tasks.
- * Note, using `bueller --rubyforge` when generating the project does this for you automatically.
-
-A gemspec setup for rubyforge would include something like this:
-
-    Gem::Specification.new do |s|
-      # ommitted for brevity
-      gemspec.rubyforge_project = 'the-perfect-gem' # This line would be new
-    end
-
-Now you must initially create a 'package' for your gem in your RubyForge 'project':
-
-    $ rake rubyforge:setup
-
-After you have configured this, `rake release` will now also release to RubyForge.
-
-If you need to release it without the rest of the release task, you can run:
-
-    $ rake rubyforge:release
+    $ rake rubygems:release
 
 ## Development and Release Workflow
 

data/lib/bueller/commands.rb

@@ -1,10 +1,5 @@
 class Bueller
   module Commands
-    autoload :BuildGem, 'bueller/commands/build_gem'
-    autoload :InstallGem, 'bueller/commands/install_gem'
-    autoload :GitTagRelease, 'bueller/commands/git_tag_release'
-    autoload :ReleaseToGithub, 'bueller/commands/release_to_github'
-    autoload :ReleaseToRubygems, 'bueller/commands/release_to_rubygems'
     autoload :WriteGemspec, 'bueller/commands/write_gemspec'
 
     module Version

data/lib/bueller/tasks.rb

@@ -32,22 +32,14 @@ class Bueller
   private
 
     def define
+      gem_helper = Bundler::GemHelper.install_tasks
+
       task :gemspec_required do
         unless File.exist?(bueller.gemspec_helper.path)
           abort "Expected #{bueller.gemspec_helper.path} to exist. See 'rake gemspec:write' to create it"
         end
       end
 
-      desc "Build gem"
-      task :build do
-        bueller.build_gem
-      end
-
-      desc "Install gem"
-      task :install => [:build] do
-        bueller.install_gem
-      end
-
       namespace :gemspec do
         desc 'Validates the gemspec'
         task :validate => :gemspec_required do
@@ -95,27 +87,12 @@ class Bueller
         end
       end
 
-      desc "Release gem"
-      task :release do
-      end
-
-      namespace :git do
-        desc "Tag a release and push to origin"
-        task :release do
-          bueller.git_tag_release
-        end
-      end
-
-      task :release => 'git:release'
-
       namespace :rubygems do
         desc "Release gem to Rubygems"
         task :release => :build do
-          bueller.release_gem_to_rubygems
+          gem_helper.rubygem_push bueller.gemspec_helper.gem_path
         end
       end
-
-      task :release => 'rubygems:release'
     end
   end
 end

data/lib/bueller.rb

@@ -3,10 +3,7 @@ require 'git'
 
 # Bueller helps you craft the perfect Rubygem. Give him a gemspec, and he takes care of the rest.
 #
-# See Bueller::Tasks for examples of how to get started. Additionally, resources are available on the wiki:
-#
-# * http://wiki.github.com/technicalpickles/bueller/create-a-new-project
-# * http://wiki.github.com/technicalpickles/bueller/configure-an-existing-project
+# See Bueller::Tasks for examples of how to get started.
 class Bueller
   require 'bueller/errors'
   require 'rubygems/user_interaction'
@@ -75,16 +72,6 @@ class Bueller
     Bueller::Commands::WriteGemspec.run_for self
   end
 
-  # Build a gem using the project's latest Gem::Specification
-  def build_gem
-    Bueller::Commands::BuildGem.run_for self
-  end
-
-  # Install a previously built gem
-  def install_gem
-    Bueller::Commands::InstallGem.run_for self
-  end
-
   # Bumps the patch version.
   #
   # 1.5.1 -> 1.5.2
@@ -111,14 +98,6 @@ class Bueller
     Bueller::Commands::Version::Write.run_for self, major, minor, patch, build
   end
 
-  def git_tag_release
-    Bueller::Commands::GitTagRelease.run_for self
-  end
-
-  def release_gem_to_rubygems
-    Bueller::Commands::ReleaseToRubygems.run_for self
-  end
-
   def git_base_dir(base_dir = nil)
     if base_dir
       base_dir = File.dirname(base_dir)

data/spec/bueller_spec.rb

@@ -36,22 +36,6 @@ describe Bueller do
     end
   end
 
-  describe '#build_gem' do
-    it 'should build and run build gem command when building gem' do
-      Bueller::Commands::BuildGem.should_receive(:run_for).with(bueller)
-
-      bueller.build_gem
-    end
-  end
-
-  describe '#install_gem' do
-    it 'should build and run build gem command when installing gem' do
-      Bueller::Commands::InstallGem.should_receive(:run_for).with(bueller)
-
-      bueller.install_gem
-    end
-  end
-
   describe '#bump_major_version' do
     it 'should build and run bump major version command when bumping major version' do
       Bueller::Commands::Version::BumpMajor.should_receive(:run_for).with(bueller)
@@ -75,12 +59,4 @@ describe Bueller do
       bueller.write_version(1, 5, 2, 'a1')
     end
   end
-
-  describe '#git_tag_release' do
-    it 'should build and tag the release' do
-      Bueller::Commands::GitTagRelease.should_receive(:run_for).with(bueller)
-
-      bueller.git_tag_release
-    end
-  end
 end

data/spec/fixtures/bar/bar.gemspec

@@ -1,5 +1,5 @@
 Gem::Specification.new do |s|
-  s.name = %q{bueller}
+  s.name = %q{bar}
   s.version = "0.0.1"
   s.date = '2010-02-15'
   s.authors = ['Josh Nichols', 'Derek Kastner']

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Derek Kastner
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 -05:00
+date: 2011-01-27 00:00:00 -05:00
 default_executable: bueller
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 9
+        version: 1.0.9
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -197,10 +197,6 @@ files:
 - lib/bueller/tasks.rb
 - lib/bueller/rubyforge_tasks.rb
 - lib/bueller/generator.rb
-- lib/bueller/commands/build_gem.rb
-- lib/bueller/commands/release_to_rubygems.rb
-- lib/bueller/commands/install_gem.rb
-- lib/bueller/commands/git_tag_release.rb
 - lib/bueller/commands/write_gemspec.rb
 - lib/bueller/commands/version/bump_patch.rb
 - lib/bueller/commands/version/bump_major.rb
@@ -283,11 +279,7 @@ files:
 - spec/fixtures/bar/lib/foo_the_ultimate_lib.rb
 - spec/fixtures/bar/bar.gemspec
 - spec/bueller/gemspec_helper_spec.rb
-- spec/bueller/commands/git_tag_release_spec.rb
-- spec/bueller/commands/release_to_rubygems_spec.rb
-- spec/bueller/commands/build_gem_spec.rb
 - spec/bueller/commands/write_gemspec_spec.rb
-- spec/bueller/commands/install_gem_spec.rb
 - spec/bueller/commands/version/bump_patch_spec.rb
 - spec/bueller/commands/version/bump_minor_spec.rb
 - spec/bueller/commands/version/bump_major_spec.rb
@@ -312,7 +304,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1018017907
+      hash: 879101009
       segments: 
       - 0
       version: "0"
@@ -359,11 +351,7 @@ test_files:
 - spec/fixtures/bar/lib/foo_the_ultimate_lib.rb
 - spec/fixtures/bar/bar.gemspec
 - spec/bueller/gemspec_helper_spec.rb
-- spec/bueller/commands/git_tag_release_spec.rb
-- spec/bueller/commands/release_to_rubygems_spec.rb
-- spec/bueller/commands/build_gem_spec.rb
 - spec/bueller/commands/write_gemspec_spec.rb
-- spec/bueller/commands/install_gem_spec.rb
 - spec/bueller/commands/version/bump_patch_spec.rb
 - spec/bueller/commands/version/bump_minor_spec.rb
 - spec/bueller/commands/version/bump_major_spec.rb

data/lib/bueller/commands/build_gem.rb

@@ -1,50 +0,0 @@
-class Bueller
-  module Commands
-    class BuildGem
-      def self.run_for(bueller)
-        command = new bueller
-        command.run
-        command
-      end
-
-      attr_reader :bueller
-
-      def initialize(bueller)
-        @bueller = bueller
-      end
-
-      def base_dir
-        bueller.base_dir
-      end
-      def gemspec_helper
-        bueller.gemspec_helper
-      end
-      def version_helper
-        bueller.version_helper
-      end
-
-      def run
-        make_package_directory
-        move_gem_file
-      end
-
-      def pkg_dir
-        @pkg_dir ||= File.join(base_dir, 'pkg')
-      end
-
-      def make_package_directory
-        FileUtils.mkdir_p pkg_dir
-      end
-
-      def build_gem
-        Gem::Builder.new(gemspec_helper.spec).build
-      end
-
-      def move_gem_file
-        gem_file_name = build_gem
-        gem_file_path = File.join(base_dir, gem_file_name)
-        FileUtils.mv gem_file_path, pkg_dir
-      end
-    end
-  end
-end

data/lib/bueller/commands/git_tag_release.rb

@@ -1,69 +0,0 @@
-class Bueller
-  module Commands
-    class GitTagRelease
-      def self.run_for(bueller)
-        command = new bueller
-        command.run
-        command
-      end
-
-      attr_accessor :repo, :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
-        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
-
-        if run
-          repo.checkout('master')
-          
-          unless release_tagged?
-            output.puts "Tagging #{release_tag}"
-            repo.add_tag release_tag
-          end
-          output.puts "Pushing #{release_tag} to origin"
-          repo.push 'origin', release_tag
-        else
-          raise "Release cancelled"
-        end
-      end 
-
-      def clean_staging_area?
-        status.added.empty? && status.deleted.empty? && status.changed.empty?
-      end
-
-      def status
-        repo.status
-      end
-
-      def release_tag
-        "v#{version}"
-      end
-
-      def release_tagged?
-        begin
-          repo.tag(release_tag)
-          true
-        rescue 
-          false
-        end
-      end
-    end
-  end
-end

data/lib/bueller/commands/install_gem.rb

@@ -1,36 +0,0 @@
-class Bueller
-  module Commands
-    class InstallGem
-      def self.run_for(bueller)
-        command = new bueller
-        command.run
-        command
-      end
-
-      attr_reader :bueller
-
-      def initialize(bueller)
-        @bueller = bueller
-        bueller.output = $stdout
-      end
-
-      def output
-        bueller.output
-      end
-      def gemspec_helper
-        bueller.gemspec_helper
-      end
-
-      def run
-        command = "#{gem_command} install #{gemspec_helper.gem_path}"
-        output.puts "Executing #{command.inspect}:"
-
-        sh command
-      end
-
-      def gem_command
-        "bundle exec gem"
-      end
-    end
-  end
-end

data/lib/bueller/commands/release_to_rubygems.rb

@@ -1,26 +0,0 @@
-class Bueller
-  module Commands
-    class ReleaseToRubygems
-      attr_reader :bueller
-
-      def initialize(bueller)
-        @bueller = bueller
-      end
-
-      def gemspec_helper; bueller.gemspec_helper; end
-      def version; bueller.version; end
-
-      def run
-        command = "gem push #{gemspec_helper.gem_path}"
-        $stdout.puts "Executing #{command.inspect}:"
-        sh command
-      end
-
-      def self.run_for(bueller)
-        command = new bueller
-        command.run
-        command
-      end
-    end
-  end
-end

data/spec/bueller/commands/build_gem_spec.rb

@@ -1,38 +0,0 @@
-require 'spec_helper'
-
-describe Bueller::Commands::BuildGem do
-  let(:bueller) { Bueller.new }
-  let(:command) { Bueller::Commands::BuildGem.new bueller }
-
-  describe '#run' do
-    it 'should make the gem' do
-      command.should_receive :make_package_directory
-      command.run
-    end
-
-    it 'should move the gem into the package directory' do
-      command.should_receive :move_gem_file
-      command.run
-    end
-  end
-
-  describe '#base_dir' do
-    it "should delegate to bueller" do
-      command.base_dir.should == '.'
-    end
-  end
-
-  describe '#gemspec_helper' do
-    it "should delegate to bueller" do
-      command.gemspec_helper.should == bueller.gemspec_helper
-    end
-  end
-
-  describe '#make_package_directory' do
-    it 'should make a package directory' do
-      command = Bueller::Commands::BuildGem.new bueller
-      FileUtils.should_receive(:mkdir_p).with './pkg'
-      command.make_package_directory
-    end
-  end
-end

data/spec/bueller/commands/git_tag_release_spec.rb

@@ -1,87 +0,0 @@
-require 'spec_helper'
-
-describe Bueller::Commands::GitTagRelease do
-  let(:bueller) { Bueller.new }
-  let(:command) { Bueller::Commands::GitTagRelease.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.repo.stub! :add_tag
-      command.stub!(:clean_staging_area?).and_return true
-      command.stub!(:release_tagged?).and_return true
-    end
-
-    it 'should not run if the staging area is unclean and user does not confirm' do
-      command.stub!(:clean_staging_area?).and_return false
-      $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'
-      command.run
-    end
-    it 'should push' 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
-
-      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
-
-      command.run
-    end
-  end
-
-  describe "#release_tagged?" do
-    it 'should be true if a tag exists' do
-      command.repo.stub!(:tag).and_raise RuntimeError
-      command.release_tagged?.should be_false
-    end
-    it 'should be false if no tag exists' do
-      command.repo.stub!(:tag)
-      command.release_tagged?.should be_true
-    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

data/spec/bueller/commands/install_gem_spec.rb

@@ -1,11 +0,0 @@
-require 'spec_helper'
-
-describe Bueller::Commands::InstallGem do
-
-  it "should call sh with gem install" do
-    bueller = Bueller.new FileSystem.fixture_path('existing-project')
-    command = Bueller::Commands::InstallGem.new bueller
-    command.should_receive(:sh).with /bundle exec gem install .*\/pkg\/existing-project-1.5.3.gem/
-    command.run
-  end
-end

data/spec/bueller/commands/release_to_rubygems_spec.rb

@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-describe Bueller::Commands::ReleaseToRubygems do
-  let(:gemspec_helper) { mock(Bueller::GemSpecHelper) }
-  let(:bueller) { mock(Bueller, :gemspec_helper => gemspec_helper) }
-  let(:command) { Bueller::Commands::ReleaseToRubygems.new bueller }
-
-  describe '.run' do
-    it "should push to gemcutter" do
-      command.gemspec_helper.stub!(:gem_path).and_return 'pkg/zomg-1.2.3.gem'
-      command.should_receive(:sh).with(/gem push pkg\/zomg-1\.2\.3\.gem/)
-      command.run
-    end
-  end
-end