borg-rb 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWZmNWNmZDM1M2Y1YzdlNGIwNzQ4ZmJlNGI0NTVlMTMyODAyMTNiYw==
+    YTU2Mzc2MGFjZTM4Nzg3M2FhNGM5NTQwMjNhMTkwNTI2MGMxM2VlOA==
   data.tar.gz: !binary |-
-    OTU4ZDg4MTQ3NjlkYjkyZTFhMWJmNTdhOTI2MWYyNWRmZDRmMzZlNA==
+    NTk4NGZjNzEyOWJhZGM2MDUyYzMxOWRhMGNiODZiODFhZGY0NDdlYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTJjNmY1MjVhMTEzY2RlNWE5ZmI0ZTVlYWQ1OGE1OWFkMWM0ZjU5ZDZkOTRj
-    ZmFhNzY5ODE4MjBhNTQ3MTkwOWMzNjk0OGY1YjM4MDE5NWIzYjJmNTY1ZWEz
-    ZDRmMjkyM2IwZDcyZGYzYzA5MWYzNDEyZmU3MGE0NzhiNDcxNjQ=
+    Y2Q1MzlmMmIwNjFlZDYzZDQwYjZjYTdmYWNkMTFhMGM3OWY3YWE5MTFhY2Rh
+    ZDQ3MDZmNTlmZjNhYjE5OWMwODcxNDJmOGRmNGJmMDJmYjEzMDMxMjMxYzZi
+    MWRhMzdjZGMzNzhhMmYzYWY0ZTljYWViYTEzODBmYjBiNTQzODA=
   data.tar.gz: !binary |-
-    NjA5ZDBhMGU2ZmI0ODkwNTI0ZjI0OGU4YzlmNmQyMDc3ZjFhMTUxODBlMGUy
-    MmFmOTc5ZjE1ZjljZjA0MTIwOWIwOGE2ZTJiMTY4ZTVlYzg4YWM0ZDYwYTc5
-    Mzk2OWQ1ZmU2YWIzYWEzZWNmMjZlN2I0YzY0NTgyZjA4NDhjNzI=
+    MDE3ZjBmYTVmNTFmYTY0ZTZjMzJkNzIxOTJlNjQ5NTU1YjMyNjRiNzJlMGU1
+    YzQ2M2FhN2IyZjgyOWZiMGViM2RmMzQ2ZGNlZDBmMGE3YjMwMGI3ZDM3ZTQz
+    NzQxOTExZmUyNmFmNzRjZjhiNWU2OWI1ZTQ2N2I5OTM0MzJhZWY=

data/CHANGELOG.md

@@ -1,10 +1,11 @@
 ## HEAD
 
-## 0.0.4 / 3-22-2013
-
-* Fix load problem in Capfile in generated skeleton (0.0.2)
+## 0.0.5 / 3-27-2013
+* Allow stage definitions with empty blocks
+* Allow access to `application` and `stage` in an application configuration by creating a capistrano variable for them (0.0.4)
 * Change load borg-rb to a require (0.0.3)
-* Allow access to `application` and `stage` in an application configuration by creating a capistrano variable for them
+* Fix load problem in Capfile in generated skeleton (0.0.2)
+
 
 
 ## 0.0.1 / 3-21-2013

data/lib/borg/configuration/stages.rb

@@ -13,7 +13,7 @@ module Borg
           end
         end
         @applications[app].stages[name] ||= Stage.new(name, @applications[app])
-        @applications[app].stages[name].execution_blocks << block
+        @applications[app].stages[name].execution_blocks << block if block_given?
       end
 
       class Stage

data/lib/borg/version.rb

@@ -1,3 +1,3 @@
 module Borg
-  VERSION = "0.0.4"
+  VERSION = '0.0.5'
 end

data/spec/acceptance/application_spec.rb

@@ -3,65 +3,42 @@ require 'spec_helper'
 describe 'borg app:stage task' do
   include_context 'acceptance'
 
-  # TODO: probably want to have some factory that generates what we want in an app config to DRY this out
-  let(:basic_app_config) {
-    <<-RUBY
-application :app do
-  task :some_task do
-  end
-end
-    RUBY
-  }
-
-  let(:app_config_with_stages) {
-    <<-RUBY
-application :app do
-  task :common_task do
-  end
-end
-stage :app, :prd do
-  task :prd_task do
-  end
-end
-stage :app, :stg do
-  task :stg_task do
-  end
-end
-    RUBY
-  }
-
-  let(:app_config_with_display_app_task) {
-    <<-RUBY
-application :app do
-  task :display_app do
-    puts "The application is set to: \#{application}"
-  end
-end
-    RUBY
+  let(:app_config) { <<-RUBY.gsub(/^ {4}/, '')
+    application :app do
+      task :app_task do
+      end
+      task :display_app do
+        puts "The application is set to: \#{application}"
+      end
+    end
+  RUBY
   }
 
-  let(:app_config_with_stage_with_display_app_task) {
-    <<-RUBY
-stage :app, :prd do
-  task :display_app do
-    puts "The application is set to: \#{application}"
-  end
-end
-    RUBY
+  let(:app_config_with_stages) { app_config.concat <<-RUBY.gsub(/^ {6}/, '')
+    stage :app, :prd do
+      task :prd_task do
+      end
+    end
+    stage :app, :stg do
+      task :stg_task do
+      end
+    end
+    stage :app, :alf
+  RUBY
   }
 
   before do
     assert_execute('borgify')
   end
 
-  context "app with no stages" do
+  context 'app with no stages' do
     before do
-      environment.create_file('cap/applications/app.rb', basic_app_config)
+      environment.create_file('cap/applications/app.rb', app_config)
     end
 
-    it "allows us to run tasks for that app" do
+    it 'allows us to execute tasks defined for the app' do
       # a task defined for the app
-      assert_execute('borg', 'app', 'some_task')
+      assert_execute('borg', 'app', 'app_task')
 
       # an undefined task
       expect(execute('borg', 'app', 'undefined_task')).to_not succeed
@@ -69,17 +46,23 @@ end
       # an undefined app
       expect(execute('borg', 'undefined_app', 'some_task')).to_not succeed
     end
+
+    it 'can read the `application` capistrano variable' do
+      result = execute('borg', 'app', 'display_app')
+      expect(result.stdout).to match(/The application is set to: app/)
+    end
   end
 
-  context "app with stages: prd, stg" do
+  context 'app config with stages: prd, stg' do
     before do
       environment.create_file('cap/applications/app.rb', app_config_with_stages)
     end
 
-    it "allows us to set common/stage-specific tasks" do
+    it 'allows us to execute common/stage-specific tasks' do
       # commonly defined tasks
-      assert_execute('borg', 'app:prd', 'common_task')
-      assert_execute('borg', 'app:stg', 'common_task')
+      assert_execute('borg', 'app:prd', 'app_task')
+      assert_execute('borg', 'app:stg', 'app_task')
+      assert_execute('borg', 'app:alf', 'app_task')
 
       # stage specific tasks in their respective stages
       assert_execute('borg', 'app:prd', 'prd_task')
@@ -89,27 +72,10 @@ end
       expect(execute('borg', 'app:stg', 'prd_task')).to_not succeed
       expect(execute('borg', 'app:prd', 'stg_task')).to_not succeed
     end
-  end
-
-  context 'app with a task `display_app` which prints `application`' do
-    before do
-      environment.create_file('cap/applications/app.rb', app_config_with_display_app_task)
-    end
 
-    it 'the task prints `app`' do
-      result = execute('borg', 'app', 'display_app')
-      expect(result.stdout).to match(/The application is set to: app/)
-    end
-  end
-
-  context 'app with stages: prd, and a task `display_app` which prints `application`' do
-    before do
-      environment.create_file('cap/applications/app.rb', app_config_with_stage_with_display_app_task)
-    end
-
-    it 'the task prints `app`' do
-      result = execute('borg', 'app:prd', 'display_app')
-      expect(result.stdout).to match(/The application is set to: app/)
+    it 'can read the `application` capistrano variable' do
+      expect(execute('borg', 'app:prd', 'display_app').stdout).to match(/The application is set to: app/)
+      expect(execute('borg', 'app:stg', 'display_app').stdout).to match(/The application is set to: app/)
     end
   end
 

data/spec/acceptance/stage_spec.rb

@@ -3,14 +3,18 @@ require 'spec_helper'
 describe 'borg app:stage task' do
   include_context 'acceptance'
 
-  let(:stage_test_config) {
-    <<-RUBY
-stage :app, :prd do
-  task :display_stage do
-    puts "The stage is set to: \#{stage}"
-  end
-end
-    RUBY
+  let(:app_config) { <<-RUBY.gsub(/^ {4}/, '')
+    stage :app, :prd do
+      task :display_stage do
+        puts "The stage is set to: \#{stage}"
+      end
+    end
+    stage :app, :stg do
+      task :display_stage do
+        puts "The stage is set to: \#{stage}"
+      end
+    end
+  RUBY
   }
 
   before do
@@ -19,12 +23,14 @@ end
 
   context 'app with stages: prd, and a task `display_stage` which prints `stage`' do
     before do
-      environment.create_file('cap/applications/app.rb', stage_test_config)
+      environment.create_file('cap/applications/app.rb', app_config)
     end
 
-    it 'the task prints `prd`' do
+    it 'the task prints `prd` for app:prd, and `stg` for app:stg' do
       result = execute('borg', 'app:prd', 'display_stage')
       expect(result.stdout).to match(/The stage is set to: prd/)
+      result = execute('borg', 'app:stg', 'display_stage')
+      expect(result.stdout).to match(/The stage is set to: stg/)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: borg-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Identified