capistrano-fanfare 0.0.3 → 0.0.4

data/lib/capistrano/fanfare/assets.rb

@@ -0,0 +1,13 @@
+require 'capistrano'
+
+module Capistrano::Fanfare::Assets
+  def self.load_into(configuration)
+    configuration.load do
+      load 'deploy/assets'
+    end
+  end
+end
+
+if Capistrano::Configuration.instance
+  Capistrano::Fanfare::Assets.load_into(Capistrano::Configuration.instance)
+end

data/lib/capistrano/fanfare/colors.rb

@@ -0,0 +1,11 @@
+require 'capistrano'
+
+module Capistrano::Fanfare::Colors
+  def self.load_into(configuration)
+    configuration.load do
+      require 'capistrano_colors'
+
+      colorize({ :match => /^out ::.*$/, :color => :magenta, :prio => 20 })
+    end
+  end
+end

data/lib/capistrano/fanfare/database_yaml.rb

@@ -24,3 +24,7 @@ module Capistrano::Fanfare::DatabaseYaml
     end
   end
 end
+
+if Capistrano::Configuration.instance
+  Capistrano::Fanfare::DatabaseYaml.load_into(Capistrano::Configuration.instance)
+end

data/lib/capistrano/fanfare/defaults.rb

@@ -6,7 +6,6 @@ module Capistrano::Fanfare::Defaults
       set :scm,         :git
       set :use_sudo,    false
       set :user,        "deploy"
-      set :rake,        "bundle exec rake"
       set(:branch)      { ENV['BRANCH'] ? ENV['BRANCH'] : "master" }
       set(:deploy_to)   { "/srv/#{application}_#{deploy_env}" }
       set :ssh_options, { :forward_agent => true }

data/lib/capistrano/fanfare/foreman.rb

@@ -16,6 +16,7 @@ module Capistrano::Fanfare::Foreman
       set(:user_home)           { capture("echo $HOME").chomp }
 
       set :foreman_cmd,         "foreman"
+      set(:rake)                { "#{foreman_cmd} run rake" }
       set :foreman_export_via,  :runit
 
       set(:foreman_strategy) do

data/lib/capistrano/fanfare/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Fanfare
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/assets_spec.rb

@@ -0,0 +1,45 @@
+require 'minitest/autorun'
+require 'minitest/capistrano'
+require 'capistrano/fanfare'
+require 'capistrano/fanfare/assets'
+
+#
+# Rake mixes in FileUtils methods into Capistrano::Configuration::Namespace as
+# private methods which will cause a method/task namespace collision when the
+# `deploy:assets:symlink' task is created.
+#
+# So, if we are in a Rake context, nuke :symlink in the Namespace class--we
+# won't be using it directly in this codebase but this feels so very, very
+# wrong (here be dragons).
+#
+if defined?(Rake::DSL)
+  Capistrano::Configuration::Namespaces::Namespace.class_eval { undef :symlink }
+end
+
+describe Capistrano::Fanfare::Assets do
+  before do
+    @config = Capistrano::Configuration.new
+    Capistrano::Fanfare::Assets.load_into(@config)
+    @config.extend(MiniTest::Capistrano::ConfigurationExtension)
+    # @orig_config = Capistrano::Configuration.instance
+    # Capistrano::Configuration.instance = @config
+  end
+
+  after do
+    # Capistrano::Configuration.instance = @orig_config
+  end
+
+  describe "for namespace :deploy" do
+    it "creates a deploy:assets:symlink task" do
+      @config.must_have_task "deploy:assets:symlink"
+    end
+
+    it "creates a deploy:assets:precompile task" do
+      @config.must_have_task "deploy:assets:precompile"
+    end
+
+    it "creates a deploy:assets:clean task" do
+      @config.must_have_task "deploy:assets:clean"
+    end
+  end
+end

data/spec/colors_spec.rb

@@ -0,0 +1,9 @@
+require 'minitest/autorun'
+require 'minitest/capistrano'
+require 'capistrano/fanfare'
+require 'capistrano/fanfare/colors'
+
+describe Capistrano::Fanfare::Colors do
+  # This recipe is not being tested as it patches Capistrano's log
+  # method and causes random failures in the rest of the test suite.
+end

data/spec/defaults_spec.rb

@@ -23,10 +23,6 @@ describe Capistrano::Fanfare::Defaults do
     @config.fetch(:user).must_equal "deploy"
   end
 
-  it "sets :rake to 'bundle exec rake'" do
-    @config.fetch(:rake).must_equal "bundle exec rake"
-  end
-
   it "sets :ssh_options to include :forward_agent => true" do
     @config.fetch(:ssh_options)[:forward_agent].must_equal true
   end

data/spec/foreman_spec.rb

@@ -26,6 +26,12 @@ describe Capistrano::Fanfare::Foreman do
       @config.fetch(:foreman_cmd).must_equal "foreman"
     end
 
+    it "sets :rake to ':foreman_cmd run rake'" do
+      @config.set :foreman_cmd, "bin/foreman"
+
+      @config.fetch(:rake).must_equal "bin/foreman run rake"
+    end
+
     it "sets :foreman_export_via to :runit" do
       @config.fetch(:foreman_export_via).must_equal :runit
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-fanfare
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70250305558200 !ruby/object:Gem::Requirement
+  requirement: &70116851192820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 2.10.0.pre
   type: :runtime
   prerelease: false
-  version_requirements: *70250305558200
+  version_requirements: *70116851192820
 - !ruby/object:Gem::Dependency
   name: capistrano_colors
-  requirement: &70250305557440 !ruby/object:Gem::Requirement
+  requirement: &70116851192120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70250305557440
+  version_requirements: *70116851192120
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70250305556660 !ruby/object:Gem::Requirement
+  requirement: &70116851191300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70250305556660
+  version_requirements: *70116851191300
 - !ruby/object:Gem::Dependency
   name: minitest-capistrano
-  requirement: &70250305555900 !ruby/object:Gem::Requirement
+  requirement: &70116851190600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.0'
   type: :development
   prerelease: false
-  version_requirements: *70250305555900
+  version_requirements: *70116851190600
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70250305555360 !ruby/object:Gem::Requirement
+  requirement: &70116851189820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70250305555360
+  version_requirements: *70116851189820
 description: Capistrano recipes (with full test suite) for fanfare application deployment
   framework
 email:
@@ -82,7 +82,9 @@ files:
 - Rakefile
 - capistrano-fanfare.gemspec
 - lib/capistrano/fanfare.rb
+- lib/capistrano/fanfare/assets.rb
 - lib/capistrano/fanfare/bundler.rb
+- lib/capistrano/fanfare/colors.rb
 - lib/capistrano/fanfare/database_yaml.rb
 - lib/capistrano/fanfare/defaults.rb
 - lib/capistrano/fanfare/foreman.rb
@@ -93,7 +95,9 @@ files:
 - lib/capistrano/fanfare/multistage.rb
 - lib/capistrano/fanfare/version.rb
 - lib/capistrano/recipes/deploy/strategy/git_style.rb
+- spec/assets_spec.rb
 - spec/bundler_spec.rb
+- spec/colors_spec.rb
 - spec/database_yaml_spec.rb
 - spec/defaults_spec.rb
 - spec/fixtures/Procfile
@@ -119,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3823857243740536617
+      hash: -31402072217329006
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3823857243740536617
+      hash: -31402072217329006
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -137,7 +141,9 @@ specification_version: 3
 summary: Capistrano recipes (with full test suite) for fanfare application deployment
   framework
 test_files:
+- spec/assets_spec.rb
 - spec/bundler_spec.rb
+- spec/colors_spec.rb
 - spec/database_yaml_spec.rb
 - spec/defaults_spec.rb
 - spec/fixtures/Procfile