chap 0.0.9 → 0.1.0

data/README.md

@@ -82,6 +82,15 @@ From capistrano, on local or deploy box:
 $ cap deploy # cap recipe calls "chap deploy"
 </pre>
 
+Example capistrano deploy
+
+```ruby
+namespace :deploy do
+  task :default do
+    run "chap deploy"
+  end
+```
+
 Chef Chap LWRP:
 
 <pre>
@@ -123,8 +132,7 @@ Special methods:
 * run - output the command to be ran and runs command.
 * log - log messages to [shared_path]/chap/chap.log.
 * symlink_configs - useful as a chap/deploy hook. Symlinks any config files in [shared_path]/config/* over to [release_path]/config.
-* with - used to prepend all commands with the run method in a block with another command.  A example is provided below.
-
+* with - used to prepend all commands within a block with another command.  A example is provided below.
 
 with example:
 
@@ -145,7 +153,7 @@ run "cd #{release_path} && RAILS_ENV=#{node[:environment]} rake do:something2"
 
 ### Test deploy hooks
 
-When a chap hook fails, you want want to quicky test it on the server without having commit new code and running a full deploy.  You can edit the chap/* hooks on the spot and test them via:
+When a chap hook fails, you might want to quicky test it on the server without having commit new code and running a full deploy.  You can edit the chap/* hooks on the spot and test them via:
 
 <pre>
 $ cap hook deploy
@@ -156,9 +164,11 @@ This will test the hooks on the latest timestamp release at [deploy_to]/releases
 
 ### Syncing restart phase
 
-Some apps require that all the code be available on all the servers before a restart should happen on any of the servers.  For example, if you're serving assets on the same server as your app code, you wan to make sure that the assets have been download on all servers before any of the servers start serving the new assets.  To sync the retart phase you have to break out the capistano recipe so that it calls 2 chap command:
+Some apps require that all the code be available on all the servers before a restart should happen on any of the servers.  For example, if you're serving assets on the same server as your app code, you want to make sure that all the assets have been download on all servers before any of the servers start serving the new assets.  To sync the retart phase you have to break out the capistano recipe so that it calls 2 chap command:
 
-<pre>
-$ chap deploy --stop-at-symlink
-$ chap deploy --cont-at-symlink
-</pre>
+```ruby
+task :chap do
+  run "chap deploy -q --stop-at-symlink"
+  run "chap deploy -q --cont-at-symlink"
+end
+```

data/lib/chap.rb

@@ -12,6 +12,7 @@ require 'chap/cli'
 require 'chap/task'
 require 'chap/special_methods'
 require 'chap/config'
+require 'chap/benchmarking'
 require 'chap/runner'
 require 'chap/hook'
 require 'chap/strategy'

data/lib/chap/benchmarking.rb

@@ -0,0 +1,76 @@
+require 'benchmark'
+
+module Chap
+  module Benchmarking
+    def self.included(base)
+      @@benchmarks = []
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def benchmark(*methods)
+        methods.each do |method|
+          benchmark_each method
+        end
+      end
+      def benchmark_each(method, scope=nil)
+        class_eval <<-EOL
+          def #{method}_with_benchmark(*args,&block)
+            scope=#{scope.inspect}
+            result = nil
+            realtime = Benchmark.realtime do
+              result = #{method}_without_benchmark(*args,&block)
+            end
+            method_name = if args.empty?
+                            "#{method}"
+                          else
+                            name = "#{method}" + '("' + args.join(',') + '")'
+                            name = shorten_name(name)
+                          end
+            method_name = scope + ': ' + method_name if scope
+            @@benchmarks << [method_name, realtime]
+            result
+          end
+        EOL
+        alias_method "#{method}_without_benchmark", method
+        alias_method method, "#{method}_with_benchmark"
+      end
+    end
+
+    def shorten_name(string)
+      if string.length >= 80
+        preprend = string[0,20]
+        append = string[-55..-1]
+        preprend + ' ... ' + append
+      else 
+        string
+      end
+    end
+
+    def benchmarks
+      @@benchmarks
+    end
+
+    def report_benchmarks
+      return if benchmarks.empty?
+      report = []
+      report << "Benchmark Report:"
+
+      max = benchmarks.collect{|x| x[0]}.max_by{|a| a.length}.length
+      report_block = lambda do |data|
+        name,took = data
+        mins = '%d' % (took / 60.0)
+        secs = '%d' % (took % 60.0)
+        report << "  %-#{max}s : %2s mins and %2s secs" % [name,mins,secs]
+      end
+
+      report << "Ordered by slowest:"
+      benchmarks.sort_by {|x| x[1]}.reverse.each(&report_block)
+
+      report.each do |line|
+        log(line) unless options[:quiet]
+      end
+    end
+
+  end
+end

data/lib/chap/hook.rb

@@ -1,6 +1,7 @@
 module Chap
   class Hook
     include SpecialMethods
+    include Benchmarking
 
     attr_reader :options, :config
     def initialize(path, config)
@@ -45,6 +46,7 @@ module Chap
       cmd = "#{@with} #{cmd}"
       config.run(cmd)
     end
+    benchmark_each :run, "hook"
 
   end
 end

data/lib/chap/runner.rb

@@ -1,6 +1,7 @@
 module Chap
   class Runner
     include SpecialMethods
+    include Benchmarking
 
     attr_reader :options, :config
     def initialize(options={})
@@ -11,11 +12,12 @@ module Chap
     def deploy
       deploy_to_symlink
       deploy_from_symlink
+      report_benchmarks
     end
 
     def deploy_to_symlink
       setup
-      strategy.deploy
+      deploy_via_strategy
       symlink_shared
       rm_rvmrc
       hook(:deploy)
@@ -58,6 +60,10 @@ module Chap
       @strategy ||= klass.new(:config => @config)
     end
 
+    def deploy_via_strategy
+      strategy.deploy
+    end
+
     def camel_case(string)
       return string if string !~ /_/ && string =~ /[A-Z]+.*/
       string.split('_').map{|e| e.capitalize}.join
@@ -161,5 +167,8 @@ module Chap
         log "chap/#{name} hook does not exist".colorize(:red)
       end
     end
-  end
-end
+
+    benchmark :setup, :symlink_shared, :rm_rvmrc, :hook, :symlink_current, :cleanup, :deploy_via_strategy
+
+  end # eof Runner
+end # eof Chap

data/lib/chap/strategy/checkout.rb

@@ -1,6 +1,8 @@
 module Chap
   module Strategy
     class Checkout < Base
+      include Benchmarking
+
       def deploy
         update
         copy
@@ -43,6 +45,8 @@ BASH
         log "Code copied to #{release_path}".colorize(:green)
       end
 
+      benchmark :update, :copy
+      
     private
 
       def mark

data/lib/chap/strategy/copy.rb

@@ -2,9 +2,12 @@ module Chap
   module Strategy
     # useful for specs
     class Copy < Base
+      include Benchmarking
       def deploy
         run("cp -RPp #{config.chap[:source]} #{release_path}")
       end
+
+      benchmark :deploy
     end
   end # of Strategy
 end # of Chap

data/lib/chap/version.rb

@@ -1,3 +1,3 @@
 module Chap
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/spec/lib/chap_spec.rb

@@ -103,7 +103,7 @@ describe Chap do
 
     it "should only respect keep option" do
       system("cd #{root} && ./bin/chap deploy -q -c #{system_root}/etc/chef/chap.yml")
-      system("cd #{root} && ./bin/chap deploy -q -c #{system_root}/etc/chef/chap.yml")
+      sleep 1
       system("cd #{root} && ./bin/chap deploy -q -c #{system_root}/etc/chef/chap.yml")
       releases = Dir.glob("#{system_root}/data/chapdemo/releases/*").size
       releases.should == 2 # test the keep option

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chap
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -191,6 +191,7 @@ files:
 - bin/chap
 - chap.gemspec
 - lib/chap.rb
+- lib/chap/benchmarking.rb
 - lib/chap/cli.rb
 - lib/chap/config.rb
 - lib/chap/hook.rb