mina 0.1.2.pre2 → 0.1.2

data/HISTORY.md

@@ -1,30 +1,38 @@
-v0.1.2.pre2 - Jul 3, 2012
--------------------------
+v0.1.2 - Jul 06, 2012
+---------------------
+
+### Fixed:
+  * __Show stdout output properly on deploy.__
+  * 'mina rake' now works.
+
+### 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)
+
+v0.1.2.pre2 - Jul 03, 2012
+--------------------------
 
 ### Added:
-  * Add bundle_bin option
-  * Add ssh port option
+  * Add `:bundle_bin` option.
+  * Add `:ssh` port option.
 
 ### Fixed:
-  * Fix deploy:link_shared_paths to use absolute paths
-  * Fix console logs for task init
+  * __Fix `deploy:link_shared_paths` to use absolute paths.__
+  * Fix console logs for task init.
 
 v0.1.2.pre1 - Jun 12, 2012
 --------------------------
 
 ### Fixed:
-  * Fixed JRuby support.
-  * Respect .bashrc. (#5)
+  * __Fixed JRuby support.__
+  * __Respect .bashrc.__ (#5)
 
 ### Changed:
   * Implement `ssh("..", return: true)`.
-  * Rename simulate_mode to simulate_mode?. Same with verbose_mode?.
+  * Rename `simulate_mode` to `simulate_mode?`. Same with `verbose_mode?`.
   * Show the SSH command in the simulation output.
 
-### Misc:
-  * Prepare for Tomdoc.
-  * Stop invoking bash needlessly to prettify things.
-
 v0.1.1 - Jun 07, 2012
 ---------------------
 

data/bin/mina

@@ -24,29 +24,37 @@ scope = self
 
 Rake.application.instance_eval do
   standard_exception_handling do
-    # Initialize Rake and make it think it's Mina.
-    init 'mina'
+    begin
+      # Initialize Rake and make it think it's Mina.
+      init 'mina'
 
-    # (The only way @rakefiles has only 1 value is if -f is specified.)
-    custom_rakefile = (@rakefiles.size == 1)
-    @rakefiles = ['Minafile', 'config/deploy.rb']  unless custom_rakefile
+      # (The only way @rakefiles has only 1 value is if -f is specified.)
+      custom_rakefile = (@rakefiles.size == 1)
+      @rakefiles = ['Minafile', 'config/deploy.rb']  unless custom_rakefile
 
-    # Workaround: Rake 0.9+ doesn't record task descriptions unless it's needed.
-    # Need it for 'mina help'
-    if Rake::TaskManager.respond_to?(:record_task_metadata)
-      Rake::TaskManager.record_task_metadata = true
-    end
+      # Workaround: Rake 0.9+ doesn't record task descriptions unless it's needed.
+      # Need it for 'mina help'
+      if Rake::TaskManager.respond_to?(:record_task_metadata)
+        Rake::TaskManager.record_task_metadata = true
+      end
+
+      # Load the Mina Rake DSL.
+      require 'mina/rake'
 
-    # Load the Mina Rake DSL.
-    require 'mina/rake'
+      # Allow running without a Rakefile
+      load_rakefile  if have_rakefile || custom_rakefile
 
-    # Allow running without a Rakefile
-    load_rakefile  if have_rakefile || custom_rakefile
+      # Run tasks
+      top_level
 
-    # Run tasks
-    top_level
+      scope.mina_cleanup! if top_level_tasks.any?
 
-    scope.mina_cleanup! if top_level_tasks.any?
+    rescue Mina::Failed => e
+      puts ""
+      scope.print_error "Command failed."
+      scope.print_stderr "#{e.message}"
+      exit e.exitstatus
+    end
   end
 end
 

data/data/deploy.sh.erb

@@ -7,7 +7,7 @@
 
 # Go to the deploy path
 cd "<%= deploy_to %>" || (
-  echo "=====> ERROR: not set up."
+  echo "! ERROR: not set up."
   echo "The path '<%= deploy_to %>' is not accessible on the server."
   echo "You may need to run 'mina setup' first."
   false
@@ -15,7 +15,7 @@ cd "<%= deploy_to %>" || (
 
 # Check releases path
 if [ ! -d "<%= releases_path %>" ]; then
-  echo "=====> ERROR: not set up."
+  echo "! ERROR: not set up."
   echo "The directory '<%= releases_path %>' does not exist on the server."
   echo "You may need to run 'mina setup' first."
   exit 16
@@ -23,7 +23,7 @@ fi
 
 # Check lockfile
 if [ -e "<%= lock_file %>" ]; then
-  echo "=====> ERROR: another deployment is ongoing."
+  echo "! ERROR: another deployment is ongoing."
   echo "The file '<%= lock_file %>' was found."
   echo "If no other deployment is ongoing, delete the file to continue."
   exit 17
@@ -37,7 +37,7 @@ release_path="<%= releases_path %>/$version"
 
 # Sanity check
 if [ -e "$build_path" ]; then
-  echo "=====> ERROR: Path already exists"
+  echo "! ERROR: Path already exists."
   exit 18
 fi
 
@@ -82,7 +82,7 @@ fi
 # ============================
 # === Failed deployment
 (
-  echo "=====> ERROR: Deploy failed."
+  echo "! ERROR: Deploy failed."
 
 <%= indent 2, clean %>
 

data/lib/mina.rb

@@ -5,6 +5,7 @@ module Mina
   require 'mina/version'
 
   autoload :DeployHelpers, 'mina/deploy_helpers'
+  autoload :OutputHelpers, 'mina/output_helpers'
   autoload :Helpers, 'mina/helpers'
   autoload :Settings, 'mina/settings'
   autoload :Tools, 'mina/tools'

data/lib/mina/git.rb

@@ -12,7 +12,7 @@ namespace :git do
       echo "-----> Cloning the Git repository"
       #{echo_cmd %[git clone "#{repository!}" . -n --recursive]} &&
       echo "-----> Using revision #{revision}" &&
-      #{echo_cmd %[git checkout "#{revision}" -b current_release 1>/dev/null]} &&
+      #{echo_cmd %[git checkout -q "#{revision}" -b current_release 1>/dev/null]} &&
       #{echo_cmd %[rm -rf .git]}
     }
   end

data/lib/mina/helpers.rb

@@ -80,7 +80,7 @@ module Mina
 
       elsif settings.term_mode == :pretty
         code = "#{ssh_command} -- bash #{bash_options} -c #{script}"
-        result = pretty_system("#{code} 2>&1")
+        result = pretty_system(code)
 
       elsif settings.term_mode == :exec
         code = "#{ssh_command} -t -- bash #{bash_options} -c #{script}"
@@ -118,58 +118,6 @@ module Mina
       "ssh #{args}"
     end
 
-    # Internal: Works like 'system', but indents and puts color.
-    #
-    # Returns the exit code in integer form.
-    #
-    def pretty_system(code)
-      require 'shellwords'
-      cmds = Shellwords.shellsplit(code)
-      cmds << "2>&1"
-
-      status =
-        Tools.popen4(*cmds) do |pid, i, o, e|
-          i.close
-
-          last = nil
-          clear_on_nl = false
-          while c = o.getc
-            # Because Ruby 1.8.x returns a number on #getc
-            c = "%c" % [c]  if c.is_a?(Fixnum)
-
-            break if o.closed?
-            if last == "\n"
-              if clear_on_nl
-                clear_on_nl = false
-                print "\033[0m"
-              end
-
-              # Color the verbose echo commands
-              if c == "$" && ((c += o.read(1)) == "$ ")
-                clear_on_nl = true
-                print " "*7 + "\033[32m#{c}\033[34m"
-
-              # (Don't) color the status messages
-              elsif c == "-" && ((c += o.read(5)) == "----->")
-                print c
-
-              # Color errors
-              elsif c == "=" && ((c += o.read(5)) == "=====>")
-                print "\033[31m=====>\033[0m"
-
-              else
-                print " "*7 + c
-              end
-            else
-              print c
-            end
-
-            last = c
-          end
-        end
-      status.exitstatus
-    end
-
     # Queues code to be ran.
     #
     # This queues code to be ran to the current code bucket (defaults to `:default`).

data/lib/mina/output_helpers.rb

@@ -0,0 +1,95 @@
+module Mina
+  module OutputHelpers
+    # Protip! make a module that overrides these settings, then use `extend YourModule`
+    # to make your own pretty printing thing.
+    def print_status(msg)
+      puts ""  if verbose_mode?
+      puts "#{color('----->', 32)} #{msg}"
+    end
+
+    def print_error(msg)
+      puts " #{color("!", 33)}     #{color(msg, 31)}"
+    end
+
+    def print_stderr(msg)
+      puts "       #{color(msg, 31)}"
+    end
+
+    def print_command(msg)
+      puts "       #{color("$", 32)} #{color(msg, 32)}"
+    end
+
+    def print_stdout(msg)
+      puts "       #{msg}"
+    end
+
+    # Internal: Colorizes a string.
+    # Returns the string `str` with the color `c`.
+    def color(str, c)
+      ENV['NO_COLOR'] ? str : "\033[#{c}m#{str}\033[0m"
+    end
+
+    # Internal: Prints a string by delegating it to the proper output helper.
+    #
+    # It takes an input with text and prints them nicely. The text block can
+    # have statuses (prefixed with `-----> `), errors (prefixed with `! `),
+    # commands (prefixed with `$ `) or anything else. Depending on the type of
+    # the message, they will be delegated to the proper print_* helper.
+    #
+    #     -----> Unlocking
+    #     $ unlock foo
+    #     Unlocked.
+    #     ! ERROR: Failed
+    #
+    # Returns nothing.
+    #
+    def print_str(str)
+      if str =~ /^\-+> (.*?)$/
+        print_status $1
+      elsif str =~ /^! (.*?)$/
+        print_error $1
+      elsif str =~ /^\$ (.*?)$/
+        print_command $1
+      else
+        print_stdout str
+      end
+    end
+
+    # Internal: Works like `system`, but indents and puts color.
+    #
+    # Returns the exit code in integer form.
+    #
+    def pretty_system(code)
+      require 'shellwords'
+      cmds = Shellwords.shellsplit(code)
+
+      status =
+        Tools.popen4(*cmds) do |pid, i, o, e|
+          trap "INT" do
+            puts ""
+            print_status "Mina: SIGINT received."
+          end
+
+          # Read stderr in the background.
+          p1 = fork do
+            trap("INT") {}
+            while str = e.gets
+              # Supress expected errors.
+              next if str.include? "bash: no job control in this shell"
+              next if str.include? "stdin is not a terminal"
+              print_stderr str.strip
+            end
+          end
+
+          # Read stdout.
+          while str = o.gets
+            print_str str
+          end
+
+          Process.waitpid p1
+        end
+
+      status.exitstatus
+    end
+  end
+end

data/lib/mina/rails.rb

@@ -7,12 +7,13 @@ settings.rails ||= lambda { %{#{bundle_prefix} rails} }
 # Macro used later by :rails, :rake, etc
 make_run_task = lambda { |name, sample_args|
   task name, :arguments do |t, args|
-    command = args[:arguments]
+    arguments = args[:arguments]
+    command = send name
     unless command
       puts %{You need to provide arguments. Try: mina "#{name}[#{sample_args}]"}
       exit 1
     end
-    queue %[cd "#{deploy_to!}/#{current_path!}" && #{rails} #{command}]
+    queue echo_cmd %[cd "#{deploy_to!}/#{current_path!}" && #{command} #{arguments}]
   end
 }
 

data/lib/mina/rake.rb

@@ -1,6 +1,7 @@
 # This file is invoked from Rake.
 extend Mina::Helpers
 extend Mina::DeployHelpers
+extend Mina::OutputHelpers
 
 require 'mina/default'
 require 'mina/deploy' if Rake.application.have_rakefile

data/lib/mina/tools.rb

@@ -11,5 +11,10 @@ module Mina
         Open4.popen4 *cmd, &blk
       end
     end
+
+    def self.pfork4(*cmd, &blk)
+      require 'open4'
+      Open4.pfork4 *cmd, &blk
+    end
   end
 end

data/lib/mina/version.rb

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

data/test_env/config/deploy.rb

@@ -28,6 +28,7 @@ task :deploy do
   queue "bundle() { true; }" # Stub the bundle command.
 
   deploy do
+    queue %[ruby -e "\\$stderr.write \\\"This is stdout output\n\\\""]
     invoke :'git:clone'
     invoke :'bundle:install'
     invoke :'rails:db_migrate'

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: mina
 version: !ruby/object:Gem::Version
-  version: 0.1.2.pre2
-  prerelease: 6
+  version: 0.1.2
+  prerelease: 
 platform: ruby
 authors:
 - Rico Sta. Cruz
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-03 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70278252972060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70278252972060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70278252960240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70278252960240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70278252958560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +54,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70278252958560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Really fast deployer and server automation tool.
 email:
 - rico@nadarei.co
@@ -72,6 +87,7 @@ files:
 - lib/mina/deploy_helpers.rb
 - lib/mina/git.rb
 - lib/mina/helpers.rb
+- lib/mina/output_helpers.rb
 - lib/mina/rails.rb
 - lib/mina/rake.rb
 - lib/mina/settings.rb
@@ -109,13 +125,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Really fast deployer and server automation tool.
 test_files: []
+has_rdoc: