rake-funnel 0.6.1.pre → 0.7.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae05bed046eb3b73a76819bbda79a6c4bf036c3f
-  data.tar.gz: 900d5509ec9c9408a5f6ebe3b457501f0f9c2e3a
+  metadata.gz: d6defad9023eeda6c378f699947d46e1f8a29896
+  data.tar.gz: d2a706ac662b8bd2d5cb21b9f631dbd53f2ca937
 SHA512:
-  metadata.gz: 939ba39f9f7b4fb606c533e8456bae1cc2983d5eea0f844e767018004f00432588015339be09daee7bafd7e0d6136a709a7c173d7c0ebdf3415328dd145f9f59
-  data.tar.gz: 32694b789d2aabeac684d79396ed0dd48606ed6a081b0d1c0725ff684bbc0dce1e6ff29a31031730e69ac3f4b88113a310a1df5e709feb52f66d060700d0b800
+  metadata.gz: 2ccd1cd9867b67b590a8bdb1febd0b32b4774c18a6f864c9aa546324610ef0682311dbbb8a9382c938cfe67afee099c9a56f9ad4ca87d0dfd35c423c9a5a468f
+  data.tar.gz: f6d3e1aa1825ee501c9d13879fc6cb0d6ed21d3d5b17f1ba0dd800f988e30ebc49539775bd41dd2f66bbf38f7fecde6497f3c1bc1c1eab75bc916777573ffe68

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

@@ -21,6 +21,7 @@ module Rake
 
             def escape(string)
               string
+                .to_s
                 .gsub(/\|/, '||')
                 .gsub(/'/, "|'")
                 .gsub(/\r/, '|r')
@@ -35,8 +36,8 @@ module Rake
             def escaped_array_of(args)
               return [] if args.nil?
 
-              return "'#{escape args}'" unless args.is_a?(Hash)
-              args.map { |key, value| "#{key.camelize}='#{escape value.to_s}'" }
+              return "'#{escape(args)}'" unless args.is_a?(Hash)
+              args.map { |key, value| "#{key.camelize}='#{escape(value.to_s)}'" }
             end
           end
         end

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

@@ -14,6 +14,10 @@ module Rake
           define(args, &task_block)
         end
 
+        def next_to_source(language, _version_info, source)
+          File.join(File.dirname(source), "VersionInfo.#{language}")
+        end
+
         private
         def setup_ivars(args)
           @name = args.shift || :version
@@ -21,7 +25,9 @@ module Rake
           @language = :cs
           @source = :FromVersionFiles
           @source_args = {}
-          @target_path = next_to_version_file
+          @target_path = proc { |language, version_info, source|
+            next_to_source(language, version_info, source)
+          }
         end
 
         def define(args, &task_block)
@@ -34,10 +40,6 @@ module Rake
             writer.write(target_path, language)
           end
         end
-
-        def next_to_version_file
-          proc { |language, _version_info, source| File.join(File.dirname(source), "VersionInfo.#{language}") }
-        end
       end
     end
   end

data/lib/rake/funnel/version.rb

@@ -1,5 +1,5 @@
 module Rake
   module Funnel
-    VERSION = '0.6.1.pre'
+    VERSION = '0.7.0.pre'
   end
 end

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

@@ -108,9 +108,17 @@ describe Rake::Funnel::Integration::TeamCity::ServiceMessages do
         end
       end
 
+      context 'when reporting a message with an unnamed non-string parameter' do
+        it 'should print the service message' do
+          described_class.progress_message 42
+
+          expect($stdout).to have_received(:puts).with("##teamcity[progressMessage '42']")
+        end
+      end
+
       context 'when reporting a message with a named parameter' do
         it 'should print the service message' do
-          described_class.block_opened({ name: 'block name' })
+          described_class.block_opened(name: 'block name')
 
           expect($stdout).to have_received(:puts).with("##teamcity[blockOpened name='block name']")
         end
@@ -118,7 +126,7 @@ describe Rake::Funnel::Integration::TeamCity::ServiceMessages do
 
       context 'when reporting a message with multiple named parameters' do
         it 'should print the service message' do
-          described_class.test_started ({ name: 'test name', captureStandardOutput: true })
+          described_class.test_started(name: 'test name', captureStandardOutput: true)
 
           expect($stdout).to have_received(:puts).with("##teamcity[testStarted name='test name' captureStandardOutput='true']")
         end
@@ -126,7 +134,7 @@ describe Rake::Funnel::Integration::TeamCity::ServiceMessages do
 
       context 'when reporting a message with Ruby-style named parameters' do
         it 'should print the service message' do
-          described_class.test_started ({ capture_standard_output: true })
+          described_class.test_started(capture_standard_output: true)
 
           expect($stdout).to have_received(:puts).with("##teamcity[testStarted captureStandardOutput='true']")
         end

data/spec/rake/funnel/support/specs_remover/project/paket.references

@@ -1,3 +1,3 @@
-Paket-Ref
-Explicitly-Removed-Package
-Untouched
+Paket-Ref
+Explicitly-Removed-Package
+Untouched

data/spec/rake/funnel/support/specs_remover/project/uncompiled-code/paket.references

@@ -1,3 +1,3 @@
-Paket-Ref
-Explicitly-Removed-Package
-Untouched
+Paket-Ref
+Explicitly-Removed-Package
+Untouched

data/spec/rake/funnel/support/specs_remover/project-specific paket.references/Sample.csproj.paket.references

@@ -1,3 +1,3 @@
-Paket-Ref
-Explicitly-Removed-Package
-Untouched
+Paket-Ref
+Explicitly-Removed-Package
+Untouched

data/spec/rake/funnel/support/specs_remover/project-specific paket.references/paket.references

@@ -1,3 +1,3 @@
-Paket-Ref
-Explicitly-Removed-Package
-Untouched
+Paket-Ref
+Explicitly-Removed-Package
+Untouched

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

@@ -14,6 +14,12 @@ describe Rake::Funnel::Tasks::AssemblyVersion do
     its(:target_path) { should be_an_instance_of(Proc) }
   end
 
+  describe '#next_to_source' do
+    it 'should place VersionInfo next to source' do
+      expect(described_class.new.next_to_source(:cs, {}, 'blah/VERSION')).to eq('blah/VersionInfo.cs')
+    end
+  end
+
   describe 'execution' do
     let(:writer) { instance_double(AssemblyVersionWriter).as_null_object }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-funnel
 version: !ruby/object:Gem::Version
-  version: 0.6.1.pre
+  version: 0.7.0.pre
 platform: ruby
 authors:
 - Alexander Groß