physique 0.2.2 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzJjZThlOTNiYzUxZTIyYzliZjI2YjI4ZmM0MTA0NzcxMDk1MGQ3MA==
+    MTk4ZGQ1NDM0Mzc2MDY1MjljNjRhZTc5ZDg1ZjZmZjk3ZjU3MjQ1Ng==
   data.tar.gz: !binary |-
-    ZGYwZDUxOWQ2NWRhNDJmZTkyMWJmZWJkZmQ1YmFlOWE4ZDIzM2UyYw==
+    ZTZhNGMyN2ZiMGNhMjZjYjM3MDIwZmRkMTc2NWQ0NGQ0NTY3YjVmZQ==
 SHA512:
   metadata.gz: !binary |-
-    MDlhZTI2YzAwODNkZWIyYmJjMWU4YTZjNjIwZDMwZThhYWEyNzkwNzU1ZTcy
-    ODJhODZjNmRlMjM5MDU1MzhlNjUyZDNlMTkzODQwOWEyODc3Y2FjZjdhN2I0
-    ZmFjMzFjMjlhMzA0OWEyYTI5MTVkZmNhYjQ0YWY5N2VmM2I2N2Q=
+    NjQzZmI2MTY2M2I1MDZmM2E5NWZkNTJlMTBlNzNlNTY1YzQyYTFhZWEwMDU3
+    YTgyMTA1Nzk5NWQ5ZWZlNzgxOWY4ODNlMDBmMzY4NjMyYTZlMjIxOWRkZjAx
+    M2NjODhhOTgzMGY3OWE0M2ZhOTIxMmI1Yjk5ZDQ1OWZkYmY3YTM=
   data.tar.gz: !binary |-
-    YmE1NDU2MDU0NTNjMmNlN2NlZGE1YjUzYzc3OGYyZGNhZTgwMTVjMGFkNmIy
-    YTg5ZmZjMTRlNzk3NDExNjM3M2NjOTkzM2RkMmIwMjQwMmU0NTYwOGU5ODZj
-    M2UxNWZkYTg1MTBiYmM4MzA0NzBiYmU0ZmVkNmQ4M2ZhNTFjMDg=
+    N2FkYTlmMThhNzEzNjhjNDA5ZGNkNTcxMTgxNTcxYmM4M2ViMDhlNWE0MTgy
+    NjYzZWU0YTYwYjY5NjExNWE4N2U1MmQ5ZmJmNDQyOTI0ZDEyZmZiMjI1OGE0
+    MGY3ODk4NDhmYzgxNjE4Njk4YzQ1N2EyMDk4OGIzM2Y3MDFlNWE=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    physique (0.2.2)
+    physique (0.3.0)
       activesupport (~> 4.1)
       albacore (= 2.0.0.rc.12)
       map (~> 6.5)
@@ -11,11 +11,11 @@ GEM
   specs:
     ProcessPilot (2.0.0.20120301)
       rUtilAnts (>= 1.0)
-    activesupport (4.1.4)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     albacore (2.0.0.rc.12)
       ProcessPilot (~> 2.0)
@@ -28,15 +28,15 @@ GEM
     diff-lcs (1.2.5)
     facter (1.7.6)
     highline (1.6.21)
-    i18n (0.6.9)
-    json (1.8.1)
-    map (6.5.4)
-    mini_portile (0.6.0)
-    minitest (5.4.0)
-    nokogiri (1.6.2.1-x86-mingw32)
-      mini_portile (= 0.6.0)
+    i18n (0.7.0)
+    json (1.8.2)
+    map (6.5.5)
+    mini_portile (0.6.2)
+    minitest (5.5.1)
+    nokogiri (1.6.6.2-x86-mingw32)
+      mini_portile (~> 0.6.0)
     rUtilAnts (2.0.0.20130827)
-    rake (10.3.2)
+    rake (10.4.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -45,9 +45,9 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    semver2 (3.3.3)
+    semver2 (3.4.1)
     thread_safe (0.3.4)
-    tzinfo (1.2.1)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
 PLATFORMS

data/lib/physique/dsl.rb

@@ -2,39 +2,9 @@ require 'albacore/dsl'
 
 # Reopen Albacore DSL to get at the pre-built tasks
 # There is probably a better way to do this but ```me == :ruby_noob```
-module Albacore
+module Physique
   module DSL
-    def asmver_task(*args, &block)
-      asmver *args, &block
-    end
-
-    def build_task(*args, &block)
-      build *args, &block
-    end
-
-    def nugets_restore_task(*args, &block)
-      nugets_restore *args, &block
-    end
-
-    def test_runner_task(*args, &block)
-      test_runner *args, &block
-    end
-
-    def sqlcmd_task(*args, &block)
-      sqlcmd *args, &block
-    end
-
-    def fluent_migrator_task(*args, &block)
-      fluent_migrator *args, &block
-    end
-
-    def nugets_pack_task(*args, &block)
-      nugets_pack *args, &block
-    end
-
-    def octopus_pack_task(*args, &block)
-      octopus_pack *args, &block
-    end
+    include Albacore::DSL
 
     private
 

data/lib/physique/solution.rb

@@ -49,7 +49,7 @@ module Physique
     def opts
       Map.new({
         file: @file,
-        nuget: @nuget.opts && @nuget.opts,
+        nuget: @nuget && @nuget.opts,
         compile: @compilation && @compilation.opts,
         test: @tests && @tests.opts,
         migrator: @migrator && @migrator.opts,

data/lib/physique/task_builders/build.rb

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

data/lib/physique/task_builders/fluent_migrator.rb

@@ -53,7 +53,7 @@ module Physique
       FileList["#{@options.scripts_dir}/*.sql"].each do |f|
         namespace :db do
           task_name = File.basename(f, '.*')
-          task = sqlcmd_task task_name do |s|
+          task = sqlcmd task_name do |s|
             s.file = f
             s.server_name = @options.instance
             s.set_variable 'DATABASE_NAME', @options.name
@@ -67,7 +67,7 @@ module Physique
       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 task_name do |s|
+            task = sqlcmd task_name do |s|
               s.command = sql
               s.server_name = @options.instance
               s.set_variable 'DATABASE_NAME', @options.name
@@ -99,7 +99,7 @@ module Physique
       require 'physique/tasks/fluent_migrator'
 
       namespace :db do
-        build_task :compile_db do |b|
+        build :compile_db do |b|
           b.target = [ 'Build' ]
           b.file = solution.migrator.project_file
           b.prop 'Configuration', solution.compile.configuration
@@ -109,11 +109,11 @@ module Physique
         block = lambda &method(:configure_migration)
 
         # Migrate up
-        task = fluent_migrator_task :migrate => [ :compile_db ], &block.curry.('migrate:up')
+        task = fluent_migrator :migrate => [ :compile_db ], &block.curry.('migrate:up')
         task.add_description 'Migrate database to the latest version'
 
         # Migrate down
-        task = fluent_migrator_task :rollback => [ :compile_db ], &block.curry.('rollback')
+        task = fluent_migrator :rollback => [ :compile_db ], &block.curry.('rollback')
         task.add_description 'Rollback the database to the previous version'
       end
     end

data/lib/physique/task_builders/nuget.rb

@@ -35,7 +35,7 @@ module Physique
     private
 
     def add_restore
-      task = nugets_restore_task :restore do |r|
+      task = nugets_restore :restore do |r|
         r.out = solution.nuget.restore_location
         r.exe = solution.nuget.exe
       end

data/lib/physique/task_builders/octopus.rb

@@ -93,7 +93,7 @@ module Physique
       @options.apps.each do |a|
         namespace :octo do
           namespace :package do
-            task = octopus_pack_task a.name => [:versionizer, :test] do |o|
+            task = octopus_pack a.name => [:versionizer, :test] do |o|
               ensure_output_location solution.nuget.build_location
 
               o.project_file = a.project_file

data/lib/physique/task_builders/publish_nugets.rb

@@ -1,15 +1,17 @@
 require 'physique/config'
+require 'forwardable'
 
 module Physique
   class PublishNugetsConfig < MetadataConfig
+    extend Forwardable
+
     attr_writer :project_files, # Project files to include
                 :exclude,       # Project files to exclude
-                :local_path,    # Path to publish locally
-                :feed_url,      # Nuget feed to publish packages
-                :api_key        # Nuget API key
+                :local_path     # Path to publish locally
 
     def initialize
       super
+      @feeds = []
       @alias_tasks = true
     end
 
@@ -18,10 +20,7 @@ module Physique
       @alias_tasks = false
     end
 
-    def symbols_feed_url=(value)
-      @gen_symbols = true
-      @symbols_feed_url = value
-    end
+    def_delegators :default_feed, :feed_url=, :symbols_feed_url=, :api_key=
 
     def opts
       Map.new(
@@ -32,7 +31,8 @@ module Physique
         gen_symbols: @gen_symbols,
         symbols_feed_url: @symbols_feed_url,
         api_key: @api_key,
-        alias_tasks: @alias_tasks
+        alias_tasks: @alias_tasks,
+        feeds: @feeds.map { |f| f.opts }
       ).apply(
         local_path: 'C:/Nuget.Local'
       )
@@ -45,6 +45,45 @@ module Physique
     def exclude_or_default
       @exclude || /Tests/
     end
+
+    private
+
+    def default_feed
+      @default_feed || create_default_feed
+    end
+
+    def create_default_feed
+      PublishNugetsFeedConfig.new.tap do |feed|
+        feed.name = 'default'
+        @default_feed = feed
+        @feeds << feed
+      end
+    end
+  end
+
+  class PublishNugetsFeedConfig
+    attr_writer :name,     # Name of the nuget feed
+                :feed_url, # Nuget feed to publish packages
+                :api_key   # Nuget API key
+
+    # Nuget feed to publish symbol packages
+    def symbols_feed_url=(value)
+      @gen_symbols = true
+      @symbols_feed_url = value
+    end
+
+    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?
+
+      Map.new(
+        name: @name,
+        feed_url: @feed_url,
+        gen_symbols: @gen_symbols,
+        symbols_feed_url: @symbols_feed_url,
+        api_key: @api_key
+      )
+    end
   end
 
   class PublishNugetsTasksBuilder < TasksBuilder
@@ -65,7 +104,7 @@ module Physique
 
     def add_package_nugets_task
       namespace :nuget do
-        task = nugets_pack_task :package => [ :versionizer, :test ] do |p|
+        task = nugets_pack :package => [ :versionizer, :test ] do |p|
           ensure_output_location solution.nuget.build_location
 
           p.configuration = solution.compile.configuration

data/lib/physique/task_builders/test.rb

@@ -25,12 +25,11 @@ module Physique
       configuration = solution.compile.configuration
       package_dir = solution.nuget.restore_location
 
-      task = test_runner_task :test => test_dependencies do |tests|
+      task = test_runner :test => test_dependencies 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')
-        tests.parameters.add('/exclude=PersistenceTest')
       end
       task.add_description 'Run unit tests'
     end

data/lib/physique/tasks/octopus_pack.rb

@@ -80,7 +80,7 @@ module Physique
                                             work_dir: cwd,
                                             out: out
 
-        # Octopus packages don't confirm to NuGet standards so
+        # Octopus packages don't conform to NuGet standards so
         # disable package analysis to prevent unnecessary warnings.
         cmd.disable_package_analysis
 

data/lib/physique/tasks_builder.rb

@@ -3,8 +3,8 @@ require 'physique/tool_locator'
 
 module Physique
   class TasksBuilder
-    include Albacore::DSL
     include Albacore::Logging
+    include Physique::DSL
     include Physique::ToolLocator
 
     @subclasses = []

data/lib/physique/tool_locator.rb

@@ -12,7 +12,7 @@ module Physique
     # The tool sorts any matching executables in descending order to that the most recent version is returned. To
     # change this behavior call the method with the reverse option.
     #
-    #   locate_tool 'C:/path/to/**/tool.exe', reverse: false
+    #   locate_tool 'C:/path/to/**/tool.exe', find_latest: false
     #
     # Throws a ToolNotFoundError if no tool could be found.
     def locate_tool(paths, options = {})
@@ -24,9 +24,9 @@ module Physique
 
       info { "Attempting to locate tool in the following paths #{paths}" }
       opts = Map.options(options)
-      opts = opts.apply :reverse => true
+      opts = opts.apply :find_latest => true
       paths = paths.collect { |p| which(p) }.compact.sort
-      paths = paths.reverse if opts[:reverse]
+      paths = paths.reverse if opts[:find_latest]
       tool = paths.first
 
       raise ToolNotFoundError, "Could not find tool in the following paths: \n #{paths}" if tool.nil?

data/lib/physique/version.rb

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

data/spec/publish_nugets_spec.rb

@@ -0,0 +1,40 @@
+FEED_URL = 'https://www.nuget.org'
+SYMBOLS_FEED_URL = 'http://nuget.gw.symbolsource.org/Public/NuGet'
+
+describe Physique::PublishNugetsConfig do
+  let(:config) { Physique::PublishNugetsConfig.new }
+  let(:opts) { config.opts }
+
+  describe 'when setting feed data directly' do
+    let(:first_feed) { opts.feeds[0] }
+
+    it 'should create a default feed and delegate its configuration' do
+      config.feed_url = FEED_URL
+      config.symbols_feed_url = SYMBOLS_FEED_URL
+
+      opts.feeds.count.should eq(1)
+
+      first_feed.name.should eq('default')
+      first_feed.feed_url.should eq(FEED_URL)
+      first_feed.symbols_feed_url.should eq(SYMBOLS_FEED_URL)
+      first_feed.gen_symbols.should be_true
+    end
+  end
+end
+
+describe Physique::PublishNugetsFeedConfig do
+  let(:config) { Physique::PublishNugetsFeedConfig.new }
+  let(:feed) { config.opts }
+
+  it 'should set opts values' do
+    config.name = 'default'
+    config.feed_url = FEED_URL
+    config.symbols_feed_url = SYMBOLS_FEED_URL
+    config.api_key = 'API_KEY'
+
+    feed.name.should eq('default')
+    feed.feed_url.should eq(FEED_URL)
+    feed.symbols_feed_url.should eq(SYMBOLS_FEED_URL)
+    feed.gen_symbols.should be_true
+  end
+end

data/spec/test_data/tool_locator/Program Files/Microsoft SQL Server/110/Tools/Binn/SQLCMD.exe.txt

@@ -0,0 +1 @@
+This is just a place holder to make tests pass.

data/spec/test_data/tool_locator/Windows/Microsoft.NET/Framework/v3.5/MSBuild.exe.txt

@@ -0,0 +1 @@
+This is just a place holder to make tests pass.

data/spec/test_data/tool_locator/Windows/Microsoft.NET/Framework/v4.0.30319/MSBuild.exe.txt

@@ -0,0 +1 @@
+This is just a place holder to make tests pass.

data/spec/tool_locator_spec.rb

@@ -10,13 +10,20 @@ describe Physique::ToolLocator do
     end
 
     it 'should find tool based on file spec' do
-      result = locate_tool('C:/Program Files/Microsoft SQL Server/**/Tools/Binn/SQLCMD.EXE')
-      expect(result).to eq('C:/Program Files/Microsoft SQL Server/110/Tools/Binn/SQLCMD.EXE')
+      result = locate_tool('./spec/test_data/tool_locator/Program Files/Microsoft SQL Server/**/Tools/Binn/SQLCMD.exe.txt')
+      expect(result).to eq('./spec/test_data/tool_locator/Program Files/Microsoft SQL Server/110/Tools/Binn/SQLCMD.exe.txt')
     end
 
-    it 'should find tool based on file spec' do
-      result = Physique::ToolLocator.locate_tool('C:/Windows/Microsoft.NET/Framework/**/msbuild.exe')
+    MS_BUILD_PATH = './spec/test_data/tool_locator/Windows/Microsoft.NET/Framework/**/msbuild.exe.txt'
+
+    it 'should find latest version of a tool based on file spec' do
+      result = locate_tool(MS_BUILD_PATH)
       expect(result).to match(%r{v4.0}i)
     end
+
+    it 'should find first version of a tool if specified' do
+      result = locate_tool(MS_BUILD_PATH, find_latest: false)
+      expect(result).to match(%r{v3.5}i)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: physique
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Robert Scaduto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,8 +115,12 @@ files:
 - physique.gemspec
 - spec/config_spec.rb
 - spec/project_spec.rb
+- spec/publish_nugets_spec.rb
 - spec/solution_spec.rb
 - spec/sqlcmd_spec.rb
+- spec/test_data/tool_locator/Program Files/Microsoft SQL Server/110/Tools/Binn/SQLCMD.exe.txt
+- spec/test_data/tool_locator/Windows/Microsoft.NET/Framework/v3.5/MSBuild.exe.txt
+- spec/test_data/tool_locator/Windows/Microsoft.NET/Framework/v4.0.30319/MSBuild.exe.txt
 - spec/tool_locator_spec.rb
 homepage: http://github.com/scardetto/physique
 licenses:
@@ -138,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: A conventional build framework supporting NUnit, FluentMigrator and Octopus
@@ -146,6 +150,10 @@ summary: A conventional build framework supporting NUnit, FluentMigrator and Oct
 test_files:
 - spec/config_spec.rb
 - spec/project_spec.rb
+- spec/publish_nugets_spec.rb
 - spec/solution_spec.rb
 - spec/sqlcmd_spec.rb
+- spec/test_data/tool_locator/Program Files/Microsoft SQL Server/110/Tools/Binn/SQLCMD.exe.txt
+- spec/test_data/tool_locator/Windows/Microsoft.NET/Framework/v3.5/MSBuild.exe.txt
+- spec/test_data/tool_locator/Windows/Microsoft.NET/Framework/v4.0.30319/MSBuild.exe.txt
 - spec/tool_locator_spec.rb