kumade 0.7.0 → 0.8.0

data/Changelog.md

@@ -1,3 +1,9 @@
+## 0.8.0 (2011-10-21)
+* Kumade now has working (and autoloaded!) Rake tasks. `rake deploy:staging`
+  will Just Work.
+
+* Removed Less::More packager. The only included packager is now Jammit.
+
 ## 0.7.0 (2011-10-15)
 * Kumade now has a working check for the Cedar stack.
 

data/README.md

@@ -11,8 +11,8 @@ rebase against master a couple times before your pull request can be merged.
 ## What does Kumade do?
 Before deploying, Kumade ensures the git repo is clean.
 After that, it packages assets using
-[Jammit](http://documentcloud.github.com/jammit/) and/or
-[More](https://github.com/cloudhead/more), commits them, and pushes to origin.
+[Jammit](http://documentcloud.github.com/jammit/) (if it's installed), commits
+them, and pushes to origin.
 Then it force pushes to the correct Heroku remote, runs `rake db:migrate` on the
 Heroku app, and then restarts the app.
 
@@ -43,15 +43,12 @@ The default is to deploy to staging:
 
 ## Rake
 
-Kumade auto-generates a deploy:ENV task for every Heroku environment.
-
-    # in your Rakefile:
-    require 'kumade'
+Kumade auto-generates a deploy:ENV task for every Heroku environment. You don't
+need to do anything to get the Rake tasks, they're automatically set up for you.
+If you have a "staging" remote, you would run:
 
     $ rake deploy:staging
 
-If you use rake tasks, you can't pass in options (like -p/--pretend).
-
 ## Does it support the Cedar stack?
 
 Yes. Kumade will automatically detect if your app is running on Cedar.

data/features/kumade_executable.feature

@@ -1,4 +1,4 @@
-@extra-timeout @creates-remote @disable-bundler
+@slow @creates-remote @disable-bundler
 Feature: Kumade executable
   As a user
   I want to be able to use the kumade executable
@@ -11,8 +11,8 @@ Feature: Kumade executable
     And I add "jammit" to the Gemfile
     And I bundle
     When I set up a git repo
-    And I create a Heroku remote for "pretend-staging-app" named "pretend-staging"
-    And I create a Heroku remote for "app-two" named "staging"
+    And I create a Heroku remote named "pretend-staging"
+    And I create a Heroku remote named "staging"
     And I create a non-Heroku remote named "bad-remote"
 
   Scenario: Pretend mode with a Heroku remote
@@ -31,7 +31,6 @@ Feature: Kumade executable
       ==> Restarted pretend-staging
       ==> Deployed to: pretend-staging
       """
-    But the output should not contain "==> Packaged with Kumade::MorePackager"
 
   Scenario: Default environment is staging
     When I run kumade with "-p"

data/features/kumade_without_jammit.feature

@@ -1,4 +1,4 @@
-@extra-timeout @creates-remote @disable-bundler
+@slow @creates-remote @disable-bundler
 Feature: Kumade without jammit
 
   Background:
@@ -7,7 +7,7 @@ Feature: Kumade without jammit
     And I set up the Gemfile with kumade
     And I bundle
     When I set up a git repo
-    And I create a Heroku remote for "pretend-staging-app" named "pretend-staging"
+    And I create a Heroku remote named "pretend-staging"
 
   Scenario: Jammit packager does not run if Jammit is not installed
     When I run kumade with "pretend-staging"

data/features/railtie.feature

@@ -0,0 +1,12 @@
+Feature: Railtie
+  As a Rake user
+  I want Kumade to autoload Rake tasks for my Rails application
+  So that I can integrate Kumade with other Rake tasks
+
+  @creates-remote @disable-bundler @slow
+  Scenario: Rake tasks are loaded
+    Given a new Rails application with Kumade
+    When I create a Heroku remote named "staging"
+    And I create a non-Heroku remote named "bad_remote"
+    Then the rake tasks should include "deploy:staging" with a description of "Deploy to staging environment"
+    But the rake tasks should not include "deploy:bad_remote"

data/features/step_definitions/bundler_steps.rb

@@ -1,5 +1,5 @@
 When /^I bundle$/ do
-  When %{I successfully run `bundle --gemfile=./Gemfile --local || bundle --gemfile=./Gemfile`}
+  run_bundler
 end
 
 When /^I rebundle$/ do

data/features/step_definitions/git_steps.rb

@@ -1,28 +1,23 @@
-When /^I create a Heroku remote for "([^"]*)" named "([^"]*)"$/ do |app_name, remote_name|
-  When %{I successfully run `git remote add #{remote_name} git@heroku.com:#{app_name}.git`}
+When /^I create a Heroku remote named "([^"]*)"$/ do |remote_name|
+  add_heroku_remote_named(remote_name)
 end
 
 When /^I create a non-Heroku remote named "([^"]*)"$/ do |remote_name|
-  When %{I successfully run `git remote add #{remote_name} git@github.com:gabebw/kumade.git`}
+  add_non_heroku_remote_named(remote_name)
 end
 
 When /^I set up a git repo$/ do
-  steps %{
-    When I successfully run `git init`
-    And I successfully run `touch .gitkeep`
-    And I successfully run `git add .`
-    And I successfully run `git commit -am First`
-  }
+  ["git init", "touch .gitkeep", "git add .", "git commit -am First"].each do |git_command|
+    run_simple(git_command)
+  end
 end
 
 When /^I commit everything in the current repo$/ do
-  steps %{
-    When I successfully run `git add .`
-    And I successfully run `git commit -am MY_MESSAGE`
-  }
+  ['git add .', 'git commit -am MY_MESSAGE'].each do |git_command|
+    run_simple(git_command)
+  end
 end
 
 After("@creates-remote") do
-  heroku_remotes = `git remote -v show | grep heroku | grep fetch | cut -f1`.strip.split
-  heroku_remotes.each { |remote| `git remote rm #{remote} 2> /dev/null` }
+  remove_all_created_remotes
 end

data/features/step_definitions/rails_steps.rb

@@ -0,0 +1,6 @@
+Given /^a new Rails application with Kumade$/ do
+  run_simple("rails new rake-tasks")
+  cd('rake-tasks')
+  append_to_file('Gemfile', "gem 'kumade', :path => '#{PROJECT_PATH}'")
+  run_bundler
+end

data/features/step_definitions/rake_steps.rb

@@ -0,0 +1,26 @@
+When /^I require the kumade railtie in the Rakefile$/ do
+  rakefile_content = prep_for_fs_check { IO.readlines("Rakefile") }
+  new_rakefile_content = rakefile_content.map do |line|
+    if line.include?('load_tasks')
+      ["require 'kumade/railtie'", line].join("\n")
+    else
+      line
+    end
+  end.join
+
+  overwrite_file("Rakefile", new_rakefile_content)
+end
+
+Then /^the rake tasks should include "([^"]+)" with a description of "([^"]+)"$/ do |task_name, task_description|
+  steps %{
+    When I run `bundle exec rake -T`
+    Then the output should match /#{task_name}.+#{task_description}/
+  }
+end
+
+Then /^the rake tasks should not include "([^"]+)"/ do |task_name|
+  steps %{
+    When I run `bundle exec rake -T`
+    Then the output from "bundle exec rake -T" should not contain "#{task_name}"
+  }
+end

data/features/support/bundler.rb

@@ -0,0 +1,7 @@
+module BundlerHelpers
+  def run_bundler
+    run_simple('bundle --gemfile=./Gemfile --local || bundle --gemfile=./Gemfile')
+  end
+end
+
+World(BundlerHelpers)

data/features/support/env.rb

@@ -6,6 +6,6 @@ end
 require 'aruba/cucumber'
 require 'kumade'
 
-Before('@extra-timeout') do
+Before('@slow') do
   @aruba_timeout_seconds = 15
 end

data/features/support/git_remotes.rb

@@ -0,0 +1,25 @@
+module GitRemoteHelpers
+  @@created_remotes = []
+
+  def remove_all_created_remotes
+    in_current_dir do
+      @@created_remotes.each do |remote|
+        run_simple("git remote rm #{remote}")
+      end
+    end
+
+    @@created_remotes = []
+  end
+
+  def add_heroku_remote_named(remote_name)
+    run_simple("git remote add #{remote_name} git@heroku.com:#{remote_name}_app.git")
+    @@created_remotes << remote_name
+  end
+
+  def add_non_heroku_remote_named(remote_name)
+    run_simple("git remote add #{remote_name} git@github.com:gabebw/kumade.git")
+    @@created_remotes << remote_name
+  end
+end
+
+World(GitRemoteHelpers)

data/features/support/project_path.rb

@@ -0,0 +1 @@
+PROJECT_PATH = File.expand_path("../../..", __FILE__)

data/lib/kumade.rb

@@ -1,13 +1,13 @@
+require 'kumade/railtie'
+
 module Kumade
   autoload :Git,             "kumade/git"
   autoload :Deployer,        "kumade/deployer"
   autoload :CLI,             "kumade/cli"
-  autoload :Railtie,         "kumade/railtie"
   autoload :DeploymentError, "kumade/deployment_error"
   autoload :Configuration,   "kumade/configuration"
   autoload :Heroku,          "kumade/heroku"
   autoload :Packager,        "kumade/packager"
-  autoload :MorePackager,    "kumade/packagers/more_packager"
   autoload :JammitPackager,  "kumade/packagers/jammit_packager"
   autoload :NoopPackager,    "kumade/packagers/noop_packager"
   autoload :PackagerList,    "kumade/packager_list"

data/lib/kumade/packager_list.rb

@@ -2,7 +2,7 @@ module Kumade
   class PackagerList
     include Enumerable
 
-    PACKAGERS = [MorePackager, JammitPackager]
+    PACKAGERS = [JammitPackager]
 
     def initialize
       @packagers = build_packagers_list

data/lib/kumade/railtie.rb

@@ -1,10 +1,9 @@
-# add rake tasks if we are inside Rails
 if defined?(Rails::Railtie)
-  class Module
+  module Kumade
     class Railtie < ::Rails::Railtie
       rake_tasks do
-        load File.expand_path("../../tasks/deploy.rake", __FILE__)
+        load "kumade/tasks/deploy.rake"
       end
     end
   end
-end
+end

data/lib/{tasks → kumade/tasks}/deploy.rake

@@ -5,4 +5,4 @@ namespace :deploy do
       Kumade::CLI.run([environment])
     end
   end
-end
+end

data/lib/kumade/version.rb

@@ -1,3 +1,3 @@
 module Kumade
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/spec/kumade/packager_list_spec.rb

@@ -3,28 +3,12 @@ require 'spec_helper'
 describe Kumade::PackagerList, "detecting packages", :with_mock_outputter do
   it "returns an array containing the Jammit packager if Jammit is installed" do
     Kumade::JammitPackager.stubs(:installed? => true)
-    Kumade::MorePackager.stubs(:installed? => false)
 
     Kumade::PackagerList.new.to_a.should == [Kumade::JammitPackager]
   end
 
-  it "returns an array containing the More packager if More is installed" do
-    Kumade::JammitPackager.stubs(:installed? => false)
-    Kumade::MorePackager.stubs(:installed? => true)
-
-    Kumade::PackagerList.new.to_a.should == [Kumade::MorePackager]
-  end
-
-  it "returns multiple packagers if they are installed" do
-    Kumade::JammitPackager.stubs(:installed? => true)
-    Kumade::MorePackager.stubs(:installed? => true)
-
-    Kumade::PackagerList.new.to_a.should =~ [Kumade::JammitPackager, Kumade::MorePackager]
-  end
-
   it "returns an array containing the no-op packager if no other packagers are found" do
     Kumade::JammitPackager.stubs(:installed? => false)
-    Kumade::MorePackager.stubs(:installed? => false)
 
     Kumade::PackagerList.new.to_a.should == [Kumade::NoopPackager]
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kumade
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-10-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku
-  requirement: &70180072865600 !ruby/object:Gem::Requirement
+  requirement: &70235434208420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70180072865600
+  version_requirements: *70235434208420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70180072864740 !ruby/object:Gem::Requirement
+  requirement: &70235434207920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.8.7
   type: :runtime
   prerelease: false
-  version_requirements: *70180072864740
+  version_requirements: *70235434207920
 - !ruby/object:Gem::Dependency
   name: cocaine
-  requirement: &70180072862960 !ruby/object:Gem::Requirement
+  requirement: &70235434207460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70180072862960
+  version_requirements: *70235434207460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70180072854560 !ruby/object:Gem::Requirement
+  requirement: &70235434207000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70180072854560
+  version_requirements: *70235434207000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70180072853060 !ruby/object:Gem::Requirement
+  requirement: &70235434206540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70180072853060
+  version_requirements: *70235434206540
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70180072851460 !ruby/object:Gem::Requirement
+  requirement: &70235434206080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *70180072851460
+  version_requirements: *70235434206080
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70180072850160 !ruby/object:Gem::Requirement
+  requirement: &70235434205620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.4.3
   type: :development
   prerelease: false
-  version_requirements: *70180072850160
+  version_requirements: *70235434205620
 - !ruby/object:Gem::Dependency
   name: jammit
-  requirement: &70180072849500 !ruby/object:Gem::Requirement
+  requirement: &70235434205160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 0.6.3
   type: :development
   prerelease: false
-  version_requirements: *70180072849500
+  version_requirements: *70235434205160
 - !ruby/object:Gem::Dependency
   name: less
-  requirement: &70180072848760 !ruby/object:Gem::Requirement
+  requirement: &70235434204700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70180072848760
+  version_requirements: *70235434204700
 - !ruby/object:Gem::Dependency
   name: bourne
-  requirement: &70180072848100 !ruby/object:Gem::Requirement
+  requirement: &70235434204320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70180072848100
+  version_requirements: *70235434204320
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70180072840840 !ruby/object:Gem::Requirement
+  requirement: &70235434203820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,7 +132,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70180072840840
+  version_requirements: *70235434203820
 description: A well-tested script for easy deploying to Heroku
 email:
 - gabe@thoughtbot.com
@@ -153,11 +153,17 @@ files:
 - bin/kumade
 - features/kumade_executable.feature
 - features/kumade_without_jammit.feature
+- features/railtie.feature
 - features/step_definitions/bundler_steps.rb
 - features/step_definitions/dependency_steps.rb
 - features/step_definitions/git_steps.rb
 - features/step_definitions/kumade_steps.rb
+- features/step_definitions/rails_steps.rb
+- features/step_definitions/rake_steps.rb
+- features/support/bundler.rb
 - features/support/env.rb
+- features/support/git_remotes.rb
+- features/support/project_path.rb
 - kumade.gemspec
 - lib/kumade.rb
 - lib/kumade/cli.rb
@@ -171,12 +177,11 @@ files:
 - lib/kumade/packager.rb
 - lib/kumade/packager_list.rb
 - lib/kumade/packagers/jammit_packager.rb
-- lib/kumade/packagers/more_packager.rb
 - lib/kumade/packagers/noop_packager.rb
 - lib/kumade/railtie.rb
 - lib/kumade/rake_task_runner.rb
+- lib/kumade/tasks/deploy.rake
 - lib/kumade/version.rb
-- lib/tasks/deploy.rake
 - spec/kumade/cli_spec.rb
 - spec/kumade/command_line_spec.rb
 - spec/kumade/configuration_spec.rb
@@ -187,7 +192,6 @@ files:
 - spec/kumade/packager_list_spec.rb
 - spec/kumade/packager_spec.rb
 - spec/kumade/packagers/jammit_packager_spec.rb
-- spec/kumade/packagers/more_packager_spec.rb
 - spec/kumade/packagers/noop_packager_spec.rb
 - spec/kumade/rake_task_runner_spec.rb
 - spec/kumade_spec.rb
@@ -211,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2390276882750566623
+      hash: 216053856628192471
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -220,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2390276882750566623
+      hash: 216053856628192471
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
@@ -230,11 +234,17 @@ summary: A well-tested script for easy deploying to Heroku
 test_files:
 - features/kumade_executable.feature
 - features/kumade_without_jammit.feature
+- features/railtie.feature
 - features/step_definitions/bundler_steps.rb
 - features/step_definitions/dependency_steps.rb
 - features/step_definitions/git_steps.rb
 - features/step_definitions/kumade_steps.rb
+- features/step_definitions/rails_steps.rb
+- features/step_definitions/rake_steps.rb
+- features/support/bundler.rb
 - features/support/env.rb
+- features/support/git_remotes.rb
+- features/support/project_path.rb
 - spec/kumade/cli_spec.rb
 - spec/kumade/command_line_spec.rb
 - spec/kumade/configuration_spec.rb
@@ -245,7 +255,6 @@ test_files:
 - spec/kumade/packager_list_spec.rb
 - spec/kumade/packager_spec.rb
 - spec/kumade/packagers/jammit_packager_spec.rb
-- spec/kumade/packagers/more_packager_spec.rb
 - spec/kumade/packagers/noop_packager_spec.rb
 - spec/kumade/rake_task_runner_spec.rb
 - spec/kumade_spec.rb

data/lib/kumade/packagers/more_packager.rb

@@ -1,20 +0,0 @@
-begin
-  require "less/more"
-rescue LoadError
-end
-
-module Kumade
-  class MorePackager
-    def self.assets_path
-      File.join("public", ::Less::More.destination_path)
-    end
-
-    def self.installed?
-      !!defined?(Less::More)
-    end
-
-    def self.package
-      ::Less::More.generate_all
-    end
-  end
-end

data/spec/kumade/packagers/more_packager_spec.rb

@@ -1,37 +0,0 @@
-require "spec_helper"
-
-require "less"
-
-describe Kumade::MorePackager, :with_mock_outputter do
-  subject { Kumade::MorePackager }
-
-  before do
-    define_constant "Less::More" do
-      def self.destination_path
-        "awesome_destination"
-      end
-    end
-  end
-
-  it_should_behave_like "packager"
-
-  its(:assets_path) { should == File.join('public', ::Less::More.destination_path) }
-
-  it "knows how to package itself" do
-    Less::More.stubs(:generate_all)
-
-    subject.package
-
-    Less::More.should have_received(:generate_all).once
-  end
-
-  context "when More is defined" do
-    before { Less::More }
-    it     { should be_installed }
-  end
-
-  context "when Less::More is not defined" do
-    before { Less.send(:remove_const, :More) }
-    it     { should_not be_installed }
-  end
-end