physique 0.3.10 → 0.4.0

data/lib/physique/task_builders/nuget.rb

@@ -4,13 +4,18 @@ module Physique
 
     attr_path :exe,               # Path to nuget executable
               :restore_location,  # Path where nuget packages will be downloaded
-              :build_location     # Path where nuget packages will be built
+              :build_location,    # Path where nuget packages will be built
+              :disable_restore    # Disable the restore step
 
     # Disable metadata analysis (sets -NoPackageAnalysis flag)
     def disable_package_analysis
       @disable_package_analysis = true
     end
 
+    def disable_restore
+      @disable_restore = true
+    end
+
     def initialize
       @exe = 'src/.nuget/NuGet.exe'
       @restore_location = 'src/packages'
@@ -22,7 +27,8 @@ module Physique
         exe: @exe,
         restore_location: @restore_location,
         build_location: @build_location,
-        disable_package_analysis: !!@disable_package_analysis
+        disable_package_analysis: !!@disable_package_analysis,
+        disable_restore: !!@disable_restore
       })
     end
   end
@@ -36,10 +42,16 @@ module Physique
 
     def add_restore_task
       desc 'Restores all nugets as per the packages.config files'
-      nugets_restore :restore do |r|
-        r.out = solution.nuget.restore_location
-        r.exe = solution.nuget.exe
+      if solution.nuget.disable_restore
+        task :restore do
+          puts 'Nuget package restore skipped via configuration.'
+        end
+      else
+        nugets_restore :restore do |r|
+          r.out = solution.nuget.restore_location
+          r.exe = solution.nuget.exe
+        end
       end
     end
   end
-end
+end

data/lib/physique/task_builders/octopus.rb

@@ -116,10 +116,12 @@ module Physique
       nuget = solution.nuget
 
       @options.apps.each do |a|
+        project = Albacore::Project.new a.project_file
+
         namespace a.name do
           desc "Publish #{a.project} app to Octopus Server"
           task :publish => [ "#{a.name}:package" ] do
-            package_location = Albacore::Paths.normalise_slashes "#{nuget.build_location}/#{a.project}.#{a.metadata.version}.nupkg"
+            package_location = Albacore::Paths.normalise_slashes "#{nuget.build_location}/#{project.name}.#{a.metadata.version}.nupkg"
             sh "#{nuget.exe} push #{package_location} -ApiKey #{@options.api_key} -Source #{@options.server}"
           end
         end
@@ -141,4 +143,4 @@ module Physique
       task :publish => [ 'octo:publish' ]
     end
   end
-end
+end

data/lib/physique/task_builders/publish_nugets.rb

@@ -36,7 +36,8 @@ module Physique
     end
 
     def project_files_or_default
-      @project_files || 'src/**/*.{csproj,fsproj,nuspec}'
+      files = @project_files || 'src/**/*.{csproj,fsproj,nuspec}'
+      files.gsub('\\', '/')
     end
 
     def exclude_or_default
@@ -71,7 +72,7 @@ module Physique
 
     def opts
       raise ArgumentError, 'You must specify a name for all nuget feeds' if @name.blank?
-      raise ArgumentError, "You must specify a feed_url for feed #{name}" if @feed_url.blank?
+      raise ArgumentError, "You must specify a feed_url for feed #{@name}" if @feed_url.blank?
 
       Map.new(
         name: @name,
@@ -148,7 +149,8 @@ module Physique
         desc 'Copy nuget packages to local path'
         task :local => [ 'nuget:package' ] do
           ensure_output_location local_path
-          FileUtils.cp FileList["#{solution.nuget.build_location}/*"], local_path
+          build_location = solution.nuget.build_location.gsub('\\', '/')
+          FileUtils.cp FileList["#{build_location}/*"], local_path
         end
       end
     end

data/lib/physique/task_builders/test.rb

@@ -65,14 +65,14 @@ module Physique
       defaults = {
         nunit: {
             files: FileList["**/*.Tests/bin/#{configuration}/*.Tests.dll"],
-            exe: "#{package_dir}/NUnit.Runners.*/tools/nunit-console.exe",
-            parameters: %w(/labels /trace=Verbose)},
+            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",
+            exe: "#{package_dir}/nspec*/tools/NSpecRunner.exe",
             parameters: []}}
 
       defaults[options.runner]
     end
   end
-end
+end

data/lib/physique/tasks/fluent_migrator.rb

@@ -1,159 +1,159 @@
-require 'active_support/core_ext/string'
-require 'map'
-
-module Physique
-  module FluentMigrator
-    class Cmd
-      include Albacore::CrossPlatformCmd
-
-      attr_reader :parameters
-
-      def initialize(opts)
-        @work_dir = opts[:work_dir]
-        @executable = opts[:exe]
-        set_parameters opts
-      end
-
-      def execute
-        sh "#{@executable} #{@parameters.join(' ')}"
-      end
-
-      private
-
-      def set_parameters(opts)
-        @parameters = @parameters || []
-        @parameters << "--target #{opts.dll}"
-        @parameters << "--provider #{opts.dialect}"
-        @parameters << %Q{--connectionString "#{opts.connection_string}"}
-        @parameters << "--task #{opts.task}"
-        @parameters << "--namespace #{opts.namespace}" unless opts.namespace.blank?
-        @parameters << "--nested #{opts.nested}" unless opts.namespace.blank? # Modifies the namespace option
-        @parameters << "--output --outputFileName #{opts.output_file}" unless opts.output_file.blank?
-        @parameters << '--preview true' if opts.preview
-        @parameters << "--steps #{opts.steps}" if opts.task =~ /rollback/
-        @parameters << "--version #{opts.version}" if opts.task =~ /^migrate($|:up)|^rollback:toversion$/
-        @parameters << '--transaction-per-session' if opts.tps
-      end
-    end
-
-    class Config
-      include Albacore::CmdConfig
-      include Physique::ToolLocator
-      self.extend Albacore::ConfigDSL
-
-      # SQL Server instance
-      attr_path :instance
-
-      # SQL Server database
-      attr_writer :database
-
-      # SQL dialect
-      attr_writer :dialect
-
-      # Dll containing the migrations
-      attr_path :dll
-
-      # Namespace of migration to run
-      def namespace=(val)
-        @namespace = val
-        @nested = true
-      end
-
-      def shallow
-        @nested = false
-      end
-
-      def deep
-        @nested = true
-      end
-
-      # Migration task
-      attr_writer :task
-
-      # Version number to migrate to
-      attr_writer :version
-
-      # Number of steps to rollback
-      attr_writer :steps
-
-      # Verbosity
-      attr_writer :verbose
-
-      # Timeout
-      attr_writer :timeout
-
-      # Output file
-      attr_path :output_file
-
-      def output_to_file
-        # Set a default output file
-        @output_file = "#{@database}-output.sql"
-      end
-
-      def transaction_per_session
-        @tps = true
-      end
-
-      def preview
-        @preview = true
-      end
-
-      # Path Migrator executable
-      attr_path :exe
-
-      # Bin folder to look find the Migrate tool if :exe is not set
-      attr_path :bin_dir
-
-      def opts
-        raise ArgumentError, 'You must specify a server name' if @instance.blank?
-        raise ArgumentError, 'You must specify a database name' if @database.blank?
-        raise ArgumentError, 'You must specify the path to the migrator executable' if @exe.blank?
-        raise ArgumentError, 'You must specify a migration dll' if @dll.blank?
-        raise ArgumentError, 'You must specify a valid task' unless valid_tasks.include? @task
-
-        Map.new({
-          connection_string: connection_string,
-          dialect: @dialect,
-          dll: @dll,
-          namespace: @namespace,
-          nested: @nested,
-          task: @task,
-          version: @version,
-          steps: @steps,
-          verbose: @verbose,
-          output_file: @output_file,
-          exe: @exe,
-          tps: @tps,
-          preview: @preview,
-          timeout: @timeout,
-        }).apply(
-          dialect: 'SqlServer2008',
-          verbose: true,
-          version: 0,
-          steps: 1,
-          timeout: 30 # seconds
-        )
-      end
-
-      private
-
-      def connection_string
-        "Data Source=#{@instance};Initial Catalog=#{@database};Integrated Security=True;"
-      end
-
-      def valid_tasks
-         %w{migrate:up migrate migrate:down rollback rollback:toversion rollback:all validateversionorder listmigrations}
-      end
-    end
-
-    class Task
-      def initialize(opts)
-        @cmd = Physique::FluentMigrator::Cmd.new opts
-      end
-
-      def execute
-        @cmd.execute
-      end
-    end
-  end
+require 'active_support/core_ext/string'
+require 'map'
+
+module Physique
+  module FluentMigrator
+    class Cmd
+      include Albacore::CrossPlatformCmd
+
+      attr_reader :parameters
+
+      def initialize(opts)
+        @work_dir = opts[:work_dir]
+        @executable = opts[:exe]
+        set_parameters opts
+      end
+
+      def execute
+        sh "#{@executable} #{@parameters.join(' ')}"
+      end
+
+      private
+
+      def set_parameters(opts)
+        @parameters = @parameters || []
+        @parameters << "--target #{opts.dll}"
+        @parameters << "--provider #{opts.dialect}"
+        @parameters << %Q{--connectionString "#{opts.connection_string}"}
+        @parameters << "--task #{opts.task}"
+        @parameters << "--namespace #{opts.namespace}" unless opts.namespace.blank?
+        @parameters << "--nested #{opts.nested}" unless opts.namespace.blank? # Modifies the namespace option
+        @parameters << "--output --outputFileName #{opts.output_file}" unless opts.output_file.blank?
+        @parameters << '--preview true' if opts.preview
+        @parameters << "--steps #{opts.steps}" if opts.task =~ /rollback/
+        @parameters << "--version #{opts.version}" if opts.task =~ /^migrate($|:up)|^rollback:toversion$/
+        @parameters << '--transaction-per-session' if opts.tps
+      end
+    end
+
+    class Config
+      include Albacore::CmdConfig
+      include Physique::ToolLocator
+      self.extend Albacore::ConfigDSL
+
+      # SQL Server instance
+      attr_path :instance
+
+      # SQL Server database
+      attr_writer :database
+
+      # SQL dialect
+      attr_writer :dialect
+
+      # Dll containing the migrations
+      attr_path :dll
+
+      # Namespace of migration to run
+      def namespace=(val)
+        @namespace = val
+        @nested = true
+      end
+
+      def shallow
+        @nested = false
+      end
+
+      def deep
+        @nested = true
+      end
+
+      # Migration task
+      attr_writer :task
+
+      # Version number to migrate to
+      attr_writer :version
+
+      # Number of steps to rollback
+      attr_writer :steps
+
+      # Verbosity
+      attr_writer :verbose
+
+      # Timeout
+      attr_writer :timeout
+
+      # Output file
+      attr_path :output_file
+
+      def output_to_file
+        # Set a default output file
+        @output_file = "#{@database}-output.sql"
+      end
+
+      def transaction_per_session
+        @tps = true
+      end
+
+      def preview
+        @preview = true
+      end
+
+      # Path Migrator executable
+      attr_path :exe
+
+      # Bin folder to look find the Migrate tool if :exe is not set
+      attr_path :bin_dir
+
+      def opts
+        raise ArgumentError, 'You must specify a server name' if @instance.blank?
+        raise ArgumentError, 'You must specify a database name' if @database.blank?
+        raise ArgumentError, 'You must specify the path to the migrator executable' if @exe.blank?
+        raise ArgumentError, 'You must specify a migration dll' if @dll.blank?
+        raise ArgumentError, 'You must specify a valid task' unless valid_tasks.include? @task
+
+        Map.new({
+          connection_string: connection_string,
+          dialect: @dialect,
+          dll: @dll,
+          namespace: @namespace,
+          nested: @nested,
+          task: @task,
+          version: @version,
+          steps: @steps,
+          verbose: @verbose,
+          output_file: @output_file,
+          exe: @exe,
+          tps: @tps,
+          preview: @preview,
+          timeout: @timeout,
+        }).apply(
+          dialect: 'SqlServer2008',
+          verbose: true,
+          version: 0,
+          steps: 1,
+          timeout: 30 # seconds
+        )
+      end
+
+      private
+
+      def connection_string
+        "Data Source=#{@instance};Initial Catalog=#{@database};Integrated Security=True;"
+      end
+
+      def valid_tasks
+         %w{migrate:up migrate migrate:down rollback rollback:toversion rollback:all validateversionorder listmigrations}
+      end
+    end
+
+    class Task
+      def initialize(opts)
+        @cmd = Physique::FluentMigrator::Cmd.new opts
+      end
+
+      def execute
+        @cmd.execute
+      end
+    end
+  end
 end

data/lib/physique/tasks/nugets_pack.rb

@@ -1,12 +1,12 @@
-require 'albacore/task_types/nugets_pack'
-
-module Albacore
-  module NugetsPack
-    # the nuget command
-    class Cmd
-      def disable_package_analysis
-        @parameters << '-NoPackageAnalysis'
-      end
-    end
-  end
-end
+require 'albacore/task_types/nugets_pack'
+
+module Albacore
+  module NugetsPack
+    # the nuget command
+    class Cmd
+      def disable_package_analysis
+        @parameters << '-NoPackageAnalysis'
+      end
+    end
+  end
+end