Moving gitversion Ruby executable to bin

Author: agross

GitVersionExe/GemAssets/.gitignore

@@ -1 +1,2 @@
 Gemfile.lock
+!bin/

GitVersionExe/GemAssets/gitversion renamed to GitVersionExe/GemAssets/bin/gitversion

@@ -3,10 +3,6 @@ Gem::Specification.new do |spec|
   spec.name        = 'gitversion'
   spec.licenses    = ['MIT']
   spec.version     = '0.20.0'
-  spec.files       = Dir['bin/**/*']
-  spec.bindir      = 'bin'
-  spec.executables << 'gitversion'
-
   spec.summary     = 'Derives SemVer information from a repository following GitFlow or GitHubFlow.'
   spec.description = <<-EOF
 Derives SemVer information from a repository following GitFlow or GitHubFlow.
@@ -16,4 +12,9 @@ EOF
   spec.email             = '[email protected]'
   spec.homepage          = 'http://github.com/Particular/GitVersion'
   spec.rubyforge_project = 'GitVersion'
+
+  spec.files         = Dir['bin/**/*', 'lib/**/*', '*.gemspec']
+  spec.executables   = spec.files.grep(%r{^bin/.+(?<!\.exe|\.pdb)$}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ['lib']
 end

GitVersionExe/GemAssets/gitversion.gemspec

@@ -60,8 +60,6 @@
     <Compile Include="AssemblyInfoFileUpdate.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="GemAssets\gitversion" />
-    <None Include="GemAssets\gitversion.gemspec" />
     <None Include="NugetAssets\chocolateyInstall.ps1">
       <SubType>Designer</SubType>
     </None>
@@ -109,12 +107,14 @@
     <Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersion.nuspec" DestinationFolder="$(SolutionDir)NuGetExeBuild" />
     <PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(SolutionDir)NuGetExeBuild" MetadataAssembly="$(OutputPath)GitVersion.exe" />
     <!-- Gem -->
-    <MakeDir Directories="$(SolutionDir)GemBuild" />
-    <MakeDir Directories="$(SolutionDir)GemBuild\bin" />
     <Copy SourceFiles="$(OutputPath)\GitVersion.pdb" DestinationFolder="$(SolutionDir)GemBuild\bin" />
     <Copy SourceFiles="$(OutputPath)\GitVersion.exe" DestinationFolder="$(SolutionDir)GemBuild\bin" />
-    <Copy SourceFiles="$(ProjectDir)GemAssets\gitversion" DestinationFolder="$(SolutionDir)GemBuild\bin" />
-    <Copy SourceFiles="$(ProjectDir)GemAssets\gitversion.gemspec" DestinationFolder="$(SolutionDir)GemBuild" />
+    <ItemGroup>
+      <GemFiles Include="$(ProjectDir)GemAssets\bin*\**\*.*" />
+      <GemFiles Include="$(ProjectDir)GemAssets\lib*\**\*.*" />
+      <GemFiles Include="$(ProjectDir)GemAssets\*.gemspec" />
+    </ItemGroup>
+    <Copy SourceFiles="@(GemFiles)" DestinationFiles="@(GemFiles->'$(SolutionDir)GemBuild\%(RecursiveDir)%(Filename)%(Extension)')" />
   </Target>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -169,4 +169,4 @@ if not exist "$(TargetDir)NativeBinaries\amd64" md "$(TargetDir)NativeBinaries\a
 xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.18.1.0\lib\net40\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64"</PostBuildEvent>
   </PropertyGroup>
   <Import Project="..\packages\Fody.1.24.0\build\Fody.targets" Condition="Exists('..\packages\Fody.1.24.0\build\Fody.targets')" />
-</Project>
+</Project>