runpuppet 0.5.13 → 0.5.14

data/VERSION

@@ -1 +1 @@
-0.5.13
+0.5.14

data/bin/runpuppet

@@ -22,6 +22,7 @@ BANNER
   opts.on('-v', '--version','Show Version'){ puts Runpuppet::VERSION; exit}
   opts.on('--try','Runs only if selected on puppet_controller'){ options[:try] = true }
   opts.on('-f', '--facts','Report facts'){ options[:facts] = true }
+  opts.on('-vv', '--verbose','Verbose Output'){ options[:verbose] = true }
   opts.on('-b x', '--branch x', 'Run this branch') do |branch|
     options[:branch] = branch
   end

data/lib/runpuppet.rb

@@ -34,11 +34,13 @@ class Runpuppet
   end
 
 
-  def self.get(path)
+  def self.get(path, options={})
     path += (path.include?('?') ? '&' : '?')
     path += "hostname=#{Socket.gethostname}&ip=#{Config.local_ip}"
     begin
-      open(Config.puppet_controller_url + path, {:http_basic_authentication =>Config.puppet_controller_auth} )
+      url = Config.puppet_controller_url + path
+      puts "Getting #{url}" if options[:verbose]
+      open(url , {:http_basic_authentication =>Config.puppet_controller_auth} )
     rescue Exception => e
       puts e.inspect
       puts "WARNING: error connecting to puppet controller!"
@@ -62,17 +64,18 @@ class Runpuppet
     with_lock(Config.lock_file) do
       time = Time.now.utc.strftime("%Y-%m-%d %H:%M:%S")
 
-      todo, branch = get("/puppet/run").read.split('-') rescue []
+      todo, branch = get("/puppet/run", options).read.split('-') rescue []
+      puts "got #{todo} with branch #{branch}" if options[:verbose]
       branch ||= (options[:branch] || Config.default_branch)
       if todo == 'run' or !options[:try] # try allows not running
-        get '/puppet/status?status=started'
+        get '/puppet/status?status=started', options
         cmd = Config.command.gsub('@@branch@@', branch)
         puts "#{time}: run #{branch}"
 
         if sh(cmd)
-          get '/puppet/status?status=finished'
+          get '/puppet/status?status=finished', options
         else
-          get '/puppet/status?status=error'
+          get '/puppet/status?status=error', options
           exit 2
         end
       else

data/runpuppet.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{runpuppet}
-  s.version = "0.5.13"
+  s.version = "0.5.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Roman Heinrich}]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: runpuppet
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 5
-  - 13
-  version: 0.5.13
+  - 14
+  version: 0.5.14
 platform: ruby
 authors: 
 - Roman Heinrich