rake-funnel 0.4.0.pre → 0.5.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8f5640c14dff5bf858d39fc9ae5bac6be7871ee
-  data.tar.gz: 03a44a3c45f0a6f9ccaf71a2ac87e4c73accab58
+  metadata.gz: b802578d7663c71e143eeb59c653e9007c5e68a1
+  data.tar.gz: 4fdb2bd0f6685e3796b65e9d28231126bd611860
 SHA512:
-  metadata.gz: 8759d1624ab1c1f6cb18693966e263cde514d516ce02d2250fe2da279b32561b13ad3e68785349ca5041d8beaba3622d2dac9aa1b34d43d6e8b665a20461c6c1
-  data.tar.gz: 99aaf5c647d45208a2056514b824e2795f7c90e053be7c7d665cb44eccc0384f4fca5520e6a024bec8ca9a37ea13a35ebce2a886d70fd849e65c6e4f8b39cb08
+  metadata.gz: 4498c0b46d7ec90ecd91af78cb3a674f16490433253dd43181cfd64de3b559bd1228b9c371cffdafe0d03a3d0e77643217df6563fc3a0d14394b60ccf78a958b
+  data.tar.gz: d37bb5fdc8ff28b5351087deb011bf66f039e62d813a02851b67297093074efac7d4cdb44477d060e9ceb8604b95a021860c14d3c3f637d143f82bfb932b4259

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

@@ -5,45 +5,49 @@ module Rake
     module Support
       class SpecsRemover
         class << self
-          DEFAULTS = {
-            projects: [],
-            references: [],
-            specs: []
-          }
-
           def remove(args = {})
-            args = DEFAULTS.merge(args)
+            remove_specs_from_projects(args)
+            delete_test_files(args)
+            remove_paket_references(args)
+          end
 
+          private
+          def remove_specs_from_projects(args)
             projects(args).each do |project|
-              xml = REXML::Document.new(File.read(project), { attribute_quote: :quote })
-
+              xml = REXML::Document.new(File.read(project), attribute_quote: :quote)
               removed = remove_references(args, xml) + remove_specs(args, xml)
 
               write_xml(project, xml) if removed.flatten.any?
             end
-
-            delete_specs(args)
           end
 
-          private
-          def write_xml(project, xml)
-            File.open(project, 'w+') do |file|
-              xml.write(output: file, ie_hack: true)
+          def remove_paket_references(args)
+            paket_references(args).each do |references|
+              text = File.read(references)
+              removed = remove_packages(text, args)
+
+              File.write(references, removed) if removed != text
             end
           end
 
-          def delete_specs(args)
-            Dir[*args[:specs]].uniq.each do |spec|
+          def delete_test_files(args)
+            Dir[*list(args[:specs])].uniq.each do |spec|
               RakeFileUtils.rm(spec)
             end
           end
 
+          def list(args)
+            ([] << args).flatten.compact
+          end
+
           def projects(args)
-            Dir[*args[:projects]]
+            Dir[*list(args[:projects])]
           end
 
-          def list(args)
-            ([] << args).flatten
+          def write_xml(project, xml)
+            File.open(project, 'w+') do |file|
+              xml.write(output: file, ie_hack: true)
+            end
           end
 
           def remove_references(args, xml)
@@ -59,6 +63,17 @@ module Rake
               xml.elements.delete_all(query)
             end
           end
+
+          def paket_references(args)
+            Dir[*list(args[:paket_references])]
+          end
+
+          def remove_packages(text, args)
+            list(args[:packages]).each do |package|
+              text = text.gsub(/^#{package}.*\n?/i, '')
+            end
+            text
+          end
         end
       end
     end

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

@@ -67,7 +67,7 @@ module Rake
             semver = [
               numeric_version,
               alpha_version,
-              pre(context),
+              pre(context)
             ].join
 
             [
@@ -78,10 +78,7 @@ module Rake
 
           def pre(context)
             pre = context.fetch(:metadata, {})[:pre]
-
-            if pre && pre.to_s !~ /^-/
-              pre = "-#{pre}"
-            end
+            pre = "-#{pre}" if pre && pre.to_s !~ /^-/
 
             pre
           end

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

@@ -7,6 +7,7 @@ module Rake
         include Rake::Funnel::Support
 
         attr_accessor :name, :projects, :references, :specs, :enabled
+        attr_accessor :paket_references, :packages
 
         def initialize(*args, &task_block)
           setup_ivars(args)
@@ -22,6 +23,8 @@ module Rake
           @references = []
           @specs = %w(*Specs.cs **/*Specs.cs *Tests.cs **/*Tests.cs)
           @enabled = false
+          @paket_references = %w(**/*paket.references)
+          @packages = []
         end
 
         def define(args, &task_block)
@@ -30,11 +33,22 @@ module Rake
             task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block
 
             next unless enabled
-            SpecsRemover.remove(projects: projects, references: references, specs: specs)
+
+            SpecsRemover.remove(remove_args)
           end
 
           self
         end
+
+        def remove_args
+          {
+            projects: projects,
+            references: references,
+            specs: specs,
+            paket_references: paket_references,
+            packages: packages
+          }
+        end
       end
     end
   end

data/lib/rake/funnel/version.rb

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

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

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

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

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

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

@@ -1,25 +1,26 @@
 describe Rake::Funnel::Support::SpecsRemover do
   describe 'removal' do
-    let(:projects) { [] }
-    let(:references) { [] }
-    let(:specs) { [] }
+    let(:projects) {}
+    let(:references) {}
+    let(:specs) {}
+    let(:paket_references) {}
+    let(:packages) {}
 
     before {
-      allow(Dir).to receive(:[]).and_return(%w(project.proj))
-      allow(File).to receive(:read).and_return('<root></root>')
       allow(File).to receive(:open)
+      allow(File).to receive(:write)
       allow(RakeFileUtils).to receive(:rm)
     }
 
-    before {
-      described_class.remove({
-          projects: projects,
-          references: references,
-          specs: specs
-        })
-    }
-
     describe 'arguments' do
+      before {
+        described_class.remove(projects: projects,
+                               references: references,
+                               specs: specs,
+                               paket_references: paket_references,
+                               packages: packages)
+      }
+
       context 'string projects' do
         let(:projects) { '**/*.??proj' }
 
@@ -47,13 +48,48 @@ describe Rake::Funnel::Support::SpecsRemover do
       end
     end
 
-    context 'project unchanged' do
-      let(:projects) { '**/*.??proj' }
-      let(:references) { 'Reference' }
-      let(:specs) { '*Specs.cs' }
+    describe 'unchanged files' do
+      let(:project_file) {}
+      let(:paket_references_file) {}
+
+      before {
+        allow(Dir).to receive(:[]).and_return([])
+      }
+
+      before {
+        allow(Dir).to receive(:[]).with(projects).and_return([project_file])
+        allow(File).to receive(:read).with(project_file).and_return('<root></root>')
+      }
+
+      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')
+      }
+
+      before {
+        described_class.remove(projects: projects,
+                               references: references,
+                               specs: specs,
+                               paket_references: paket_references,
+                               packages: packages)
+      }
+
+      context 'project unchanged' do
+        let(:projects) { '**/*.??proj' }
+        let(:project_file) { 'project.proj' }
+
+        it 'should not write the project file' do
+          expect(File).not_to have_received(:open)
+        end
+      end
 
-      it 'should not write XML' do
-        expect(File).not_to have_received(:open)
+      context 'paket references unchanged' do
+        let(:paket_references) { '*paket.references' }
+        let(:paket_references_file) { 'paket.references' }
+
+        it 'should not write the references file' do
+          expect(File).not_to have_received(:write)
+        end
       end
     end
   end
@@ -62,6 +98,8 @@ describe Rake::Funnel::Support::SpecsRemover do
     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(:temp_dir) { Dir.mktmpdir }
 
@@ -75,11 +113,11 @@ describe Rake::Funnel::Support::SpecsRemover do
 
     before {
       Dir.chdir(temp_dir) do
-        described_class.remove({
-            projects: projects,
-            references: references,
-            specs: specs
-          })
+        described_class.remove(projects: projects,
+                               references: references,
+                               specs: specs,
+                               paket_references: paket_references,
+                               packages: packages)
       end
     }
 
@@ -105,12 +143,36 @@ describe Rake::Funnel::Support::SpecsRemover do
       end
 
       it 'should remove references' do
-        expect(project_xml).not_to include('Sample-Ref-1', 'Sample-Ref-2', 'Sample-Ref-3')
+        expect(project_xml).not_to include(*references)
       end
 
       it 'should remove spec files' do
         expect(project_xml).not_to include('Specs.cs', 'SampleSpecs.cs')
       end
     end
+
+    describe 'paket references' do
+      def content(file)
+        File.read(File.join(temp_dir, file))
+      end
+
+      it 'should remove packages' do
+        [
+          content('paket.references'),
+          content('subdir/foo.paket.references')
+        ].each do |content|
+          expect(content).not_to include(*packages)
+        end
+      end
+
+      it 'should keep other packages' do
+        [
+          content('paket.references'),
+          content('subdir/foo.paket.references')
+        ].each do |content|
+          expect(content).to include('Untouched')
+        end
+      end
+    end
   end
 end

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

@@ -14,15 +14,19 @@ describe Rake::Funnel::Tasks::SideBySideSpecs do
     its(:references) { should == [] }
     its(:specs) { should == %w(*Specs.cs **/*Specs.cs *Tests.cs **/*Tests.cs) }
     its(:enabled) { should == false }
+    its(:paket_references) { should == %w(**/*paket.references) }
+    its(:packages) { should == [] }
   end
 
   describe 'execution' do
     subject {
       described_class.new do |t|
         t.projects = %w(**/*.??proj)
-        t.references = %w(Ref-1)
+        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
     }
 
@@ -39,11 +43,11 @@ describe Rake::Funnel::Tasks::SideBySideSpecs do
 
       it 'should use remover' do
         expect(SpecsRemover).to have_received(:remove)
-            .with({
-                projects: subject.projects,
-                references: subject.references,
-                specs: subject.specs
-              })
+            .with(projects: subject.projects,
+                  references: subject.references,
+                  specs: subject.specs,
+                  paket_references: subject.paket_references,
+                  packages: subject.packages)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-funnel
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre
+  version: 0.5.0.pre
 platform: ruby
 authors:
 - Alexander Groß
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -176,8 +176,10 @@ files:
 - 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_spec.rb
 - spec/rake/funnel/support/template_engine_spec.rb
 - spec/rake/funnel/support/timing/report_spec.rb
@@ -255,8 +257,10 @@ test_files:
 - 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_spec.rb
 - spec/rake/funnel/support/template_engine_spec.rb
 - spec/rake/funnel/support/timing/report_spec.rb