physique 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTk4ZGQ1NDM0Mzc2MDY1MjljNjRhZTc5ZDg1ZjZmZjk3ZjU3MjQ1Ng==
+    YzZlZWQ4M2U1ZjFkNTYyZDhhNDViZWM1MmUzZjA4NDRkNWJmOGI5Mg==
   data.tar.gz: !binary |-
-    ZTZhNGMyN2ZiMGNhMjZjYjM3MDIwZmRkMTc2NWQ0NGQ0NTY3YjVmZQ==
+    YWJmNTM0ZGM5OWQxMDU0ZDhmOGJhYTJmZDRlNTg3OGEyYTY2MGRjYw==
 SHA512:
   metadata.gz: !binary |-
-    NjQzZmI2MTY2M2I1MDZmM2E5NWZkNTJlMTBlNzNlNTY1YzQyYTFhZWEwMDU3
-    YTgyMTA1Nzk5NWQ5ZWZlNzgxOWY4ODNlMDBmMzY4NjMyYTZlMjIxOWRkZjAx
-    M2NjODhhOTgzMGY3OWE0M2ZhOTIxMmI1Yjk5ZDQ1OWZkYmY3YTM=
+    MzQxM2I4NmNiMWQ0OWU3ZDQ2ZDlkMGNhNzlmMTJmYjA3ZTkzMzdkMjMwNjQ1
+    Y2Q5ZDBjOGE2YzYyMDg1NWUwYTdkMjJjNDM0NTlhY2I2NmFhMGEyNGI3MzIw
+    ZmY5MDZmMDEwNGRhNWQ2ZGUyZTA5ZDYxYWRiMTRlM2JiNzIwNDI=
   data.tar.gz: !binary |-
-    N2FkYTlmMThhNzEzNjhjNDA5ZGNkNTcxMTgxNTcxYmM4M2ViMDhlNWE0MTgy
-    NjYzZWU0YTYwYjY5NjExNWE4N2U1MmQ5ZmJmNDQyOTI0ZDEyZmZiMjI1OGE0
-    MGY3ODk4NDhmYzgxNjE4Njk4YzQ1N2EyMDk4OGIzM2Y3MDFlNWE=
+    NzE0ZTM4YmU2MTU5M2E1YWQyNWVhZmNlNDc1ZTA0Mjc5MGNlZjI5NGE3NGJh
+    MmZiM2RkNTA5YmUwMzkyYTg1OWJiZTVmMjNhNzIwMzE3M2Q3NWU2ODI1ZGYz
+    NDBmODVjN2NhMDNhMWM2OGMxYWQ3YmFjZTgzYjRiNTk5M2NiNmQ=

data/Gemfile.lock

@@ -1,33 +1,27 @@
 PATH
   remote: .
   specs:
-    physique (0.3.0)
+    physique (0.3.1)
       activesupport (~> 4.1)
-      albacore (= 2.0.0.rc.12)
+      albacore (~> 2.3)
       map (~> 6.5)
+      rake (~> 10)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ProcessPilot (2.0.0.20120301)
-      rUtilAnts (>= 1.0)
     activesupport (4.2.0)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    albacore (2.0.0.rc.12)
-      ProcessPilot (~> 2.0)
-      facter (~> 1.7)
-      highline (~> 1.6)
+    albacore (2.3.15)
       map (~> 6.5)
       nokogiri (~> 1.5)
-      rake (> 10)
-      semver2 (~> 3.3)
+      rake (~> 10)
+      semver2 (~> 3.4)
     diff-lcs (1.2.5)
-    facter (1.7.6)
-    highline (1.6.21)
     i18n (0.7.0)
     json (1.8.2)
     map (6.5.5)
@@ -35,7 +29,6 @@ GEM
     minitest (5.5.1)
     nokogiri (1.6.6.2-x86-mingw32)
       mini_portile (~> 0.6.0)
-    rUtilAnts (2.0.0.20130827)
     rake (10.4.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)

data/lib/physique/solution.rb

@@ -30,8 +30,12 @@ module Physique
     end
 
     def fluently_migrate
-      @migrator = FluentMigratorConfig.new
-      yield @migrator
+      @dbs_to_migrate = @dbs_to_migrate || []
+
+      migrator = FluentMigratorConfig.new
+      yield migrator
+
+      @dbs_to_migrate << migrator
     end
 
     alias_method :database, :fluently_migrate
@@ -52,9 +56,9 @@ module Physique
         nuget: @nuget && @nuget.opts,
         compile: @compilation && @compilation.opts,
         test: @tests && @tests.opts,
-        migrator: @migrator && @migrator.opts,
+        fluent_migrator_dbs: @dbs_to_migrate && @dbs_to_migrate.map {|db| db.opts },
         octopus: @octopus && @octopus.opts,
-        publish_nugets: @publish_nugets && @publish_nugets.opts,
+        publish_nugets: @publish_nugets && @publish_nugets.opts
       })
     end
   end

data/lib/physique/task_builders/build.rb

@@ -41,13 +41,13 @@ module Physique
     def add_compile_tasks
       block = lambda &method(:configure_build)
 
-      task = build :compile => [ :restore ], &block.curry.(%w(Clean Rebuild))
-      task.add_description 'Builds the solution'
+      desc 'Builds the solution'
+      build :compile => [ :restore ], &block.curry.(%w(Clean Rebuild))
 
       namespace :compile do
         solution.compile.targets.each do |t|
-          task = build t.downcase, &block.curry.(t)
-          task.add_description "Builds the solution using the #{t} target"
+          desc "Builds the solution using the #{t} target"
+          build t.downcase, &block.curry.(t)
         end
       end
     end

data/lib/physique/task_builders/default.rb

@@ -1,8 +1,8 @@
 module Physique
   class DefaultTasksBuilder < TasksBuilder
     def build_tasks
-      Rake::Task.define_task :default => [ :test ]
-      Rake::Task.define_task :ci => [ :versionizer, :test ]
+      task :default => [ :test ]
+      task :ci => [ :versionizer, :test ]
     end
   end
 end

data/lib/physique/task_builders/fluent_migrator.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/string'
+require 'active_support/core_ext/array'
 require 'physique/project'
 
 module Physique
@@ -12,7 +14,8 @@ module Physique
                 :instance,    # Server instance name
                 :name,        # Database name
                 :scripts_dir, # Scripts folder to examine to create tasks
-                :dialect      # Dialect to use for generating SQL
+                :dialect,     # Dialect to use for generating SQL
+                :task_alias   # Alias used to construct rake task names
 
     def initialize
       @lang = :cs
@@ -20,135 +23,157 @@ module Physique
     end
 
     def opts
+      validate_config
+
       Map.new({
-        exe: @exe,
         instance: @instance,
         name: @name,
         project: @project,
         project_file: Physique::Project.get_path(@project, @lang),
         lang: @lang,
+        task_alias: (@task_alias || @name)
       }).apply(
         lang: :cs,
         project_dir: "src/#{@project}",
         scripts_dir: "src/#{@project}/#{@scripts_dir}"
       )
     end
+
+    private
+
+    def validate_config
+      raise ArgumentError, 'You must specify a database instance' if @instance.blank?
+      raise ArgumentError, 'You must specify a database name' if @name.blank?
+      raise ArgumentError, 'You must specify the FluentMigrator project' if @project.blank?
+      raise ArgumentError, 'You must specify a language' if @lang.blank?
+      raise ArgumentError, 'You must specify a scripts_dir' if @scripts_dir.blank?
+    end
   end
 
   class FluentMigratorTasksBuilder < TasksBuilder
     def build_tasks
-      @options = solution.migrator
-      return if @options.nil?
+      dbs = solution.fluent_migrator_dbs
+      return if dbs.empty?
 
-      add_script_tasks
-      add_default_db_tasks
-      add_migrator_tasks
-      add_workflow_tasks
-      add_new_migration_task
-    end
-
-    private
+      dbs.each do |db|
+        task_namespace = db_task_name(db)
 
-    def add_script_tasks
-      FileList["#{@options.scripts_dir}/*.sql"].each do |f|
         namespace :db do
-          task_name = File.basename(f, '.*')
-          task = sqlcmd task_name do |s|
-            s.file = f
-            s.server_name = @options.instance
-            s.set_variable 'DATABASE_NAME', @options.name
+          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)
+            add_script_tasks db, defaults
+
+            # Then add the default minimum required tasks in case the scripts_dir didn't contain them
+            add_default_db_tasks db, defaults
+
+            # Add the migrate and rollback tasks
+            add_migrator_tasks db
+
+            # Add the tasks to create the db from scratch
+            add_create_tasks
+
+            # Add a task to create a new migration in the db project
+            add_new_migration_task db
           end
-          task.add_description get_script_task_description(task_name, @options.scripts_dir)
         end
+
+        # Rebuild the databases when running tests
+        task :test => "db:#{task_namespace}:rebuild"
       end
+
+      alias_default_tasks
     end
 
-    def add_default_db_tasks
-      default_tasks(@options.name).each do |task_name,sql|
-        unless Rake::Task.task_defined? "db:#{task_name.to_s}"
-          namespace :db do
-            task = sqlcmd task_name do |s|
-              s.command = sql
-              s.server_name = @options.instance
-              s.set_variable 'DATABASE_NAME', @options.name
-            end
-            task.add_description get_script_task_description(task_name, @options.scripts_dir)
-          end
+    private
+
+    def add_script_tasks(db, defaults)
+      FileList["#{db.scripts_dir}/*.sql"].each do |f|
+        task_name = File.basename(f, '.*')
+
+        desc get_script_task_description(defaults, task_name, db)
+        sqlcmd task_name do |s|
+          s.file = f
+          s.server_name = db.instance
+          s.set_variable 'DATABASE_NAME', db.name
         end
       end
     end
 
-    def default_tasks(database)
-      { create: "CREATE DATABASE #{database}",
-        drop: "DROP DATABASE #{database}",
-        seed: 'SELECT 1' } # This is a no-op
+    def get_script_task_description(defaults, task_name, db)
+      default_task = defaults[task_name.to_sym]
+      default_task ? default_task[:description] : "Executes #{task_name}.sql on #{db.name} in the #{db.scripts_dir} folder."
     end
 
-    def get_script_task_description(task, dir)
-      well_known_scripts[task.to_sym] || "Executes #{task}.sql in the #{dir} folder."
+    def add_default_db_tasks(db, defaults)
+      defaults.each do |task_name,task_details|
+        unless Rake::Task.task_defined? "db:#{db_task_name(db)}:#{task_name.to_s}"
+          desc task_details[:description]
+          sqlcmd task_name do |s|
+            s.command = task_details[:command]
+            s.server_name = db.instance
+            s.set_variable 'DATABASE_NAME', db.name
+          end
+        end
+      end
     end
 
-    # TODO: Refactor this to combine this with default_tasks
-    def well_known_scripts
-      { create: 'Creates the database',
-        drop: 'Drops the database',
-        seed: 'Seeds the database with test data' }
+    def default_tasks(database)
+      { create: { description: 'Create the database', command: "CREATE DATABASE #{database}" },
+        drop: { description: 'Drop the database', command: "DROP DATABASE #{database}"},
+        seed: { description: 'Seed the database with test data', command: 'SELECT 1' } } # This is a no-op
     end
 
-    def add_migrator_tasks
+    def add_migrator_tasks(db)
       require 'physique/tasks/fluent_migrator'
 
-      namespace :db do
-        build :compile_db do |b|
-          b.target = [ 'Build' ]
-          b.file = solution.migrator.project_file
-          b.prop 'Configuration', solution.compile.configuration
-          b.logging = solution.compile.logging
-        end
+      build :compile_db do |b|
+        b.target = [ 'Build' ]
+        b.file = db.project_file
+        b.prop 'Configuration', solution.compile.configuration
+        b.logging = solution.compile.logging
+      end
 
-        block = lambda &method(:configure_migration)
+      block = lambda &method(:configure_migration)
 
-        # Migrate up
-        task = fluent_migrator :migrate => [ :compile_db ], &block.curry.('migrate:up')
-        task.add_description 'Migrate database to the latest version'
+      # Migrate up
+      desc 'Migrate database to the latest version'
+      fluent_migrator :migrate => [ :compile_db ], &block.curry.(db, 'migrate:up')
 
-        # Migrate down
-        task = fluent_migrator :rollback => [ :compile_db ], &block.curry.('rollback')
-        task.add_description 'Rollback the database to the previous version'
-      end
+      # Migrate down
+      desc 'Rollback the database to the previous version'
+      fluent_migrator :rollback => [ :compile_db ], &block.curry.(db, 'rollback')
+
+      # Try the migration
+      desc 'Migrate and then immediately rollback'
+      task :try => [ :migrate, :rollback ]
     end
 
-    def configure_migration(task, config)
-      config.instance = solution.migrator.instance
-      config.database = solution.migrator.name
+    def configure_migration(db, task, config)
+      config.instance = db.instance
+      config.database = db.name
       config.task = task
-      config.dll = migration_dll
-      config.exe = locate_tool(tool_in_output_folder || tool_in_nuget_package)
+      config.dll = migration_dll db
+      config.exe = locate_tool(tool_in_output_folder(db) || tool_in_nuget_package)
       config.output_to_file
     end
 
-    def add_workflow_tasks
-      namespace :db do
-        # Try the migration
-        task = Rake::Task.define_task :try => [ :migrate, :rollback ]
-        task.add_description 'Migrate and then immediately rollback'
-
-        # Setup the database from nothing
-        task = Rake::Task.define_task :setup => [ :create, :migrate, :seed ]
-        task.add_description 'Create the database and run all migrations'
+    def add_create_tasks
+      # Setup the database from nothing
+      desc 'Create the database and run all migrations'
+      task :setup => [ :create, :migrate, :seed ]
 
-        # Setup the database from nothing
-        task = Rake::Task.define_task :rebuild => [ :drop, :setup ]
-        task.add_description 'Drop and recreate the database'
-      end
+      # Drop and recreate the database
+      desc 'Drop and recreate the database'
+      task :rebuild => [ :drop, :setup ]
     end
 
-    def migration_dll
-      "#{solution.migrator.project_dir}/bin/#{solution.compile.configuration}/#{solution.migrator.project}.dll"
+    def migration_dll(db)
+      "#{db.project_dir}/bin/#{solution.compile.configuration}/#{db.project}.dll"
     end
 
-    def tool_in_output_folder
-      existing_path "#{solution.migrator.project_dir}/bin/#{solution.compile.configuration}/Migrate.exe"
+    def tool_in_output_folder(db)
+      existing_path "#{db.project_dir}/bin/#{solution.compile.configuration}/Migrate.exe"
     end
 
     def tool_in_nuget_package
@@ -160,33 +185,33 @@ module Physique
       nil
     end
 
-    def add_new_migration_task
-      namespace :db do
-        task = Rake::Task.define_task :new_migration, :name, :description do |t, args|
-          name, description = args[:name], args[:description]
+    def db_task_name(db)
+      db.task_alias.downcase
+    end
 
-          unless name
-            abort [
-              %Q{Usage: rake "#{t.name}[name[,description]]"},
-              desc,
-            ].join "\n\n"
-          end
+    def add_new_migration_task(db)
+      desc 'Create a new migration file with the specified name'
+      task :new_migration, :name, :description do |t, args|
+        name, description = args[:name], args[:description]
 
-          project, project_dir, project_file = solution.migrator.project, solution.migrator.project_dir, solution.migrator.project_file
-          version = migration_version
-          migration_file_name = "#{version}_#{name}.cs"
-          migration_content = migration_template(version, name, description, project)
+        unless name
+          abort [
+            %Q{Usage: rake "#{t.name}[name[,description]]"},
+            desc,
+          ].join "\n\n"
+        end
 
-          # Save the new migration file
-          save_file migration_content, "#{project_dir}/Migrations/#{migration_file_name}"
+        # Save the new migration file
+        version = migration_version
+        migration_file_name = "#{version}_#{name}.cs"
+        migration_content = migration_template(version, name, description, db.project)
+        save_file migration_content, "#{db.project_dir}/Migrations/#{migration_file_name}"
 
-          # Add the new migration file to the project
-          Albacore::Project.new(project_file).tap do |p|
-            p.add_compile_node :Migrations, migration_file_name
-            p.save
-          end
+        # Add the new migration file to the project
+        Albacore::Project.new(db.project_file).tap do |p|
+          p.add_compile_node :Migrations, migration_file_name
+          p.save
         end
-        task.add_description 'Creates a new migration file with the specified name'
       end
     end
 
@@ -198,7 +223,6 @@ module Physique
       description = ", \"#{description}\"" unless description.nil?
       return <<TEMPLATE
 using FluentMigrator;
-using FluentMigrator.Runner;
 
 namespace #{project_name}.Migrations
 {
@@ -214,7 +238,7 @@ namespace #{project_name}.Migrations
         {
             // Add migration rollback code here
         }
-    }
+    }rake install
 }
 TEMPLATE
     end
@@ -223,5 +247,27 @@ TEMPLATE
       raise "#{file_path} already exists, cancelling" if File.exists? file_path
       File.open(file_path, 'w') { |f| f.write(content) }
     end
+
+    def alias_default_tasks
+      Rake.application.tasks
+        .select {|t| t.name.starts_with?('db') && GLOBAL_TASKS.has_key?(db_command(t))}
+        .group_by {|t| db_command(t) }
+        .each do |command,tasks|
+          desc GLOBAL_TASKS[command]
+          task "db:#{command}" => tasks.map {|t| t.name }
+        end
+    end
+
+    def db_command(task)
+      task.name.split(':').last.to_sym
+    end
+
+    GLOBAL_TASKS = {
+        create: 'Create all databases',
+        drop: 'Drop all databases',
+        seed: 'Seed all databases with test data',
+        setup: 'Build all databases and migrate them to the latest version',
+        rebuild: 'Drop and recreate all databases',
+        migrate: 'Migrates all databases to the latest version' }
   end
 end

data/lib/physique/task_builders/nuget.rb

@@ -29,17 +29,17 @@ module Physique
 
   class NugetTasksBuilder < TasksBuilder
     def build_tasks
-      add_restore
+      add_restore_task
     end
 
     private
 
-    def add_restore
-      task = nugets_restore :restore do |r|
+    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
       end
-      task.add_description 'Restores all nugets as per the packages.config files'
     end
   end
 end

data/lib/physique/task_builders/octopus.rb

@@ -79,8 +79,10 @@ module Physique
       return if @options.nil?
       return if @options.apps.blank?
 
-      add_octopus_package_tasks
-      add_octopus_publish_tasks
+      namespace :octo do
+        add_octopus_package_tasks
+        add_octopus_publish_tasks
+      end
 
       if @options.alias_tasks
         add_task_aliases
@@ -91,57 +93,52 @@ module Physique
 
     def add_octopus_package_tasks
       @options.apps.each do |a|
-        namespace :octo do
-          namespace :package do
-            task = octopus_pack a.name => [:versionizer, :test] do |o|
-              ensure_output_location solution.nuget.build_location
-
-              o.project_file = a.project_file
-              o.type = a.type
-              o.configuration = solution.compile.configuration
-              o.exe = solution.nuget.exe
-              o.out = solution.nuget.build_location
-              o.metadata = a.metadata
-            end
-            task.add_description "Package #{a.project} for Octopus deployment"
+        namespace :package do
+          desc "Package #{a.project} for Octopus deployment"
+          octopus_pack a.name => [:versionizer, :test] do |o|
+            ensure_output_location solution.nuget.build_location
+
+            o.project_file = a.project_file
+            o.type = a.type
+            o.configuration = solution.compile.configuration
+            o.exe = solution.nuget.exe
+            o.out = solution.nuget.build_location
+            o.metadata = a.metadata
           end
-
-          task = Rake::Task.define_task :package => all_octopus_app_tasks('package')
-          task.add_description 'Package all applications'
         end
       end
+
+      desc 'Package all applications'
+      task :package => all_octopus_app_tasks('package')
     end
 
     def add_octopus_publish_tasks
       nuget = solution.nuget
 
       @options.apps.each do |a|
-        namespace :octo do
-          namespace :publish do
-            task = Rake::Task.define_task a.name => [ "package:#{a.name}" ] do
-              package_location = Albacore::Paths.normalise_slashes "#{nuget.build_location}/#{a.project}.#{a.metadata.version}.nupkg"
-              sh "#{nuget.exe} push #{package_location} -ApiKey #{@options.api_key} -Source #{@options.server}"
-            end
-            task.add_description "Publish #{a.project} app to Octopus Server"
+        namespace :publish do
+          desc "Publish #{a.project} app to Octopus Server"
+          task a.name => [ "package:#{a.name}" ] do
+            package_location = Albacore::Paths.normalise_slashes "#{nuget.build_location}/#{a.project}.#{a.metadata.version}.nupkg"
+            sh "#{nuget.exe} push #{package_location} -ApiKey #{@options.api_key} -Source #{@options.server}"
           end
-
-          task = Rake::Task.define_task :publish => all_octopus_app_tasks('publish')
-          task.add_description 'Publish all apps to Octopus Server'
         end
       end
+
+      desc 'Publish all apps to Octopus Server'
+      task :publish => all_octopus_app_tasks('publish')
     end
 
     def all_octopus_app_tasks(task)
-      # It is assumed that this is called within the octo namespace
       @options.apps.map { |a| "#{task}:#{a.name}" }
     end
 
     def add_task_aliases
-      task = Rake::Task.define_task :package => [ 'octo:package' ]
-      task.add_description 'Package all applications'
+      desc 'Package all applications'
+      task :package => [ 'octo:package' ]
 
-      task = Rake::Task.define_task :publish => [ 'octo:publish' ]
-      task.add_description 'Publish apps to Octopus Server'
+      desc 'Publish apps to Octopus Server'
+      task :publish => [ 'octo:publish' ]
     end
   end
 end

data/lib/physique/task_builders/publish_nugets.rb

@@ -91,9 +91,11 @@ module Physique
       @options = solution.publish_nugets
       return if @options.nil?
 
-      add_package_nugets_task
-      add_publish_nugets_task
-      add_publish_nugets_local_task
+      namespace :nuget do
+        add_package_nugets_task
+        add_publish_nugets_task
+        add_publish_nugets_local_task
+      end
 
       if @options.alias_tasks
         add_task_aliases
@@ -103,39 +105,35 @@ module Physique
     private
 
     def add_package_nugets_task
-      namespace :nuget do
-        task = nugets_pack :package => [ :versionizer, :test ] do |p|
-          ensure_output_location solution.nuget.build_location
-
-          p.configuration = solution.compile.configuration
-          p.out           = solution.nuget.build_location
-          p.exe           = solution.nuget.exe
-          p.files         = @options.project_files
-          p.gen_symbols   if @options.gen_symbols
-          p.with_metadata do |m|
-            @options.metadata.set_fields.each do |attr|
-              eval "m.#{attr}= @options.metadata.#{attr}"
-            end
+      desc 'Package all nugets'
+      nugets_pack :package => [ :versionizer, :test ] do |p|
+        ensure_output_location solution.nuget.build_location
+
+        p.configuration = solution.compile.configuration
+        p.out           = solution.nuget.build_location
+        p.exe           = solution.nuget.exe
+        p.files         = @options.project_files
+        p.gen_symbols   if @options.gen_symbols
+        p.with_metadata do |m|
+          @options.metadata.set_fields.each do |attr|
+            eval "m.#{attr}= @options.metadata.#{attr}"
           end
         end
-        task.add_description 'Package all nugets'
       end
     end
 
     def add_publish_nugets_task
-      namespace :nuget do
-        task = Rake::Task.define_task :publish => [ 'nuget:package' ] do
-          raise ArgumentError, 'You must specify an :api_key to connect to the server' if @options.api_key.blank?
+      desc 'Publish nuget packages to feed'
+      task :publish => [ 'nuget:package' ] do
+        raise ArgumentError, 'You must specify an :api_key to connect to the server' if @options.api_key.blank?
 
-          nuget_project_names.each do |p|
-            sh nuget_publish_command(p, 'nupkg', @options.feed_url)
+        nuget_project_names.each do |p|
+          sh nuget_publish_command(p, 'nupkg', @options.feed_url)
 
-            if @options.gen_symbols
-              sh nuget_publish_command(p, 'symbols.nupkg', @options.symbols_feed_url)
-            end
+          if @options.gen_symbols
+            sh nuget_publish_command(p, 'symbols.nupkg', @options.symbols_feed_url)
           end
         end
-        task.add_description 'Publish nuget packages to feed'
       end
     end
 
@@ -146,13 +144,11 @@ module Physique
     def add_publish_nugets_local_task
       local_path = @options.local_path
 
-      namespace :nuget do
-        namespace :publish do
-          task = Rake::Task.define_task :local => [ 'nuget:package' ] do
-            ensure_output_location local_path
-            FileUtils.cp FileList["#{solution.nuget.build_location}/*"], local_path
-          end
-          task.add_description 'Copy nuget packages to local path'
+      namespace :publish do
+        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
         end
       end
     end
@@ -162,11 +158,11 @@ module Physique
     end
 
     def add_task_aliases
-      task = Rake::Task.define_task :package => [ 'nuget:package' ]
-      task.add_description 'Package all nugets'
+      desc 'Package all nugets'
+      task :package => [ 'nuget:package' ]
 
-      task = Rake::Task.define_task :publish => [ 'nuget:publish' ]
-      task.add_description 'Publish nuget packages to feed'
+      desc 'Publish nuget packages to feed'
+      task :publish => [ 'nuget:publish' ]
     end
   end
 end

data/lib/physique/task_builders/test.rb

@@ -25,19 +25,13 @@ module Physique
       configuration = solution.compile.configuration
       package_dir = solution.nuget.restore_location
 
-      task = test_runner :test => test_dependencies do |tests|
+      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')
       end
-      task.add_description 'Run unit tests'
-    end
-
-    def test_dependencies
-      dependencies = [ :compile ]
-      dependencies << 'db:rebuild' unless solution.migrator.nil?
-      dependencies
     end
   end
 end

data/lib/physique/tasks_builder.rb

@@ -1,9 +1,11 @@
+require 'rake/dsl_definition'
 require 'physique/dsl'
 require 'physique/tool_locator'
 
 module Physique
   class TasksBuilder
     include Albacore::Logging
+    include Rake::DSL
     include Physique::DSL
     include Physique::ToolLocator
 

data/lib/physique/tool_locator.rb

@@ -19,10 +19,10 @@ module Physique
       # FileList only correctly handles forward-slashes, even on Windows
       paths = paths.gsub('\\', '/')
 
-      info { "Extracting paths from the following pattern #{paths}" }
+      debug { "Extracting paths from the following pattern #{paths}" }
       paths = FileList[paths] unless paths.respond_to?(:each)
 
-      info { "Attempting to locate tool in the following paths #{paths}" }
+      debug { "Attempting to locate tool in the following paths #{paths}" }
       opts = Map.options(options)
       opts = opts.apply :find_latest => true
       paths = paths.collect { |p| which(p) }.compact.sort

data/lib/physique/version.rb

@@ -1,3 +1,3 @@
 module Physique
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/physique.gemspec

@@ -20,7 +20,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rspec', '2.14.1'
+  spec.add_dependency 'rake', '~> 10'
   spec.add_dependency 'activesupport', '~> 4.1'
   spec.add_dependency 'map', '~> 6.5'
-  spec.add_dependency 'albacore', '2.0.0.rc.12'
+  spec.add_dependency 'albacore', '~> 2.3'
 end

data/spec/fluent_migrator_config_spec.rb

@@ -0,0 +1,42 @@
+require 'physique'
+
+describe Physique::FluentMigratorConfig do
+
+  it 'should throw when config is missing required values' do
+    %w(instance= name= project= lang= scripts_dir=).each do |p|
+      expect {
+        default_config do |c|
+          c.send p, nil
+        end
+      }.to raise_error(ArgumentError)
+    end
+  end
+
+  it 'should default to the cs programming language' do
+    project_name = 'Test.Database'
+    opts = default_config do |c|
+      c.project = 'Test.Database'
+    end
+    expect(opts.project_file).to eq("src/#{project_name}/#{project_name}.csproj")
+  end
+
+  it 'should find full project path when specifying the name and language' do
+    project_name = 'Test.Database'
+    opts = default_config do |c|
+      c.lang = :vb
+    end
+
+    expect(opts.project_file).to eq("src/#{project_name}/#{project_name}.vbproj")
+  end
+
+  def default_config
+    config = Physique::FluentMigratorConfig.new.tap do |c|
+      c.instance = '(local)'
+      c.name = 'TestDatabase'
+      c.project = 'Test.Database'
+
+      yield c if block_given?
+    end
+    config.opts
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: physique
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Robert Scaduto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +84,16 @@ dependencies:
   name: albacore
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc.12
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc.12
+        version: '2.3'
 description: Beautiful builds for .NET projects
 email:
 - rscaduto@thirdwave.it
@@ -113,7 +127,7 @@ files:
 - lib/physique/tool_locator.rb
 - lib/physique/version.rb
 - physique.gemspec
-- spec/config_spec.rb
+- spec/fluent_migrator_config_spec.rb
 - spec/project_spec.rb
 - spec/publish_nugets_spec.rb
 - spec/solution_spec.rb
@@ -148,7 +162,7 @@ specification_version: 4
 summary: A conventional build framework supporting NUnit, FluentMigrator and Octopus
   Deploy
 test_files:
-- spec/config_spec.rb
+- spec/fluent_migrator_config_spec.rb
 - spec/project_spec.rb
 - spec/publish_nugets_spec.rb
 - spec/solution_spec.rb

data/spec/config_spec.rb

@@ -1,22 +0,0 @@
-require 'physique'
-
-describe Physique::FluentMigratorConfig do
-  it 'should find full project path when specifying the name and language' do
-    project_name = 'Test.Database'
-    opts = Physique::FluentMigratorConfig.new.tap { |c|
-      c.project = project_name
-      c.lang = :vb
-    }.opts
-
-    expect(opts.project_file).to eq("src/#{project_name}/#{project_name}.vbproj")
-  end
-
-  it 'should default to the cs programming language' do
-    project_name = 'Test.Database'
-    opts = Physique::FluentMigratorConfig.new.tap { |c|
-      c.project = project_name
-    }.opts
-
-    expect(opts.project_file).to eq("src/#{project_name}/#{project_name}.csproj")
-  end
-end