capistrano-soa 0.0.6 → 0.0.8

data/Guardfile

@@ -0,0 +1,9 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard :rspec, :cli => "--color --format nested" do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+

data/capistrano-soa.gemspec

@@ -5,11 +5,11 @@ require "capistrano/version"
 Gem::Specification.new do |s|
 
   s.name        = "capistrano-soa"
-  s.version     =  "0.0.6"
+  s.version     =  "0.0.8"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ben Wu"]
   s.email       = ["wucheokman@gmail.com"]
-  s.homepage    = "http://github.com/capistrano/capistrano-soa"
+  s.homepage    = "http://github.com/cheokman/capistrano-soa"
   s.summary     = %q{An extension for Capistrano supporting SOA Services Deployment}
   s.description = %q{Capistrano SOA let you management services group in SOA architecuture with multi-stage support.}
   s.files         = `git ls-files`.split("\n")

data/lib/capistrano/ext/soa.rb

@@ -2,6 +2,19 @@ require 'capistrano'
 require 'fileutils'
 require 'colored'
 
+module Capistrano
+ class Configuration
+   module Namespaces
+    def rename_task(new_name, old_name)
+    metaclass = class << self; self; end
+    metaclass.send(:alias_method, new_name.to_s, old_name.to_s)
+    metaclass.send(:remove_method, old_name.to_s)
+    tasks[new_name.to_sym] = tasks.delete(old_name.to_sym)
+    end
+   end
+ end
+end
+
 module Capistrano::Ext
   module SOA
     def get_config_files(config_root)
@@ -61,22 +74,22 @@ module Capistrano::Ext
       stages.include?(possible_stage_name) ? possible_stage_name : nil
     end
 
-    # 
+    #
     # One Environment with different applications deployment
     # cap integration prj0:subprj0:app0 prj1:subprj0:app1 deploy
-    # cap prj0:subprj0:app0:integration prj0:subprj0:app0:integration deploy 
+    # cap prj0:subprj0:app0:integration prj0:subprj0:app0:integration deploy
     #
     # One environment with one application
-    # cap prj0:subprj0:app0:integration deploy 
-    # 
-    # Different Environments with different applications deployment 
+    # cap prj0:subprj0:app0:integration deploy
+    #
+    # Different Environments with different applications deployment
     # cap prj0:subprj0:app0:integration prj0:subprj0:app0:staging deploy
     #
 
     def parse_args(args, stages, services)
       args = args.dup
       selected_services = []
-      task = nil
+      tasks = nil
       selected_stage = nil
 
       selected_stage = if stages.include?(args.first)
@@ -88,7 +101,8 @@ module Capistrano::Ext
               else
                 nil
               end
-      args.each do |a|
+
+      args.each_with_index do |a, i|
         if selected_stage.nil? && !get_stage_name(a, stages).nil?
           selected_stage = get_stage_name(a, stages)
           _service = get_service_name(a, services)
@@ -97,41 +111,51 @@ module Capistrano::Ext
           _service = get_service_name(a, services)
           selected_services << _service unless selected_services.include?(_service)
         else
-          task = a
+          tasks = args[i..args.length].join(" ")
           break
         end
       end
-      [selected_stage, selected_services.flatten.uniq, task]
+      [selected_stage, selected_services.flatten.uniq, tasks]
     end
 
     def build_task(stage, services, this_task)
-
       if services.size > 1
-        segments = this_task.split(':')
-        if segments.size > 1
-          namespace_names = segments[0, segments.size-1]
-          task_name = segments.last
-        else
-          namespace_names = [segments[0]]
-          task_name = "default"
-        end
-        
-        block = lambda do |parent|
-          alias_task "_#{task_name}".to_sym, task_name.to_sym
+        these_tasks = this_task.split(" ")
+        these_tasks.each do |current_task|
+          next if find_task(current_task).nil?
+
+          segments = current_task.split(':')
+          if segments.size > 1
+            namespace_names = segments[0, segments.size-1]
+            task_name = segments.last
+          else
+            namespace_names = [segments[0]]
+            task_name = "default"
+          end
+          original_task = "original_#{task_name}" 
 
-          task(task_name) do
-            services.each do |service|
-              system("cap #{stage} #{service} #{this_task}")
-            end
-          end  
-        end
+          block = lambda do |parent|
+            before current_task do 
+              logger.debug "find_task:#{task_name}: #{find_task task_name}"
+              rename_task "original_#{task_name}", task_name
+              logger.debug "find_task:#{task_name}: #{find_task task_name}"
+              task(task_name.to_sym) do
+                logger.debug "call..."
+                services.each do |service|
+                  system("cap #{stage} #{service} #{namespace_names.join(":")}:#{task_name}")
+                end
+              end 
+              logger.debug "find_task:#{task_name}: #{find_task task_name}"
+            end 
+          end
 
-        block = namespace_names.reverse.inject(block) do |child, name|
-          lambda do |parent|
-            parent.namespace(name, &child)
+          block = namespace_names.reverse.inject(block) do |child, name|
+            lambda do |parent|
+              parent.namespace(name, &child)
+            end
           end
+          block.call(top)
         end
-        block.call(top)
       end
     end
 
@@ -145,7 +169,7 @@ module Capistrano::Ext
         config_files = get_config_files(config_root)
         
         set :stages, collect_stages(config_files) unless exists?(:stages)
-      
+
         # build configuration names list
         config_names = get_config_names(config_files,config_root)
 
@@ -160,7 +184,7 @@ module Capistrano::Ext
         stages.each do |s|
           desc "Set the target stage to `#{s}'."
 
-          task(s.to_sym) do            
+          task(s.to_sym) do
             top.set :stage, s.to_sym
           end
         end
@@ -234,70 +258,15 @@ module Capistrano::Ext
           block.call(top)
         end
 
-       STDOUT.sync
-        before "deploy:update_code" do
-            print "Updating Code........ "
-            start_spinner()
-        end
-
-        after "deploy:update_code" do
-            stop_spinner()
-            puts "Done.".green
-        end
-
-        before "deploy:cleanup" do
-            print "Cleaning Up.......... "
-            start_spinner()
-        end
-
-        after "deploy:restart" do
-            stop_spinner()
-            puts "Done.".green
-        end
-
-        before "deploy:restart" do
-            print "Restarting .......... "
-            start_spinner()
-        end
-
-        after "deploy:cleanup" do
-            stop_spinner()
-            puts "Done.".green
-        end
-        # spinner stuff
-        @spinner_running = false
-        @chars = ['|', '/', '-', '\\']
-        @spinner = Thread.new do
-          loop do
-            unless @spinner_running
-              Thread.stop
-            end
-            print @chars[0]
-            sleep(0.1)
-            print "\b"
-            @chars.push @chars.shift
-          end
-        end
-
-        def start_spinner
-          @spinner_running = true
-          @spinner.wakeup
-        end
-
-        # stops the spinner and backspaces over last displayed character
-        def stop_spinner
-          @spinner_running = false
-          print "\b"
-        end
-
+       
         on :load do
           services_name = get_services_name(config_names)
 
-          selected_stage, selected_services, selected_task = parse_args(ARGV, stages, services_name)
+          selected_stage, selected_services, selected_tasks = parse_args(ARGV, stages, services_name)
 
           set :stage, selected_stage
           set :services, selected_services
-          build_task(selected_stage, selected_services, selected_task)
+          build_task(selected_stage, selected_services, selected_tasks)
      
           if stages.include?(stage)
             # Execute the specified stage so that recipes required in stage can contribute to task list
@@ -356,8 +325,63 @@ module Capistrano::Ext
         #     end
         #   end
         # end
-      end
 
+        STDOUT.sync
+        before "deploy:update_code" do
+            print "Updating Code........ "
+            start_spinner()
+        end
+
+        after "deploy:update_code" do
+            stop_spinner()
+            puts "Done.".green
+        end
+
+        before "deploy:cleanup" do
+            print "Cleaning Up.......... "
+            start_spinner()
+        end
+
+        after "deploy:restart" do
+            stop_spinner()
+            puts "Done.".green
+        end
+
+        before "deploy:restart" do
+            print "Restarting .......... "
+            start_spinner()
+        end
+
+        after "deploy:cleanup" do
+            stop_spinner()
+            puts "Done.".green
+        end
+        # spinner stuff
+        @spinner_running = false
+        @chars = ['|', '/', '-', '\\']
+        @spinner = Thread.new do
+          loop do
+            unless @spinner_running
+              Thread.stop
+            end
+            print @chars[0]
+            sleep(0.1)
+            print "\b"
+            @chars.push @chars.shift
+          end
+        end
+
+        def start_spinner
+          @spinner_running = true
+          @spinner.wakeup
+        end
+
+        # stops the spinner and backspaces over last displayed character
+        def stop_spinner
+          @spinner_running = false
+          print "\b"
+        end
+      end
     end
 
   end

data/spec/recipes/fake_recipe.rb

@@ -13,6 +13,10 @@ require 'capistrano'
                 run ('do inner some stuff')
               end
             end
+            desc "foo and run foo"
+            task :foo do
+              set :cool, "cool"
+            end
             desc "thing and run fake manifests"
             task :thing do
               set :bar, "baz"

data/spec/soa_spec.rb

@@ -7,10 +7,10 @@ describe Capistrano::Ext::SOA, "loaded into a configuration" do
     @configuration.extend(Capistrano::Spec::ConfigurationExtension)
     config_root = "/opt/deploy"
 
-    File.stub!(:expand_path) {config_root}
+    File.stub(:expand_path) {config_root}
     @project_dir = ["a/b/production.rb", "a/b/staging.rb", "a/b.rb", "a/c/staging.rb"]
 
-    Dir.stub!(:[]) {@project_dir.map {|dir| "#{config_root}/#{dir}"}}
+    Dir.stub(:[]) {@project_dir.map {|dir| "#{config_root}/#{dir}"}}
     @configuration.extend(Capistrano::Fakerecipe)
     Capistrano::Fakerecipe.load_into(@configuration)
     Capistrano::Ext::SOA.load_into(@configuration)
@@ -40,7 +40,7 @@ describe Capistrano::Ext::SOA, "loaded into a configuration" do
     task.should == nil
   end
 
-  it "should parse single stage with one or more services" do
+  it "should parse single stage with one service and different environment" do
     args = ["staging", "a:b", "a:b:production"]
     selected_stage, selected_services, task = @configuration.parse_args(args, @stages, @services)
     selected_services.should == ["a:b"]
@@ -48,7 +48,7 @@ describe Capistrano::Ext::SOA, "loaded into a configuration" do
     task.should == nil
   end
 
-  it "should parse single stage with one or more services" do
+  it "should parse default stage with two services" do
     args = ["a:b", "a:c"]
     selected_stage, selected_services, task = @configuration.parse_args(args, @stages, @services)
     selected_services.should == ["a:b", "a:c"]
@@ -56,7 +56,7 @@ describe Capistrano::Ext::SOA, "loaded into a configuration" do
     task.should == nil
   end
 
-  it "should parse single stage with one or more services" do
+  it "should one or more services with undefined environment" do
     args = ["a:b:integration", "a:c"]
     selected_stage, selected_services, task = @configuration.parse_args(args, @stages, @services)
     selected_services.should == ["a:b", "a:c"]
@@ -64,7 +64,15 @@ describe Capistrano::Ext::SOA, "loaded into a configuration" do
     task.should == nil
   end
 
-  it "should parse single stage with one or more services" do
+  it "should one or more services with differnt environment" do
+    args = ["a:b:staging", "a:c"]
+    selected_stage, selected_services, task = @configuration.parse_args(args, @stages, @services)
+    selected_services.should == ["a:b", "a:c"]
+    selected_stage.should == "staging"
+    task.should == nil
+  end
+
+  it "should parse multiple service and different default and specific environment" do
     args = ["staging", "a:b", "a:c:production"]
     selected_stage, selected_services, task = @configuration.parse_args(args, @stages, @services)
     selected_services.should == ["a:b", "a:c"]
@@ -72,7 +80,7 @@ describe Capistrano::Ext::SOA, "loaded into a configuration" do
     task.should == nil
   end
 
-  it "should parse single stage with one or more services" do
+  it "should parse multiple services with different specific environments" do
     args = ["a:b:staging", "a:c:production"]
     selected_stage, selected_services, task = @configuration.parse_args(args, @stages, @services)
     selected_services.should == ["a:b", "a:c"]
@@ -80,7 +88,7 @@ describe Capistrano::Ext::SOA, "loaded into a configuration" do
     task.should == nil
   end
 
-  it "should parse single stage with one or more services" do
+  it "should parse multiple services with one specific environment" do
     args = ["a:b", "a:c:production"]
     selected_stage, selected_services, task = @configuration.parse_args(args, @stages, @services)
     selected_services.should == ["a:b", "a:c"]
@@ -88,7 +96,7 @@ describe Capistrano::Ext::SOA, "loaded into a configuration" do
     task.should == nil
   end
 
-  it "should parse single stage with one or more services" do
+  it "should parse default environment, service and task" do
     args = ["staging","a:b", "deploy:start"]
     selected_stage, selected_services, task = @configuration.parse_args(args, @stages, @services)
     selected_services.should == ["a:b"]
@@ -96,20 +104,28 @@ describe Capistrano::Ext::SOA, "loaded into a configuration" do
     task.should == "deploy:start"
   end
 
-  it "should parse single stage with one or more services" do
+  it "should parse default stage and one service" do
     args = ["staging","a:b", "deploy:start", "a:d"]
     selected_stage, selected_services, task = @configuration.parse_args(args, @stages, @services)
     selected_services.should == ["a:b"]
     selected_stage.should == "staging"
-    task.should == "deploy:start"
+    task.should == "deploy:start a:d"
   end
 
-  it "should parse single stage with one or more services" do
+  it "should parse one stage, multiple services and task" do
     args = ["staging","a:b", "a:d", "deploy:start"]
     selected_stage, selected_services, task = @configuration.parse_args(args, @stages, @services)
     selected_services.should == ["a:b"]
     selected_stage.should == "staging"
-    task.should == "a:d"
+    task.should == "a:d deploy:start"
+  end
+
+  it "should parse one stage, multiple services and task" do
+    args = ["staging","a:b", "a:c", "deploy:start"]
+    selected_stage, selected_services, task = @configuration.parse_args(args, @stages, @services)
+    selected_services.should == ["a:b", "a:c"]
+    selected_stage.should == "staging"
+    task.should == "deploy:start"
   end
 
   it "should parse single stage with one or more services" do
@@ -128,23 +144,48 @@ describe Capistrano::Ext::SOA, "loaded into a configuration" do
     task.should == "deploy:start"
   end
 
-  it "should run one stage and service on load" do
-    args = ["staging"]
-    ARGV = args
-    @configuration.trigger(:load)
-    @configuration.fetch(:stage).should == "staging"
-    @configuration.fetch(:services).should == []
+  it "should build task with multiple services" do
+    stage = "staging"
+    services = ["a:b", "a:c"]
+    task = "fake:thing"
+
+    @configuration.build_task(stage, services, task)
+    @configuration.find_task("fake:al_thing").should_not be_nil
+    @configuration.find_task("fake:thing").should_not be_nil
   end
 
-  it "should build a task for services" do
-    @configuration.stub!(:services).and_return(["a:b", "a:c"])
+  it "should build multiple task with multiple services" do
+    stage = "staging"
+    services = ["a:b", "a:c"]
+    task = "fake:thing fake:foo"
 
-    @configuration.build_task("staging", ["a:b", "a:c"],"fake:thing")
-    
-    @configuration.find_task("fake:_thing").should_not == nil
-    @configuration.find_task("fake:thing").should_not == nil
+    @configuration.build_task(stage, services, task)
+    @configuration.find_task("fake:al_thing").should_not be_nil
+    @configuration.find_task("fake:thing").should_not be_nil
 
-    @configuration.find_and_execute_task("fake:thing")
-    @configuration.fetch(:bar).should == "baz"
+    @configuration.find_task("fake:al_foo").should_not be_nil
+    @configuration.find_task("fake:foo").should_not be_nil
   end
+
+
+
+  # it "should run one stage and service on load" do
+  #   args = ["staging"]
+  #   ARGV = args
+  #   @configuration.trigger(:load)
+  #   @configuration.fetch(:stage).should == "staging"
+  #   @configuration.fetch(:services).should == []
+  # end
+
+  # it "should build a task for services" do
+  #   @configuration.stub(:services).and_return(["a:b", "a:c"])
+
+  #   @configuration.build_task("staging", ["a:b", "a:c"],"fake:thing")
+    
+  #   @configuration.find_task("fake:_thing").should_not == nil
+  #   @configuration.find_task("fake:thing").should_not == nil
+
+  #   @configuration.find_and_execute_task("fake:thing")
+  #   @configuration.fetch(:bar).should == "baz"
+  # end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-soa
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies: []
 description: Capistrano SOA let you management services group in SOA architecuture
   with multi-stage support.
@@ -20,6 +20,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- Guardfile
 - README.md
 - capistrano-soa.gemspec
 - lib/capistrano/ext/soa.rb
@@ -27,7 +28,7 @@ files:
 - spec/recipes/fake_recipe.rb
 - spec/soa_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/capistrano/capistrano-soa
+homepage: http://github.com/cheokman/capistrano-soa
 licenses: []
 post_install_message: 
 rdoc_options: []