feat(block): build env branch with block

Author: sanemat

lib/env_branch.rb

@@ -2,7 +2,7 @@
 require 'env_branch/version'
 
 module EnvBranch
-  def self.new
-    Base.new
+  def self.new(&block)
+    Base.new(&block)
   end
 end

lib/env_branch/base.rb

@@ -2,8 +2,13 @@ module EnvBranch
   class Base
     attr_reader :branch_name
 
-    def initialize
-      @branch_name = fetch_branch_name
+    def initialize(&block)
+      @branch_name =
+        if block_given?
+          block.call || fetch_branch_name
+        else
+          fetch_branch_name
+        end
     end
 
     # travis-ci.org:

test/test_own_ci.rb

@@ -25,6 +25,117 @@ def self.shutdown
           end
         end
       end
+      sub_test_case 'with block' do
+        test '#branch?' do
+          assert do
+            EnvBranch.new do
+              if ENV['USER_DEFINED_BRANCH'] && !ENV['USER_DEFINED_BRANCH'].empty?
+                ENV['USER_DEFINED_BRANCH']
+              end
+            end.branch? == false
+          end
+        end
+        test '#branch_name' do
+          assert do
+            EnvBranch.new do
+              if ENV['USER_DEFINED_BRANCH'] && !ENV['USER_DEFINED_BRANCH'].empty?
+                ENV['USER_DEFINED_BRANCH']
+              end
+            end.branch_name.nil?
+          end
+        end
+      end
+    end
+
+    sub_test_case 'own ci' do
+      branch_name = 'your-branch'
+      setup do
+        ENV['USER_DEFINED_BRANCH'] = branch_name
+      end
+      teardown do
+        ENV.delete 'USER_DEFINED_BRANCH'
+      end
+
+      sub_test_case 'with block' do
+        test '#branch?' do
+          assert do
+            EnvBranch.new do
+              if ENV['USER_DEFINED_BRANCH'] && !ENV['USER_DEFINED_BRANCH'].empty?
+                ENV['USER_DEFINED_BRANCH']
+              end
+            end.branch? == true
+          end
+        end
+        test '#branch_name' do
+          assert do
+            EnvBranch.new do
+              if ENV['USER_DEFINED_BRANCH'] && !ENV['USER_DEFINED_BRANCH'].empty?
+                ENV['USER_DEFINED_BRANCH']
+              end
+            end.branch_name == branch_name
+          end
+        end
+      end
+
+      sub_test_case 'superior user definition' do
+        env_branch = 'env-branch'
+        setup do
+          ENV['TRAVIS_BRANCH'] = env_branch
+        end
+        teardown do
+          ENV.delete 'TRAVIS_BRANCH'
+        end
+        test '#branch?' do
+          assert do
+            EnvBranch.new do
+              if ENV['USER_DEFINED_BRANCH'] && !ENV['USER_DEFINED_BRANCH'].empty?
+                ENV['USER_DEFINED_BRANCH']
+              end
+            end.branch? == true
+          end
+        end
+        test '#branch_name' do
+          assert do
+            EnvBranch.new do
+              if ENV['USER_DEFINED_BRANCH'] && !ENV['USER_DEFINED_BRANCH'].empty?
+                ENV['USER_DEFINED_BRANCH']
+              end
+            end.branch_name == branch_name
+          end
+        end
+      end
+
+      sub_test_case 'complex case with travis-ci' do
+        branch_name = 'your-branch'
+        setup do
+          ENV['TRAVIS_BRANCH'] = branch_name
+        end
+
+        teardown do
+          ENV.delete 'TRAVIS_BRANCH'
+        end
+
+        sub_test_case 'with block' do
+          test '#branch?' do
+            assert do
+              EnvBranch.new do
+                if ENV['USER_DEFINED_BRANCH'] && !ENV['USER_DEFINED_BRANCH'].empty?
+                  ENV['USER_DEFINED_BRANCH']
+                end
+              end.branch? == true
+            end
+          end
+          test '#pull_request_id' do
+            assert do
+              EnvBranch.new do
+                if ENV['USER_DEFINED_BRANCH'] && !ENV['USER_DEFINED_BRANCH'].empty?
+                  ENV['USER_DEFINED_BRANCH']
+                end
+              end.branch_name == branch_name
+            end
+          end
+        end
+      end
     end
   end
 end