rake-funnel 0.6.0.pre → 0.6.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 535c3b45f15be6cb85e22f33cf71f2214fe97a0f
-  data.tar.gz: 489d309fa5d644d037064c0b103a5ebce7cade4f
+  metadata.gz: ae05bed046eb3b73a76819bbda79a6c4bf036c3f
+  data.tar.gz: 900d5509ec9c9408a5f6ebe3b457501f0f9c2e3a
 SHA512:
-  metadata.gz: d48b0e5660651815e22d7c4eac304f482f6adee8a1c8254007f4a821af46b03edccf1998f4b5a8f31fd5b2b1a1e1b7bd22c8c5b62d25a2fb8dd5794514ba80d0
-  data.tar.gz: 405a237d1d9d951360b51affc78c47d13562b61dacbc65fa42e845cc58bdb6c2943f2bebe7aa5dc441d3aeda96a092fb4adc93045085fa5320fa1d5739ebcf67
+  metadata.gz: 939ba39f9f7b4fb606c533e8456bae1cc2983d5eea0f844e767018004f00432588015339be09daee7bafd7e0d6136a709a7c173d7c0ebdf3415328dd145f9f59
+  data.tar.gz: 32694b789d2aabeac684d79396ed0dd48606ed6a081b0d1c0725ff684bbc0dce1e6ff29a31031730e69ac3f4b88113a310a1df5e709feb52f66d060700d0b800

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

@@ -28,7 +28,7 @@ module Rake
 
                 {
                   project: project,
-                  packages: resolve_package_names(project, references),
+                  packages: resolve_package_names(references),
                   specs: resolve_paths(project, specs)
                 }
               end
@@ -60,12 +60,12 @@ module Rake
               end
             end
 
-            def resolve_package_names(project, references)
-              references.map { |r| package_for(project, r) }.compact
+            def resolve_package_names(references)
+              references.map { |r| package_for(r) }.compact
             end
 
-            def package_for(project, reference)
-              path = File.expand_path(File.join(project, reference))
+            def package_for(reference)
+              path = normalize(reference)
 
               Pathname.new(path).ascend do |p|
                 break p.parent.basename.to_s if p.basename.to_s == 'lib'
@@ -73,7 +73,11 @@ module Rake
             end
 
             def resolve_paths(project, files)
-              files.map { |f| File.expand_path(File.join(File.dirname(project), f)) }
+              files.map { |f| File.expand_path(File.join(File.dirname(project), normalize(f))) }
+            end
+
+            def normalize(path)
+              path.gsub('\\', File::SEPARATOR)
             end
           end
         end

data/lib/rake/funnel/version.rb

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

data/spec/rake/funnel/support/specs_remover/project/Sample.csproj

@@ -12,6 +12,7 @@
     <Compile Include="FooCode.cs" />
     <Compile Include="FooSpecs.cs" />
     <Compile Include="DoesNotExistSpecs.cs" />
+    <Compile Include="subdir\SubdirSpecs.cs" />
   </ItemGroup>
   <Choose>
     <When Condition="ignored">

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

@@ -106,7 +106,6 @@ describe Rake::Funnel::Support::SpecsRemover do
     let(:specs) { %w(*Specs.cs) }
     let(:packages) { %w(Explicitly-Removed-Package) }
 
-    let(:current_dir) { Dir.pwd }
     let(:temp_dir) { Dir.mktmpdir }
 
     before {
@@ -115,11 +114,9 @@ describe Rake::Funnel::Support::SpecsRemover do
 
     before {
       FileUtils.cp_r(File.join(example_dir(example), '.'), temp_dir)
-      Dir.chdir(temp_dir)
     }
 
     after {
-      Dir.chdir(current_dir)
       FileUtils.rm_rf(temp_dir)
     }
 
@@ -127,30 +124,33 @@ describe Rake::Funnel::Support::SpecsRemover do
       let(:example) { 'project' }
 
       before {
-        described_class.remove(projects: projects,
-                               references: references,
-                               specs: specs,
-                               packages: packages)
+        Dir.chdir(temp_dir) do
+          described_class.remove(projects: projects,
+                                 references: references,
+                                 specs: specs,
+                                 packages: packages)
+        end
       }
 
       describe 'code files' do
         describe 'production code' do
           it 'should be kept' do
-            expect(File).to exist('FooCode.cs')
+            expect(File).to exist(File.join(temp_dir, 'FooCode.cs'))
           end
         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')
+            expect(File).to exist(File.join(temp_dir, 'uncompiled-code/BarCode.cs'))
+            expect(File).to exist(File.join(temp_dir, 'uncompiled-code/BarSpecs.cs'))
           end
         end
 
         describe 'specs' do
           it 'should be deleted' do
-            expect(File).not_to exist('Specs.cs')
-            expect(File).not_to exist('FooSpecs.cs')
+            expect(File).not_to exist(File.join(temp_dir, 'Specs.cs'))
+            expect(File).not_to exist(File.join(temp_dir, 'FooSpecs.cs'))
+            expect(File).not_to exist(File.join(temp_dir, 'subdir/SubdirSpecs.cs'))
           end
         end
       end
@@ -165,8 +165,8 @@ describe Rake::Funnel::Support::SpecsRemover do
         end
       end
 
-      describe 'paket references' do
-        describe 'paket.references for projects' do
+      describe 'paket.references' do
+        describe 'for projects' do
           it 'should remove packages' do
             expect(content('paket.references')).not_to include(*(packages + references))
           end
@@ -176,7 +176,7 @@ describe Rake::Funnel::Support::SpecsRemover do
           end
         end
 
-        describe 'unused paket.references' do
+        describe 'unused' do
           it 'should not be modified' do
             file = 'uncompiled-code/paket.references'
             original_content = content(file, example_dir(example))
@@ -191,28 +191,32 @@ describe Rake::Funnel::Support::SpecsRemover do
       let(:example) { 'project-specific paket.references' }
 
       before {
-        described_class.remove(projects: projects,
-                               references: references,
-                               specs: specs,
-                               packages: packages)
+        Dir.chdir(temp_dir) do
+          described_class.remove(projects: projects,
+                                 references: references,
+                                 specs: specs,
+                                 packages: packages)
+        end
       }
 
-      describe 'paket.references for project' do
-        it 'should remove packages' do
-          expect(content('Sample.csproj.paket.references')).not_to include(*(packages + references))
-        end
+      describe 'paket.references' do
+        describe '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')
+          it 'should keep other packages' do
+            expect(content('Sample.csproj.paket.references')).to include('Untouched')
+          end
         end
-      end
 
-      describe 'global paket.references' do
-        it 'should not be modified' do
-          file = 'paket.references'
-          original_content = content(file, example_dir(example))
+        describe 'global' do
+          it 'should not be modified' do
+            file = 'paket.references'
+            original_content = content(file, example_dir(example))
 
-          expect(content(file)).to eq(original_content)
+            expect(content(file)).to eq(original_content)
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-funnel
 version: !ruby/object:Gem::Version
-  version: 0.6.0.pre
+  version: 0.6.1.pre
 platform: ruby
 authors:
 - Alexander Groß
@@ -180,6 +180,7 @@ files:
 - 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/subdir/SubdirSpecs.cs
 - 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
@@ -264,6 +265,7 @@ test_files:
 - 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/subdir/SubdirSpecs.cs
 - 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