physique 0.3.3 → 0.3.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjE5ZjYzNzFiMDI0NWU1NDYwYmRhNDc0OTdmM2I2ZmMzNmEzN2YxMw==
+    NWU4MGE4OWY1OGU2ODQyZTZlYmQ1ZjJlNzU0MzU2YTY5ZjllZGViMg==
   data.tar.gz: !binary |-
-    MDUxMDhkZGY2NTU4NDM5OTI2ZTA3YjczZTVlM2I1ZmNjOGQzODk5NQ==
+    NzE1ZjQ5MmU1MjdhZmMxMDM4ODM1MWUxOWNmZDE5YzA3NWM2MzkzMw==
 SHA512:
   metadata.gz: !binary |-
-    ZGVjOWMzZmE2ZDljMDNmMzM4NDMxZDcyZWQ5OGFmM2Y4ZTFmOTg4ZjZjZTQw
-    YjllMTY3ZGExOGM4MjQ5MmZlMGZiYTY5ZDBjNzkwZTkwODgxNGI2NTg5NWU1
-    NjU3NTZlNjczNzk3Zjg1MTEwNjJhNTg3ZmRiMDBiNWQ3MTQ0ZmI=
+    MDZkMWQxZTMzNGFlNjQzODgyNzI0MmI4YWU5MjVkMzQ0NmU2NTc5ZTg1MDAz
+    NDIzZDVlNjhlZTZmOGE5YTYxNWRkMzk1YmM2ZTk5YjMxMTEzZjM1Mzk0NDg1
+    MTIyMjQ3ZjUxNDRiZmZjNDVlYjY5Y2Y2YjQwZTU4ZDJlYzQ1YjM=
   data.tar.gz: !binary |-
-    NjdiZTdhYmU3NDRhODUyZDJjN2NiNzY0OTczODQ2NTczOTRiZTQ5NmYxMzlk
-    ZDFiZDUxMmNjMzZmZjE3Y2Y3ODg2YTZiNGEzMjAyYTdiYWE1ODVhZDc3MTg4
-    MDZhZTA0Njc2NjdlNTRjYmZkZmUwMjBmOTRhYWQxYzZlN2Q0MjQ=
+    MzJiYTg2NzhhZGQxNWMyMDdiMjM3YTQ5YWZiNTFlYjcwNDRjZDMzMWJjNzQx
+    YzkxNTEwYjY0NWU4MjQxMjJkYWEzMWJjY2I4ZTAxMTExM2UyMDUwNzRmNDY3
+    OWNlZDVlNTMxYTc2NjYwYjkzYjY2MTA4NmY2NmVjZTYzZjU4N2M=

data/.gitignore

@@ -33,4 +33,208 @@ build/
 # .ruby-gemset
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc
+.rvmrc
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+x64/
+bld/
+[Bb]in/
+[Oo]bj/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+#NUNIT
+*.VisualState.xml
+TestResult.xml
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding addin-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+_NCrunch_*
+.*crunch*.local.xml
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+
+# NuGet Packages Directory
+## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+packages/*
+## TODO: If the tool you use requires repositories.config, also uncomment the next line
+!packages/repositories.config
+
+# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
+# This line needs to be after the ignore of the build folder (and the packages folder if the line above has been uncommented)
+!packages/build/
+
+# Windows Azure Build Output
+csx/
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.pfx
+*.publishsettings
+node_modules/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# =========================
+# Windows detritus
+# =========================
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Ignore FluentMigrator change scripts
+migrate-output.sql
+
+#Nuget packages
+packages/
+src/packages
+.bundle/
+
+#created files
+/src/SouthFloridaVision.Web/apps/userfiles
+/src/SouthFloridaVision.Web/apps/userfiles_temp
+
+working/*
+working*
+
+src/SouthFloridaVision.userprefs
+
+# Ignore NancyFx keyStore
+keyStore/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    physique (0.3.2)
+    physique (0.3.3)
       activesupport (~> 4.1)
       albacore (~> 2.3)
       map (~> 6.5)

data/lib/physique/task_builders/fluent_migrator.rb

@@ -1,5 +1,4 @@
-require 'active_support/core_ext/string'
-require 'active_support/core_ext/array'
+require 'active_support/core_ext/object/blank'
 require 'physique/project'
 
 module Physique
@@ -61,7 +60,7 @@ module Physique
         namespace :db do
           namespace task_namespace do
             # First look at the scripts_dir and add a task for every sql file that you find
-            defaults = default_tasks(db)
+            defaults = default_tasks(db.name)
             add_script_tasks db, defaults
 
             # Then add the default minimum required tasks in case the scripts_dir didn't contain them
@@ -238,7 +237,7 @@ namespace #{project_name}.Migrations
         {
             // Add migration rollback code here
         }
-    }rake install
+    }
 }
 TEMPLATE
     end

data/lib/physique/task_builders/test.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 module Physique
   class TestConfig
     self.extend Albacore::ConfigDSL
@@ -8,10 +10,20 @@ module Physique
     # Path to test runner executable
     attr_writer :files
 
+    # The test runner to use
+    attr_writer :runner
+
+    # Additional parameters to pass to the test runner
+    attr_writer :parameters
+
     def opts
       Map.new({
         exe: @exe,
-        files: @files
+        runner: @runner,
+        files: @files,
+        parameters: @parameters
+      }).apply({
+        runner: :nunit
       })
     end
   end
@@ -22,16 +34,44 @@ module Physique
     end
 
     def add_test_tasks
-      configuration = solution.compile.configuration
-      package_dir = solution.nuget.restore_location
+      options = solution.test
+      defaults = default_runner_config options
 
       desc 'Run unit tests'
-      test_runner :test => :compile do |tests|
-        tests.files = FileList["**/*.Tests/bin/#{configuration}/*.Tests.dll"]
-        tests.exe = locate_tool("#{package_dir}/NUnit.Runners.*/tools/nunit-console.exe")
-        tests.parameters.add('/labels')
-        tests.parameters.add('/trace=Verbose')
+
+      if defaults && !defaults[:files].blank?
+        test_runner :test => :compile do |tests|
+          tests.files = options.files || defaults[:files]
+          tests.exe = options.exe || locate_tool(defaults[:exe])
+
+          defaults[:parameters].each do |p|
+            tests.parameters.add(p)
+          end
+        end
+      else
+        task :test => :compile do
+          puts 'No test assemblies were detected'
+        end
       end
     end
+
+    private
+
+    def default_runner_config(options)
+      configuration = solution.compile.configuration
+      package_dir = solution.nuget.restore_location
+
+      defaults = {
+        nunit: {
+          files: FileList["**/*.Tests/bin/#{configuration}/*.Tests.dll"],
+          exe: "#{package_dir}/NUnit.Runners.*/tools/nunit-console.exe",
+          parameters: %w(/labels /trace=Verbose)},
+        nspec: {
+            files: FileList["**/*.Specs/bin/#{configuration}/*.Specs.dll"],
+            exe: "#{package_dir}/nspec.*/tools/NSpecRunner.exe",
+            parameters: []}}
+
+      defaults[options.runner]
+    end
   end
 end

data/lib/physique/tasks/sqlcmd.rb

@@ -26,7 +26,7 @@ module Physique
         @parameters << "-S #{opts[:server_name]}"
         @parameters << "-d #{opts[:database_name]}" unless opts.blank? :database_name
         @parameters << "-i #{opts[:file]}" if opts[:source] == :file
-        @parameters << "-Q '#{opts[:command]}'" if opts[:source] == :command
+        @parameters << %{-Q "#{opts[:command]}"} if opts[:source] == :command
         @parameters << '-b' unless opts[:continue_on_error]
 
         opts[:variables].each do |k, v|

data/lib/physique/version.rb

@@ -1,3 +1,3 @@
 module Physique
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

data/spec/sqlcmd_spec.rb

@@ -121,8 +121,8 @@ describe Physique::SqlCmd::Cmd do
       expect(@cmd.parameters).to include('-S server')
     end
 
-    it 'should include the command in single quotes' do
-      expect(@cmd.parameters).to include("-Q 'command'")
+    it 'should include the command in double quotes' do
+      expect(@cmd.parameters).to include('-Q "command"')
     end
   end
 
@@ -139,8 +139,8 @@ describe Physique::SqlCmd::Cmd do
     end
 
     it 'should add multiple variables to the command line' do
-      expect(@cmd.parameters).to include("-v test_variable1=test_value1")
-      expect(@cmd.parameters).to include("-v test_variable2=test_value2")
+      expect(@cmd.parameters).to include('-v test_variable1=test_value1')
+      expect(@cmd.parameters).to include('-v test_variable2=test_value2')
     end
   end
 end

data/spec/support/shared_contexts/rake.rb

@@ -0,0 +1,21 @@
+require 'rake'
+
+shared_context 'rake' do
+  let(:rake) { Rake::Application.new }
+  let(:solution_name) { self.class.top_level_description }
+  let(:solution_dir) { "spec/test_data/solutions/#{solution_name}" }
+  let(:task_names) { rake.tasks.map{|t| t.name } }
+
+
+  before do
+    @original_app = Rake.application
+    Dir.chdir(solution_dir)
+    Rake.application = rake
+    Rake.load_rakefile('Rakefile.rb')
+  end
+
+  after do
+    Rake.application = @original_app
+    Dir.chdir(@original_app.original_dir)
+  end
+end

data/spec/task_builders/build_spec.rb

@@ -0,0 +1,25 @@
+require 'support/shared_contexts/rake'
+
+describe 'basic' do
+  include_context 'rake'
+
+  BUILD_TASKS = %w(versionizer compile compile:clean compile:build compile:rebuild)
+
+  it 'should create the build tasks' do
+    BUILD_TASKS.each do |name|
+      task_names.should include(name)
+    end
+  end
+
+  describe 'the compile task' do
+    let(:task) { rake['compile'] }
+
+    it 'should run without error' do
+      task.invoke
+    end
+
+    it 'should include restore as a prerequisite' do
+      task.prerequisites.should include('restore')
+    end
+  end
+end

data/spec/task_builders/default_spec.rb

@@ -0,0 +1,17 @@
+require 'support/shared_contexts/rake'
+
+describe 'basic' do
+  include_context 'rake'
+
+  DEFAULT_TASK = 'default'
+
+  let(:task) { rake[DEFAULT_TASK] }
+
+  it 'should create the default task' do
+    task_names.should include(DEFAULT_TASK)
+  end
+
+  it 'should run default task without error' do
+    task.invoke
+  end
+end

data/spec/task_builders/nspec_spec.rb

@@ -0,0 +1,13 @@
+require 'support/shared_contexts/rake'
+
+describe 'nspec' do
+  include_context 'rake'
+
+  TASK = 'test'
+
+  let(:task) { rake[TASK] }
+
+  it 'should run the test task without error' do
+    task.invoke
+  end
+end

data/spec/task_builders/nuget_spec.rb

@@ -0,0 +1,16 @@
+require 'support/shared_contexts/rake'
+
+describe 'basic' do
+  include_context 'rake'
+
+  RESTORE_TASK = 'restore'
+  let(:task) { rake[RESTORE_TASK] }
+
+  it 'should create the build tasks' do
+    task_names.should include(RESTORE_TASK)
+  end
+
+  it 'should run without error' do
+    task.invoke
+  end
+end

data/spec/test_data/solutions/.nuget/NuGet.Config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <solution>
+    <add key="disableSourceControlIntegration" value="true" />
+  </solution>
+</configuration>

data/spec/test_data/solutions/.nuget/NuGet.targets

@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
+
+        <!-- Enable the restore command to run before builds -->
+        <RestorePackages Condition="  '$(RestorePackages)' == '' ">false</RestorePackages>
+
+        <!-- Property that enables building a package from a project -->
+        <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
+
+        <!-- Determines if package restore consent is required to restore packages -->
+        <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
+
+        <!-- Download NuGet.exe if it does not already exist -->
+        <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
+    </PropertyGroup>
+
+    <ItemGroup Condition=" '$(PackageSources)' == '' ">
+        <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
+        <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
+        <!--
+            <PackageSource Include="https://www.nuget.org/api/v2/" />
+            <PackageSource Include="https://my-nuget-source/nuget/" />
+        -->
+    </ItemGroup>
+
+    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
+        <!-- Windows specific commands -->
+        <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
+        <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
+        <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <PackagesProjectConfig Condition=" '$(OS)' == 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config</PackagesProjectConfig>
+        <PackagesProjectConfig Condition=" '$(OS)' != 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config</PackagesProjectConfig>
+    </PropertyGroup>
+
+    <PropertyGroup>
+      <PackagesConfig Condition="Exists('$(MSBuildProjectDirectory)\packages.config')">$(MSBuildProjectDirectory)\packages.config</PackagesConfig>
+      <PackagesConfig Condition="Exists('$(PackagesProjectConfig)')">$(PackagesProjectConfig)</PackagesConfig>
+    </PropertyGroup>
+    
+    <PropertyGroup>
+        <!-- NuGet command -->
+        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
+        <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
+
+        <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
+        <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
+
+        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
+
+        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
+        <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
+
+        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
+        <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
+
+        <!-- Commands -->
+        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
+        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
+
+        <!-- We need to ensure packages are restored prior to assembly resolve -->
+        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
+            RestorePackages;
+            $(BuildDependsOn);
+        </BuildDependsOn>
+
+        <!-- Make the build depend on restore packages -->
+        <BuildDependsOn Condition="$(BuildPackage) == 'true'">
+            $(BuildDependsOn);
+            BuildPackage;
+        </BuildDependsOn>
+    </PropertyGroup>
+
+    <Target Name="CheckPrerequisites">
+        <!-- Raise an error if we're unable to locate nuget.exe  -->
+        <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
+        <!--
+        Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
+        This effectively acts as a lock that makes sure that the download operation will only happen once and all
+        parallel builds will have to wait for it to complete.
+        -->
+        <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
+    </Target>
+
+    <Target Name="_DownloadNuGet">
+        <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
+    </Target>
+
+    <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">        
+        <Exec Command="$(RestoreCommand)"
+              Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
+
+        <Exec Command="$(RestoreCommand)"
+              LogStandardErrorAsError="true"
+              Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
+    </Target>
+
+    <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
+        <Exec Command="$(BuildCommand)"
+              Condition=" '$(OS)' != 'Windows_NT' " />
+
+        <Exec Command="$(BuildCommand)"
+              LogStandardErrorAsError="true"
+              Condition=" '$(OS)' == 'Windows_NT' " />
+    </Target>
+
+    <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+        <ParameterGroup>
+            <OutputFilename ParameterType="System.String" Required="true" />
+        </ParameterGroup>
+        <Task>
+            <Reference Include="System.Core" />
+            <Using Namespace="System" />
+            <Using Namespace="System.IO" />
+            <Using Namespace="System.Net" />
+            <Using Namespace="Microsoft.Build.Framework" />
+            <Using Namespace="Microsoft.Build.Utilities" />
+            <Code Type="Fragment" Language="cs">
+                <![CDATA[
+                try {
+                    OutputFilename = Path.GetFullPath(OutputFilename);
+
+                    Log.LogMessage("Downloading latest version of NuGet.exe...");
+                    WebClient webClient = new WebClient();
+                    webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
+
+                    return true;
+                }
+                catch (Exception ex) {
+                    Log.LogErrorFromException(ex);
+                    return false;
+                }
+            ]]>
+            </Code>
+        </Task>
+    </UsingTask>
+</Project>

data/spec/test_data/solutions/.nuget/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit.Runners" version="2.6.3" />
+</packages>

data/spec/test_data/solutions/basic/.semver

@@ -0,0 +1,6 @@
+---
+:major: 0
+:minor: 0
+:patch: 0
+:special: ''
+:metadata: ''