rake-funnel 0.7.0.pre → 0.8.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6defad9023eeda6c378f699947d46e1f8a29896
-  data.tar.gz: d2a706ac662b8bd2d5cb21b9f631dbd53f2ca937
+  metadata.gz: 76e33792436ca221a9d1b5ec6572d7dadd2ac3af
+  data.tar.gz: 4d856be39020bd11358c0a74fa0fa214c406891c
 SHA512:
-  metadata.gz: 2ccd1cd9867b67b590a8bdb1febd0b32b4774c18a6f864c9aa546324610ef0682311dbbb8a9382c938cfe67afee099c9a56f9ad4ca87d0dfd35c423c9a5a468f
-  data.tar.gz: f6d3e1aa1825ee501c9d13879fc6cb0d6ed21d3d5b17f1ba0dd800f988e30ebc49539775bd41dd2f66bbf38f7fecde6497f3c1bc1c1eab75bc916777573ffe68
+  metadata.gz: 31032a16b781db6847645733f160ff733f248d58b0d23d433970e3e8a76a3adaa7a8515f638a00fe7ea4a51d97d2593ccf9c9cc019a425c4f73a50f2d491243b
+  data.tar.gz: c7be402ab2563c1aa1d52bff0610d700ffd7afc57ba357687539a6f480355dbac53e525a1edeeb11f21b8747e7c30f08b78be20abae47325c2d7e7b34ba5f422

data/lib/rake/funnel/support/specs_remover.rb

@@ -20,38 +20,55 @@ module Rake
             private
             def remove(projects, references, specs)
               Dir[*projects].map do |project|
-                xml = REXML::Document.new(File.read(project), attribute_quote: :quote)
-                references = remove_references(references, xml)
-                specs = remove_specs(specs, xml)
+                Trace.message("Processing #{project} with references #{references} and specs #{specs}")
 
-                save(project, xml) if (references + specs).any?
+                removed_references, removed_specs = with_document(project) do |xml|
+                  [remove_references(references, xml), remove_specs(specs, xml)]
+                end
 
                 {
                   project: project,
-                  packages: resolve_package_names(references),
-                  specs: resolve_paths(project, specs)
+                  packages: resolve_package_names(removed_references),
+                  specs: resolve_paths(project, removed_specs)
                 }
               end
             end
 
+            def with_document(project)
+              xml = REXML::Document.new(File.read(project), attribute_quote: :quote)
+
+              removed = yield(xml) if block_given?
+
+              save(project, xml) if [removed].flatten.compact.any?
+
+              removed
+            end
+
             def remove_references(references, xml)
-              deleted = references.map do |ref|
+              deleted = references.map { |ref|
                 query = "/Project//Reference[starts-with(lower-case(@Include), '#{ref.downcase}')]"
                 xml.elements.delete_all(query)
-              end
+              }
+                .flatten
+                .tap { |d| Trace.message("Removed references: #{d.inspect}") }
 
-              deleted.flatten.map { |d|
+              deleted.map { |d|
                 d.get_elements('/HintPath').map(&:text)
-              }.flatten
+              }
+                .flatten
+                .tap { |d| Trace.message("HintPaths: #{d}") }
             end
 
             def remove_specs(specs, xml)
-              deleted = specs.map do |glob|
+              deleted = specs.map { |glob|
                 query = "/Project//Compile[matches(lower-case(@Include), '#{glob}')]"
                 xml.elements.delete_all(query)
-              end
+              }
 
-              deleted.flatten.map { |d| d.attributes['Include'] }
+              deleted
+                .flatten
+                .map { |d| d.attributes['Include'] }
+                .tap { |d| Trace.message("Removed specs: #{d}") }
             end
 
             def save(project, xml)
@@ -87,6 +104,8 @@ module Rake
             def remove_packages(projects, packages)
               projects.each do |project|
                 references = paket_references_for(project)
+                Trace.message("Found #{references || 'no paket.references'} for #{project}}")
+
                 next unless references
 
                 text = File.read(references)
@@ -105,6 +124,7 @@ module Rake
             end
 
             def remove(text, packages)
+              Trace.message("Removing packages: #{packages.inspect}")
               packages.each do |package|
                 text = text.gsub(/^#{package}.*\n?/i, '')
               end
@@ -119,9 +139,9 @@ module Rake
                                                                                  list(args[:references]),
                                                                                  list(args[:specs]))
 
-            delete(specs)
-
             PaketReferences.remove_packages(projects, list(args[:packages]) + packages)
+
+            delete(specs)
           end
 
           private

data/lib/rake/funnel/support/trace.rb

@@ -0,0 +1,15 @@
+module Rake
+  module Funnel
+    module Support
+      class Trace
+        class << self
+          def message(message)
+            return unless Rake.application.options.trace
+
+            Rake.rake_output_message(message)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rake/funnel/version.rb

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

data/spec/rake/funnel/support/specs_remover/multiple projects/Sample1.csproj

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Reference Include="Some-Ref">
+      <HintPath>somewhere\Sample-Ref.dll</HintPath>
+    </Reference>
+    <Reference Include="Ref-Without-HintPath" />
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="1Specs.cs" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="ignored">
+      <ItemGroup>
+        <Reference Include="Paket-Ref">
+          <HintPath>..\..\packages\Paket-Ref\lib\net451\Paket-Ref.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+      </ItemGroup>
+    </When>
+  </Choose>
+</Project>

data/spec/rake/funnel/support/specs_remover/multiple projects/Sample2.csproj

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Reference Include="Some-Ref">
+      <HintPath>somewhere\Sample-Ref.dll</HintPath>
+    </Reference>
+    <Reference Include="Ref-Without-HintPath" />
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="1Specs.cs" />
+  </ItemGroup>
+  <Choose>
+    <When Condition="ignored">
+      <ItemGroup>
+        <Reference Include="Paket-Ref">
+          <HintPath>..\..\packages\Paket-Ref\lib\net451\Paket-Ref.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+      </ItemGroup>
+    </When>
+  </Choose>
+</Project>

data/spec/rake/funnel/support/specs_remover/multiple projects/paket.references

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

data/spec/rake/funnel/support/specs_remover_spec.rb

@@ -1,4 +1,8 @@
 describe Rake::Funnel::Support::SpecsRemover do
+  before {
+    allow(Rake::Funnel::Support::Trace).to receive(:message)
+  }
+
   describe 'removal' do
     let(:projects) {}
     let(:references) {}
@@ -220,5 +224,30 @@ describe Rake::Funnel::Support::SpecsRemover do
         end
       end
     end
+
+    context 'multiple projects' do
+      let(:example) { 'multiple projects' }
+
+      before {
+        Dir.chdir(temp_dir) do
+          described_class.remove(projects: projects,
+                                 references: references,
+                                 specs: specs,
+                                 packages: packages)
+        end
+      }
+
+      describe 'projects' do
+        it 'should remove references' do
+          expect(content('Sample1.csproj')).not_to include(*references)
+          expect(content('Sample2.csproj')).not_to include(*references)
+        end
+
+        it 'should remove compiled specs' do
+          expect(content('Sample1.csproj')).not_to include(*%w(Specs.cs))
+          expect(content('Sample2.csproj')).not_to include(*%w(Specs.cs))
+        end
+      end
+    end
   end
 end

data/spec/rake/funnel/support/trace_spec.rb

@@ -0,0 +1,29 @@
+describe Rake::Funnel::Support::Trace do
+  before {
+    allow(Rake).to receive(:rake_output_message)
+  }
+
+  context 'Rake run with --trace' do
+    before {
+      allow(Rake.application.options).to receive(:trace).and_return(true)
+    }
+
+    it 'should write messages' do
+      described_class.message('foo')
+
+      expect(Rake).to have_received(:rake_output_message).with('foo')
+    end
+  end
+
+  context 'Rake run without --trace' do
+    before {
+      allow(Rake.application.options).to receive(:trace).and_return(false)
+    }
+
+    it 'should not write messages' do
+      described_class.message('foo')
+
+      expect(Rake).not_to have_received(:rake_output_message)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-funnel
 version: !ruby/object:Gem::Version
-  version: 0.7.0.pre
+  version: 0.8.0.pre
 platform: ruby
 authors:
 - Alexander Groß
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -126,6 +126,7 @@ files:
 - lib/rake/funnel/support/timing.rb
 - lib/rake/funnel/support/timing/report.rb
 - lib/rake/funnel/support/timing/statistics.rb
+- lib/rake/funnel/support/trace.rb
 - lib/rake/funnel/support/version_info.rb
 - lib/rake/funnel/support/which.rb
 - lib/rake/funnel/support/zipper.rb
@@ -172,6 +173,9 @@ files:
 - spec/rake/funnel/support/msbuild/build_tool_spec.rb
 - spec/rake/funnel/support/msdeploy/registry_patch_spec.rb
 - spec/rake/funnel/support/patch_spec.rb
+- spec/rake/funnel/support/specs_remover/multiple projects/Sample1.csproj
+- spec/rake/funnel/support/specs_remover/multiple projects/Sample2.csproj
+- spec/rake/funnel/support/specs_remover/multiple projects/paket.references
 - spec/rake/funnel/support/specs_remover/project-specific paket.references/Sample.csproj
 - spec/rake/funnel/support/specs_remover/project-specific paket.references/Sample.csproj.paket.references
 - spec/rake/funnel/support/specs_remover/project-specific paket.references/paket.references
@@ -187,6 +191,7 @@ files:
 - spec/rake/funnel/support/specs_remover_spec.rb
 - spec/rake/funnel/support/template_engine_spec.rb
 - spec/rake/funnel/support/timing/report_spec.rb
+- spec/rake/funnel/support/trace_spec.rb
 - spec/rake/funnel/support/version_info_spec.rb
 - spec/rake/funnel/support/which_spec.rb
 - spec/rake/funnel/support/zipper_spec.rb
@@ -257,6 +262,9 @@ test_files:
 - spec/rake/funnel/support/msbuild/build_tool_spec.rb
 - spec/rake/funnel/support/msdeploy/registry_patch_spec.rb
 - spec/rake/funnel/support/patch_spec.rb
+- spec/rake/funnel/support/specs_remover/multiple projects/Sample1.csproj
+- spec/rake/funnel/support/specs_remover/multiple projects/Sample2.csproj
+- spec/rake/funnel/support/specs_remover/multiple projects/paket.references
 - spec/rake/funnel/support/specs_remover/project-specific paket.references/Sample.csproj
 - spec/rake/funnel/support/specs_remover/project-specific paket.references/Sample.csproj.paket.references
 - spec/rake/funnel/support/specs_remover/project-specific paket.references/paket.references
@@ -272,6 +280,7 @@ test_files:
 - spec/rake/funnel/support/specs_remover_spec.rb
 - spec/rake/funnel/support/template_engine_spec.rb
 - spec/rake/funnel/support/timing/report_spec.rb
+- spec/rake/funnel/support/trace_spec.rb
 - spec/rake/funnel/support/version_info_spec.rb
 - spec/rake/funnel/support/which_spec.rb
 - spec/rake/funnel/support/zipper_spec.rb