pulsar 0.2.3 → 0.3.0

data/README.md

@@ -129,6 +129,28 @@ load_recipes do
 end
 ```
 
+---
+
+You can specify some recipes to be loaded only when you run Pulsar from inside a Rack application directory.
+This is useful with recipes that require something inside that directory (like retrieving the database/assets
+from a staging environment). 
+
+You can do that like this:
+
+```ruby
+#
+# Somewhere inside apps/
+#
+
+#
+# These recipes will be available only if you're running 
+# Pulsar inside a Rack application (like Rails) directory
+#
+load_recipes(app_only: true) do
+  rails :assets_pull, :database_pull
+end
+```
+
 ### Loading the repository
 
 Once the repository is ready, you'll need to tell Pulsar where it is. The repository location can be specified either

data/lib/pulsar/commands/main.rb

@@ -5,7 +5,7 @@ module Pulsar
     include Pulsar::Options::ConfRepo
     
     option [ "-l", "--log-level" ], "LOG LEVEL",
-                                    "how much output will Capistrano print out. Can be any of: important, info, debug",
+                                    "how much output will Capistrano print out. Can be any of: important, info, debug, trace",
                                     :default => "important"
 
     option [ "-s", "--skip-cap-run" ], :flag,
@@ -16,22 +16,19 @@ module Pulsar
       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 "STAGE", "the stage on which you would like to deploy"
 
     parameter "[TASKS] ...", "the arguments and/or options that will be passed to capistrano", :default => "deploy"
 
     def execute
       find_apps.each do |app|
-        target = "#{app}:#{environment}"
-
         Bundler.with_clean_env do
           begin
             fetch_repo
+            validate(app, stage)
             bundle_install
             create_capfile
-            build_capfile(target)
+            build_capfile(app, stage)
 
             unless skip_cap_run?
               cap_args = [ tasks_list ].flatten.join(" ")

data/lib/pulsar/commands/utils.rb

@@ -3,7 +3,7 @@ module Pulsar
     include Pulsar::Helpers::Clamp
     include Pulsar::Options::Shared
 
-    subcommand "list", "list all available apps and environments which you can deploy", ListCommand
+    subcommand "list", "list all available apps and stages which you can deploy", ListCommand
     subcommand "init", "generate a new configuration repo with some basic recipes to use with pulsar", InitCommand
   end
 end

data/lib/pulsar/helpers/all.rb

@@ -1,5 +1,6 @@
 module Pulsar::Helpers
   autoload :Capistrano, "pulsar/helpers/capistrano"
   autoload :Clamp, "pulsar/helpers/clamp"
+  autoload :Path, "pulsar/helpers/path"
   autoload :Shell, "pulsar/helpers/shell"
 end

data/lib/pulsar/helpers/clamp.rb

@@ -2,6 +2,7 @@ module Pulsar
   module Helpers
     module Clamp
       include Pulsar::Helpers::Shell
+      include Pulsar::Helpers::Path
 
       def self.included(base)
         base.extend(InstanceAndClassMethods)
@@ -21,9 +22,7 @@ module Pulsar
           Dir.pwd if from_application_path?
         end
 
-        def build_capfile(args)
-          app, stage = args.split(":")
-
+        def build_capfile(app, stage)
           # Variables
           set_log_level
           include_base_conf
@@ -39,20 +38,12 @@ module Pulsar
           end
         end
 
-        def capfile_path
-          @capfile_name ||= "#{tmp_dir}/capfile-#{time_to_deploy}"
-        end
-
-        def config_path
-          @configuration_path ||= "#{tmp_dir}/conf-repo-#{time_to_deploy}"
-        end
-
         def create_capfile
           touch(capfile_path, :verbose => verbose?)
         end
 
         def each_app
-          Dir["#{config_path}/apps/*"].each do |path|
+          Dir["#{config_apps_path}/*"].each do |path|
             yield(File.basename(path)) if File.directory?(path)
           end
         end
@@ -71,46 +62,47 @@ module Pulsar
 
         def fetch_directory_repo(repo)
           if File.directory?("#{repo}/.git")
-            fetch_git_repo(repo)
+            fetch_git_repo(repo, true)
           else
             run_cmd("cp -rp #{repo} #{config_path}", :verbose => verbose?)
           end
         end
 
-        def fetch_git_repo(repo)
-          git_options = "--quiet --depth=1 --branch #{conf_branch}"
+        def fetch_git_repo(repo, local=false)
+          git_options = "--quiet --branch #{conf_branch}"
+          git_options = "#{git_options} --depth=1" unless local
+
           run_cmd("git clone #{git_options} #{repo} #{config_path}", :verbose => verbose?)
         end
 
-        def include_app(app, stage=nil)
-          app_file = "#{config_path}/apps/#{app}/defaults.rb"
-          stage_file = "#{config_path}/apps/#{app}/#{stage}.rb"
+        def include_app(app, stage)
+          app_file = config_app_defaults_path(app)
+          stage_file = config_stage_path(app, stage)
 
           if File.exists?(app_file)
             run_cmd("cat #{app_file} >> #{capfile_path}", :verbose => verbose?)
           end
 
-          if stage
+          if File.exists?(stage_file)
             run_cmd("cat #{stage_file} >> #{capfile_path}", :verbose => verbose?)
           end
         end
 
-        def include_app_recipes(app, stage=nil)
-          recipes_dir = "#{config_path}/apps/#{app}/recipes"
+        def include_app_recipes(app, stage)
+          recipes_dir = config_app_recipes_path(app)
+          stage_recipes_dir = config_app_stage_recipes_path(app, stage)
 
           Dir.glob("#{recipes_dir}/*.rb").each do |recipe|
             run_cmd("cat #{recipe} >> #{capfile_path}", :verbose => verbose?)
           end
 
-          if stage
-            Dir.glob("#{recipes_dir}/#{stage}/*.rb").each do |recipe|
-              run_cmd("cat #{recipe} >> #{capfile_path}", :verbose => verbose?)
-            end
+          Dir.glob("#{stage_recipes_dir}/*.rb").each do |recipe|
+            run_cmd("cat #{recipe} >> #{capfile_path}", :verbose => verbose?)
           end
         end
 
         def include_base_conf
-          run_cmd("cat #{config_path}/apps/base.rb >> #{capfile_path}", :verbose => verbose?)
+          run_cmd("cat #{config_base_path} >> #{capfile_path}", :verbose => verbose?)
         end
 
         def list_apps
@@ -164,7 +156,7 @@ module Pulsar
 
         def set_log_level
           level = log_level.upcase
-          levels = %w(IMPORTANT INFO DEBUG)
+          levels = %w(IMPORTANT INFO DEBUG TRACE)
 
           level = levels.first unless levels.include?(level)
 
@@ -174,17 +166,20 @@ module Pulsar
         end
 
         def stages_for(app)
-          environments = %w(development staging production)
+          exclude = %w(defaults recipes)
 
-          Dir["#{config_path}/apps/#{app}/*"].map do |env|
+          Dir["#{config_app_path(app)}/*"].sort.map do |env|
             env_name = File.basename(env, '.rb')
 
-            env_name if environments.include?(env_name)
+            env_name unless exclude.include?(env_name)
           end.compact
         end
 
-        def time_to_deploy
-          @now ||= Time.now.strftime("%Y-%m-%d-%H%M%S-s#{rand(9999)}")
+        def validate(app, stage)
+          app_path = config_app_path(app)
+          stage_path = config_stage_path(app, stage)
+
+          raise(ArgumentError) unless File.exists?(app_path) && File.exists?(stage_path)
         end
       end
     end

data/lib/pulsar/helpers/path.rb

@@ -0,0 +1,46 @@
+module Pulsar
+  module Helpers
+    module Path
+      def capfile_path
+        @capfile_name ||= "#{tmp_dir}/capfile-#{time_to_deploy}"
+      end
+
+      def config_path
+        @configuration_path ||= "#{tmp_dir}/conf-repo-#{time_to_deploy}"
+      end
+
+      def config_app_path(app)
+        "#{config_apps_path}/#{app}"
+      end
+
+      def config_app_defaults_path(app)
+        "#{config_app_path(app)}/defaults.rb"
+      end
+
+      def config_app_recipes_path(app)
+        "#{config_app_path(app)}/recipes"
+      end
+
+      def config_app_stage_recipes_path(app, stage)
+        "#{config_app_recipes_path(app)}/#{stage}"
+      end
+
+      def config_apps_path
+        "#{config_path}/apps"
+      end
+
+      def config_base_path
+        "#{config_apps_path}/base.rb"
+      end
+
+      def config_stage_path(app, stage)
+        "#{config_app_path(app)}/#{stage}.rb"
+      end
+
+      private
+      def time_to_deploy
+        @now ||= Time.now.strftime("%Y-%m-%d-%H%M%S-s#{rand(9999)}")
+      end
+    end
+  end
+end

data/lib/pulsar/version.rb

@@ -1,3 +1,3 @@
 module Pulsar
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/pulsar.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency "bundler", "~> 1.2"
   gem.add_dependency "colored", "~> 1.2"
 
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec", "~> 2.12"
-  gem.add_development_dependency "rr", "~> 1.0"
-  gem.add_development_dependency "coveralls", "~> 0.6.3"
+  gem.add_development_dependency "rake", "10.0.4"
+  gem.add_development_dependency "rspec", "2.12.0"
+  gem.add_development_dependency "rr", "1.0.4"
+  gem.add_development_dependency "coveralls", "0.6.3"
 end

data/spec/pulsar/commands/list_spec.rb

@@ -23,14 +23,13 @@ describe Pulsar::ListCommand do
     app_one = Regexp.escape("dummy_app".cyan)
     app_two = Regexp.escape("other_dummy_app".cyan)
     
-    stages = [ "production".magenta, "staging".magenta ]
+    stages = [ "custom_stage".magenta, "production".magenta, "staging".magenta ]
     escaped_stages = Regexp.escape(stages.join(', '))
-    reversed_stages = Regexp.escape(stages.reverse.join(', '))
 
     pulsar.run(full_list_args)
 
-    stdout.should match(/#{app_one}: (#{escaped_stages})|(#{reversed_stages})/)
-    stdout.should match(/#{app_two}: (#{escaped_stages})|(#{reversed_stages})/)
+    stdout.should match(/#{app_one}: #{escaped_stages}/)
+    stdout.should match(/#{app_two}: #{escaped_stages}/)
   end
 
   it "reads configuration variables from .pulsar file in home" do

data/spec/pulsar/commands/main_spec.rb

@@ -101,6 +101,14 @@ describe Pulsar::MainCommand do
     end
   end
 
+  it "errors out if application does not exist in configuration repository" do
+    expect { pulsar.run(full_cap_args + %w(non_existant_app production)) }.to raise_error(ArgumentError)
+  end
+
+  it "errors out if stage does not exist in configuration repository" do
+    expect { pulsar.run(full_cap_args + dummy_app(:non_existant_stage)) }.to raise_error(ArgumentError)
+  end
+
   context "Capfile" do
     it "uses base.rb in staging stage" do
       pulsar.run(full_cap_args + dummy_app(:staging))
@@ -259,5 +267,11 @@ describe Pulsar::MainCommand do
 
       latest_capfile.should include("logger.level = logger.level = Capistrano::Logger::DEBUG")
     end
+
+    it "supports Capistrano TRACE" do
+      pulsar.run(full_cap_args + %w(--log-level trace) + dummy_app)
+
+      latest_capfile.should include("logger.level = logger.level = Capistrano::Logger::TRACE")
+    end
   end
 end

data/spec/support/dummies/dummy_conf/apps/dummy_app/custom_stage.rb

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

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulsar
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-12 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -65,55 +65,55 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.0.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.6.3
   type: :development
@@ -121,7 +121,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.6.3
 description: Manage your Capistrano deployments with ease
@@ -165,6 +165,7 @@ files:
 - lib/pulsar/helpers/all.rb
 - lib/pulsar/helpers/capistrano.rb
 - lib/pulsar/helpers/clamp.rb
+- lib/pulsar/helpers/path.rb
 - lib/pulsar/helpers/shell.rb
 - lib/pulsar/options/all.rb
 - lib/pulsar/options/conf_repo.rb
@@ -182,12 +183,14 @@ files:
 - spec/support/dummies/dummy_app/config.ru
 - spec/support/dummies/dummy_conf/Gemfile
 - spec/support/dummies/dummy_conf/apps/base.rb
+- spec/support/dummies/dummy_conf/apps/dummy_app/custom_stage.rb
 - spec/support/dummies/dummy_conf/apps/dummy_app/defaults.rb
 - spec/support/dummies/dummy_conf/apps/dummy_app/production.rb
 - spec/support/dummies/dummy_conf/apps/dummy_app/recipes/custom_recipe.rb
 - 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/custom_stage.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
@@ -209,7 +212,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 882451203726848959
+      hash: 2226446731285894531
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -218,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 882451203726848959
+      hash: 2226446731285894531
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -239,12 +242,14 @@ test_files:
 - spec/support/dummies/dummy_app/config.ru
 - spec/support/dummies/dummy_conf/Gemfile
 - spec/support/dummies/dummy_conf/apps/base.rb
+- spec/support/dummies/dummy_conf/apps/dummy_app/custom_stage.rb
 - spec/support/dummies/dummy_conf/apps/dummy_app/defaults.rb
 - spec/support/dummies/dummy_conf/apps/dummy_app/production.rb
 - spec/support/dummies/dummy_conf/apps/dummy_app/recipes/custom_recipe.rb
 - 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/custom_stage.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