dopi 0.18.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76172f4760eaf3ed0a244457346f69b44901e51a
-  data.tar.gz: 22e167ba7260b906a39cd3114056b8b6b2f6c5c0
+  metadata.gz: 77e99a3d8150126a8603955f6e19e34a8902ba2d
+  data.tar.gz: e8b99ece6efae4cd566d560f0d3925447201c795
 SHA512:
-  metadata.gz: e3b32d4ab26d002dc7d6bf90ec174dd6ed39682000919e4d6cdf6024968cc419e6df7563e5cc9590cbc1cdc0680dcb7f697f720f2285e47cd859329f845e0742
-  data.tar.gz: d18f82635f8fe8097b5ef3cb6b7393d0054c12a01bc390ee5c84d4177d5deb2490f95fa83bb8224d5af78faeb5b7d9c50c808b73210e35b01668b7b68c544a0c
+  metadata.gz: af686a937f4059bfaf2308c13779d96cb2c2ff9aa7058bf2d1b2927ca1c081e2880ecff14f63c0d3aaf4a79a90ec1441638692f5fbfb4118cd02b20ef7ad31e3
+  data.tar.gz: d1e57135fa7f9ba45d9d8a566c1a9cad43d5972dcd78385f9854542d09bbbbb74351bc8a34fae44fb178275799587ea4f24955e35b178b7e2c509d7a7c8a565c

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log
 All notable changes to DOPi will be documented in this file.
 
+## [0.18.2] - 2017-06-28
+### Fixed
+- Puppet should now use the puppet in the search path per default
+- The puppet binary can now be configured with puppet_bin
+
 ## [0.18.1] - 2017-05-24
 ### Fixed
 - Update dependencies

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dopi (0.18.0)
+    dopi (0.18.2)
       curses (~> 1)
       dop_common (~> 0.15, >= 0.15.0)
       gli (~> 2)
@@ -17,7 +17,7 @@ GEM
     curses (1.2.2)
     diff-lcs (1.3)
     docile (1.1.5)
-    dop_common (0.15.0)
+    dop_common (0.15.1)
       hashdiff (~> 0.3, >= 0.3.1)
       lockfile (~> 2)
       rb-inotify (~> 0.9)
@@ -29,7 +29,7 @@ GEM
     gyoku (1.3.1)
       builder (>= 2.1.2)
     hashdiff (0.3.4)
-    hiera (3.3.1)
+    hiera (3.4.0)
     httpclient (2.8.3)
     json (2.1.0)
     little-plugger (1.1.4)
@@ -38,7 +38,7 @@ GEM
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    mcollective-client (2.10.4)
+    mcollective-client (2.11.0)
       json
       stomp
       systemu
@@ -47,8 +47,8 @@ GEM
     nori (2.6.0)
     parallel (1.11.2)
     rake (12.0.0)
-    rb-inotify (0.9.8)
-      ffi (>= 0.5.0)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
       rspec-expectations (~> 3.6.0)
@@ -75,7 +75,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.1)
-    stomp (1.4.3)
+    stomp (1.4.4)
     systemu (2.6.5)
     winrm (2.2.3)
       builder (>= 2.1.2)

data/Rakefile

@@ -8,7 +8,7 @@ namespace :spec do
       hiera = 'spec/fixtures/puppet/hiera.yaml'
       plan  = 'spec/fixtures/testenv_plan.yaml'
       sh('bundle package --all')
-      sh("bundle exec bin/dopi --verbosity debug --trace --hiera_yaml #{hiera} oneshot #{plan}")
+      sh("bundle exec bin/dopi --hiera_yaml #{hiera} oneshot #{plan}")
     end
   end
 

data/lib/dopi/command/ssh/puppet_agent_run.rb

@@ -19,10 +19,6 @@ module Dopi
           super(command_parser, step, node, is_verify_command)
         end
 
-        def puppet_bin
-          '/usr/bin/puppet'
-        end
-
         def check_run_lock
           ssh_command(env, "test -f $(#{puppet_bin} config print statedir)/agent_catalog_run.lock")
         end

data/lib/dopi/command/winrm/puppet_agent_run.rb

@@ -19,14 +19,6 @@ module Dopi
           super(command_parser, step, node, is_verify_command)
         end
 
-        def puppet_bin
-          'puppet'
-        end
-
-        def check_run_lock_b
-          false
-        end
-
         def check_run_lock
           winrm_powershell_command <<-cmd
             $Statedir = #{puppet_bin} config print statedir

data/lib/dopi/command_parser/puppet_run.rb

@@ -2,6 +2,8 @@
 # This is a mixin for command plugins that need to parse puppet_run specific
 # options and for some methods to wrap the rerun logic.
 #
+require 'pathname'
+
 module Dopi
   module CommandParser
     module PuppetRun
@@ -19,6 +21,7 @@ module Dopi
         log_validation_method('rerun_on_error_valid?', CommandParsingError)
         log_validation_method('max_rerun_valid?', CommandParsingError)
         log_validation_method('wait_if_already_running_valid?', CommandParsingError)
+        log_validation_method('puppet_bin_valid?', CommandParsingError)
       end
 
       def rerun_on_change
@@ -37,6 +40,10 @@ module Dopi
         @wait_if_already_running ||= wait_if_already_running_valid? ? hash[:wait_if_already_running] : true
       end
 
+      def puppet_bin
+        @puppet_bin ||= puppet_bin_valid? ? hash[:puppet_bin] : 'puppet'
+      end
+
       def run
         runs = 0
         loop do
@@ -144,6 +151,17 @@ module Dopi
           raise CommandParsingError, "Plugin #{name}: The value for 'wait_if_already_running' must be boolean"
       end
 
+      def puppet_bin_valid?
+        return false unless hash.kind_of?(Hash)
+        return false if hash[:puppet_bin].nil? # is optional
+        begin
+          Pathname.new(hash[:puppet_bin]).absolute? or hash[:puppet_bin][/[a-zA-Z]+:\\/] or hash[:puppet_bin][/\\\\\w+/] or
+            raise CommandParsingError, "Plugin #{name}: The path for 'puppet_bin' has to be absolute"
+        rescue ArgumentError => e
+          raise CommandParsingError, "Plugin #{name}: The value in 'puppet_bin' is not a valid file path: #{e.message}"
+        end
+      end
+
     end
   end
 end

data/lib/dopi/version.rb

@@ -1,3 +1,3 @@
 module Dopi
-  VERSION = '0.18.1'
+  VERSION = '0.18.2'
 end

data/spec/fixtures/testenv_plan.yaml

@@ -130,7 +130,7 @@ steps:
         - plugin: 'ssh/custom'
           exec: 'gem list | grep dop_common'
       plugin: 'ssh/custom'
-      exec: 'cd /vagrant/vendor/cache/dop_common-*/ && gem build dop_common.gemspec && gem install dop_common*.gem'
+      exec: 'gem install dop_common'
 
   - name: 'Install DOPi so we can add the plan'
     roles: 'puppetmaster'
@@ -148,7 +148,7 @@ steps:
     command:
       verify_commands:
         - plugin: 'ssh/file_exists'
-          file: '/var/lib/dop/plans/build_dop_test_environment.yaml'
+          file: '/var/lib/dop/cache/build_dop_test_environment/dopi.yaml'
       plugin: 'ssh/custom'
       exec: 'bundle'
       arguments: 'exec dopi add /vagrant/spec/fixtures/testenv_plan.yaml'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dopi
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.18.2
 platform: ruby
 authors:
 - Andreas Zuber
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler