rake-funnel 0.0.5.pre → 0.0.6.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 276f461ed75b3b78a82c23de466ed0f8057b6019
-  data.tar.gz: ff755cdb17ebc083b62c378823bc0f85211bef92
+  metadata.gz: 1c5f4731ba432fe73f8c1f716f708347c4acbb13
+  data.tar.gz: 7b7bde023095c65f429fb7329bcb7648bdbd160a
 SHA512:
-  metadata.gz: 08f26a42351dd4c114dd6c0ab367c7af0707d98cfdd5da12f88317f7ef52776dc3725b6624d055a2b6d34aa81ed28185fd9f9d20f8ca2e13e1e78fe03dd4f1f6
-  data.tar.gz: fece830b5b3479da6c8b161897529709e125776361074f47ca1f6bed80fa0d45794d22a4609f814f9edc58385c7ebf234d012a270c89bd6e81e335535fd511f6
+  metadata.gz: 3e18e39c549ef30274224c56607d0d14ff09ede32ce913b3c9625700cfedbbbdca26fca2a267e3ec8605e3372fd44c00cc20e62cbe27128d2e9e1b185d80e478
+  data.tar.gz: eebc2eb577d4d9b4225dc386a9e2ac31b3d48d2286f7f29d110ccb0a8e43823bdcd593d85c1000c23bdff8c81de48c25bc250ccd6e4fca82759dc358195841b3

data/lib/rake/funnel/support/version.rb

@@ -0,0 +1,55 @@
+module Rake::Funnel::Support
+  class Version
+    class << self
+      def parse(context)
+        {
+          assembly_version: assembly_version(context),
+          assembly_file_version: assembly_file_version(context),
+          assembly_informational_version: assembly_informational_version(context)
+        }
+      end
+
+      private
+      def default_version(context)
+        context[:version] || '0'
+      end
+
+      def assembly_version(context)
+        strip_trailing_non_numeric(default_version(context))
+      end
+
+      def assembly_file_version(context)
+        numeric_build_number = strip_leading_non_numeric(context[:build_number])
+
+        [
+          assembly_version(context),
+          numeric_build_number
+        ].compact.join('.')
+      end
+
+      def assembly_informational_version(context)
+        build_number = context[:build_number]
+        join_using = '.'
+        join_using = '' if build_number =~ /^\D/
+
+        prefix = [default_version(context), build_number].compact.join(join_using)
+        sha = context[:sha]
+
+        [prefix, sha].compact.join('-')
+      end
+
+      def strip_trailing_non_numeric(str)
+        return nil if str.nil?
+        str.gsub(/[^\d\.].*/, '')
+      end
+
+      def strip_leading_non_numeric(str)
+        return nil if str.nil?
+        str = str.gsub(/[^\d\.]/, '')
+
+        return nil if str.empty?
+        str
+      end
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module Rake::Funnel::Tasks
     def initialize(name = :template)
       @name = name
 
-      @search_pattern = %w(**/*.template)
+      @search_pattern = %w(**/*.erb)
       @context = binding
 
       yield self if block_given?

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

@@ -38,11 +38,11 @@ module Rake::Funnel::Tasks
     end
 
     def patches
-      @patches ||= create_patches
+      @patches ||= [report, benchmark]
     end
 
-    def create_patches
-      report = Rake::Funnel::Support::Patch.new do |p|
+    def report
+      Rake::Funnel::Support::Patch.new do |p|
         report_invoker = -> (opts) { TimingSupport::Report.new(@stats, opts).render }
 
         p.setup do
@@ -67,8 +67,10 @@ module Rake::Funnel::Tasks
           end
         end
       end
+    end
 
-      benchmark = Rake::Funnel::Support::Patch.new do |p|
+    def benchmark
+      Rake::Funnel::Support::Patch.new do |p|
         benchmark_invoker = -> (task, &block) { @stats.benchmark(task, &block) }
 
         p.setup do
@@ -93,8 +95,6 @@ module Rake::Funnel::Tasks
           end
         end
       end
-
-      [report, benchmark]
     end
   end
 end

data/lib/rake/funnel/version.rb

@@ -1,5 +1,5 @@
 module Rake
   module Funnel
-    VERSION = '0.0.5.pre'
+    VERSION = '0.0.6.pre'
   end
 end

data/rake-funnel.gemspec

@@ -15,13 +15,13 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.0.0'
 
-  s.add_dependency 'rake'
+  s.add_dependency 'rake', '~> 10.4'
   s.add_dependency 'rubyzip', '~> 1.0'
   s.add_dependency 'smart_colored'
   s.add_dependency 'configatron', '~> 4.5'
 
   git = ENV['TEAMCITY_GIT_PATH'] || 'git'
-  s.files         = `"#{git}" ls-files -z`.split("\x0")
+  s.files         = `"#{git}" ls-files -z`.split("\x0").reject { |file| file =~ %r{^(config/|tools/|lib/tasks|\.gitignore|\.travis)} || file =~ %r{(Guard|Rake)file} || File.extname(file) == '.cmd' }
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']

data/spec/rake/funnel/support/version_spec.rb

@@ -0,0 +1,145 @@
+describe Rake::Funnel::Support::Version do
+  [
+    {
+      context: {
+        version: '1.2',
+        build_number: '42',
+        sha: 'sha'
+      },
+      expected: {
+        assembly_version: '1.2',
+        assembly_file_version: '1.2.42',
+        assembly_informational_version: '1.2.42-sha'
+      }
+    },
+    {
+      context: {
+        version: '1.2-pre1',
+        build_number: '42',
+        sha: 'sha'
+      },
+      expected: {
+        assembly_version: '1.2',
+        assembly_file_version: '1.2.42',
+        assembly_informational_version: '1.2-pre1.42-sha'
+      }
+    },
+    {
+      context: {
+        version: '1.2.3',
+        build_number: '42',
+        sha: 'sha' },
+      expected: {
+        assembly_version: '1.2.3',
+        assembly_file_version: '1.2.3.42',
+        assembly_informational_version: '1.2.3.42-sha'
+      }
+    },
+    {
+      context: {
+        version: '1.2.3-pre1',
+        build_number: '42',
+        sha: 'sha'
+      },
+      expected: {
+        assembly_version: '1.2.3',
+        assembly_file_version: '1.2.3.42',
+        assembly_informational_version: '1.2.3-pre1.42-sha'
+      }
+    },
+    {
+      context: {
+        version: '1.2',
+        build_number: '-pre',
+        sha: 'sha'
+      },
+      expected: {
+        assembly_version: '1.2',
+        assembly_file_version: '1.2',
+        assembly_informational_version: '1.2-pre-sha'
+      }
+    },
+    {
+      context: {
+        version: '1.2',
+        build_number: '-pre42',
+        sha: 'sha'
+      },
+      expected: {
+        assembly_version: '1.2',
+        assembly_file_version: '1.2.42',
+        assembly_informational_version: '1.2-pre42-sha'
+      }
+    },
+    {
+      context: {
+        version: '1.2',
+        build_number: nil,
+        sha: nil
+      },
+      expected: {
+        assembly_version: '1.2',
+        assembly_file_version: '1.2',
+        assembly_informational_version: '1.2'
+      }
+    },
+    {
+      context: {
+        version: '1.2',
+        build_number: '42',
+        sha: nil
+      },
+      expected: {
+        assembly_version: '1.2',
+        assembly_file_version: '1.2.42',
+        assembly_informational_version: '1.2.42'
+      }
+    },
+    {
+      context: {
+        version: '1.2'
+      },
+      expected: {
+        assembly_version: '1.2',
+        assembly_file_version: '1.2',
+        assembly_informational_version: '1.2'
+      }
+    },
+    {
+      context: {
+        version: nil,
+        build_number: nil,
+        sha: nil
+      },
+      expected: {
+        assembly_version: '0',
+        assembly_file_version: '0',
+        assembly_informational_version: '0'
+      }
+    },
+    {
+      context: { },
+      expected: {
+        assembly_version: '0',
+        assembly_file_version: '0',
+        assembly_informational_version: '0'
+      }
+    }
+  ].each do |spec|
+    context "version #{spec[:context][:version] || 'none'}, build number #{spec[:context][:build_number] || 'none'}, SHA #{spec[:context][:sha] || 'none'}" do
+      let(:parsed) { described_class.parse(spec[:context]) }
+
+      it "should generate assembly version #{spec[:expected][:assembly_version]}" do
+        expect(parsed[:assembly_version]).to eq(spec[:expected][:assembly_version])
+      end
+
+      it "should generate assembly file version #{spec[:expected][:assembly_file_version]}" do
+        expect(parsed[:assembly_file_version]).to eq(spec[:expected][:assembly_file_version])
+      end
+
+      it "should generate assembly informational version #{spec[:expected][:assembly_informational_version]}" do
+        expect(parsed[:assembly_informational_version]).to eq(spec[:expected][:assembly_informational_version])
+      end
+    end
+  end
+end

data/spec/rake/funnel/tasks/quick_template_spec.rb

@@ -11,7 +11,7 @@ describe Rake::Funnel::Tasks::QuickTemplate do
 
   describe 'defaults' do
     its(:name) { should == :template }
-    its(:search_pattern) { should eq(%w(**/*.template)) }
+    its(:search_pattern) { should eq(%w(**/*.erb)) }
     its(:context) { should kind_of?(Binding) }
 
     describe 'target files are cleaned' do

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'simplecov'
 require 'coveralls'
 require 'codeclimate-test-reporter'
+require 'bundler/setup'
 
 SimpleCov.start do
   if Coveralls.will_run?

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rake-funnel
 version: !ruby/object:Gem::Version
-  version: 0.0.5.pre
+  version: 0.0.6.pre
 platform: ruby
 authors:
 - Alexander Groß
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -73,20 +73,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
 - .rspec
-- .travis.yml
 - Gemfile
-- Guardfile
 - README.md
-- Rakefile
-- build.cmd
-- bundle.cmd
-- config/.gitignore
-- config/.local.yaml.example
-- config/default.yaml
-- config/dev.yaml
-- config/production.yaml
 - lib/rake/funnel.rb
 - lib/rake/funnel/ambiguous_file_error.rb
 - lib/rake/funnel/execution_error.rb
@@ -112,6 +101,7 @@ files:
 - lib/rake/funnel/support/mono.rb
 - lib/rake/funnel/support/patch.rb
 - lib/rake/funnel/support/template_engine.rb
+- lib/rake/funnel/support/version.rb
 - lib/rake/funnel/support/which.rb
 - lib/rake/funnel/tasks/bin_path.rb
 - lib/rake/funnel/tasks/copy.rb
@@ -152,6 +142,7 @@ files:
 - spec/rake/funnel/support/mono_spec.rb
 - spec/rake/funnel/support/patch_spec.rb
 - spec/rake/funnel/support/template_engine_spec.rb
+- spec/rake/funnel/support/version_spec.rb
 - spec/rake/funnel/support/which_spec.rb
 - spec/rake/funnel/tasks/bin_path_spec.rb
 - spec/rake/funnel/tasks/copy_spec.rb
@@ -176,12 +167,6 @@ files:
 - spec/rake/funnel/tasks/timing_support/report_spec.rb
 - spec/rake/funnel/tasks/zip_spec.rb
 - spec/spec_helper.rb
-- tools/MSDeploy/Microsoft.Web.Delegation.dll
-- tools/MSDeploy/Microsoft.Web.Deployment.Tracing.dll
-- tools/MSDeploy/Microsoft.Web.Deployment.dll
-- tools/MSDeploy/en/msdeploy.resources.dll
-- tools/MSDeploy/msdeploy.exe
-- tools/MSDeploy/msdeploy.exe.config
 homepage: http://grossweber.com
 licenses:
 - BSD
@@ -227,6 +212,7 @@ test_files:
 - spec/rake/funnel/support/mono_spec.rb
 - spec/rake/funnel/support/patch_spec.rb
 - spec/rake/funnel/support/template_engine_spec.rb
+- spec/rake/funnel/support/version_spec.rb
 - spec/rake/funnel/support/which_spec.rb
 - spec/rake/funnel/tasks/bin_path_spec.rb
 - spec/rake/funnel/tasks/copy_spec.rb

data/.gitignore

@@ -1,7 +0,0 @@
-.idea/
-build/
-deploy/
-tmp/
-
-Gemfile.lock
-cacert.pem

data/.travis.yml

@@ -1,21 +0,0 @@
-language: ruby
-bundler_args: --without development
-script: bundle exec rspec --tag ~platform:win32
-rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.1.1
-  - 2.1.2
-  - 2.1.3
-  - 2.1.4
-  - 2.1.5
-  - 2.2.0
-  - ruby-head
-notifications:
-  email:
-    recipients:
-      - agross@therightstuff.de
-    on_success: never
-addons:
-  code_climate:
-    repo_token: d8b15ab15f45f543f1ddd59b4224f83e6fcc9576f2fa4ba2817ae20d445f5f4f

data/Guardfile

@@ -1,24 +0,0 @@
-case RbConfig::CONFIG['target_os']
-when /windows|bccwin|cygwin|djgpp|mingw|mswin|wince/i
-  notification :gntp, :host => 'localhost'
-when /linux/i
-  notification :notifysend
-when /mac|darwin/i
-  notification :growl
-end
-
-guard 'bundler' do
-  watch('Gemfile')
-  watch(/^.+\.gemspec/)
-end
-
-guard 'rspec',
-  :all_on_start => true,
-  :all_after_pass => true,
-  :notification => true,
-  :cmd => 'bundle exec rspec' do
-    watch('.rspec')              { 'spec' }
-    watch(%r{^spec/.+_spec\.rb$})
-    watch(%r{^lib/(.+)\.rb$})    { |m| "spec/#{m[1]}_spec.rb" }
-    watch('spec/spec_helper.rb') { 'spec' }
-end

data/Rakefile

@@ -1,77 +0,0 @@
-require 'rake/funnel'
-require 'rubygems/package_task'
-require 'rspec/core/rake_task'
-
-include Rake::Funnel
-
-Tasks::Timing.new
-Tasks::BinPath.new
-Integration::SyncOutput.new
-Integration::ProgressReport.new
-Integration::TeamCity::ProgressReport.new
-
-namespace :env do
-  Tasks::Environments.new do |t|
-    t.default_env = :dev
-  end
-end
-
-task default: :spec
-
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = '--order random'
-  if Integration::TeamCity.running?
-    t.rspec_opts += ' --format progress --format html --out build/spec/rspec.html'
-  end
-  t.rspec_opts += ' --tag ~platform:win32' unless Rake::Win32.windows?
-end
-
-spec = Gem::Specification.load('rake-funnel.gemspec')
-gem = Gem::PackageTask.new(spec) do |t|
-  t.package_dir = 'deploy'
-
-  task :gem do
-    rm_rf t.package_dir_path
-  end
-end
-
-task gem: :spec do
-  Integration::TeamCity::ServiceMessages.build_number(spec.version.to_s)
-end
-
-Tasks::MSDeploy.new :push => [:bin_path, :gem] do |t|
-  gem = File.join(File.expand_path(gem.package_dir), gem.gem_spec.file_name)
-
-  t.log_file = 'deploy/msdeploy.log'
-  t.args = {
-    verb: :sync,
-    pre_sync: {
-      run_command: "mkdir #{configatron.deployment.remote_dir}\\gems",
-      wait_interval: 60 * 1000
-    },
-    source: {
-      file_path: gem
-    },
-    dest: {
-      computer_name: configatron.deployment.computer_name,
-      username: configatron.deployment.username,
-      password: configatron.deployment.password,
-      file_path: File.join(configatron.deployment.remote_dir, 'gems', File.basename(gem))
-    },
-    skip: [{ skip_action: :delete }],
-    post_sync_on_success: {
-      run_command: "gem generate_index -V --directory=#{configatron.deployment.remote_dir} & icacls #{configatron.deployment.remote_dir} /reset /t /c /q",
-      wait_interval: 60 * 1000
-    },
-    use_check_sum: nil,
-    allow_untrusted: nil
-  }
-end
-
-task :fail do
-  raise 'this build is expected to fail'
-end
-
-task :long_running do
-  sleep(30)
-end

data/build.cmd

@@ -1,30 +0,0 @@
-@echo off
-setlocal
-
-set LANG=en_US.UTF-8
-
-:build
-cls
-
-call bundle.cmd check
-if errorlevel 1 call bundle.cmd install
-if errorlevel 1 goto wait
-
-cls
-
-call bundle.cmd exec rake %*
-
-:wait
-rem Bail if we're running a TeamCity build.
-if defined TEAMCITY_PROJECT_NAME goto quit
-
-rem Loop the build script.
-set choice=nothing
-echo (Q)uit, (Enter) runs the build again
-set /P choice=
-if /i "%choice%"=="Q" goto quit
-
-goto build
-
-:quit
-exit /b %errorlevel%

data/bundle.cmd

@@ -1,26 +0,0 @@
-@echo off
-setlocal
-
-set LANG=en_US.UTF-8
-set PATH=%~dp0tools\Git\bin;%path%
-set DOWNLOAD_CA_BUNDLE="require 'net/http'; Net::HTTP.start('curl.haxx.se') { |http| resp = http.get('/ca/cacert.pem'); abort 'Error downloading CA bundle: ' + resp.code unless resp.code == '200'; open('cacert.pem', 'wb') { |file| file.write(resp.body) }; }"
-
-if not exist cacert.pem (
-  echo Downloading latest CA bundle...
-  ruby -e %DOWNLOAD_CA_BUNDLE%
-
-  if errorlevel 1 (
-    exit /b %errorlevel%
-  )
-)
-
-set SSL_CERT_FILE=%cd%\cacert.pem
-
-call gem.bat which bundler > NUL 2>&1
-if errorlevel 1 (
-  echo Installing bundler...
-  call gem.bat install bundler --no-ri --no-rdoc
-)
-
-call bundle.bat %*
-exit /b %errorlevel%

data/config/.gitignore

@@ -1 +0,0 @@
-local.yaml

data/config/.local.yaml.example

@@ -1,9 +0,0 @@
-# Copy this file to local.yaml and put configuration values to temporarily
-# override here.
-#
-# Please do not add local.yaml to source control.
-#
-# Example:
-
-deployment:
-  computer_name: somewhere-else

data/config/default.yaml

@@ -1,5 +0,0 @@
-deployment:
-  computer_name: localhost
-  username:  <%= ENV['DEPLOY_USER'] || ENV['COMPUTERNAME'] + '\Administrator' %>
-  password: <%= ENV['DEPLOY_PASSWORD'] %>
-  remote_dir: <%= (ENV['TEMP'] + '/_gems').gsub(%r|/|, '\\') %>

data/config/production.yaml

@@ -1,3 +0,0 @@
-deployment:
-  computer_name: gems.grossweber.com
-  remote_dir: <%= 'C:/GROSSWEBER/gems'.gsub(%r|/|, '\\') %>

data/tools/MSDeploy/msdeploy.exe.config

@@ -1,6 +0,0 @@
-<configuration>
-  <startup  useLegacyV2RuntimeActivationPolicy="true" >
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
-    <supportedRuntime version="v2.0.50727" />
-  </startup>
-</configuration>