rake-funnel 0.5.0.pre → 0.6.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b802578d7663c71e143eeb59c653e9007c5e68a1
-  data.tar.gz: 4fdb2bd0f6685e3796b65e9d28231126bd611860
+  metadata.gz: 535c3b45f15be6cb85e22f33cf71f2214fe97a0f
+  data.tar.gz: 489d309fa5d644d037064c0b103a5ebce7cade4f
 SHA512:
-  metadata.gz: 4498c0b46d7ec90ecd91af78cb3a674f16490433253dd43181cfd64de3b559bd1228b9c371cffdafe0d03a3d0e77643217df6563fc3a0d14394b60ccf78a958b
-  data.tar.gz: d37bb5fdc8ff28b5351087deb011bf66f039e62d813a02851b67297093074efac7d4cdb44477d060e9ceb8604b95a021860c14d3c3f637d143f82bfb932b4259
+  metadata.gz: d48b0e5660651815e22d7c4eac304f482f6adee8a1c8254007f4a821af46b03edccf1998f4b5a8f31fd5b2b1a1e1b7bd22c8c5b62d25a2fb8dd5794514ba80d0
+  data.tar.gz: 405a237d1d9d951360b51affc78c47d13562b61dacbc65fa42e845cc58bdb6c2943f2bebe7aa5dc441d3aeda96a092fb4adc93045085fa5320fa1d5739ebcf67

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

@@ -1,78 +1,134 @@
+require 'pathname'
 require 'rexml/document'
 
 module Rake
   module Funnel
     module Support
       class SpecsRemover
-        class << self
-          def remove(args = {})
-            remove_specs_from_projects(args)
-            delete_test_files(args)
-            remove_paket_references(args)
-          end
+        class ProjectFiles
+          class << self
+            def remove_specs_and_references(projects, references, specs)
+              deleted = remove(projects, references, specs)
 
-          private
-          def remove_specs_from_projects(args)
-            projects(args).each do |project|
-              xml = REXML::Document.new(File.read(project), attribute_quote: :quote)
-              removed = remove_references(args, xml) + remove_specs(args, xml)
+              projects = deleted.map { |e| e[:project] }.flatten.uniq
+              packages = deleted.map { |e| e[:packages] }.flatten.uniq
+              specs = deleted.map { |e| e[:specs] }.flatten.uniq
 
-              write_xml(project, xml) if removed.flatten.any?
+              [projects, packages, specs]
             end
-          end
 
-          def remove_paket_references(args)
-            paket_references(args).each do |references|
-              text = File.read(references)
-              removed = remove_packages(text, args)
+            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)
 
-              File.write(references, removed) if removed != text
+                save(project, xml) if (references + specs).any?
+
+                {
+                  project: project,
+                  packages: resolve_package_names(project, references),
+                  specs: resolve_paths(project, specs)
+                }
+              end
             end
-          end
 
-          def delete_test_files(args)
-            Dir[*list(args[:specs])].uniq.each do |spec|
-              RakeFileUtils.rm(spec)
+            def remove_references(references, xml)
+              deleted = references.map do |ref|
+                query = "/Project//Reference[starts-with(lower-case(@Include), '#{ref.downcase}')]"
+                xml.elements.delete_all(query)
+              end
+
+              deleted.flatten.map { |d|
+                d.get_elements('/HintPath').map(&:text)
+              }.flatten
             end
-          end
 
-          def list(args)
-            ([] << args).flatten.compact
-          end
+            def remove_specs(specs, xml)
+              deleted = specs.map do |glob|
+                query = "/Project//Compile[matches(lower-case(@Include), '#{glob}')]"
+                xml.elements.delete_all(query)
+              end
 
-          def projects(args)
-            Dir[*list(args[:projects])]
-          end
+              deleted.flatten.map { |d| d.attributes['Include'] }
+            end
 
-          def write_xml(project, xml)
-            File.open(project, 'w+') do |file|
-              xml.write(output: file, ie_hack: true)
+            def save(project, xml)
+              File.open(project, 'w+') do |file|
+                xml.write(output: file, ie_hack: true)
+              end
+            end
+
+            def resolve_package_names(project, references)
+              references.map { |r| package_for(project, r) }.compact
+            end
+
+            def package_for(project, reference)
+              path = File.expand_path(File.join(project, reference))
+
+              Pathname.new(path).ascend do |p|
+                break p.parent.basename.to_s if p.basename.to_s == 'lib'
+              end
             end
-          end
 
-          def remove_references(args, xml)
-            list(args[:references]).map do |ref|
-              query = "/Project//Reference[starts-with(lower-case(@Include), '#{ref.downcase}')]"
-              xml.elements.delete_all(query)
+            def resolve_paths(project, files)
+              files.map { |f| File.expand_path(File.join(File.dirname(project), f)) }
             end
           end
+        end
+
+        class PaketReferences
+          class << self
+            def remove_packages(projects, packages)
+              projects.each do |project|
+                references = paket_references_for(project)
+                next unless references
+
+                text = File.read(references)
+                removed = remove(text, packages)
+
+                File.write(references, removed) if removed != text
+              end
+            end
+
+            private
+            def paket_references_for(project)
+              project_specific = project + '.paket.references'
+              global = File.join(File.dirname(project), 'paket.references')
 
-          def remove_specs(args, xml)
-            list(args[:specs]).map do |glob|
-              query = "/Project//Compile[matches(lower-case(@Include), '#{glob}')]"
-              xml.elements.delete_all(query)
+              [project_specific, global].select { |f| File.exist?(f) }.first
+            end
+
+            def remove(text, packages)
+              packages.each do |package|
+                text = text.gsub(/^#{package}.*\n?/i, '')
+              end
+              text
             end
           end
+        end
 
-          def paket_references(args)
-            Dir[*list(args[:paket_references])]
+        class << self
+          def remove(args = {})
+            projects, packages, specs = ProjectFiles.remove_specs_and_references(list(args[:projects]),
+                                                                                 list(args[:references]),
+                                                                                 list(args[:specs]))
+
+            delete(specs)
+
+            PaketReferences.remove_packages(projects, list(args[:packages]) + packages)
+          end
+
+          private
+          def list(args)
+            ([] << args).flatten.compact
           end
 
-          def remove_packages(text, args)
-            list(args[:packages]).each do |package|
-              text = text.gsub(/^#{package}.*\n?/i, '')
+          def delete(files)
+            files.each do |file|
+              RakeFileUtils.rm(file) if File.exist?(file)
             end
-            text
           end
         end
       end

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

@@ -6,8 +6,7 @@ module Rake
       class SideBySideSpecs < Rake::TaskLib
         include Rake::Funnel::Support
 
-        attr_accessor :name, :projects, :references, :specs, :enabled
-        attr_accessor :paket_references, :packages
+        attr_accessor :name, :projects, :references, :specs, :packages, :enabled
 
         def initialize(*args, &task_block)
           setup_ivars(args)
@@ -21,9 +20,8 @@ module Rake
 
           @projects = %w(**/*.csproj **/*.vbproj **/*.fsproj)
           @references = []
-          @specs = %w(*Specs.cs **/*Specs.cs *Tests.cs **/*Tests.cs)
+          @specs = %w(*Specs.cs *Tests.cs)
           @enabled = false
-          @paket_references = %w(**/*paket.references)
           @packages = []
         end
 
@@ -45,7 +43,6 @@ module Rake
             projects: projects,
             references: references,
             specs: specs,
-            paket_references: paket_references,
             packages: packages
           }
         end

data/lib/rake/funnel/version.rb

@@ -1,5 +1,5 @@
 module Rake
   module Funnel
-    VERSION = '0.5.0.pre'
+    VERSION = '0.6.0.pre'
   end
 end

data/spec/rake/funnel/support/specs_remover/{Sample.csproj → project/Sample.csproj}

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

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

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

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

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

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

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

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

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

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

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

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

@@ -3,7 +3,6 @@ describe Rake::Funnel::Support::SpecsRemover do
     let(:projects) {}
     let(:references) {}
     let(:specs) {}
-    let(:paket_references) {}
     let(:packages) {}
 
     before {
@@ -17,7 +16,6 @@ describe Rake::Funnel::Support::SpecsRemover do
         described_class.remove(projects: projects,
                                references: references,
                                specs: specs,
-                               paket_references: paket_references,
                                packages: packages)
       }
 
@@ -46,131 +44,175 @@ describe Rake::Funnel::Support::SpecsRemover do
           expect(true).to be(true)
         end
       end
-    end
-
-    describe 'unchanged files' do
-      let(:project_file) {}
-      let(:paket_references_file) {}
 
-      before {
-        allow(Dir).to receive(:[]).and_return([])
-      }
+      context 'string packages' do
+        let(:packages) { 'SomePackage' }
 
-      before {
-        allow(Dir).to receive(:[]).with(projects).and_return([project_file])
-        allow(File).to receive(:read).with(project_file).and_return('<root></root>')
-      }
+        it 'should succeed' do
+          expect(true).to be(true)
+        end
+      end
+    end
 
-      before {
-        allow(Dir).to receive(:[]).with(paket_references).and_return([paket_references_file])
-        allow(File).to receive(:read).with(paket_references_file).and_return('SomePackage')
-      }
+    describe 'unchanged files' do
+      describe Rake::Funnel::Support::SpecsRemover::ProjectFiles do
+        let(:projects) { '**/*.??proj' }
 
-      before {
-        described_class.remove(projects: projects,
-                               references: references,
-                               specs: specs,
-                               paket_references: paket_references,
-                               packages: packages)
-      }
+        before {
+          allow(Dir).to receive(:[]).and_return([:some])
+          allow(File).to receive(:read).and_return('<root></root>')
+        }
 
-      context 'project unchanged' do
-        let(:projects) { '**/*.??proj' }
-        let(:project_file) { 'project.proj' }
+        before {
+          described_class.remove_specs_and_references(projects, [], [])
+        }
 
         it 'should not write the project file' do
           expect(File).not_to have_received(:open)
         end
       end
 
-      context 'paket references unchanged' do
-        let(:paket_references) { '*paket.references' }
-        let(:paket_references_file) { 'paket.references' }
+      describe Rake::Funnel::Support::SpecsRemover::PaketReferences do
+        let(:projects) { %w(project.proj) }
+
+        before {
+          allow(Dir).to receive(:[]).and_return([:some])
+          allow(File).to receive(:exist?).and_return(true)
+          allow(File).to receive(:read).and_return('SomePackage')
+        }
 
-        it 'should not write the references file' do
+        before {
+          described_class.remove_packages(projects, [])
+        }
+
+        it 'should not write the project file' do
           expect(File).not_to have_received(:write)
         end
       end
     end
   end
 
-  describe 'example' do
+  describe 'examples' do
+    def content(file, dir = temp_dir)
+      File.read(File.join(dir, file))
+    end
+
+    def example_dir(example)
+      File.join(File.dirname(__FILE__), 'specs_remover', example)
+    end
+
     let(:projects) { %w(**/*.??proj) }
-    let(:references) { %w(Sample-Ref-1 Sample-Ref-2 Sample-Ref-3) }
-    let(:specs) { %w(*Specs.cs **/*Specs.cs) }
-    let(:paket_references) { %w(**/*paket.references) }
-    let(:packages) { references }
+    let(:references) { %w(Some-Ref Ref-Without-HintPath Paket-Ref) }
+    let(:specs) { %w(*Specs.cs) }
+    let(:packages) { %w(Explicitly-Removed-Package) }
 
+    let(:current_dir) { Dir.pwd }
     let(:temp_dir) { Dir.mktmpdir }
 
     before {
-      FileUtils.cp_r(File.join(File.dirname(__FILE__), 'specs_remover/.'), temp_dir)
+      allow($stderr).to receive(:puts)
     }
 
     before {
-      allow(RakeFileUtils).to receive(:rm)
+      FileUtils.cp_r(File.join(example_dir(example), '.'), temp_dir)
+      Dir.chdir(temp_dir)
     }
 
-    before {
-      Dir.chdir(temp_dir) do
+    after {
+      Dir.chdir(current_dir)
+      FileUtils.rm_rf(temp_dir)
+    }
+
+    context 'project' do
+      let(:example) { 'project' }
+
+      before {
         described_class.remove(projects: projects,
                                references: references,
                                specs: specs,
-                               paket_references: paket_references,
                                packages: packages)
-      end
-    }
+      }
 
-    after {
-      FileUtils.rm_rf(temp_dir)
-    }
+      describe 'code files' do
+        describe 'production code' do
+          it 'should be kept' do
+            expect(File).to exist('FooCode.cs')
+          end
+        end
 
-    describe 'code files' do
-      it 'should keep production code' do
-        expect(RakeFileUtils).not_to have_received(:rm).with('Code.cs')
-      end
+        describe 'uncompiled code' do
+          it 'should be kept' do
+            expect(File).to exist('uncompiled-code/BarCode.cs')
+            expect(File).to exist('uncompiled-code/BarSpecs.cs')
+          end
+        end
 
-      it 'should delete specs' do
-        expect(RakeFileUtils).to have_received(:rm).with('Specs.cs')
-        expect(RakeFileUtils).to have_received(:rm).with('FooSpecs.cs')
-        expect(RakeFileUtils).to have_received(:rm).with('subdir/BarSpecs.cs')
+        describe 'specs' do
+          it 'should be deleted' do
+            expect(File).not_to exist('Specs.cs')
+            expect(File).not_to exist('FooSpecs.cs')
+          end
+        end
       end
-    end
 
-    describe 'projects' do
-      def project_xml
-        File.read(File.join(temp_dir, 'Sample.csproj'))
-      end
+      describe 'projects' do
+        it 'should remove references' do
+          expect(content('Sample.csproj')).not_to include(*references)
+        end
 
-      it 'should remove references' do
-        expect(project_xml).not_to include(*references)
+        it 'should remove compiled specs' do
+          expect(content('Sample.csproj')).not_to include(*%w(Specs.cs SampleSpecs.cs DoesNotExistSpecs.cs))
+        end
       end
 
-      it 'should remove spec files' do
-        expect(project_xml).not_to include('Specs.cs', 'SampleSpecs.cs')
+      describe 'paket references' do
+        describe 'paket.references for projects' do
+          it 'should remove packages' do
+            expect(content('paket.references')).not_to include(*(packages + references))
+          end
+
+          it 'should keep other packages' do
+            expect(content('paket.references')).to include('Untouched')
+          end
+        end
+
+        describe 'unused paket.references' do
+          it 'should not be modified' do
+            file = 'uncompiled-code/paket.references'
+            original_content = content(file, example_dir(example))
+
+            expect(content(file)).to eq(original_content)
+          end
+        end
       end
     end
 
-    describe 'paket references' do
-      def content(file)
-        File.read(File.join(temp_dir, file))
-      end
+    context 'project-specific paket.references' do
+      let(:example) { 'project-specific paket.references' }
 
-      it 'should remove packages' do
-        [
-          content('paket.references'),
-          content('subdir/foo.paket.references')
-        ].each do |content|
-          expect(content).not_to include(*packages)
+      before {
+        described_class.remove(projects: projects,
+                               references: references,
+                               specs: specs,
+                               packages: packages)
+      }
+
+      describe 'paket.references for project' do
+        it 'should remove packages' do
+          expect(content('Sample.csproj.paket.references')).not_to include(*(packages + references))
+        end
+
+        it 'should keep other packages' do
+          expect(content('Sample.csproj.paket.references')).to include('Untouched')
         end
       end
 
-      it 'should keep other packages' do
-        [
-          content('paket.references'),
-          content('subdir/foo.paket.references')
-        ].each do |content|
-          expect(content).to include('Untouched')
+      describe 'global paket.references' do
+        it 'should not be modified' do
+          file = 'paket.references'
+          original_content = content(file, example_dir(example))
+
+          expect(content(file)).to eq(original_content)
         end
       end
     end

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

@@ -12,9 +12,8 @@ describe Rake::Funnel::Tasks::SideBySideSpecs do
     its(:name) { should == :compile }
     its(:projects) { should == %w(**/*.csproj **/*.vbproj **/*.fsproj) }
     its(:references) { should == [] }
-    its(:specs) { should == %w(*Specs.cs **/*Specs.cs *Tests.cs **/*Tests.cs) }
+    its(:specs) { should == %w(*Specs.cs *Tests.cs) }
     its(:enabled) { should == false }
-    its(:paket_references) { should == %w(**/*paket.references) }
     its(:packages) { should == [] }
   end
 
@@ -25,7 +24,6 @@ describe Rake::Funnel::Tasks::SideBySideSpecs do
         t.references = %w(Ref)
         t.specs = %w(*Specs.cs **/*Specs.cs)
         t.enabled = enabled
-        t.paket_references = %w(paket.references)
         t.packages = %w(Package)
       end
     }
@@ -46,7 +44,6 @@ describe Rake::Funnel::Tasks::SideBySideSpecs do
             .with(projects: subject.projects,
                   references: subject.references,
                   specs: subject.specs,
-                  paket_references: subject.paket_references,
                   packages: subject.packages)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-funnel
 version: !ruby/object:Gem::Version
-  version: 0.5.0.pre
+  version: 0.6.0.pre
 platform: ruby
 authors:
 - Alexander Groß
@@ -172,14 +172,17 @@ 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/FooCode.cs
-- spec/rake/funnel/support/specs_remover/FooSpecs.cs
-- spec/rake/funnel/support/specs_remover/Sample.csproj
-- spec/rake/funnel/support/specs_remover/Specs.cs
-- spec/rake/funnel/support/specs_remover/paket.references
-- spec/rake/funnel/support/specs_remover/subdir/BarCode.cs
-- spec/rake/funnel/support/specs_remover/subdir/BarSpecs.cs
-- spec/rake/funnel/support/specs_remover/subdir/foo.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
+- spec/rake/funnel/support/specs_remover/project/FooCode.cs
+- spec/rake/funnel/support/specs_remover/project/FooSpecs.cs
+- spec/rake/funnel/support/specs_remover/project/Sample.csproj
+- spec/rake/funnel/support/specs_remover/project/Specs.cs
+- spec/rake/funnel/support/specs_remover/project/paket.references
+- spec/rake/funnel/support/specs_remover/project/uncompiled-code/BarCode.cs
+- spec/rake/funnel/support/specs_remover/project/uncompiled-code/BarSpecs.cs
+- spec/rake/funnel/support/specs_remover/project/uncompiled-code/paket.references
 - spec/rake/funnel/support/specs_remover_spec.rb
 - spec/rake/funnel/support/template_engine_spec.rb
 - spec/rake/funnel/support/timing/report_spec.rb
@@ -253,14 +256,17 @@ 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/FooCode.cs
-- spec/rake/funnel/support/specs_remover/FooSpecs.cs
-- spec/rake/funnel/support/specs_remover/Sample.csproj
-- spec/rake/funnel/support/specs_remover/Specs.cs
-- spec/rake/funnel/support/specs_remover/paket.references
-- spec/rake/funnel/support/specs_remover/subdir/BarCode.cs
-- spec/rake/funnel/support/specs_remover/subdir/BarSpecs.cs
-- spec/rake/funnel/support/specs_remover/subdir/foo.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
+- spec/rake/funnel/support/specs_remover/project/FooCode.cs
+- spec/rake/funnel/support/specs_remover/project/FooSpecs.cs
+- spec/rake/funnel/support/specs_remover/project/Sample.csproj
+- spec/rake/funnel/support/specs_remover/project/Specs.cs
+- spec/rake/funnel/support/specs_remover/project/paket.references
+- spec/rake/funnel/support/specs_remover/project/uncompiled-code/BarCode.cs
+- spec/rake/funnel/support/specs_remover/project/uncompiled-code/BarSpecs.cs
+- spec/rake/funnel/support/specs_remover/project/uncompiled-code/paket.references
 - spec/rake/funnel/support/specs_remover_spec.rb
 - spec/rake/funnel/support/template_engine_spec.rb
 - spec/rake/funnel/support/timing/report_spec.rb

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

@@ -1,4 +0,0 @@
-Sample-Ref-1
-Sample-Ref-2
-Untouched
-Sample-Ref-3

data/spec/rake/funnel/support/specs_remover/subdir/foo.paket.references

@@ -1,4 +0,0 @@
-Sample-Ref-1
-Sample-Ref-2
-Untouched
-Sample-Ref-3