albacore 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01eb159fca6cc1eba5b2ce83d3835de3742df11a
-  data.tar.gz: c16cbe3f7777b17779c6a208e6cb606d7b65b90c
+  metadata.gz: af9dd9c6d77987035b6c5fe1a6d4255b380cddca
+  data.tar.gz: f7089ead80b7a9e88ce1f91514e6b74725e9b3c6
 SHA512:
-  metadata.gz: a9d9f39444ccb58051bff961ecb7750d7b449ce50a265ed79bd38ab750b3bf5ca3a6b5eb4dbc13f8dbe363d74bf35252daf54bd465188bf9b32ca2d333b66222
-  data.tar.gz: 7ae0f6df0051fb53874a5821775db824e5273c449da8d8539903860338056f5cc2bfb7d753b37feb97b6fd9cd27865e056afbe5101968907256593a2e56fe192
+  metadata.gz: df93fdf4478c808d1305b3c87af31679e55b6caef826cbe07e89f7a62a559b65c435c20e912544363486b867b2f7ee0c2809d6f36be3c746a9532a83157f9071
+  data.tar.gz: c7c6c7e7fd7b331eaa68100c6ee586b0aba5cd18a9d9c40847e844451b340082d24253dee3274209f02c41ae31e9adbf49cbccb1c14da2d8466b16eac620969d

data/lib/albacore/tools/fluent_migrator.rb

@@ -6,6 +6,9 @@ require 'albacore/logging'
 
 module Albacore::Tools
   module FluentMigrator
+    class MissingFluentMigratorExe < ::StandardError
+    end
+
     class Cmd
       include ::Albacore::CrossPlatformCmd
 
@@ -59,21 +62,31 @@ module Albacore::Tools
           @parameters.push opts.get(:task_override)
         end
 
-        opts.get(:extras).each{|e| @parameters.push e}
+        opts.get(:extras).each{ |e| @parameters.push e}
 
-        trace "configured Albacore::FluentMigrator::Cmd with exe: '#{@executable}', params: #{@parameters.join(' ')}"
+        trace { "configured Albacore::FluentMigrator::Cmd with exe: '#{@executable}', params: #{@parameters.join(' ')}" }
+        prepare_verify @executable, opts
 
         mono_command
       end
 
       def execute
-        Dir.chdir (opts.get(:work_dir, '.')) do
-          raise "Missing FluentMigrator at #{@executable}" unless File.exists? @executable
-        end
+        verify_exists
         system @executable, @parameters, :work_dir => opts.get(:work_dir)
       end
 
       private
+      def prepare_verify exe, opts
+        Dir.chdir(opts.get(:work_dir) || '.') do
+          @failed_verify = "Missing FluentMigrator at #{@failed_ver}" unless File.exists? exe
+        end
+      end
+
+      def verify_exists
+        if @failed_verify
+          raise MissingFluentMigratorExe, @failed_verify
+        end
+      end
 
       def agree txt, default
         reply = default ? "[Y/n]" : "[y/N]"

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 end

data/spec/tools/fluent_migrator_spec.rb

@@ -15,6 +15,12 @@ describe Albacore::Tools::FluentMigrator::MigrateCmdFactory, "when constructing"
   end
 end
 
+module VerifyInterceptor
+  # don't throw if it doesn't exist
+  def verify_exists
+  end
+end
+
 describe Albacore::Tools::FluentMigrator::Cmd, "when calling #execute" do
 
   def cmd *args
@@ -25,6 +31,7 @@ describe Albacore::Tools::FluentMigrator::Cmd, "when calling #execute" do
     @logger.debug "calling new with #{opts.inspect}"
     c = Albacore::Tools::FluentMigrator::Cmd.new opts
     c.extend ShInterceptor
+    c.extend VerifyInterceptor
     c
   end
 

data/spec/utils_spec.rb

@@ -0,0 +1,16 @@
+require 'map'
+
+describe 'getting defaults from map' do
+  subject do
+    Map.options my_key: 456, dir: 'abc'
+  end
+  it 'should contain :my_key' do
+    expect(subject.getopt :my_key).to be 456
+  end
+  it 'should contain :my_key with #get' do
+    expect(subject.get :my_key).to be 456
+  end
+  it 'should allow defaults' do
+    expect(subject.getopt(:doesntexist, 333)).to be 333
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Henrik Feldt
@@ -360,6 +360,7 @@ files:
 - spec/testdata/example.nuspec
 - spec/testdata/example.symbols.nuspec
 - spec/tools/fluent_migrator_spec.rb
+- spec/utils_spec.rb
 homepage: http://albacorebuild.net
 licenses:
 - MIT
@@ -579,3 +580,4 @@ test_files:
 - spec/testdata/example.nuspec
 - spec/testdata/example.symbols.nuspec
 - spec/tools/fluent_migrator_spec.rb
+- spec/utils_spec.rb