pulsar 0.1.0 → 0.1.1

data/lib/pulsar/commands/list.rb

@@ -4,12 +4,14 @@ module Pulsar
     
     def execute
       Bundler.with_clean_env do
-        fetch_repo
-        
-        list_apps
+        begin
+          fetch_repo
 
-        remove_capfile unless keep_capfile?
-        remove_repo unless keep_repo?
+          list_apps
+        ensure
+          remove_capfile unless keep_capfile?
+          remove_repo unless keep_repo?
+        end
       end
     end
   end

data/lib/pulsar/commands/main.rb

@@ -12,29 +12,40 @@ module Pulsar
                                        "do everything pulsar does (build a Capfile) but don't run the cap command",
                                        :default => false
 
-    parameter "APPLICATION", "the application which you would like to deploy" unless File.exists?("#{Dir.pwd}/config.ru")
+    unless File.exists?("#{Dir.pwd}/config.ru")
+      parameter "APPLICATION", "the application which you would like to deploy. Pass a comma separated list to deploy multiple applications at once"
+    end
+
     parameter "ENVIRONMENT", "the environment on which you would like to deploy" do |env|
       %w(production staging development).include?(env) ? env : raise(ArgumentError)
     end
+
     parameter "[TASKS] ...", "the arguments and/or options that will be passed to capistrano", :default => "deploy"
 
     def execute
-      app = application rescue File.basename(Dir.pwd)
-      target = "#{app}:#{environment}"
-
-      Bundler.with_clean_env do
-        fetch_repo
-        bundle_install
-        create_capfile
-        build_capfile(target)
-
-        unless skip_cap_run?
-          cap_args = [tasks_list].flatten.join(" ")
-          run_capistrano(cap_args)
-        end
+      apps = application.split(',') rescue [ File.basename(Dir.pwd) ]
 
-        remove_capfile unless keep_capfile?
-        remove_repo unless keep_repo?
+      apps.each do |app|
+        target = "#{app}:#{environment}"
+
+        Bundler.with_clean_env do
+          begin
+            fetch_repo
+            bundle_install
+            create_capfile
+            build_capfile(target)
+
+            unless skip_cap_run?
+              cap_args = [tasks_list].flatten.join(" ")
+              run_capistrano(cap_args)
+            end
+          ensure
+            remove_capfile unless keep_capfile?
+            remove_repo unless keep_repo?
+
+            reset_for_other_app!
+          end
+        end
       end
     end
   end

data/lib/pulsar/helpers/clamp.rb

@@ -120,6 +120,10 @@ module Pulsar
         rm_rf(config_path, :verbose => verbose?)
       end
 
+      def reset_for_other_app!
+        @capfile_name = @configuration_path = @now = nil
+      end
+
       def run_capistrano(args)
         cd(config_path, :verbose => verbose?) do
           run_cmd("bundle exec cap CONFIG_PATH=#{config_path} --file #{capfile_path} #{args}", :verbose => verbose?)

data/lib/pulsar/version.rb

@@ -1,3 +1,3 @@
 module Pulsar
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/pulsar/commands/list_spec.rb

@@ -12,6 +12,13 @@ describe Pulsar::ListCommand do
     expect { pulsar.run(full_list_args + %w(--keep-repo)) }.to change{ Dir.glob("#{tmp_path}/conf-repo*").length }.by(1)
   end
 
+  it "removes the temp directory even if it's raised an error" do
+    Pulsar::ListCommand.any_instance.stub(:list_apps) { raise 'error' }
+    pulsar.run(full_list_args) rescue nil
+
+    Dir.glob("#{tmp_path}/conf-repo*").should be_empty
+  end
+
   context "--conf-repo option" do
     it "is required" do
       expect { pulsar.parse([]) }.to raise_error(Clamp::UsageError)

data/spec/pulsar/commands/main_spec.rb

@@ -13,6 +13,13 @@ describe Pulsar::MainCommand do
     expect { pulsar.run(full_cap_args + %w(--keep-repo) + dummy_app) }.to change{ Dir.glob("#{tmp_path}/conf-repo*").length }.by(1)
   end
 
+  it "removes the temp directory even if it's raised an error" do
+    Pulsar::MainCommand.any_instance.stub(:run_capistrano) { raise 'error' }
+    pulsar.run(base_args + [ "--tmp-dir", tmp_path, "--keep-capfile" ] + dummy_app) rescue nil
+
+    Dir.glob("#{tmp_path}/conf-repo*").should be_empty
+  end
+
   it "copies a the repo when there is a dir with same name" do
     system("mkdir #{tmp_path}/conf-repo")
     expect { pulsar.run(full_cap_args + %w(--keep-repo) + dummy_app) }.to change{ Dir.glob("#{tmp_path}/conf-repo*").length }.by(1)
@@ -26,6 +33,12 @@ describe Pulsar::MainCommand do
     end
   end
 
+  it "supports multiple apps via comma separated argument" do
+    apps_to_deploy = [ 'dummy_app,other_dummy_app', 'production' ] 
+
+    expect { pulsar.run(full_cap_args + apps_to_deploy) }.to change{ Dir.glob("#{tmp_path}/capfile-*").length }.by(2)
+  end
+
   context "Capfile" do
     it "uses base.rb in staging stage" do
       pulsar.run(full_cap_args + dummy_app(:staging))

data/spec/pulsar/helpers/clamp_spec.rb

@@ -8,4 +8,16 @@ describe Pulsar::Helpers::Clamp do
       expect { run_cmd("return 1", {}) }.to raise_error
     end
   end
+
+  context "reset_for_other_app!" do
+    it "resets instance variables written by the module" do
+      cap, conf, time = capfile_path, config_path, time_to_deploy
+
+      reset_for_other_app!
+
+      capfile_path.should_not == cap
+      config_path.should_not == conf
+      time_to_deploy.should_not == time
+    end
+  end
 end

data/spec/support/dummies/dummy_conf/apps/other_dummy_app/defaults.rb

@@ -0,0 +1,7 @@
+# This is apps/other_dummy_app/defaults.rb
+
+set :application, "other_dummy_app"
+
+load_recipes do
+  generic :recipe
+end

data/spec/support/dummies/dummy_conf/apps/other_dummy_app/production.rb

@@ -0,0 +1,5 @@
+# This is apps/other_dummy_app/production.rb
+
+server "other_dummy.it", :db, :web, :app, :primary => true
+
+set :stage, "production"

data/spec/support/dummies/dummy_conf/apps/other_dummy_app/staging.rb

@@ -0,0 +1,5 @@
+# This is apps/other_dummy_app/staging.rb
+
+server "staging.other_dummy.it", :db, :web, :app, :primary => true
+
+set :stage, "staging"

data/spec/support/modules/helpers.rb

@@ -19,8 +19,12 @@ module Helpers
     File.join(File.dirname(__FILE__), "..", "dummies", "dummy_app")
   end
 
+  def tmp_dir
+    "tmp"
+  end
+
   def tmp_path
-    File.join(File.dirname(__FILE__), "..", "tmp")
+    File.join(File.dirname(__FILE__), "..", tmp_dir)
   end
 
   def dummy_app(stage = :production)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulsar
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -184,6 +184,9 @@ files:
 - spec/support/dummies/dummy_conf/apps/dummy_app/recipes/production/custom_recipe.rb
 - spec/support/dummies/dummy_conf/apps/dummy_app/recipes/staging/custom_recipe.rb
 - spec/support/dummies/dummy_conf/apps/dummy_app/staging.rb
+- spec/support/dummies/dummy_conf/apps/other_dummy_app/defaults.rb
+- spec/support/dummies/dummy_conf/apps/other_dummy_app/production.rb
+- spec/support/dummies/dummy_conf/apps/other_dummy_app/staging.rb
 - spec/support/dummies/dummy_conf/recipes/generic/recipe.rb
 - spec/support/modules/helpers.rb
 - spec/support/modules/output_capture.rb
@@ -202,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2803214498054614513
+      hash: 3212148214793715680
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -211,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2803214498054614513
+      hash: 3212148214793715680
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -236,6 +239,9 @@ test_files:
 - spec/support/dummies/dummy_conf/apps/dummy_app/recipes/production/custom_recipe.rb
 - spec/support/dummies/dummy_conf/apps/dummy_app/recipes/staging/custom_recipe.rb
 - spec/support/dummies/dummy_conf/apps/dummy_app/staging.rb
+- spec/support/dummies/dummy_conf/apps/other_dummy_app/defaults.rb
+- spec/support/dummies/dummy_conf/apps/other_dummy_app/production.rb
+- spec/support/dummies/dummy_conf/apps/other_dummy_app/staging.rb
 - spec/support/dummies/dummy_conf/recipes/generic/recipe.rb
 - spec/support/modules/helpers.rb
 - spec/support/modules/output_capture.rb