rake-funnel 0.16.1 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15c93cd453fd3a4cb44ff99fecb8b9e12501bab0
-  data.tar.gz: 2b6ccf54a20198fb9b1c05cdb8c6ae9425b53040
+  metadata.gz: af6a3384beef14d765b3deeb68f46bc6e9075753
+  data.tar.gz: 56a85fbb32a083c02f329c2c379a46b91fd312b7
 SHA512:
-  metadata.gz: 4cabea259d82d608fdf27acfdc6e24f2ff085805abf698dbb5b58c15d2281857d56fff1af83c7b463967f9f0478caff3732436fc436fecf18546ee5dd68cf45b
-  data.tar.gz: 6d3f30c6d8570a6c4f501d00c998add9dc75142aa50b933f38891a0dfa4f2a5131885a0b46b4dc8a9dd97c888b8ae0cbd2619648a85239688cdf9602b2eaf262
+  metadata.gz: fcf794c4853b54485436d3d102d2edc58e61840de0e72965af8d6ef2d395c6afe49110b97a04c94ebab5d222f8f1ddcb6c46f251b63098a49a4e9b46494fd2db
+  data.tar.gz: e3ae2368bd27d0c25b78eb46ba4d2ebf1c216623041629e93e91ce98dc34b10e937459c12e45338dbaf3a26d0e7617971da94b4d2dc2f9e5e268ecc4f058f9d6

data/lib/rake/funnel/tasks/bin_path.rb

@@ -4,7 +4,7 @@ module Rake
   module Funnel
     module Tasks
       class BinPath < Rake::TaskLib
-        attr_accessor :name, :search_pattern
+        attr_accessor :name, :search_pattern, :path_modifier
 
         def initialize(*args, &task_block)
           setup_ivars(args)
@@ -16,6 +16,7 @@ module Rake
         def setup_ivars(args)
           @name = args.shift || :bin_path
           @search_pattern = %w(tools/* tools/*/bin packages/**/tools)
+          @path_modifier = proc { |paths| paths }
         end
 
         def define(args, &task_block)
@@ -26,7 +27,7 @@ module Rake
 
             next unless paths.any?
 
-            add_pattern_to_path_environment(paths)
+            prepend_pattern_to_path_environment(paths)
             Rake.rake_output_message 'Added the following paths to the PATH environment variable:'
             paths.each do |p|
               Rake.rake_output_message "  - #{p}"
@@ -37,10 +38,12 @@ module Rake
         end
 
         def paths
-          @paths ||= Dir[*search_pattern].map { |path| File.expand_path(path) }.sort
+          @paths ||= @path_modifier.call(Dir[*search_pattern])
+                                   .map { |path| File.expand_path(path) }
+                                   .sort
         end
 
-        def add_pattern_to_path_environment(paths)
+        def prepend_pattern_to_path_environment(paths)
           ENV['PATH'] = ([] << paths << ENV['PATH']).flatten.join(File::PATH_SEPARATOR)
           paths
         end

data/lib/rake/funnel/version.rb

@@ -1,5 +1,5 @@
 module Rake
   module Funnel
-    VERSION = '0.16.1'
+    VERSION = '0.17.0'.freeze
   end
 end

data/spec/rake/funnel/tasks/bin_path_spec.rb

@@ -13,6 +13,7 @@ describe Rake::Funnel::Tasks::BinPath do
   describe 'execution' do
     let(:default_path) { 'default PATH contents' }
     let(:search_pattern) { %w(foo bar) }
+    let(:path_modifier) { nil }
 
     before {
       allow(ENV).to receive(:[]).with('PATH').and_return(default_path)
@@ -23,6 +24,7 @@ describe Rake::Funnel::Tasks::BinPath do
     subject {
       described_class.new do |t|
         t.search_pattern = search_pattern
+        t.path_modifier = path_modifier unless path_modifier.nil?
       end
     }
 
@@ -49,6 +51,33 @@ describe Rake::Funnel::Tasks::BinPath do
         expect(Rake).to have_received(:rake_output_message).with(%r|/foo$|)
         expect(Rake).to have_received(:rake_output_message).with(%r|/bar$|)
       end
+
+      describe 'path modifier' do
+        context 'adding paths' do
+          let(:path_modifier) { proc { |paths| paths.push('added path') } }
+
+          it 'adds extra paths' do
+            expect(ENV).to have_received(:[]=).with('PATH',/added path/)
+          end
+
+          it 'retains other paths' do
+            expect(ENV).to have_received(:[]=).with('PATH', /foo/)
+            expect(ENV).to have_received(:[]=).with('PATH', /bar/)
+          end
+        end
+
+        context 'rejecting paths' do
+          let(:path_modifier) { proc { |paths| paths.reject { |p| p =~ /foo/ } } }
+
+          it 'removes matching paths' do
+            expect(ENV).not_to have_received(:[]=).with('PATH', /foo/)
+          end
+
+          it 'retains non-matching paths' do
+            expect(ENV).to have_received(:[]=).with('PATH', /bar/)
+          end
+        end
+      end
     end
 
     context 'no paths to add' do
@@ -63,6 +92,10 @@ describe Rake::Funnel::Tasks::BinPath do
       it 'should not print message' do
         expect(Rake).not_to have_received(:rake_output_message)
       end
+
+      it 'should not set environment variable' do
+        expect(ENV).not_to have_received(:[]=).with('PATH')
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-funnel
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.17.0
 platform: ruby
 authors:
 - Alexander Groß
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake