rake-funnel 0.9.1.pre → 0.10.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 654127b97949b02eee869ea2a09be66f9f2a310d
-  data.tar.gz: 612b33cf3287735aa3a0cf5454188dae4266f299
+  metadata.gz: 31d63ccc013d1d0d30b8ffdadf10ca032863a551
+  data.tar.gz: 289eaa803667f90ac64813689ba365652528ff4c
 SHA512:
-  metadata.gz: 4551b61164ed3a434664ae5a81c975397617783407e0bcef7e937fe2822331299e79161fee40744c26833976111f3540a748bdcf7c302fd286c41c0fc164a3eb
-  data.tar.gz: a8ee0e0085f6f8bd9109669340ae4257919f97e906175190b977d507fd0641d141ad276b452e2a91a18b55ba0102f114be97ed03a7190e01791f79d0154d3301
+  metadata.gz: 0c732f352b946d9ac6ad642e89f0898763e34a63b0ad4acef6e8c40eb4fe1a90a8f9403c5ba0821b5881bd6782058ccf74956144d81bd1906eddd6ee2fbbacf6
+  data.tar.gz: 1d51ff492ae68c9e0aa17336d421520b444bdba2818d67c92c4f2a84092fe010441d4294146ba8d009caa2da851c7628b93c24b7dddf5a2b3aa66e521e1f6098

data/lib/rake/funnel/integration/teamcity/teamcity.rb

@@ -2,16 +2,37 @@ module Rake
   module Funnel
     module Integration
       module TeamCity
-        ENV_VAR = 'TEAMCITY_PROJECT_NAME'
+        PROJECT_ENV_VAR = 'TEAMCITY_PROJECT_NAME'
+        JRE_ENV_VAR = 'TEAMCITY_JRE'
 
         class << self
           def running?
-            ENV.include?(ENV_VAR)
+            ENV.include?(PROJECT_ENV_VAR)
           end
 
           def rake_runner?
             running? && Object.const_defined?('Rake') && Rake.const_defined?('TeamCityApplication')
           end
+
+          def with_java_runtime(&block)
+            return unless block_given?
+
+            begin
+              original_path = ENV['PATH']
+
+              ENV['PATH'] = ([] << ENV['PATH'] << teamcity_jre).compact.join(File::PATH_SEPARATOR)
+
+              block.call
+            ensure
+              ENV['PATH'] = original_path
+            end
+          end
+
+          private
+          def teamcity_jre
+            return nil unless ENV.include?(JRE_ENV_VAR)
+            File.join(ENV[JRE_ENV_VAR], 'bin')
+          end
         end
       end
     end

data/lib/rake/funnel/version.rb

@@ -1,5 +1,5 @@
 module Rake
   module Funnel
-    VERSION = '0.9.1.pre'
+    VERSION = '0.10.0.pre'
   end
 end

data/spec/rake/funnel/integration/teamcity/teamcity_spec.rb

@@ -1,34 +1,102 @@
 describe Rake::Funnel::Integration::TeamCity do
-  before {
-    allow(ENV).to receive(:include?).with(described_class::ENV_VAR).and_return(teamcity_running?)
-  }
+  describe 'runner detection' do
+    before {
+      allow(ENV).to receive(:include?).with(described_class::PROJECT_ENV_VAR).and_return(teamcity_running?)
+    }
 
-  context 'when running outside TeamCity' do
-    let(:teamcity_running?) { false }
+    context 'when running outside TeamCity' do
+      let(:teamcity_running?) { false }
 
-    it 'should not detect TeamCity' do
-      expect(described_class.running?).to eq(false)
+      it 'should not detect TeamCity' do
+        expect(described_class.running?).to eq(false)
+      end
+
+      it "should not detect TeamCity's rake runner" do
+        expect(described_class.rake_runner?).to eq(false)
+      end
     end
 
-    it "should not detect TeamCity's rake runner" do
-      expect(described_class.rake_runner?).to eq(false)
+    context 'when running inside TeamCity' do
+      let(:teamcity_running?) { true }
+
+      it 'should detect TeamCity' do
+        expect(described_class.running?).to eq(true)
+      end
+
+      it "should detect TeamCity's rake runner" do
+        module Rake
+          module TeamCityApplication
+          end
+        end
+
+        expect(described_class.rake_runner?).to eq(true)
+      end
     end
   end
 
-  context 'when running inside TeamCity' do
-    let(:teamcity_running?) { true }
+  describe '#with_java_runtime' do
+    let(:original_path) { 'original path environment variable contents' }
+    let(:jre) { nil }
+
+    before {
+      allow(ENV).to receive(:[]=)
+
+      allow(ENV).to receive(:[]).with('PATH').and_return(original_path)
+
+      allow(ENV).to receive(:include?).with(described_class::JRE_ENV_VAR).and_return(!jre.nil?)
+      allow(ENV).to receive(:[]).with(described_class::JRE_ENV_VAR).and_return(jre)
+    }
 
-    it 'should detect TeamCity' do
-      expect(described_class.running?).to eq(true)
+    context 'without block' do
+      it 'should not modify environment variables' do
+        described_class.with_java_runtime
+
+        expect(ENV).not_to have_received(:[]=)
+      end
     end
 
-    it "should detect TeamCity's rake runner" do
-      module ::Rake
-        module TeamCityApplication
+    context 'with block' do
+      context 'Java runtime environment variable does not exists' do
+        let(:jre) { nil }
+
+        it 'should yield to block' do
+          expect { |b| described_class.with_java_runtime(&b) }.to yield_with_no_args
+        end
+
+        it 'should not modify path' do
+          described_class.with_java_runtime {}
+
+          expect(ENV).not_to have_received(:[]=).with('PATH')
         end
       end
 
-      expect(described_class.rake_runner?).to eq(true)
+      context 'Java runtime environment variable exists' do
+        let(:jre) { 'path/to/JRE' }
+
+        it 'should yield to block' do
+          expect { |b| described_class.with_java_runtime(&b) }.to yield_with_no_args
+        end
+
+        it 'should add JRE to path' do
+          described_class.with_java_runtime {}
+
+          expect(ENV).to have_received(:[]=).with('PATH', /#{original_path}.#{jre}/)
+        end
+
+        it 'should reset path' do
+          described_class.with_java_runtime {}
+
+          expect(ENV).to have_received(:[]=).with('PATH', original_path)
+        end
+
+        context 'block error' do
+          it 'should reset path' do
+            expect { described_class.with_java_runtime { fail 'with some error' } }.to raise_error
+
+            expect(ENV).to have_received(:[]=).with('PATH', original_path)
+          end
+        end
+      end
     end
   end
 end

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

@@ -202,7 +202,6 @@ describe Rake::Funnel::Tasks::MSDeploy do
         }
 
         it 'should quote the string' do
-          args = '"path to/msdeploy" -"simple key":"simple value" -hash:"hash key 1"="hash value 1","hash key 2"="hash value 2" -array:"array value 1" -array:"array value 2" -"some flag"'
           args = %w(
             "path to/msdeploy"
             -"simple key":"simple value"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-funnel
 version: !ruby/object:Gem::Version
-  version: 0.9.1.pre
+  version: 0.10.0.pre
 platform: ruby
 authors:
 - Alexander Groß
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake