rake-funnel 0.3.2.pre → 0.4.0.pre

data/lib/rake/funnel/tasks/environments.rb

@@ -1,89 +1,89 @@
-require 'configatron'
-require 'rake/tasklib'
-
-Dir["#{File.dirname(__FILE__)}/environments_support/*.rb"].each do |path|
-  require path
-end
-
-module Rake::Funnel::Tasks
-  class Environments < Rake::TaskLib
-    include Rake::Funnel::Support::Environments
-
-    attr_accessor :base_dir, :store, :default_env, :default_config, :local_config, :customizer
-
-    def initialize(*args, &task_block)
-      setup_ivars(args)
-
-      define(args, &task_block)
-    end
-
-    private
-    def setup_ivars(_args)
-      @store = configatron
-      @default_env = nil
-      @default_config = 'default'
-      @local_config = 'local'
-      @base_dir = 'config'
-    end
-
-    def define(args, &task_block)
-      task_block.call(*[self].slice(0, task_block.arity)) if task_block
-
-      environments.each do |env|
-        desc "Configure for the #{env[:name]} environment"
-
-        task(env[:name], *args) do |_, task_args|
-          Loader.load_configuration(env, store, customizer)
-        end
-      end
-
-      default_environment_setup
-    end
-
-    def environments
-      default = File.join(base_dir, config_ext(default_config))
-      local = File.join(base_dir, config_ext(local_config))
-
-      Dir[File.join(base_dir, config_ext('*'))]
-        .reject { |config| config == default || config == local }
-        .map do |config|
-        {
-          name: File.basename(config, '.*'),
-          config_files: [
-            File.exists?(default) ? default : nil,
-            config,
-            File.exists?(local) ? local : nil
-          ].compact
-        }
-      end
-    end
-
-    def config_ext(name)
-      "#{name}.yaml"
-    end
-
-    def default_environment_setup
-      return unless default_env
-
-      top_level_envs = top_level_env_tasks
-      if top_level_envs.empty?
-        task = Rake.application.current_scope.path_with_task_name(default_env)
-        prepend_task(task)
-      else
-        top_level_envs.each do |task|
-          Rake.application.top_level_tasks.delete(task)
-          prepend_task(task)
-        end
-      end
-    end
-
-    def prepend_task(task)
-      Rake.application.top_level_tasks.unshift(task)
-    end
-
-    def top_level_env_tasks
-      expect_user_defined = environments.map { |env| Rake.application.current_scope.path_with_task_name(env[:name]) }
-      Rake.application.top_level_tasks.select { |t| expect_user_defined.include?(t) }
-    end
-  end
-end
+require 'configatron'
+require 'rake/tasklib'
+
+module Rake
+  module Funnel
+    module Tasks
+      class Environments < Rake::TaskLib
+        include Rake::Funnel::Support::Environments
+
+        attr_accessor :base_dir, :store, :default_env, :default_config, :local_config, :customizer
+
+        def initialize(*args, &task_block)
+          setup_ivars(args)
+
+          define(args, &task_block)
+        end
+
+        private
+        def setup_ivars(_args)
+          @store = configatron
+          @default_env = nil
+          @default_config = 'default'
+          @local_config = 'local'
+          @base_dir = 'config'
+        end
+
+        def define(args, &task_block)
+          task_block.call(*[self].slice(0, task_block.arity)) if task_block
+
+          environments.each do |env|
+            desc "Configure for the #{env[:name]} environment"
+
+            task(env[:name], *args) do |_, _task_args|
+              Loader.load_configuration(env, store, customizer)
+            end
+          end
+
+          default_environment_setup
+        end
+
+        def environments
+          default = File.join(base_dir, config_ext(default_config))
+          local = File.join(base_dir, config_ext(local_config))
+
+          Dir[File.join(base_dir, config_ext('*'))]
+            .reject { |config| config == default || config == local }
+            .map do |config|
+            {
+              name: File.basename(config, '.*'),
+              config_files: [
+                File.exist?(default) ? default : nil,
+                config,
+                File.exist?(local) ? local : nil
+              ].compact
+            }
+          end
+        end
+
+        def config_ext(name)
+          "#{name}.yaml"
+        end
+
+        def default_environment_setup
+          return unless default_env
+
+          top_level_envs = top_level_env_tasks
+          if top_level_envs.empty?
+            task = Rake.application.current_scope.path_with_task_name(default_env)
+            prepend_task(task)
+          else
+            top_level_envs.each do |task|
+              Rake.application.top_level_tasks.delete(task)
+              prepend_task(task)
+            end
+          end
+        end
+
+        def prepend_task(task)
+          Rake.application.top_level_tasks.unshift(task)
+        end
+
+        def top_level_env_tasks
+          expect_user_defined = environments.map { |env| Rake.application.current_scope.path_with_task_name(env[:name]) }
+          Rake.application.top_level_tasks.select { |t| expect_user_defined.include?(t) }
+        end
+      end
+    end
+  end
+end

data/lib/rake/funnel/tasks/msbuild.rb

@@ -1,51 +1,55 @@
-require 'rake/tasklib'
-
-module Rake::Funnel::Tasks
-  class MSBuild < Rake::TaskLib
-    include Rake::Funnel::Support
-    include Rake::Funnel::Support::MSBuild
-
-    attr_accessor :name, :msbuild, :project_or_solution, :args, :search_pattern
-
-    def initialize(*args, &task_block)
-      setup_ivars(args)
-
-      define(args, &task_block)
-    end
-
-    def project_or_solution
-      Finder.new(@project_or_solution || search_pattern, self, 'No projects or more than one project found.')
-    end
-
-    def project_or_solution=(value)
-      @project_or_solution = value
-    end
-
-    private
-    def setup_ivars(args)
-      @name = args.shift || :compile
-
-      @msbuild = BuildTool.find
-      @args = {}
-      @search_pattern = %w(**/*.sln)
-    end
-
-    def define(args, &task_block)
-      desc 'Compile MSBuild projects' unless Rake.application.last_description
-
-      task(name, *args) do |_, task_args|
-        task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block
-
-        cmd = [
-          msbuild,
-          project_or_solution.single,
-          *Mapper.new(:MSBuild).map(@args)
-        ]
-
-        sh(*cmd)
-      end
-
-      self
-    end
-  end
-end
+require 'rake/tasklib'
+
+module Rake
+  module Funnel
+    module Tasks
+      class MSBuild < Rake::TaskLib
+        include Rake::Funnel::Support
+        include Rake::Funnel::Support::MSBuild
+
+        attr_accessor :name, :msbuild, :project_or_solution, :args, :search_pattern
+
+        def initialize(*args, &task_block)
+          setup_ivars(args)
+
+          define(args, &task_block)
+        end
+
+        def project_or_solution
+          Finder.new(@project_or_solution || search_pattern, self, 'No projects or more than one project found.')
+        end
+
+        def project_or_solution=(value)
+          @project_or_solution = value
+        end
+
+        private
+        def setup_ivars(args)
+          @name = args.shift || :compile
+
+          @msbuild = BuildTool.find
+          @args = {}
+          @search_pattern = %w(**/*.sln)
+        end
+
+        def define(args, &task_block)
+          desc 'Compile MSBuild projects' unless Rake.application.last_description
+
+          task(name, *args) do |_, task_args|
+            task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block
+
+            cmd = [
+              msbuild,
+              project_or_solution.single,
+              *Mapper.new(:MSBuild).map(@args)
+            ]
+
+            sh(*cmd)
+          end
+
+          self
+        end
+      end
+    end
+  end
+end

data/lib/rake/funnel/tasks/msdeploy.rb

@@ -1,50 +1,54 @@
-require 'rake/tasklib'
-
-module Rake::Funnel::Tasks
-  class MSDeploy < Rake::TaskLib
-    include Rake::Funnel::Support
-    include Rake::Funnel::Support::MSDeploy
-
-    attr_accessor :name, :msdeploy, :args, :log_file
-
-    def initialize(*args, &task_block)
-      setup_ivars(args)
-
-      define(args, &task_block)
-    end
-
-    private
-    def setup_ivars(args)
-      @name = args.shift || :msdeploy
-
-      @msdeploy = 'msdeploy'
-      @args = {}
-      @log_file = "#{@name}.log"
-    end
-
-    def define(args, &task_block)
-      desc 'Deploy application' unless Rake.application.last_description
-
-      task(name, *args) do |_, task_args|
-        task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block
-
-        mapper = Mapper.new(:MSDeploy)
-        cmd = [quote(msdeploy), mapper.map(@args)]
-          .flatten
-          .join(' ')
-
-        RegistryPatch.new do
-          shell(cmd, log_file: log_file, error_lines: /^(error|[\w\.]*exception)/i)
-        end
-      end
-
-      self
-    end
-
-    def quote(value)
-      value = value.gsub(/"/, '""') if value.kind_of?(String)
-      return %Q{"#{value}"} if value =~ /\s/
-      value
-    end
-  end
-end
+require 'rake/tasklib'
+
+module Rake
+  module Funnel
+    module Tasks
+      class MSDeploy < Rake::TaskLib
+        include Rake::Funnel::Support
+        include Rake::Funnel::Support::MSDeploy
+
+        attr_accessor :name, :msdeploy, :args, :log_file
+
+        def initialize(*args, &task_block)
+          setup_ivars(args)
+
+          define(args, &task_block)
+        end
+
+        private
+        def setup_ivars(args)
+          @name = args.shift || :msdeploy
+
+          @msdeploy = 'msdeploy'
+          @args = {}
+          @log_file = "#{@name}.log"
+        end
+
+        def define(args, &task_block)
+          desc 'Deploy application' unless Rake.application.last_description
+
+          task(name, *args) do |_, task_args|
+            task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block
+
+            mapper = Mapper.new(:MSDeploy)
+            cmd = [quote(msdeploy), mapper.map(@args)]
+              .flatten
+              .join(' ')
+
+            RegistryPatch.new do
+              shell(cmd, log_file: log_file, error_lines: /^(error|[\w\.]*exception)/i)
+            end
+          end
+
+          self
+        end
+
+        def quote(value)
+          value = value.gsub(/"/, '""') if value.is_a?(String)
+          return %Q{"#{value}"} if value =~ /\s/
+          value
+        end
+      end
+    end
+  end
+end

data/lib/rake/funnel/tasks/nunit.rb

@@ -1,48 +1,52 @@
-require 'rake/tasklib'
-
-module Rake::Funnel::Tasks
-  class NUnit < Rake::TaskLib
-    include Rake::Funnel::Support
-
-    attr_accessor :name, :nunit, :files, :args
-
-    def initialize(*args, &task_block)
-      setup_ivars(args)
-
-      define(args, &task_block)
-    end
-
-    private
-    def setup_ivars(args)
-      @name = args.shift || :test
-
-      @nunit = 'nunit-console.exe'
-      @args = {}
-      @files = %w(build/specs/**/*.dll build/specs/**/*.exe)
-    end
-
-    def define(args, &task_block)
-      desc "Test #{test_assemblies.all_or_default.join(', ')}" unless Rake.application.last_description
-
-      task(name, *args) do |_, task_args|
-        task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block
-
-        Rake::Funnel::Integration::TeamCity::NUnitPlugin.setup(nunit)
-
-        cmd = [
-          *Mono.invocation(nunit),
-          *test_assemblies.all,
-          *Mapper.new(:NUnit).map(@args)
-        ]
-
-        sh(*cmd)
-      end
-
-      self
-    end
-
-    def test_assemblies
-      Finder.new(files, self, 'No test assemblies found.')
-    end
-  end
-end
+require 'rake/tasklib'
+
+module Rake
+  module Funnel
+    module Tasks
+      class NUnit < Rake::TaskLib
+        include Rake::Funnel::Support
+
+        attr_accessor :name, :nunit, :files, :args
+
+        def initialize(*args, &task_block)
+          setup_ivars(args)
+
+          define(args, &task_block)
+        end
+
+        private
+        def setup_ivars(args)
+          @name = args.shift || :test
+
+          @nunit = 'nunit-console.exe'
+          @args = {}
+          @files = %w(build/specs/**/*.dll build/specs/**/*.exe)
+        end
+
+        def define(args, &task_block)
+          desc "Test #{test_assemblies.all_or_default.join(', ')}" unless Rake.application.last_description
+
+          task(name, *args) do |_, task_args|
+            task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block
+
+            Rake::Funnel::Integration::TeamCity::NUnitPlugin.setup(nunit)
+
+            cmd = [
+              *Mono.invocation(nunit),
+              *test_assemblies.all,
+              *Mapper.new(:NUnit).map(@args)
+            ]
+
+            sh(*cmd)
+          end
+
+          self
+        end
+
+        def test_assemblies
+          Finder.new(files, self, 'No test assemblies found.')
+        end
+      end
+    end
+  end
+end

data/lib/rake/funnel/tasks/paket.rb

@@ -1,47 +1,51 @@
-require 'rake/tasklib'
-
-module Rake::Funnel::Tasks
-  class Paket < Rake::TaskLib
-    include Rake::Funnel::Support
-
-    attr_accessor :name, :paket, :paket_args, :bootstrapper, :bootstrapper_args
-
-    def initialize(*args, &task_block)
-      setup_ivars(args)
-
-      define(args, &task_block)
-    end
-
-    private
-    def setup_ivars(args)
-      @name = args.shift || :paket
-
-      @paket = File.join('.paket', 'paket.exe')
-      @paket_args = 'restore'
-
-      @bootstrapper = File.join('.paket', 'paket.bootstrapper.exe')
-      @bootstrapper_args = nil
-    end
-
-    def define(args, &task_block)
-      desc 'Restore packages' unless Rake.application.last_description
-
-      task(name, *args) do |_, task_args|
-        task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block
-
-        sh(*bootstrapper_cmd) unless File.exist?(paket)
-        sh(*paket_cmd)
-      end
-
-      self
-    end
-
-    def bootstrapper_cmd
-      Mono.invocation(bootstrapper, bootstrapper_args)
-    end
-
-    def paket_cmd
-      Mono.invocation(paket, paket_args)
-    end
-  end
-end
+require 'rake/tasklib'
+
+module Rake
+  module Funnel
+    module Tasks
+      class Paket < Rake::TaskLib
+        include Rake::Funnel::Support
+
+        attr_accessor :name, :paket, :paket_args, :bootstrapper, :bootstrapper_args
+
+        def initialize(*args, &task_block)
+          setup_ivars(args)
+
+          define(args, &task_block)
+        end
+
+        private
+        def setup_ivars(args)
+          @name = args.shift || :paket
+
+          @paket = File.join('.paket', 'paket.exe')
+          @paket_args = 'restore'
+
+          @bootstrapper = File.join('.paket', 'paket.bootstrapper.exe')
+          @bootstrapper_args = nil
+        end
+
+        def define(args, &task_block)
+          desc 'Restore packages' unless Rake.application.last_description
+
+          task(name, *args) do |_, task_args|
+            task_block.call(*[self, task_args].slice(0, task_block.arity)) if task_block
+
+            sh(*bootstrapper_cmd) unless File.exist?(paket)
+            sh(*paket_cmd)
+          end
+
+          self
+        end
+
+        def bootstrapper_cmd
+          Mono.invocation(bootstrapper, bootstrapper_args)
+        end
+
+        def paket_cmd
+          Mono.invocation(paket, paket_args)
+        end
+      end
+    end
+  end
+end