magentify 0.0.2 → 0.0.3

data/bin/magentify

@@ -21,7 +21,7 @@ OptionParser.new do |opts|
 end
 
 if ARGV.empty?
-  abort "Please specify the directory to capifony, e.g. `#{File.basename($0)} .'"
+  abort "Please specify the directory to magentify, e.g. `#{File.basename($0)} .'"
 elsif !File.exists?(ARGV.first)
   abort "`#{ARGV.first}' does not exist."
 elsif !File.directory?(ARGV.first)

data/features/deploy.feature

@@ -6,4 +6,9 @@ Feature: Deployment
   Scenario: User runs $ cap deploy
     Given an app
     When I execute deploy
-    Then the PEOPLE_LIKE_YOU file should be written to shared
+    Then the local.xml file should be written to shared
+
+  Scenario: User runs $ cap deploy with missing config
+    Given an app
+    When I have deploy.rb with missing config
+    Then [error] should be returned

data/features/magentify.feature

@@ -6,9 +6,9 @@ Feature: Magentify
   Scenario: User runs $ magentify .
     Given an app
     When I execute magentify .
-    Then deploy.rb should load mage.rb
+    Then Capfile should load mage.rb
 
   Scenario: User runs $ cap -T
     Given an app
     When I execute cap -T
-    Then cap -T should list mage
+    Then mage tasks should be listed

data/features/step_definitions/deploy_steps.rb

@@ -1,10 +1,34 @@
 When /^I execute deploy$/ do
   Dir.chdir(@app_dir) do
-    system "cap deploy:setup > /dev/null"
-    system "cap deploy > /dev/null"
+    system "cap deploy:setup > /dev/null 2>&1"
+    system "cap deploy > /dev/null 2>&1"
   end
 end
 
-Then /^the PEOPLE_LIKE_YOU file should be written to shared$/ do
-  File.exists?(File.join(@test_files_dir, "deployed", "shared", "PEOPLE_LIKE_YOU")).should be_true
+Then /^the local\.xml file should be written to shared$/ do
+  File.exists?(File.join(@test_files_dir, "deployed", "shared", "app", "etc", "local.xml")).should be_true
+end
+
+When /^I have deploy\.rb with missing config$/ do
+  # Write a custom deploy file to the app, using an ERB template
+  deploy_variables = {
+    :deploy_to => File.join(@test_files_dir, "deployed"),
+    :repository => @repo_dir,
+    :git_executable => `which git`.strip,
+    :logged_in_user => Etc.getlogin
+  }
+
+  template_path     = File.expand_path(File.join(__FILE__, "..", "..", "templates", "deploy-fail.erb"))
+  compiled_template = ERB.new(File.read(template_path)).result(binding)
+
+  File.open(File.join(@app_dir, "config", "deploy.rb"), 'w') {|f| 
+    f.write compiled_template
+  }
+end
+
+Then /^\[error\] should be returned$/ do
+  Dir.chdir(@app_dir) do
+    result = %x[cap -T]
+    result.match('error').should be_true
+  end
 end

data/features/step_definitions/magentify_steps.rb

@@ -1,19 +1,22 @@
 When /^I execute magentify \.$/ do
   Dir.chdir(@app_dir) do
-    system "magentify . > /dev/null"
+    system "magentify . > /dev/null 2>&1"
   end
 end
 
-Then /^deploy\.rb should load mage\.rb$/ do
-  pending # express the regexp above with the code you wish you had
+Then /^Capfile should load mage\.rb$/ do
+  File.open(File.join(@app_dir, "Capfile"), 'rb').read().match('mage\.rb').should be_true
 end
 
 When /^I execute cap \-T$/ do
   Dir.chdir(@app_dir) do
-    system "cap -T > /dev/null"
+    system "cap -T > /dev/null 2>&1"
   end
 end
 
-Then /^cap \-T should list mage$/ do
-  pending # express the regexp above with the code you wish you had
+Then /^mage tasks should be listed$/ do
+  Dir.chdir(@app_dir) do
+    result = %x[cap -T]
+    result.match('Clear the Magento Cache').should be_true
+  end
 end

data/features/step_definitions/setup_steps.rb

@@ -1,6 +1,6 @@
 When /^I execute deploy:setup$/ do
   Dir.chdir(@app_dir) do
-    system "cap deploy:setup > /dev/null"
+    system "cap deploy:setup > /dev/null 2>&1"
   end
 end
 

data/features/templates/deploy-fail.erb

@@ -0,0 +1,18 @@
+set :application, "magento"
+set :domain,      "#{application}.com"
+set :deploy_to,   "<%= deploy_variables[:deploy_to] %>"
+
+set :user,        "<%= deploy_variables[:logged_in_user] %>"
+set :repository,  "file://<%= deploy_variables[:repository] %>"
+set :scm,         :git
+# Or: `accurev`, `bzr`, `cvs`, `darcs`, `subversion`, `mercurial`, `perforce`, `subversion` or `none`
+set :scm_command, "<%= deploy_variables[:git_executable] %>"
+
+role :web,        "localhost"                         # Your HTTP server, Apache/etc
+role :app,        "localhost"                         # This may be the same as your `Web` server
+role :db,         "localhost", :primary => true       # This is where Rails migrations will run
+
+set  :keep_releases,  3
+
+# Turn of use of sudo as your local machine does not need it.
+set :use_sudo, false

data/features/templates/deploy.erb

@@ -14,6 +14,9 @@ role :db,         "localhost", :primary => true       # This is where Rails migr
 
 set  :keep_releases,  3
 
+# Turn of use of sudo as your local machine does not need it.
+set :use_sudo, false
+
 set :app_symlinks, ["/media", "/var", "/sitemaps", "/staging"]
 set :app_shared_dirs, ["/app/etc", "/sitemaps", "/media", "/var", "/staging"]
 set :app_shared_files, ["/app/etc/local.xml"]

data/lib/mage.rb

@@ -1,7 +1,15 @@
 load Gem.find_files('nonrails.rb').last.to_s
-set :app_symlinks, ["/media", "/var", "/sitemaps", "/staging"]
-set :app_shared_dirs, ["/app/etc", "/sitemaps", "/media", "/var", "/staging"]
-set :app_shared_files, ["/app/etc/local.xml"]
+
+# =========================================================================
+# These variables MUST be set in the client capfiles. If they are not set,
+# the deploy will fail with an error.
+# =========================================================================
+
+_cset(:app_symlinks) { 
+  abort "[error] Please specify an array of symlinks to shared resources, set :app_symlinks, ['/media', .. '/staging']"
+}
+_cset(:app_shared_dirs)  { abort "[error] Please specify, set :app_shared_dirs" }
+_cset(:app_shared_files)  { abort "[error] Please specify, set :app_shared_files" }
 
 namespace :mage do
   desc <<-DESC
@@ -18,10 +26,10 @@ namespace :mage do
   DESC
   task :setup, :roles => :web, :except => { :no_release => true } do
     if app_shared_dirs
-      app_shared_dirs.each { |link| run "#{try_sudo} mkdir -p #{shared_path}#{link} && chmod 777 #{shared_path}#{link}"}
+      app_shared_dirs.each { |link| run "#{try_sudo} mkdir -p #{shared_path}#{link} && chmod g+w #{shared_path}#{link}"}
     end
     if app_shared_files
-      app_shared_files.each { |link| run "#{try_sudo} touch #{shared_path}#{link} && chmod 777 #{shared_path}#{link}" }
+      app_shared_files.each { |link| run "#{try_sudo} touch #{shared_path}#{link} && chmod g+w #{shared_path}#{link}" }
     end
   end
 

data/lib/magentify/version.rb

@@ -1,3 +1,3 @@
 module Magentify
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/nonrails.rb

@@ -22,21 +22,21 @@ namespace :deploy do
     This method should be overridden to meet the requirements of your allocation.
   DESC
   task :finalize_update, :except => { :no_release => true } do
-    #
+    # do nothing for non rails apps
   end
 
   desc <<-DESC
     [Overload] Default actions cancelled
   DESC
   task :restart, :roles => :app, :except => { :no_release => true } do
-    #
+    # do nothing for non rails apps
   end
 
   desc <<-DESC
     [Overload] Default actions cancelled.
   DESC
   task :migrate, :roles => :db, :only => { :primary => true } do
-    #
+    # do nothing for non rails apps
   end
 
   desc <<-DESC
@@ -44,7 +44,7 @@ namespace :deploy do
   DESC
   task :migrations do
     set :migrate_target, :latest
-    #
+    # // do nothing for non rails apps
   end
 
   desc <<-DESC
@@ -54,20 +54,6 @@ namespace :deploy do
     update
   end
 
-  desc <<-DESC
-    [Overload] Default actions cancelled.
-  DESC
-  task :start, :roles => :app do
-    #
-  end
-
-  desc <<-DESC
-    [Overload] Default actions cancelled.
-  DESC
-  task :stop, :roles => :app do
-    #
-  end
-
   namespace :web do
     desc <<-DESC
       Present a maintenance page to visitors. Disables your application's web \

data/magentify.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{An extension to Capistrano to deploy Magento. Adding the specific requirements and additional tasks.}
   gem.summary       = %q{Deploying Magento PHP applications with Capistrano.}
   gem.homepage      = "https://github.com/alistairstead/Magentify"
+  gem.license       = 'MIT'
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magentify
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70095624644500 !ruby/object:Gem::Requirement
+  requirement: &70214939636340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 2.5.10
   type: :runtime
   prerelease: false
-  version_requirements: *70095624644500
+  version_requirements: *70214939636340
 description: An extension to Capistrano to deploy Magento. Adding the specific requirements
   and additional tasks.
 email:
@@ -45,6 +45,7 @@ files:
 - features/step_definitions/magentify_steps.rb
 - features/step_definitions/setup_steps.rb
 - features/support/env.rb
+- features/templates/deploy-fail.erb
 - features/templates/deploy.erb
 - lib/mage.rb
 - lib/magentify.rb
@@ -52,7 +53,8 @@ files:
 - lib/nonrails.rb
 - magentify.gemspec
 homepage: https://github.com/alistairstead/Magentify
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -84,4 +86,5 @@ test_files:
 - features/step_definitions/magentify_steps.rb
 - features/step_definitions/setup_steps.rb
 - features/support/env.rb
+- features/templates/deploy-fail.erb
 - features/templates/deploy.erb