mina 0.1.2 → 0.1.3.pre1

data/HISTORY.md

@@ -1,37 +1,43 @@
-v0.1.2 - Jul 06, 2012
----------------------
+v0.1.3 - Jul 13, 2012 (Unreleased)
+----------------------------------
 
 ### Fixed:
-  * __Show stdout output properly on deploy.__
-  * 'mina rake' now works.
+  * [pre1] Respect the `bundle_bin` setting when doing `bundle exec` in Rails commands. (#29)
+  * [pre1] Doing `rails:assets_precompile` now properly skips asset compilation if not needed. (#25)
+
+### Added:
+  * [pre1] Doing `rails:db_migrate` now skips doing migrations if they're not needed. (#18)
+  * [pre1] Added the `mina console` command for Rails.
+  * [pre1] Make asset paths configurable using the `asset_paths` setting.
 
 ### Changed:
-  * Refactor pretty printing to be simpler, cleaner, and extensible.
-  * Show prettier abort messages when ^C'd.
-  * Use the new error message format. (See lib/mina/output_helpers.rb)
+  * [pre1] Refactor pretty printing to be simpler, cleaner, and extensible.
+  * [pre1] Show prettier abort messages when ^C'd.
 
-v0.1.2.pre2 - Jul 03, 2012
---------------------------
+v0.1.2 - Jul 06, 2012
+---------------------
 
-### Added:
-  * Add `:bundle_bin` option.
-  * Add `:ssh` port option.
+This release had two prereleases: v0.1.2.pre1 and v0.1.2.pre2.
 
 ### Fixed:
-  * __Fix `deploy:link_shared_paths` to use absolute paths.__
-  * Fix console logs for task init.
-
-v0.1.2.pre1 - Jun 12, 2012
---------------------------
+  * __Show stdout output properly on deploy.__
+  * 'mina rake' now works.
+  * [.pre2] __Fix `deploy:link_shared_paths` to use absolute paths.__
+  * [.pre2] Fix console logs for task init.
+  * [.pre1] __Fixed JRuby support.__
+  * [.pre1] __Respect .bashrc.__ (#5)
 
-### Fixed:
-  * __Fixed JRuby support.__
-  * __Respect .bashrc.__ (#5)
+### Added:
+  * [.pre2] Add `:bundle_bin` option.
+  * [.pre2] Add `:ssh` port option.
 
-### Changed:
-  * Implement `ssh("..", return: true)`.
-  * Rename `simulate_mode` to `simulate_mode?`. Same with `verbose_mode?`.
-  * Show the SSH command in the simulation output.
+### Changed: (v0.1.2)
+  * Refactor pretty printing to be simpler, cleaner, and extensible.
+  * Show prettier abort messages when ^C'd.
+  * Use the new error message format. (See lib/mina/output_helpers.rb)
+  * [.pre1] Implement `ssh("..", return: true)`.
+  * [.pre1] Rename `simulate_mode` to `simulate_mode?`. Same with `verbose_mode?`.
+  * [.pre1] Show the SSH command in the simulation output.
 
 v0.1.1 - Jun 07, 2012
 ---------------------

data/lib/mina/helpers.rb

@@ -155,6 +155,10 @@ module Mina
       code.strip
     end
 
+    def reindent(n, code)
+      indent n, unindent(code)
+    end
+
     # Returns an array of queued code strings.
     #
     # You may give an optional `aspect`.

data/lib/mina/output_helpers.rb

@@ -68,6 +68,7 @@ module Mina
           trap "INT" do
             puts ""
             print_status "Mina: SIGINT received."
+            Process.kill "TERM", pid
           end
 
           # Read stderr in the background.

data/lib/mina/rails.rb

@@ -1,8 +1,11 @@
+require 'mina/bundler'
+
 settings.rails_env ||= 'production'
 # TODO: This should be lambda
-settings.bundle_prefix ||= lambda { %{RAILS_ENV="#{rails_env}" bundle exec} }
+settings.bundle_prefix ||= lambda { %{RAILS_ENV="#{rails_env}" #{bundle_bin} exec} }
 settings.rake ||= lambda { %{#{bundle_prefix} rake} }
 settings.rails ||= lambda { %{#{bundle_prefix} rails} }
+settings.asset_paths ||= ['vendor/assets/', 'app/assets/']
 
 # Macro used later by :rails, :rake, etc
 make_run_task = lambda { |name, sample_args|
@@ -17,15 +20,70 @@ make_run_task = lambda { |name, sample_args|
   end
 }
 
+def check_for_changes_script(options={})
+  diffs = options[:at].map { |path|
+    %[diff -r "#{deploy_to}/#{current_path}/#{path}" "./#{path}" 2>/dev/null]
+  }.join("\n")
+
+  unindent %[
+    if [ -e "#{deploy_to}/#{current_path}/#{options[:check]}" ]; then
+      count=`(
+        #{reindent 4, diffs}
+      ) | wc -l`
+
+      if [ "$((count))" = "0" ]; then
+        #{reindent 4, options[:skip]} &&
+        exit
+      else
+        #{reindent 4, options[:changed]}
+      fi
+    else
+      #{reindent 2, options[:default]}
+    fi
+  ]
+end
+
 desc "Execute a Rails command in the current deploy."
 make_run_task[:rails, 'console']
 
 desc "Execute a Rake command in the current deploy."
 make_run_task[:rake, 'db:migrate']
 
+desc "Starts an interactive console."
+task :console do
+  queue echo_cmd %[cd "#{deploy_to!}/#{current_path!}" && #{rails} console]
+end
+
 namespace :rails do
-  desc "Migrates the Rails database."
+  desc "Migrates the Rails database (skips if nothing has changed since the last release)."
   task :db_migrate do
+    if ENV['force_migrate']
+      invoke :'rails:db_migrate:force'
+      return
+    end
+
+    message = verbose_mode? ?
+      '$((count)) changes found, migrating database' :
+      'Migrating database'
+
+    queue check_for_changes_script \
+      check: 'db/schema.rb',
+      at: ['db/schema.rb'],
+      skip: %[
+        echo "-----> DB schema unchanged; skipping DB migration"
+      ],
+      changed: %[
+        echo "-----> #{message}"
+        #{echo_cmd %[#{rake} db:migrate]}
+      ],
+      default: %[
+        echo "-----> Migrating database"
+        #{echo_cmd %[#{rake} db:migrate]}
+      ]
+  end
+
+  desc "Migrates the Rails database."
+  task :'db_migrate:force' do
     queue %{
       echo "-----> Migrating database"
       #{echo_cmd %[#{rake} db:migrate]}
@@ -47,24 +105,25 @@ namespace :rails do
       return
     end
 
-    queue %{
-      # Check if the last deploy has assets built, and if it can be re-used.
-      if [ -d "#{current_path}/public/assets" ]; then
-        count=`(
-          diff -r "#{current_path}/vendor/assets/" "./vendor/assets/" 2>/dev/null;
-          diff -r "#{current_path}/app/assets/" "./app/assets/" 2>/dev/null
-        ) | wc -l`
-
-        if [ "$((count))" = "0" ]; then
-          echo "-----> Skipping asset precompilation"
-          #{echo_cmd %[cp -R "#{current_path}/public/assets" "./public/assets"]} &&
-          exit
-        fi
-      fi
+    message = verbose_mode? ?
+      '$((count)) changes found, precompiling asset files' :
+      'Precompiling asset files'
 
-      echo "-----> Precompiling asset files"
-      #{echo_cmd %[#{rake} assets:precompile]}
-    }
+    queue check_for_changes_script \
+      check: 'public/assets/',
+      at: [*asset_paths],
+      skip: %[
+        echo "-----> Skipping asset precompilation"
+        #{echo_cmd %[cp -R "#{deploy_to}/#{current_path}/public/assets" "./public/assets"]}
+      ],
+      changed: %[
+        echo "-----> #{message}"
+        #{echo_cmd %[#{rake} assets:precompile]}
+      ],
+      default: %[
+        echo "-----> Precompiling asset files"
+        #{echo_cmd %[#{rake} assets:precompile]}
+      ]
   end
 
 end

data/lib/mina/version.rb

@@ -1,5 +1,5 @@
 module Mina
   def self.version
-    "0.1.2"
+    "0.1.3.pre1"
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: mina
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.1.3.pre1
+  prerelease: 6
 platform: ruby
 authors:
 - Rico Sta. Cruz
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000 Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -125,9 +125,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23